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

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

    Fill out and implement the rest of the AbstractAccountParametersWidget class.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1003232
---
 .../abstract-account-parameters-widget.cpp                   | 12 +++++++++++-
 .../abstract-account-parameters-widget.h                     | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
index 6b96e01..dae3764 100644
--- a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
+++ b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
@@ -29,13 +29,18 @@ public:
     {
         kDebug();
     }
+
+    Tp::ProtocolParameterList parameters;
 };
 
-AbstractAccountParametersWidget::AbstractAccountParametersWidget(QWidget *parent)
+AbstractAccountParametersWidget::AbstractAccountParametersWidget(Tp::ProtocolParameterList parameters,
+                                                                 QWidget *parent)
         : QWidget(parent),
           d(new Private)
 {
     kDebug();
+
+    d->parameters = parameters;
 }
 
 AbstractAccountParametersWidget::~AbstractAccountParametersWidget()
@@ -45,6 +50,11 @@ AbstractAccountParametersWidget::~AbstractAccountParametersWidget()
     delete d;
 }
 
+Tp::ProtocolParameterList AbstractAccountParametersWidget::parameters() const
+{
+    return d->parameters;
+}
+
 
 #include "abstract-account-parameters-widget.moc"
 
diff --git a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
index c0dce99..c8f8611 100644
--- a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
@@ -23,17 +23,27 @@
 
 #include <kdemacros.h>
 
+#include <QtCore/QMap>
+#include <QtCore/QVariant>
 #include <QtGui/QWidget>
 
+#include <TelepathyQt4/ConnectionManager>
+
 class KDE_EXPORT AbstractAccountParametersWidget : public QWidget
 {
     Q_OBJECT
     Q_DISABLE_COPY(AbstractAccountParametersWidget);
 
 public:
-    explicit AbstractAccountParametersWidget(QWidget *parent = 0);
+    explicit AbstractAccountParametersWidget(Tp::ProtocolParameterList parameters,
+                                             QWidget *parent = 0);
     virtual ~AbstractAccountParametersWidget();
 
+    virtual QMap<Tp::ProtocolParameter*, QVariant> parameterValues() const = 0;
+
+protected:
+    virtual Tp::ProtocolParameterList parameters() const;
+
 private:
     class Private;
     Private * const d;

-- 
ktp-accounts-kcm packaging