[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=bc2b8e4

The following commit has been merged in the master branch:
commit bc2b8e40c33437009df54d46bf1b24604a07af7d
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Mon Jul 27 21:27:21 2009 +0000

    Add AbstractAccountUi shell class (and installed headers).
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1003227
---
 src/libkcmtelepathyaccounts/CMakeLists.txt         |  3 ++
 .../abstract-account-ui.cpp}                       | 39 ++++++++++++----------
 .../abstract-account-ui.h}                         | 28 +++++++---------
 .../include/AbstractAccountUi                      |  7 ++++
 4 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/src/libkcmtelepathyaccounts/CMakeLists.txt b/src/libkcmtelepathyaccounts/CMakeLists.txt
index 01ecb01..d7ae8e2 100644
--- a/src/libkcmtelepathyaccounts/CMakeLists.txt
+++ b/src/libkcmtelepathyaccounts/CMakeLists.txt
@@ -6,14 +6,17 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
 
 set (libkcmtelepathyaccounts_SRCS
      abstract-account-ui-plugin.cpp
+     abstract-account-ui.cpp
 )
 
 set (libkcmtelepathyaccounts_HDRS
      abstract-account-ui-plugin.h
+     abstract-account-ui.h
 )
 
 set (libkcmtelepathyaccounts_PRETTY_HDRS
      include/AbstractAccountUiPlugin
+     include/AbstractAccountUi
 )
 
 kde4_add_library (libkcmtelepathyaccounts
diff --git a/src/dictionary.h b/src/libkcmtelepathyaccounts/abstract-account-ui.cpp
similarity index 66%
copy from src/dictionary.h
copy to src/libkcmtelepathyaccounts/abstract-account-ui.cpp
index fabb9eb..21d854c 100644
--- a/src/dictionary.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-ui.cpp
@@ -1,5 +1,5 @@
- /*
- * This file is part of Kopete
+/*
+ * This file is part of telepathy-accounts-kcm
  *
  * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
  *
@@ -18,28 +18,31 @@
  * 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 "abstract-account-ui.h"
 
-#include <QtCore/QMap>
-#include <QtCore/QString>
+#include <KDebug>
 
-class Dictionary
+class AbstractAccountUi::Private
 {
 public:
-    static Dictionary *instance();
-
-    virtual ~Dictionary();
-
-    QString string(const QString &key) const;
+    Private()
+    {
+        kDebug();
+    }
+};
 
-private:
-    Dictionary();
-    static Dictionary *s_self;
+AbstractAccountUi::AbstractAccountUi(QObject *parent)
+ : QObject(parent),
+   d(new Private)
+{
+    kDebug();
+}
 
-    QMap<QString, QString> m_strings;
-};
+AbstractAccountUi::~AbstractAccountUi()
+{
+    kDebug();
+}
 
 
-#endif  // Header guard
+#include "abstract-account-ui.h"
 
diff --git a/src/integer-edit.h b/src/libkcmtelepathyaccounts/abstract-account-ui.h
similarity index 68%
copy from src/integer-edit.h
copy to src/libkcmtelepathyaccounts/abstract-account-ui.h
index 85f5cac..a0afa51 100644
--- a/src/integer-edit.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-ui.h
@@ -18,29 +18,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef TELEPATHY_ACCOUNTS_KCM_INTEGER_EDIT_H
-#define TELEPATHY_ACCOUNTS_KCM_INTEGER_EDIT_H
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_UI_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_UI_H
 
-#include <QtGui/QLineEdit>
+#include <kdemacros.h>
 
-class IntegerEdit : public QLineEdit
+#include <QtCore/QObject>
+
+class KDE_EXPORT AbstractAccountUi : public QObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(AbstractAccountUi);
 
 public:
-    explicit IntegerEdit(QWidget *parent = 0);
-    virtual ~IntegerEdit();
-
-    void setValue(int integer);
-
-protected:
-    void keyPressEvent(QKeyEvent *event);
-
-Q_SIGNALS:
-    void integerChanged(int integer);
+    AbstractAccountUi(QObject *parent = 0);
+    virtual ~AbstractAccountUi();
 
-private Q_SLOTS:
-    void onTextChanged(const QString &text);
+private:
+    class Private;
+    Private * const d;
 };
 
 
diff --git a/src/libkcmtelepathyaccounts/include/AbstractAccountUi b/src/libkcmtelepathyaccounts/include/AbstractAccountUi
new file mode 100644
index 0000000..cd5c167
--- /dev/null
+++ b/src/libkcmtelepathyaccounts/include/AbstractAccountUi
@@ -0,0 +1,7 @@
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_UI_PRETTY_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_UI_PRETTY_H
+
+#include <KCMTelepathyAccounts/abstract-account-ui.h>
+
+#endif
+

-- 
ktp-accounts-kcm packaging