[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=8c86e24

The following commit has been merged in the master branch:
commit 8c86e245fbc947125d7d3c7a418464b54baec668
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Wed Jul 29 15:58:23 2009 +0000

    Add stub singleton PluginManager class.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1004209
---
 src/CMakeLists.txt                       |  1 +
 src/{dictionary.h => plugin-manager.cpp} | 43 ++++++++++++++++++++------------
 src/{dictionary.h => plugin-manager.h}   | 24 ++++++++----------
 3 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d481c7..9f709c5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,6 +22,7 @@ set (telepathy_accounts_kcm_SRCS
      integer-edit.cpp
      unsigned-integer-edit.cpp
      dictionary.cpp
+     plugin-manager.cpp
 )
 
 kde4_add_ui_files (telepathy_accounts_kcm_SRCS
diff --git a/src/dictionary.h b/src/plugin-manager.cpp
similarity index 59%
copy from src/dictionary.h
copy to src/plugin-manager.cpp
index fabb9eb..46eab42 100644
--- a/src/dictionary.h
+++ b/src/plugin-manager.cpp
@@ -1,4 +1,4 @@
- /*
+/*
  * This file is part of Kopete
  *
  * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
@@ -18,28 +18,39 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef TELEPATHY_ACCOUNTS_KCM_DICTIONARY_H
-#define TELEPATHY_ACCOUNTS_KCM_DICTIONARY_H
+#include "plugin-manager.h"
 
-#include <QtCore/QMap>
-#include <QtCore/QString>
+#include <KDebug>
 
-class Dictionary
+PluginManager* PluginManager::s_self = 0;
+
+PluginManager::PluginManager(QObject *parent)
+ : QObject(parent)
 {
-public:
-    static Dictionary *instance();
+    kDebug();
 
-    virtual ~Dictionary();
+    // Set up the singleton instance
+    s_self = this;
+}
 
-    QString string(const QString &key) const;
+PluginManager::~PluginManager()
+{
+    kDebug();
 
-private:
-    Dictionary();
-    static Dictionary *s_self;
+    // Delete the singleton instance of this class
+    s_self = 0;
+}
 
-    QMap<QString, QString> m_strings;
-};
+PluginManager *PluginManager::instance()
+{
+    kDebug();
 
+    // Construct the singleton if hasn't been already
+    if (!s_self) {
+        s_self = new PluginManager(0);
+    }
 
-#endif  // Header guard
+    // Return the singleton instance of this class
+    return s_self;
+}
 
diff --git a/src/dictionary.h b/src/plugin-manager.h
similarity index 71%
copy from src/dictionary.h
copy to src/plugin-manager.h
index fabb9eb..0f73448 100644
--- a/src/dictionary.h
+++ b/src/plugin-manager.h
@@ -18,26 +18,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef TELEPATHY_ACCOUNTS_KCM_DICTIONARY_H
-#define TELEPATHY_ACCOUNTS_KCM_DICTIONARY_H
+#ifndef TELEPATHY_ACCOUNTS_KCM_PLUGIN_MANAGER_H
+#define TELEPATHY_ACCOUNTS_KCM_PLUGIN_MANAGER_H
 
-#include <QtCore/QMap>
-#include <QtCore/QString>
+#include <QtCore/QObject>
 
-class Dictionary
+class PluginManager : public QObject
 {
-public:
-    static Dictionary *instance();
+    Q_OBJECT
+    Q_DISABLE_COPY(PluginManager)
 
-    virtual ~Dictionary();
+public:
+    static PluginManager *instance();
 
-    QString string(const QString &key) const;
+    virtual ~PluginManager();
 
 private:
-    Dictionary();
-    static Dictionary *s_self;
-
-    QMap<QString, QString> m_strings;
+    explicit PluginManager(QObject *parent = 0);
+    static PluginManager *s_self;
 };
 
 

-- 
ktp-accounts-kcm packaging