Mario: some improvements (see ChangeLogs)

svn path=/trunk/kdenetwork/kmail/; revision=8148

ChangeLog

@@ -1,3 +1,12 @@
+1998-06-11  Mario Weilguni   <mweilguni@kde.org> (KMail-0.6.9)
+	
+	* "P" and "N" (next and previous mail) will cause the header
+	list to be scrolled if the new item is not visible
+
+	* fixed some code to prevent compiler warning
+
+	* panner position is now (again) restored
+	
 1998-06-07  Stefan Taferner  <taferner@kde.org> (KMail-0.6.8)
 
 	* Message/Headers: Email addresses like <joe@home.org>

kmcomposewin.cpp

@@ -1569,8 +1569,11 @@ void KMComposeWin::slotSpellcheck2(KSpell*)
 
 
 //-----------------------------------------------------------------------------
-void KMComposeWin::slotSpellResult(char* aNewText)
+void KMComposeWin::slotSpellResult(char *aNewText)
 {
+  // prevent warning
+  (void)aNewText;
+
 #ifdef HAS_KSPELL
   mEditor->setText(aNewText);
   mEditor->setReadOnly(FALSE);
@@ -1584,6 +1587,11 @@ void KMComposeWin::slotSpellResult(char* aNewText)
 void KMComposeWin::slotSpellCorrected(char *originalword, 
 				      char *newword, long pos)
 {
+  // prevent warning
+  (void)originalword;
+  (void)newword;
+  (void)pos;
+
 #ifdef HAS_KSPELL
   //we'll reselect the original word in case the user has played with
   //the selection in eframe or the word was auto-replaced
@@ -1617,6 +1625,10 @@ void KMComposeWin::slotSpellCorrected(char *originalword,
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotSpellMispelling(char *word, QStrList *, long pos)
 {
+  // prevent warning
+  (void)word;
+  (void)pos;
+
 #ifdef HAS_KSPELL
   int l, cnt=0;
 
@@ -1663,6 +1675,13 @@ void KMComposeWin::slotConfigureCharsets()
 void KMComposeWin::slotSetCharsets(const char *message,const char *composer,
                                    bool ascii,bool quote,bool def)
 {
+  // prevent warning
+  (void)message;
+  (void)composer;
+  (void)ascii;
+  (void)quote;
+  (void)def;
+
 #ifdef CHARSETS
   mCharset=message;
   m7BitAscii=ascii;

kmfilterdlg.cpp

@@ -402,7 +402,7 @@ void KMFilterDlg::slotFilterSelected(int idx)
   debug("KMFilterDlg::slotFilterSelected()");
 
   if (mFilter) applyFilterChanges();
-  if (idx < filterMgr->count())
+  if (idx < (int)filterMgr->count())
   {
     filter = filterMgr->at(idx);
     if (filter) showFilter(filter);

kmfoldertree.cpp

@@ -88,7 +88,6 @@ void KMFolderTree::reload(void)
   KMFolder* folder;
   QString str;
   bool upd = autoUpdate();
-  int i;
 
   setAutoUpdate(FALSE);
 

kmheaders.cpp

@@ -283,7 +283,7 @@ void KMHeaders::setMsgStatus (KMMsgStatus status, int msgId)
 
 
 //-----------------------------------------------------------------------------
-void KMHeaders::applyFiltersOnMsg(int msgId)
+void KMHeaders::applyFiltersOnMsg(int /*msgId*/)
 {
   KMMessage* msg;
   KMMessageList* msgList = selectedMsgs();
@@ -575,8 +575,10 @@ void KMHeaders::nextMessage()
 {
   int idx = currentItem();
 
-  if (idx < mFolder->count())
+  if (idx < mFolder->count()) {
     setCurrentItem(idx+1);
+    makeHeaderVisible();
+  }
 }
 
 
@@ -585,11 +587,22 @@ void KMHeaders::prevMessage()
 {
   int idx = currentItem();
 
-  if (idx > 0) 
-    setCurrentItem(idx-1);
+  if (idx > 0) {
+    setCurrentItem(idx-1); 
+    makeHeaderVisible();
+  }
 }  
 
 
+//-----------------------------------------------------------------------------
+void KMHeaders::makeHeaderVisible() {
+    if(currentItem() > lastRowVisible())
+      setTopItem(topItem() + currentItem() - lastRowVisible());
+    else if(currentItem() < topItem())
+      setTopItem(currentItem());  
+}
+
+
 //-----------------------------------------------------------------------------
 void KMHeaders::changeItemPart (char c, int itemIndex, int column)
 {

kmheaders.h

@@ -84,6 +84,9 @@ public slots:
   void prevMessage();
 
 protected:
+  
+  void makeHeaderVisible();
+
   virtual bool prepareForDrag (int col, int row, char** data, int* size, 
 			       int* type);
 

kmmainwin.cpp

@@ -97,12 +97,13 @@ KMMainWin::KMMainWin(QWidget *, char *name) :
 
   readConfig();
 
-  mVertPanner->setAbsSeparatorPos(mVertPannerSep);
-  mHorizPanner->setAbsSeparatorPos(mHorizPannerSep);
-
   mVertPanner->activate(mHorizPanner, mMsgView);
   mHorizPanner->activate(mFolderTree, mHeaders);
 
+  // now adjust panner positions
+  mVertPanner->setAbsSeparatorPos(mVertPannerSep);
+  mHorizPanner->setAbsSeparatorPos(mHorizPannerSep);
+
   setupMenuBar();
   setupToolBar();
   setupStatusBar();

kmmsgbase.cpp

@@ -463,6 +463,7 @@ const QString KMMsgBase::decodeQuotedPrintableString(const QString aStr)
   int start, beg, mid, end;
 
   start = 0;
+  end = 0;
   result = "";
 
   while (1)

kmmsglist.cpp

@@ -191,7 +191,7 @@ void KMMsgList::rethinkHigh(void)
 void KMMsgList::sort(SortField aField, bool aDescending)
 {
   int i, j;
-  KMMsgBasePtr ptrList[mHigh+1];
+  //  KMMsgBasePtr ptrList[mHigh+1];
   KMMsgBasePtr mb;
 
   if (mHigh < 2) return;

kmnewiostatus.cpp

@@ -38,7 +38,7 @@ void KMIOStatus::update() {
 
 }
 
-void KMIOStatus::newMail(bool _newMail) {
+void KMIOStatus::newMail(bool /*_newMail*/) {
 
 }
 

kmnewiostatuswdg.cpp

@@ -61,7 +61,7 @@ KMIOStatusWdg::~KMIOStatusWdg() {
 
 }
 
-void KMIOStatusWdg::newMail(bool _newMail) {
+void KMIOStatusWdg::newMail(bool /*_newMail*/) {
 
 }
 

kmsettings.cpp

@@ -418,7 +418,6 @@ void KMSettings::createTabMisc(QWidget *parent)
   QBoxLayout* box = new QBoxLayout(tab, QBoxLayout::TopToBottom, 4);
   QGridLayout* grid;
   QGroupBox* grp;
-  QLabel* lbl;
   KConfig* config = app->getConfig();
   QString str;
 

kmversion.h

@@ -3,6 +3,6 @@
 #ifndef kmversion_h
 #define kmversion_h
 
-#define KMAIL_VERSION "0.6.8"
+#define KMAIL_VERSION "0.6.9"
 
 #endif /*kmversion_h*/