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

List:       kde-commits
Subject:    KDE/kdepimlibs
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2010-09-18 0:15:41
Message-ID: 20100918001541.AC563AC888 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1176543 by smartins:

--krazy

 M  +1 -1      akonadi/agentbase_p.h  
 M  +1 -1      akonadi/kmime/movetotrashcommand_p.h  
 M  +1 -1      kcalcore/event.cpp  
 M  +5 -2      kcalutils/recurrenceactions.cpp  


--- trunk/KDE/kdepimlibs/akonadi/agentbase_p.h #1176542:1176543
@@ -79,7 +79,7 @@
     QString mId;
     QString mName;
 
-    /// Use sessionBus() to acces the connection.
+    /// Use sessionBus() to access the connection.
     QDBusConnection mDBusConnection;
     
     int mStatusCode;
--- trunk/KDE/kdepimlibs/akonadi/kmime/movetotrashcommand_p.h #1176542:1176543
@@ -57,4 +57,4 @@
   int mFolderListJobCount;
 };
 
-#endif // MOVETOTRASHCOMMAND_H
\ No newline at end of file
+#endif // MOVETOTRASHCOMMAND_H
--- trunk/KDE/kdepimlibs/kcalcore/event.cpp #1176542:1176543
@@ -32,7 +32,7 @@
 #include "event.h"
 #include "visitor.h"
 
-#include <kdebug.h>
+#include <KDebug>
 
 using namespace KCalCore;
 
--- trunk/KDE/kdepimlibs/kcalutils/recurrenceactions.cpp #1176542:1176543
@@ -28,6 +28,8 @@
 #include <KLocale>
 #include <KMessageBox>
 
+#include <QPointer>
+
 #include <boost/shared_ptr.hpp>
 
 using namespace KCalUtils;
@@ -141,7 +143,7 @@
                                                const KGuiItem &action, int availableChoices,
                                                int preselectedChoices, QWidget *parent )
 {
-  KDialog *dialog = new KDialog( parent );
+  QPointer<KDialog> dialog = new KDialog( parent );
   dialog->setCaption( caption );
   dialog->setButtons( KDialog::Ok | KDialog::Cancel );
   dialog->setDefaultButton( KDialog::Ok );
@@ -154,7 +156,8 @@
   widget->setIcon( widget->style()->standardIcon( QStyle::SP_MessageBoxQuestion ) );
   widget->setCheckedChoices( preselectedChoices );
 
-  int result = dialog->exec();
+  const int result = dialog->exec();
+  if ( dialog )
   dialog->deleteLater();
 
   if ( result == QDialog::Rejected ) {
[prev in list] [next in list] [prev in thread] [next in thread]