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

List:       kde-commits
Subject:    kdepim/kpilot
From:       Cornelius Schumacher <schumacher () kde ! org>
Date:       2004-12-11 23:17:13
Message-ID: 20041211231713.03B381B97A () office ! kde ! org
[Download RAW message or body]

CVS commit by cschumac: 

Make it compile.


  M +7 -1      conduits/docconduit/DOC-converter.cc   1.19
  M +3 -1      lib/kpilotlink.cc   1.76
  M +4 -3      lib/options.cc   1.24
  M +8 -0      lib/options.h   1.59
  M +5 -1      lib/pilotLocalDatabase.cc   1.39
  M +3 -1      lib/recordConduit.cc   1.5


--- kdepim/kpilot/conduits/docconduit/DOC-converter.cc  #1.18:1.19
@@ -79,9 +79,13 @@ int docMatchBookmark::findMatches(QStrin
 //      bmkList res;
         int pos = 0, nr=0, found=0;
+#ifdef DEBUG
         DEBUGCONDUIT<<"Finding matches of "<<pattern<<endl;
+#endif
 
         while (pos >= 0 && found<to) {
                 pos = doctext.find(pattern, pos);
+#ifdef DEBUG
                 DEBUGCONDUIT<<"Result of search: pos="<<pos<<endl;
+#endif
                 if (pos >= 0)
                 {
@@ -108,5 +112,7 @@ int docRegExpBookmark::findMatches(QStri
 
         while (pos>=0 && found<=to) {
+#ifdef DEBUG
                 DEBUGCONDUIT<<"Searching for bookmark "<<pattern<<endl;
+#endif
                 pos=rx.search(doctext, pos);
                 if (pos > -1) {

--- kdepim/kpilot/lib/kpilotlink.cc  #1.75:1.76
@@ -621,6 +621,8 @@ void KPilotDeviceLink::acceptDevice()
         if ((ret=dlp_OpenConduit(fCurrentPilotSocket)) < 0)
         {
+#ifdef DEBUG
                 DEBUGDAEMON << k_funcinfo
                         << ": dlp_OpenConduit returned " << ret << endl;
+#endif
 
 #if 0

--- kdepim/kpilot/lib/options.cc  #1.23:1.24
@@ -122,5 +122,5 @@ struct tm writeTm(const QDate &dt)
 }
 
-
+#ifdef DEBUG
 KPilotDepthCount::KPilotDepthCount() :
         fDepth(depth)
@@ -142,2 +142,3 @@ QString KPilotDepthCount::string() const
 
 int KPilotDepthCount::depth = 0;
\ No newline at end of file
+#endif

--- kdepim/kpilot/lib/options.h  #1.58:1.59
@@ -128,4 +128,5 @@ inline std::ostream& operator <<(std::os
 
 #else
+#ifdef DEBUG
 #define DEBUGSTREAM     kdbgstream
 #define DEBUGKPILOT     kdDebug(KPILOT_AREA) << fname_.string()
@@ -133,4 +134,11 @@ inline std::ostream& operator <<(std::os
 #define DEBUGCONDUIT    kdDebug(CONDUIT_AREA) << fname_.string()
 #define DEBUGDB         kdDebug(LIBPILOTDB_AREA) << fname_.string()
+#else
+#define DEBUGSTREAM     kdbgstream
+#define DEBUGKPILOT     kdDebug(KPILOT_AREA)
+#define DEBUGDAEMON     kdDebug(DAEMON_AREA)
+#define DEBUGCONDUIT    kdDebug(CONDUIT_AREA)
+#define DEBUGDB         kdDebug(LIBPILOTDB_AREA)
+#endif
 #endif
 

--- kdepim/kpilot/lib/pilotLocalDatabase.cc  #1.38:1.39
@@ -125,5 +125,7 @@ PilotLocalDatabase::~PilotLocalDatabase(
         for (i = 0; i < fNumRecords; i++)
         {
+#ifdef DEBUG
                 DEBUGCONDUIT << fname << ": Deleting record " << i << endl;
+#endif
                 delete fRecords[i];
         }
@@ -289,5 +291,7 @@ PilotRecord *PilotLocalDatabase::readRec
         if (isDBOpen() == false)
         {
+#ifdef DEBUG
                 DEBUGKPILOT << fDBName << ": DB not open!" << endl;
+#endif
                 return 0L;
         }

--- kdepim/kpilot/lib/recordConduit.cc  #1.4:1.5
@@ -141,5 +141,7 @@ RecordConduit::~RecordConduit()
 {
         FUNCTIONSETUP;
+#ifdef DEBUG
         DEBUGCONDUIT << id_record_conduit << endl;
+#endif
 
         if ( !_prepare() ) return false;


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