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

List:       kde-commits
Subject:    KDE/kdepim/wizards
From:       Allen Winter <winter () kde ! org>
Date:       2007-06-20 14:34:11
Message-ID: 1182350051.169373.16074.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 678040 by winterz:

lots of little Krazy fixes


 M  +4 -5      groupwarewizard.cpp  
 M  +1 -1      groupwisewizard.cpp  
 M  +1 -1      kmailchanges.cpp  
 M  +8 -0      kolabwizard.cpp  
 M  +9 -10     overviewpage.cpp  
 M  +1 -0      servertype.h  
 M  +2 -3      servertypemanager.cpp  
 M  +1 -1      servertypemanager.h  


--- trunk/KDE/kdepim/wizards/groupwarewizard.cpp #678039:678040
@@ -19,15 +19,14 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <QApplication>
-#include <QLayout>
+#include "groupwarewizard.h"
+#include "overviewpage.h"
 
 #include <klocale.h>
 
-#include "overviewpage.h"
+#include <QApplication>
+#include <QLayout>
 
-#include "groupwarewizard.h"
-
 GroupwareWizard::GroupwareWizard( QWidget *parent)
   : QWidget( parent )
 {
--- trunk/KDE/kdepim/wizards/groupwisewizard.cpp #678039:678040
@@ -129,7 +129,7 @@
       KABC::ResourceGroupwise *r = new KABC::ResourceGroupwise( url, user,
                                                                 password,
                                                                 QStringList(),
-                                                                QString::null );
+                                                                QString() );
       r->setResourceName( i18n("GroupWise") );
       m.add( r );
       m.writeConfig();
--- trunk/KDE/kdepim/wizards/kmailchanges.cpp #678039:678040
@@ -342,5 +342,5 @@
       mWallet->createFolder( "kmail" );
     mWallet->setFolder( "kmail" );
   }
-  return mWallet->writePassword( type + "-" + QString::number( id ), mPassword );
+  return mWallet->writePassword( type + '-' + QString::number( id ), mPassword );
 }
--- trunk/KDE/kdepim/wizards/kolabwizard.cpp #678039:678040
@@ -25,7 +25,9 @@
 
 #include "kolabkmailchanges.h"
 
+#ifdef __GNUC__
 #warning Port me!
+#endif
 #if 0
 #include "kresources/kolab/kcal/resourcekolab.h"
 #include "kresources/kolab/kabc/resourcekolab.h"
@@ -108,7 +110,9 @@
     {
       KCal::CalendarResourceManager m( "calendar" );
       m.readConfig();
+#ifdef __GNUC__
 #warning Port me!
+#endif
 #if 0
       KCal::ResourceKolab *r = new KCal::ResourceKolab();
       r->setResourceName( i18n("Kolab Server") );
@@ -131,7 +135,9 @@
     {
       KRES::Manager<KABC::Resource> m( "contact" );
       m.readConfig();
+#ifdef __GNUC__
 #warning Port me!
+#endif
 #if 0
       KABC::ResourceKolab *r = new KABC::ResourceKolab();
       r->setResourceName( i18n("Kolab Server") );
@@ -153,7 +159,9 @@
 
     void apply()
     {
+#ifdef __GNUC__
 #warning Port me!
+#endif
 #if 0
       KRES::Manager<ResourceNotes> m( "notes" );
       m.readConfig();
--- trunk/KDE/kdepim/wizards/overviewpage.cpp #678039:678040
@@ -19,10 +19,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <QButtonGroup>
-#include <QLabel>
-#include <QLayout>
-#include <QRadioButton>
+#include "overviewpage.h"
+#include "egroupwarewizard.h"
+#include "kolabwizard.h"
+#include "sloxwizard.h"
+#include "groupwisewizard.h"
 
 #include <kacceleratormanager.h>
 #include <kdialog.h>
@@ -32,13 +33,11 @@
 #include <kpushbutton.h>
 #include <KStandardGuiItem>
 
-#include "egroupwarewizard.h"
-#include "kolabwizard.h"
-#include "sloxwizard.h"
-#include "groupwisewizard.h"
+#include <QButtonGroup>
+#include <QLabel>
+#include <QLayout>
+#include <QRadioButton>
 
-#include "overviewpage.h"
-
 OverViewPage::OverViewPage( QWidget *parent )
   : QWidget( parent )
 {
--- trunk/KDE/kdepim/wizards/servertype.h #678039:678040
@@ -29,6 +29,7 @@
 
 class ServerType : public QObject
 {
+  Q_OBJECT
   public:
     class ConnectionInfo
     {
--- trunk/KDE/kdepim/wizards/servertypemanager.cpp #678039:678040
@@ -19,11 +19,10 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kstaticdeleter.h>
-
+#include "servertypemanager.h"
 #include "egroupwarehandler.h"
 
-#include "servertypemanager.h"
+#include <kstaticdeleter.h>
 
 ServerTypeManager* ServerTypeManager::mSelf = 0;
 static KStaticDeleter<ServerTypeManager> serverManagerDeleter;
--- trunk/KDE/kdepim/wizards/servertypemanager.h #678039:678040
@@ -60,7 +60,7 @@
 
     void loadPlugins();
 
-    ServerTypeManager( QObject *parent, const char *name = 0 );
+    explicit ServerTypeManager( QObject *parent, const char *name = 0 );
 
     static ServerTypeManager* mSelf;
 
[prev in list] [next in list] [prev in thread] [next in thread]