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

List:       kde-commits
Subject:    kdepim/kpilot
From:       Adriaan de Groot <groot () kde ! org>
Date:       2005-02-09 15:02:04
Message-ID: 20050209150204.1D9A41B483 () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

Suppress some debugging, add some for tokoe, 'AddressDB' is definitely a latin-1 string.


  M +15 -8     conduits/abbrowserconduit/abbrowser-conduit.cc   1.111
  M +3 -3      lib/pilotSerialDatabase.cc   1.37


--- kdepim/kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc  #1.110:1.111
@@ -392,5 +392,5 @@ void AbbrowserConduit::_setAppInfo()
 int AbbrowserConduit::getCustom(const int index)
 {
-        FUNCTIONSETUP;
+        FUNCTIONSETUPL(4);
 
         int customEnum;
@@ -423,5 +423,5 @@ int AbbrowserConduit::getCustom(const in
 QString AbbrowserConduit::getCustomField(const Addressee &abEntry, const int index)
 {
-        FUNCTIONSETUP;
+        FUNCTIONSETUPL(4);
 
         switch (getCustom(index)) {
@@ -455,5 +455,5 @@ QString AbbrowserConduit::getCustomField
 void AbbrowserConduit::setCustomField(Addressee &abEntry,  int index, QString cust)
 {
-        FUNCTIONSETUP;
+        FUNCTIONSETUPL(4);
 
         switch (getCustom(index)) {
@@ -721,15 +721,17 @@ void AbbrowserConduit::showAdresses(Addr
 {
         FUNCTIONSETUP;
-        DEBUGCONDUIT<<id_conduit_address<<endl;
+        DEBUGCONDUIT << fname << id_conduit_address << endl;
 
         _prepare();
 
         fFirstSync = false;
-        // Database names probably in latin1.
-        if(!openDatabases(QString::fromLatin1("AddressDB"), &fFirstSync))
+        if(!openDatabases(CSL1("AddressDB"), &fFirstSync))
         {
                 emit logError(i18n("Unable to open the addressbook databases on the handheld."));
                 return false;
         }
+
+        DEBUGCONDUIT << fname << ": First sync now " << fFirstSync << endl;
+
         _getAppInfo();
         if(!_loadAddressBook())
@@ -740,4 +742,9 @@ void AbbrowserConduit::showAdresses(Addr
         fFirstSync = fFirstSync || (aBook->begin() == aBook->end());
 
+        DEBUGCONDUIT << fname << ": First sync now " << fFirstSync
+                << " and addressbook is "
+                << ((aBook->begin() == aBook->end()) ? "" : "non-")
+                << "empty." << endl;
+
         // perform syncing from palm to abbrowser
         // iterate through all records in palm pilot
@@ -1444,5 +1451,5 @@ bool AbbrowserConduit::_equal(const Pilo
         enum eqFlagsType flags) const
 {
-        FUNCTIONSETUP;
+        FUNCTIONSETUPL(8);
         // empty records are never equal!
         if (!piAddress) return false;

--- kdepim/kpilot/lib/pilotSerialDatabase.cc  #1.36:1.37
@@ -150,5 +150,5 @@ QValueList<recordid_t> PilotSerialDataba
 PilotRecord *PilotSerialDatabase::readRecordById(recordid_t id)
 {
-        FUNCTIONSETUP;
+        FUNCTIONSETUPL(3);
         int index, attr, category;
 
@@ -183,5 +183,5 @@ PilotRecord *PilotSerialDatabase::readRe
 PilotRecord *PilotSerialDatabase::readRecordByIndex(int index)
 {
-        FUNCTIONSETUP;
+        FUNCTIONSETUPL(3);
 
         if (isDBOpen() == false)


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