[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenetwork/kmail
From:       Don Sanders <don () sanders ! org>
Date:       2003-01-12 12:55:52
[Download RAW message or body]

CVS commit by sanders: 

make_it_cool merge
replace namespace kmail with namespace KMail


  M +4 -6      kmail_part.cpp   1.8
  M +1 -1      kmstartup.cpp   1.7
  M +1 -1      kmstartup.h   1.5
  M +3 -4      main.cpp   1.174


--- kdenetwork/kmail/kmail_part.cpp  #1.7:1.8
@@ -51,6 +51,4 @@ typedef KParts::GenericFactory< KMailPar
 K_EXPORT_COMPONENT_FACTORY( libkmailpart, KMailFactory );
 
-#include <qapplication.h>
-
 KMailPart::KMailPart(QWidget *parentWidget, const char *widgetName,
                      QObject *parent, const char *name, const QStringList &) :
@@ -68,6 +66,6 @@ KMailPart::KMailPart(QWidget *parentWidg
 
   // Check that all updates have been run on the config file:
-  kmail::checkConfigUpdates();
-  kmail::lockOrDie();
+  KMail::checkConfigUpdates();
+  KMail::lockOrDie();
 
   kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet
@@ -133,9 +131,9 @@ KMailPart::~KMailPart()
     ++it;
     if (window->inherits("KMTopLevelWidget"))
-      window->close(true);
+      window->close(TRUE);
   }
   kernel->notClosedByUser();
   delete kernel;
-  kmail::cleanup();
+  KMail::cleanup();
 }
 

--- kdenetwork/kmail/kmstartup.cpp  #1.6:1.7
@@ -61,5 +61,5 @@ void kmsetSignalHandler(void (*handler)(
 //-----------------------------------------------------------------------------
 
-namespace kmail
+namespace KMail
 {
 QString getMyHostName(void)

--- kdenetwork/kmail/kmstartup.h  #1.4:1.5
@@ -13,5 +13,5 @@ void kmcrashHandler(int sigId);
 }
 
-namespace kmail
+namespace KMail
 {
     QString getMyHostName(void);

--- kdenetwork/kmail/main.cpp  #1.173:1.174
@@ -220,6 +219,6 @@ int main(int argc, char *argv[])
 
   // Check that all updates have been run on the config file:
-  kmail::checkConfigUpdates();
-  kmail::lockOrDie();
+  KMail::checkConfigUpdates();
+  KMail::lockOrDie();
 
   kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet
@@ -245,5 +244,5 @@ int main(int argc, char *argv[])
   // clean up
   kmailKernel.cleanup();
-  kmail::cleanup();
+  KMail::cleanup();
   return ret;
 }


[prev in list] [next in list] [prev in thread] [next in thread]