* Addressbook: finally fixed bug in not reading last line.

Thanks to all who reported!

* Replaced occurances of KTopLevelWidget with KTMainWindow.

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

ChangeLog

@@ -1,3 +1,10 @@
+1998-09-26  Stefan Taferner  <taferner@kde.org> (KMail-0.8.1)
+
+	* Addressbook: finally fixed bug in not reading last line.
+	Thanks to all who reported!
+
+	* Replaced occurances of KTopLevelWidget with KTMainWindow.
+
 1998-09-21  Markus Wuebben  <markus@office.DInet.de>
 
 	* added a short cut for mail checking

kmaddrbook.cpp

@@ -96,10 +96,13 @@ int KMAddrBook::load(const char* aFileName)
   if (!file.open(IO_ReadOnly)) return file.status();
   clear();
 
-  while (!file.atEnd() && file.readLine(line,255)>0 )
+  while (!file.atEnd())
   {
-    if (line[strlen(line)-1] < ' ') line[strlen(line)-1] = '\0';
-    if (line[0]!='#' && line[0]!='\0') inSort(line);
+    if (file.readLine(line,255) > 0)
+    {
+      if (line[strlen(line)-1] < ' ') line[strlen(line)-1] = '\0';
+      if (line[0]!='#' && line[0]!='\0') inSort(line);
+    }
   }
   rc = file.status();
   file.close();

kmtopwidget.cpp

@@ -55,7 +55,8 @@ bool KMTopLevelWidget::close(bool aForceKill)
   rc = KMTopLevelWidgetInherited::close(aForceKill);
   if (!rc) return FALSE;
 
-  if (KTopLevelWidget::memberList && KTopLevelWidget::memberList->isEmpty())
+  if (KMTopLevelWidgetInherited::memberList && 
+      KMTopLevelWidgetInherited::memberList->isEmpty())
     kapp->quit();
 
   return TRUE;
@@ -67,10 +68,11 @@ void KMTopLevelWidget::forEvery(KForEvery func)
 {
   KMTopLevelWidget* w;
 
-  if (KTopLevelWidget::memberList)
+  if (KMTopLevelWidgetInherited::memberList)
   {
-    for (w = (KMTopLevelWidget*)KTopLevelWidget::memberList->first(); w;
-	 w = (KMTopLevelWidget*)KTopLevelWidget::memberList->next())
+    for (w=(KMTopLevelWidget*)KMTopLevelWidgetInherited::memberList->first();
+	 w;
+	 w=(KMTopLevelWidget*)KMTopLevelWidgetInherited::memberList->next())
     {
       if (w->inherits("KMTopLevelWidget")) (w->*func)();
     }

kmtopwidget.h

@@ -19,7 +19,7 @@
 #ifndef kmtopwidget_h
 #define kmtopwidget_h
 
-#include <ktopwidget.h>
+#include <ktmainwindow.h>
 
 class KMTopLevelWidget;
 
@@ -29,8 +29,8 @@ typedef void (KMTopLevelWidget::*KForEvery)(void);
 /** Top level window that offers methods to be called on every 
  * existing top level window.
  */
-#define KMTopLevelWidgetInherited KTopLevelWidget
-class KMTopLevelWidget: public KTopLevelWidget
+#define KMTopLevelWidgetInherited KTMainWindow
+class KMTopLevelWidget: public KTMainWindow
 {
   Q_OBJECT
 

kmversion.h

@@ -3,6 +3,6 @@
 #ifndef kmversion_h
 #define kmversion_h
 
-#define KMAIL_VERSION "0.8.0"
+#define KMAIL_VERSION "0.8.1"
 
 #endif /*kmversion_h*/

main.cpp

@@ -124,9 +124,9 @@ static void signalHandler(int sigId)
   fprintf(stderr, "*** KMail got signal %d\n", sigId);
 
   // try to cleanup all windows
-  while (KTopLevelWidget::memberList->first() != NULL)
+  while (KTMainWindow::memberList->first() != NULL)
   {
-    win = KTopLevelWidget::memberList->take();
+    win = KTMainWindow::memberList->take();
     if (win->inherits("KMComposeWin")) ((KMComposeWin*)win)->deadLetter();
     delete win;
   }