[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=062f7b7

The following commit has been merged in the master branch:
commit 062f7b7c7a479afadf8582b0cd6431c5e9d85f00
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Fri Aug 7 18:04:01 2009 +0000

    Move IntegerEdit and UnsignedIntegerEdit classes to the lib so that they can be used by plugins.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1008530
---
 src/CMakeLists.txt                                                | 2 --
 src/defaultaccountui/parameter-edit-delegate.cpp                  | 5 +++--
 src/libkcmtelepathyaccounts/CMakeLists.txt                        | 6 ++++++
 src/libkcmtelepathyaccounts/include/IntegerEdit                   | 7 +++++++
 src/libkcmtelepathyaccounts/include/UnsignedIntegerEdit           | 7 +++++++
 .../integer-edit.cpp                                              | 0
 src/{defaultaccountui => libkcmtelepathyaccounts}/integer-edit.h  | 8 +++++---
 .../unsigned-integer-edit.cpp                                     | 0
 .../unsigned-integer-edit.h                                       | 8 +++++---
 9 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c5080e3..09f71fd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,8 +21,6 @@ set (telepathy_accounts_kcm_SRCS
      defaultaccountui/parameter-edit-delegate.cpp
      defaultaccountui/parameter-edit-model.cpp
      defaultaccountui/parameter-item.cpp
-     defaultaccountui/integer-edit.cpp
-     defaultaccountui/unsigned-integer-edit.cpp
      defaultaccountui/mandatory-parameter-edit-widget.cpp
      defaultaccountui/optional-parameter-edit-widget.cpp
      dictionary.cpp
diff --git a/src/defaultaccountui/parameter-edit-delegate.cpp b/src/defaultaccountui/parameter-edit-delegate.cpp
index 54828fa..0b7f023 100644
--- a/src/defaultaccountui/parameter-edit-delegate.cpp
+++ b/src/defaultaccountui/parameter-edit-delegate.cpp
@@ -20,9 +20,10 @@
 
 #include "parameter-edit-delegate.h"
 
-#include "integer-edit.h"
 #include "parameter-edit-model.h"
-#include "unsigned-integer-edit.h"
+
+#include "libkcmtelepathyaccounts/integer-edit.h"
+#include "libkcmtelepathyaccounts/unsigned-integer-edit.h"
 
 #include <KDebug>
 
diff --git a/src/libkcmtelepathyaccounts/CMakeLists.txt b/src/libkcmtelepathyaccounts/CMakeLists.txt
index 12b3407..6a42018 100644
--- a/src/libkcmtelepathyaccounts/CMakeLists.txt
+++ b/src/libkcmtelepathyaccounts/CMakeLists.txt
@@ -8,6 +8,8 @@ set (libkcmtelepathyaccounts_SRCS
      abstract-account-ui-plugin.cpp
      abstract-account-ui.cpp
      abstract-account-parameters-widget.cpp
+     integer-edit.cpp
+     unsigned-integer-edit.cpp
 )
 
 set (libkcmtelepathyaccounts_HDRS
@@ -15,6 +17,8 @@ set (libkcmtelepathyaccounts_HDRS
      abstract-account-ui.h
      abstract-account-parameters-widget.h
      plugin-macros.h
+     integer-edit.h
+     unsigned-integer-edit.h
 )
 
 set (libkcmtelepathyaccounts_PRETTY_HDRS
@@ -22,6 +26,8 @@ set (libkcmtelepathyaccounts_PRETTY_HDRS
      include/AbstractAccountUi
      include/AbstractAccountParametersWidget
      include/PluginMacros
+     include/IntegerEdit
+     include/UnsignedIntegerEdit
 )
 
 kde4_add_library (kcmtelepathyaccounts
diff --git a/src/libkcmtelepathyaccounts/include/IntegerEdit b/src/libkcmtelepathyaccounts/include/IntegerEdit
new file mode 100644
index 0000000..de11179
--- /dev/null
+++ b/src/libkcmtelepathyaccounts/include/IntegerEdit
@@ -0,0 +1,7 @@
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_INTEGER_EDIT_PRETTY_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_INTEGER_EDIT_PRETTY_H
+
+#include <KCMTelepathyAccounts/integer-edit.h>
+
+#endif
+
diff --git a/src/libkcmtelepathyaccounts/include/UnsignedIntegerEdit b/src/libkcmtelepathyaccounts/include/UnsignedIntegerEdit
new file mode 100644
index 0000000..56ba91e
--- /dev/null
+++ b/src/libkcmtelepathyaccounts/include/UnsignedIntegerEdit
@@ -0,0 +1,7 @@
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_UNSIGNED_INTEGER_EDIT_PRETTY_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_UNSIGNED_INTEGER_EDIT_PRETTY_H
+
+#include <KCMTelepathyAccounts/unsigned-integer-edit.h>
+
+#endif
+
diff --git a/src/defaultaccountui/integer-edit.cpp b/src/libkcmtelepathyaccounts/integer-edit.cpp
similarity index 100%
copy from src/defaultaccountui/integer-edit.cpp
copy to src/libkcmtelepathyaccounts/integer-edit.cpp
diff --git a/src/defaultaccountui/integer-edit.h b/src/libkcmtelepathyaccounts/integer-edit.h
similarity index 87%
copy from src/defaultaccountui/integer-edit.h
copy to src/libkcmtelepathyaccounts/integer-edit.h
index 85f5cac..e16f313 100644
--- a/src/defaultaccountui/integer-edit.h
+++ b/src/libkcmtelepathyaccounts/integer-edit.h
@@ -18,12 +18,14 @@
  * 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_INTEGER_EDIT_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_INTEGER_EDIT_H
+
+#include <kdemacros.h>
 
 #include <QtGui/QLineEdit>
 
-class IntegerEdit : public QLineEdit
+class KDE_EXPORT IntegerEdit : public QLineEdit
 {
     Q_OBJECT
 
diff --git a/src/defaultaccountui/unsigned-integer-edit.cpp b/src/libkcmtelepathyaccounts/unsigned-integer-edit.cpp
similarity index 100%
copy from src/defaultaccountui/unsigned-integer-edit.cpp
copy to src/libkcmtelepathyaccounts/unsigned-integer-edit.cpp
diff --git a/src/defaultaccountui/unsigned-integer-edit.h b/src/libkcmtelepathyaccounts/unsigned-integer-edit.h
similarity index 86%
copy from src/defaultaccountui/unsigned-integer-edit.h
copy to src/libkcmtelepathyaccounts/unsigned-integer-edit.h
index 8f238fd..eec3718 100644
--- a/src/defaultaccountui/unsigned-integer-edit.h
+++ b/src/libkcmtelepathyaccounts/unsigned-integer-edit.h
@@ -18,12 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef TELEPATHY_ACCOUNTS_KCM_UNSIGNED_INTEGER_EDIT_H
-#define TELEPATHY_ACCOUNTS_KCM_UNSIGNED_INTEGER_EDIT_H
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_UNSIGNED_INTEGER_EDIT_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_UNSIGNED_INTEGER_EDIT_H
+
+#include <kdemacros.h>
 
 #include <QtGui/QLineEdit>
 
-class UnsignedIntegerEdit : public QLineEdit
+class KDE_EXPORT UnsignedIntegerEdit : public QLineEdit
 {
     Q_OBJECT
 

-- 
ktp-accounts-kcm packaging