[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=4fa2c34

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

    Build a library called libkcmtelepathyaccounts which will, to begin with, house all the classes needed for the account ui plugins. It may also house the stuff that should be in a library for access from Kopete too.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1003225
---
 src/CMakeLists.txt                                 |  2 +
 src/libkcmtelepathyaccounts/CMakeLists.txt         | 51 ++++++++++++++++++++++
 .../abstract-account-ui-plugin.cpp}                | 33 +++++---------
 .../abstract-account-ui-plugin.h}                  | 24 +++-------
 .../include/AbstractAccountUiPlugin                |  7 +++
 5 files changed, 78 insertions(+), 39 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e7bdaea..f38f36a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory (libkcmtelepathyaccounts)
+
 project (telepathy-accounts-kcm)
 
 include_directories (${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/libkcmtelepathyaccounts/CMakeLists.txt b/src/libkcmtelepathyaccounts/CMakeLists.txt
new file mode 100644
index 0000000..01ecb01
--- /dev/null
+++ b/src/libkcmtelepathyaccounts/CMakeLists.txt
@@ -0,0 +1,51 @@
+project (libkcmtelepathyaccounts)
+
+include_directories (${CMAKE_CURRENT_BINARY_DIR}
+                     ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set (libkcmtelepathyaccounts_SRCS
+     abstract-account-ui-plugin.cpp
+)
+
+set (libkcmtelepathyaccounts_HDRS
+     abstract-account-ui-plugin.h
+)
+
+set (libkcmtelepathyaccounts_PRETTY_HDRS
+     include/AbstractAccountUiPlugin
+)
+
+kde4_add_library (libkcmtelepathyaccounts
+                  SHARED
+                  ${libkcmtelepathyaccounts_SRCS}
+)
+
+target_link_libraries (libkcmtelepathyaccounts
+                       ${QT_LIBRARIES}
+                       ${KDE4_KDEUI_LIBS}
+                       ${TELEPATHY_QT4_LIBRARIES}
+)
+
+set_target_properties (libkcmtelepathyaccounts PROPERTIES
+                       VERSION ${GENERIC_LIB_VERSION}
+                       SOVERSION ${GENERIC_LIB_SOVERSION}
+)
+
+if (MSVC)
+    set_target_properties (libkcmtelepathyaccounts PROPERTIES
+                           OUTPUT_NAME libkcmtelepathyaccounts
+    )
+endif (MSVC)
+
+# Install:
+install (TARGETS libkcmtelepathyaccounts
+         ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+install (FILES
+         ${libkcmtelepathyaccounts_HDRS}
+         ${libkcmtelepathyaccounts_PRETTY_HDRS}
+         DESTINATION ${INCLUDE_INSTALL_DIR}/KCMTelepathyAccounts COMPONENT Devel
+)
+
diff --git a/src/dictionary.h b/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.cpp
similarity index 65%
copy from src/dictionary.h
copy to src/libkcmtelepathyaccounts/abstract-account-ui-plugin.cpp
index fabb9eb..1971c33 100644
--- a/src/dictionary.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.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,17 @@
  * 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 <QtCore/QMap>
-#include <QtCore/QString>
+#include "abstract-account-ui-plugin.h"
 
-class Dictionary
+AbstractAccountUiPlugin::AbstractAccountUiPlugin(QObject *parent)
+        : QObject(parent)
 {
-public:
-    static Dictionary *instance();
+    // TODO: Implement me!
+}
 
-    virtual ~Dictionary();
-
-    QString string(const QString &key) const;
-
-private:
-    Dictionary();
-    static Dictionary *s_self;
-
-    QMap<QString, QString> m_strings;
-};
-
-
-#endif  // Header guard
+AbstractAccountUiPlugin::~AbstractAccountUiPlugin()
+{
+    // TODO: Implement me!
+}
 
diff --git a/src/integer-edit.h b/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.h
similarity index 68%
copy from src/integer-edit.h
copy to src/libkcmtelepathyaccounts/abstract-account-ui-plugin.h
index 85f5cac..cb48568 100644
--- a/src/integer-edit.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.h
@@ -18,29 +18,19 @@
  * 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_PLUGIN_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_UI_PLUGIN_H
 
-#include <QtGui/QLineEdit>
+#include <QtCore/QObject>
 
-class IntegerEdit : public QLineEdit
+class AbstractAccountUiPlugin : public QObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(AbstractAccountUiPlugin);
 
 public:
-    explicit IntegerEdit(QWidget *parent = 0);
-    virtual ~IntegerEdit();
-
-    void setValue(int integer);
-
-protected:
-    void keyPressEvent(QKeyEvent *event);
-
-Q_SIGNALS:
-    void integerChanged(int integer);
-
-private Q_SLOTS:
-    void onTextChanged(const QString &text);
+    AbstractAccountUiPlugin(QObject *parent = 0);
+    virtual ~AbstractAccountUiPlugin();
 };
 
 
diff --git a/src/libkcmtelepathyaccounts/include/AbstractAccountUiPlugin b/src/libkcmtelepathyaccounts/include/AbstractAccountUiPlugin
new file mode 100644
index 0000000..b5b77e6
--- /dev/null
+++ b/src/libkcmtelepathyaccounts/include/AbstractAccountUiPlugin
@@ -0,0 +1,7 @@
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_UI_PLUGIN_PRETTY_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_UI_PLUGIN_PRETTY_H
+
+#include <KCMTelepathyAccounts/abstract-account-ui-plugin.h>
+
+#endif
+

-- 
ktp-accounts-kcm packaging