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

List:       kde-commits
Subject:    kdevelop
From:       Alexander Dymo <cloudtemple () mksat ! net>
Date:       2005-02-24 0:08:24
Message-ID: 20050224000824.056DEEA9D () office ! kde ! org
[Download RAW message or body]

CVS commit by dymo: 

Fix the compilation on KDE 3.2.


  M +7 -1      languages/cpp/ccconfigwidget.cpp   1.40
  M +8 -0      parts/snippet/snippet_widget.cpp   1.23
  M +6 -0      src/profileengine/editor/profileeditor.cpp   1.6
  M +8 -0      vcs/cvsservice/cvspartimpl.cpp   1.36


--- kdevelop/languages/cpp/ccconfigwidget.cpp  #1.39:1.40
@@ -37,4 +37,5 @@
 #include <kmainwindow.h>
 #include <klineedit.h>
+#include <kdeversion.h>
 // kdevelop includes
 #include <domutil.h>
@@ -177,5 +178,10 @@ void CCConfigWidget::slotRemovePCS()
         QString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + "/" + \
db + ".db";  
+#if KDE_VERSION >= KDE_MAKE_VERSION(3,3,0)      
         if ( KMessageBox::Continue == KMessageBox::warningContinueCancel( 0, \
question, i18n("Remove Database"), KStdGuiItem::del() ) ) +#else
+        if ( KMessageBox::Continue == KMessageBox::warningContinueCancel( 0, \
question, i18n("Remove Database"), +         KGuiItem( "&Delete", "editdelete", \
"Delete item(s)" ) ) ) +#endif
         {
                 m_pPart->removeCatalog( dbName );

--- kdevelop/parts/snippet/snippet_widget.cpp  #1.22:1.23
@@ -35,4 +35,5 @@
 #include <qtimer.h>
 #include <kcombobox.h>
+#include <kdeversion.h>
 
 #include <kdevcore.h>
@@ -161,6 +162,13 @@ void SnippetWidget::slotRemove()
   if (group) {
     if (group->childCount() > 0 &&
+#if KDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
         KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove \
this group and all its snippets?"),QString::null,KStdGuiItem::del())  == \
KMessageBox::Cancel) +#else
+        KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove \
this group and all its snippets?"), +                QString::null,KGuiItem( \
"&Delete", "editdelete", +                   "Delete item(s)"))
+        == KMessageBox::Cancel)
+#endif
       return;
 

--- kdevelop/src/profileengine/editor/profileeditor.cpp  #1.5:1.6
@@ -33,4 +33,5 @@
 #include <kdialogbase.h>
 #include <kglobalsettings.h>
+#include <kdeversion.h>
 
 #include <profile.h>
@@ -251,6 +252,11 @@ void ProfileEditor::addProfile()
 void ProfileEditor::removeProfile()
 {
+#if KDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
     if (KMessageBox::warningContinueCancel(this, i18n("Remove selected profile and \
                all its subprofiles?"),
         i18n("Remove Profile"),KStdGuiItem::del()) == KMessageBox::Continue)
+#else
+    if (KMessageBox::warningContinueCancel(this, i18n("Remove selected profile and \
all its subprofiles?"), +        i18n("Remove Profile"),KGuiItem( "&Delete", \
"editdelete", "Delete item(s)")) == KMessageBox::Continue) +#endif
     {
         Profile *profile = currentProfile();

--- kdevelop/vcs/cvsservice/cvspartimpl.cpp  #1.35:1.36
@@ -811,4 +811,5 @@ void CvsServicePartImpl::removedFilesFro
         return;
 
+#if KDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
     int s = KMessageBox::warningContinueCancel( 0,
         i18n("Do you want them to be removed from CVS repository too?\nWarning: They \
will be removed from disk too."), @@ -816,4 +817,11 @@ void \
CvsServicePartImpl::removedFilesFro  KStdGuiItem::del(),
         i18n("askWhenRemovingFiles") );
+#else
+    int s = KMessageBox::warningContinueCancel( 0,
+        i18n("Do you want them to be removed from CVS repository too?\nWarning: They \
will be removed from disk too."), +        i18n("CVS - Files Removed From Project"),
+        KGuiItem( "&Delete", "editdelete", "Delete item(s)"),
+        i18n("askWhenRemovingFiles") );
+#endif
     if (s == KMessageBox::Continue)
     {


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