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

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

    Add a stub AbstractAccountParametersWidget abstract class along with its installed headers.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1003231
---
 src/libkcmtelepathyaccounts/CMakeLists.txt         |  3 ++
 .../abstract-account-parameters-widget.cpp}        | 38 ++++++++++++----------
 .../abstract-account-parameters-widget.h}          | 28 +++++++---------
 src/libkcmtelepathyaccounts/abstract-account-ui.h  |  8 +++--
 .../include/AbstractAccountParametersWidget        |  7 ++++
 5 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/src/libkcmtelepathyaccounts/CMakeLists.txt b/src/libkcmtelepathyaccounts/CMakeLists.txt
index d7ae8e2..7890cfd 100644
--- a/src/libkcmtelepathyaccounts/CMakeLists.txt
+++ b/src/libkcmtelepathyaccounts/CMakeLists.txt
@@ -7,16 +7,19 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
 set (libkcmtelepathyaccounts_SRCS
      abstract-account-ui-plugin.cpp
      abstract-account-ui.cpp
+     abstract-account-parameters-widget.cpp
 )
 
 set (libkcmtelepathyaccounts_HDRS
      abstract-account-ui-plugin.h
      abstract-account-ui.h
+     abstract-account-parameters-widget.h
 )
 
 set (libkcmtelepathyaccounts_PRETTY_HDRS
      include/AbstractAccountUiPlugin
      include/AbstractAccountUi
+     include/AbstractAccountParametersWidget
 )
 
 kde4_add_library (libkcmtelepathyaccounts
diff --git a/src/integer-edit.h b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
similarity index 65%
copy from src/integer-edit.h
copy to src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
index 85f5cac..6b96e01 100644
--- a/src/integer-edit.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
@@ -18,31 +18,33 @@
  * 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
+#include "abstract-account-parameters-widget.h"
 
-#include <QtGui/QLineEdit>
+#include <KDebug>
 
-class IntegerEdit : public QLineEdit
+class AbstractAccountParametersWidget::Private
 {
-    Q_OBJECT
-
 public:
-    explicit IntegerEdit(QWidget *parent = 0);
-    virtual ~IntegerEdit();
-
-    void setValue(int integer);
+    Private()
+    {
+        kDebug();
+    }
+};
 
-protected:
-    void keyPressEvent(QKeyEvent *event);
+AbstractAccountParametersWidget::AbstractAccountParametersWidget(QWidget *parent)
+        : QWidget(parent),
+          d(new Private)
+{
+    kDebug();
+}
 
-Q_SIGNALS:
-    void integerChanged(int integer);
+AbstractAccountParametersWidget::~AbstractAccountParametersWidget()
+{
+    kDebug();
 
-private Q_SLOTS:
-    void onTextChanged(const QString &text);
-};
+    delete d;
+}
 
 
-#endif // header guard
+#include "abstract-account-parameters-widget.moc"
 
diff --git a/src/integer-edit.h b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
similarity index 65%
copy from src/integer-edit.h
copy to src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
index 85f5cac..c0dce99 100644
--- a/src/integer-edit.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.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_PARAMETERS_WIDGET_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_PARAMETERS_WIDGET_H
 
-#include <QtGui/QLineEdit>
+#include <kdemacros.h>
 
-class IntegerEdit : public QLineEdit
+#include <QtGui/QWidget>
+
+class KDE_EXPORT AbstractAccountParametersWidget : public QWidget
 {
     Q_OBJECT
+    Q_DISABLE_COPY(AbstractAccountParametersWidget);
 
 public:
-    explicit IntegerEdit(QWidget *parent = 0);
-    virtual ~IntegerEdit();
-
-    void setValue(int integer);
-
-protected:
-    void keyPressEvent(QKeyEvent *event);
-
-Q_SIGNALS:
-    void integerChanged(int integer);
+    explicit AbstractAccountParametersWidget(QWidget *parent = 0);
+    virtual ~AbstractAccountParametersWidget();
 
-private Q_SLOTS:
-    void onTextChanged(const QString &text);
+private:
+    class Private;
+    Private * const d;
 };
 
 
diff --git a/src/libkcmtelepathyaccounts/abstract-account-ui.h b/src/libkcmtelepathyaccounts/abstract-account-ui.h
index e1d443f..c8f1687 100644
--- a/src/libkcmtelepathyaccounts/abstract-account-ui.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-ui.h
@@ -28,6 +28,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QVariant>
 
+#include <TelepathyQt4/ConnectionManager>
+
 class AbstractAccountParametersWidget;
 
 class KDE_EXPORT AbstractAccountUi : public QObject
@@ -42,8 +44,10 @@ public:
     virtual const QMap<QString, QVariant::Type> &supportedMandatoryParameters() const;
     virtual const QMap<QString, QVariant::Type> &supportedOptionalParameters() const;
 
-    virtual AbstractAccountParametersWidget *mandatoryParametersWidget() const = 0;
-    virtual QList<AbstractAccountParametersWidget*> optionalParametersWidgets() const = 0;
+    virtual AbstractAccountParametersWidget
+              *mandatoryParametersWidget(Tp::ProtocolParameterList parameters) const = 0;
+    virtual QList<AbstractAccountParametersWidget*>
+              optionalParametersWidgets(Tp::ProtocolParameterList parameters) const = 0;
 
 protected:
     virtual void registerSupportedMandatoryParameter(const QString &name, QVariant::Type type);
diff --git a/src/libkcmtelepathyaccounts/include/AbstractAccountParametersWidget b/src/libkcmtelepathyaccounts/include/AbstractAccountParametersWidget
new file mode 100644
index 0000000..59a7490
--- /dev/null
+++ b/src/libkcmtelepathyaccounts/include/AbstractAccountParametersWidget
@@ -0,0 +1,7 @@
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_PARAMETERS_WIDGET_PRETTY_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_ABSTRACT_ACCOUNT_PARAMETERS_WIDGET_PRETTY_H
+
+#include <KCMTelepathyAccounts/abstract-account-parameters-widget.h>
+
+#endif
+

-- 
ktp-accounts-kcm packaging