kdevelop

[Andras Mantia]

CVS commit by amantia: 

Get rid of Makefile.am warnings.
Fix compilation of the cvsservice part (the DCOP interface has changed...).

CCMAIL: kdevelop-devel at kdevelop.org


  M +1 -2      kdevdesigner/designer/Makefile.am   1.4
  M +1 -1      kdevdesigner/plugins/Makefile.am   1.3
  M +1 -1      kdevdesigner/shared/Makefile.am   1.2
  M +1 -1      kdevdesigner/uilib/Makefile.am   1.2
  M +8 -1      vcs/cvsservice/cvspartimpl.cpp   1.26


--- kdevelop/kdevdesigner/designer/Makefile.am  #1.3:1.4
@@ -1,5 +1,5 @@
 SUBDIRS = pics
 
-CXXFLAGS=$(SHORTCXXFLAGS)
+AM_CXXFLAGS=$(SHORTCXXFLAGS) -DDESIGNER
 INCLUDES = -I$(top_srcdir)/kdevdesigner/shared -I$(top_srcdir)/lib/external_interfaces $(all_includes)
 METASOURCES = AUTO
@@ -13,5 +13,4 @@
 partrc_DATA = kdevdesigner_part.rc kdevdesigner_part_sh.rc
 noinst_HEADERS = kdevdesigner_part.h designeraction.h myiconloader.h
-AM_CXXFLAGS = -DDESIGNER
 picsdirdir = $(kde_datadir)/kdevdesignerpart/pics
 

--- kdevelop/kdevdesigner/plugins/Makefile.am  #1.2:1.3
@@ -1,3 +1,3 @@
-CXXFLAGS=$(SHORTCXXFLAGS)
+AM_CXXFLAGS=$(SHORTCXXFLAGS)
 INCLUDES = -I$(top_srcdir)/interfaces $(all_includes)
 METASOURCES = AUTO

--- kdevelop/kdevdesigner/shared/Makefile.am  #1.1:1.2
@@ -1,3 +1,3 @@
-CXXFLAGS=$(SHORTCXXFLAGS)
+AM_CXXFLAGS=$(SHORTCXXFLAGS)
 INCLUDES = $(all_includes) -I$(top_srcdir)/lib/external_interfaces
 METASOURCES = AUTO

--- kdevelop/kdevdesigner/uilib/Makefile.am  #1.1:1.2
@@ -1,3 +1,3 @@
-CXXFLAGS=$(SHORTCXXFLAGS)
+AM_CXXFLAGS=$(SHORTCXXFLAGS)
 
 INCLUDES = -I$(top_srcdir)/kdevdesigner/shared $(all_includes)

--- kdevelop/vcs/cvsservice/cvspartimpl.cpp  #1.25:1.26
@@ -17,4 +17,5 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
+#include <kdeversion.h>
 #include <klocale.h>
 #include <kprocess.h>
@@ -362,7 +363,13 @@ bool CvsServicePartImpl::checkout()
     if ( dlg.exec() == QDialog::Accepted )
     {
+#if KDE_IS_VERSION(3,2,90)
+        DCOPRef job = m_cvsService->checkout( dlg.workDir(), dlg.serverPath(),  
+            dlg.module(), dlg.tag(), dlg.pruneDirs(), "", false
+        );
+#else    
         DCOPRef job = m_cvsService->checkout( dlg.workDir(), dlg.serverPath(),
             dlg.module(), dlg.tag(), dlg.pruneDirs()
         );
+#endif  
         if (!m_cvsService->ok()) {
             KMessageBox::sorry( mainWindow()->main(), i18n( "Unable to checkout" ) );