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

List:       kde-commits
Subject:    KDE/kdesdk/cervisia
From:       Laurent Montel <montel () kde ! org>
Date:       2007-01-11 7:42:02
Message-ID: 1168501322.430396.27512.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 622253 by mlaurent:

Minor fix
Use relative path for interface as pointed by David


 M  +5 -4      CMakeLists.txt  
 M  +6 -8      diffdlg.cpp  
 M  +3 -4      diffdlg.h  


--- trunk/KDE/kdesdk/cervisia/CMakeLists.txt #622252:622253
@@ -31,6 +31,11 @@
    settingsdlg.cpp
 	)	
 
+qt4_add_dbus_interfaces( libcervisia_SRCS cvsservice/org.kde.cervisia.cvsservice.xml \
) +qt4_add_dbus_interfaces( libcervisia_SRCS cvsservice/org.kde.cervisia.cvsjob.xml )
+qt4_add_dbus_interfaces( libcervisia_SRCS cvsservice/org.kde.cervisia.repository.xml \
) +
+
 kde4_add_ui3_files(libcervisia_SRCS settingsdlg_advanced.ui )
 
 kde4_add_kcfg_files(libcervisia_SRCS cervisiasettings.kcfgc )
@@ -40,11 +45,7 @@
    main.cpp 
    cervisiashell.cpp )
 
-qt4_add_dbus_interfaces( cvsservice_LIB_SRCS \
                ${CMAKE_SOURCE_DIR}/cervisia/cvsservice/org.kde.cervisia.cvsservice.xml \
                )
-qt4_add_dbus_interfaces( cvsservice_LIB_SRCS \
                ${CMAKE_SOURCE_DIR}/cervisia/cvsservice/org.kde.cervisia.cvsjob.xml )
-qt4_add_dbus_interfaces( cvsservice_LIB_SRCS \
${CMAKE_SOURCE_DIR}/cervisia/cvsservice/org.kde.cervisia.repository.xml )  
-
 kde4_automoc(${cervisia_KDEINIT_SRCS})
 
 kde4_add_kdeinit_executable( cervisia ${cervisia_KDEINIT_SRCS})
--- trunk/KDE/kdesdk/cervisia/diffdlg.cpp #622252:622253
@@ -39,9 +39,7 @@
 #include <kmessagebox.h>
 #include <ktemporaryfile.h>
 #include <kprocess.h>
-
-//#include "cvsservice_stub.h"
-//#include "repository_stub.h"
+#include "cvsserviceinterface.h"
 #include "misc.h"
 #include "progressdlg.h"
 #include "diffview.h"
@@ -227,7 +225,7 @@
 };
 
 
-bool DiffDialog::parseCvsDiff(CvsService_stub* service, const QString& fileName,
+bool DiffDialog::parseCvsDiff(LocalCvsServiceInterface* service, const QString& \
fileName,  const QString &revA, const QString &revB)
 {
     QStringList linesA, linesB;
@@ -257,9 +255,9 @@
         }
 
     const QString diffOptions   = cs.readEntry("DiffOptions");
-    const unsigned contextLines = cs.readUnsignedNumEntry("ContextLines", 65535);
+    const unsigned contextLines = cs.readEntry("ContextLines", 65535);
 
-    DCOPRef job = service->diff(fileName, revA, revB, diffOptions, contextLines);
+    QDBusObjectPath job = service->diff(fileName, revA, revB, diffOptions, \
contextLines);  if( !service->ok() )
         return false;
 
@@ -362,7 +360,7 @@
 }
 
 
-void DiffDialog::callExternalDiff(const QString& extdiff, CvsService_stub* service,
+void DiffDialog::callExternalDiff(const QString& extdiff, LocalCvsServiceInterface* \
                service,
                                   const QString& fileName, const QString &revA,
                                   const QString &revB)
 {
@@ -372,7 +370,7 @@
     // create suffix for temporary file (used QFileInfo to remove path from file \
name)  const QString suffix = '-' + QFileInfo(fileName).fileName();
 
-    DCOPRef job;
+    QDBusObjectPath job;
     if (!revA.isEmpty() && !revB.isEmpty())
     {
         // We're comparing two revisions
--- trunk/KDE/kdesdk/cervisia/diffdlg.h #622252:622253
@@ -34,9 +34,8 @@
 class KConfigBase;
 class DiffItem;
 class DiffView;
-class CvsService_stub;
+class LocalCvsServiceInterface;
 
-
 class DiffDialog : public KDialog
 {
     Q_OBJECT
@@ -48,7 +47,7 @@
 
     virtual ~DiffDialog();
 
-    bool parseCvsDiff(CvsService_stub* service, const QString &fileName, 
+    bool parseCvsDiff(LocalCvsServiceInterface* service, const QString &fileName, 
                       const QString &revA, const QString &revB);
 
 protected:
@@ -64,7 +63,7 @@
 private:
     void newDiffHunk(int& linenoA, int& linenoB, const QStringList& linesA,
                      const QStringList& linesB);
-    void callExternalDiff(const QString& extdiff, CvsService_stub* service, 
+    void callExternalDiff(const QString& extdiff, LocalCvsServiceInterface* service, \
  const QString& fileName, const QString& revA, 
                           const QString& revB);
     void updateNofN();


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