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

List:       kde-commits
Subject:    KDE/kdevplatform/vcs/widgets
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2008-11-25 20:12:31
Message-ID: 1227643951.731499.21076.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 889022 by apaku:

Fix the changed code to compile.

 M  +11 -7     vcscommitdialog.cpp  


--- trunk/KDE/kdevplatform/vcs/widgets/vcscommitdialog.cpp #889021:889022
@@ -10,15 +10,23 @@
 
 #include "vcscommitdialog.h"
 
+#include <QtCore/QHash>
+#include <QtGui/QBrush>
+#include <QtCore/QRegExp>
+
 #include <KDE/KTextEdit>
 #include <KDE/KComboBox>
 #include <KDE/KLocale>
 #include <KDE/KDebug>
 #include <KDE/KColorScheme>
+#include <KDE/KMessageBox>
+#include <kparts/mainwindow.h>
+
 #include <interfaces/icore.h>
 #include <interfaces/iprojectcontroller.h>
 #include <interfaces/iproject.h>
 #include <interfaces/iplugin.h>
+#include <interfaces/iuicontroller.h>
 
 #include "../vcsjob.h"
 #include "../interfaces/ibasicversioncontrol.h"
@@ -26,10 +34,6 @@
 #include "../interfaces/icentralizedversioncontrol.h"
 #include "../vcsstatusinfo.h"
 
-#include <QtCore/QHash>
-#include <QtGui/QBrush>
-#include <QtCore/QRegExp>
-
 #include "ui_vcscommitdialog.h"
 
 namespace KDevelop
@@ -234,7 +238,7 @@
             repo = addFiles[0];
             KJob* j = idvcs->add(addFiles);
             if( !j ) {
-                KMessageDialog::error( \
ICore::self()->uiController()->activeMainWindow(), i18n( "Could not add files to \
commit list. %1 returned no job to execute.", idvcs->name() ), i18n( "Failed to add \
files to commit" ) ); +                KMessageBox::error( \
ICore::self()->uiController()->activeMainWindow(), i18n( "Could not add files to \
commit list. %1 returned no job to execute.", idvcs->name() ), i18n( "Failed to add \
files to commit" ) );  } else {
                 j->exec();
             }
@@ -242,9 +246,9 @@
         if (!rmFiles.isEmpty())
         {
             repo = rmFiles[0];
-            idvcs->remove(rmFiles)->exec();
+            KJob* j = idvcs->remove(rmFiles);
             if( !j ) {
-                KMessageDialog::error( \
ICore::self()->uiController()->activeMainWindow(), i18n( "Could not remove files. %1 \
returned no job to execute.", idvcs->name() ), i18n( "Failed to remove files" ) ); +  \
KMessageBox::error( ICore::self()->uiController()->activeMainWindow(), i18n( "Could \
not remove files. %1 returned no job to execute.", idvcs->name() ), i18n( "Failed to \
remove files" ) );  } else {
                 j->exec();
             }


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