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

List:       kde-commits
Subject:    kdereview/decibel/src/server/kde4
From:       George Goldberg <grundleborg () googlemail ! com>
Date:       2008-02-20 11:33:43
Message-ID: 1203507223.002136.27206.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 777293 by gberg:

minor adjustments to KDE integration includes and explanation text

 M  +5 -14     accountconnector.cpp  
 M  +5 -6      accountconnector.h  
 M  +3 -0      contactconnector.cpp  


--- trunk/kdereview/decibel/src/server/kde4/accountconnector.cpp #777292:777293
@@ -24,10 +24,7 @@
 #include <kcomponentdata.h>
 
 #include <QtCore/QStringList>
-#include <QtCore/QSettings>
-#include <QtCore/QHash>
 #include <QtCore/QtDebug>
-#include <QtCore/QObject>
 #include <QtCore/QMap>
 
 /// @cond FALSE
@@ -37,19 +34,13 @@
  *
  * This connector is a basic integration into KDE. It stores
  * all the account data inside a wallet of KWallet.
- * All data is stored in a subfolder of the default
- * NetworkWallet which is called 'decibel'. For each
+ * All data is stored in a subfolder called 'decibel'
+ * of the default NetworkWallet. For each
  * account handle, there is a key in this folder
  * which contains a QMap value containing all the key/value
  * pairs for the account data for that decibel account.
- *
- * when reloading the values from the wallet at a later
- * instance, we need to know whether they were uints/strings
- * etc so that they can be passed back to the decibel daemon
- * in the correct type rather than all as QStrings (how it is
- * at the moment). This means that the type needs to be stored
- * somehow in the wallet alongside the value (see the FIXME 's
- * in places below where this matters.
+ * The keys inside the QMap are prepended with a
+ * single character type specifier and then a ':'.
  */
 
 AccountConnector::AccountConnector(QObject *parent) :
@@ -530,7 +521,7 @@
     result.first = key;
     QString k = key;
     k.truncate(2);
-    if(k == "b:")    //uint
+    if(k == "b:")
     {
         bool val = value.toInt();
         result.second = val;
--- trunk/kdereview/decibel/src/server/kde4/accountconnector.h #777292:777293
@@ -23,13 +23,12 @@
 
 #include "accountconnectorbase.h"
 
-#include <kwallet.h>
-#include <kcomponentdata.h>
+#include <QtCore/QPair>
 
-#include <QtCore/QtDebug>
-#include <QtCore/QObject>
-#include <QtCore/QHash>
-#include <QtCore/QMap>
+namespace KWallet {
+    class Wallet;
+}
+class KComponentData;
 
 /// @cond FALSE
 
--- trunk/kdereview/decibel/src/server/kde4/contactconnector.cpp #777292:777293
@@ -34,6 +34,7 @@
 
 ContactConnector::ContactConnector()
 {
+    qDebug() << "ContactConnector::ContactConnector(): Started";
     QString use_filename(filename);
     if (filename.startsWith('~'))
     {
@@ -64,6 +65,7 @@
 
 ContactConnector::~ContactConnector()
 {
+    qDebug() << "ContactConnector::~ContactConnector(): Started";
     QSettings settings(filename, QSettings::IniFormat);
     settings.beginWriteArray(array_name);
     int array_index = 0;
@@ -122,6 +124,7 @@
 
 unsigned int ContactConnector::addContact(const QVariantMap & new_contact)
 {
+    qDebug() << "ContactConnector::addContact(): Started";
     m_contacts.append(new_contact);
     return m_contacts.size();
 }
[prev in list] [next in list] [prev in thread] [next in thread]