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

The following commit has been merged in the master branch:
commit a7c53af1b6c9b497c4d0386316ca619ba79689d7
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Wed Jul 29 15:59:29 2009 +0000

    Calling delete d; in a constructor considered harmful. :'( Also, some other tidyup and some clarity fixes.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1004215
---
 .../abstract-account-parameters-widget.h                      |  2 +-
 src/libkcmtelepathyaccounts/abstract-account-ui-plugin.cpp    | 11 ++++++-----
 src/libkcmtelepathyaccounts/abstract-account-ui-plugin.h      |  5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
index c8f8611..8a88bb9 100644
--- a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
@@ -40,9 +40,9 @@ public:
     virtual ~AbstractAccountParametersWidget();
 
     virtual QMap<Tp::ProtocolParameter*, QVariant> parameterValues() const = 0;
+    virtual Tp::ProtocolParameterList parameters() const;
 
 protected:
-    virtual Tp::ProtocolParameterList parameters() const;
 
 private:
     class Private;
diff --git a/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.cpp b/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.cpp
index 8aec3a8..8164a02 100644
--- a/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.cpp
+++ b/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.cpp
@@ -35,19 +35,17 @@ public:
 
 
 AbstractAccountUiPlugin::AbstractAccountUiPlugin(QObject *parent)
-        : QObject(parent),
-          d(new Private)
+ : QObject(parent),
+   d(new Private)
 {
     kDebug();
-
-    delete d;
 }
 
 AbstractAccountUiPlugin::~AbstractAccountUiPlugin()
 {
     kDebug();
 
-    // TODO: Implement me!
+    delete d;
 }
 
 const QMap<QString, QString> &AbstractAccountUiPlugin::providedProtocols() const
@@ -73,3 +71,6 @@ void AbstractAccountUiPlugin::registerProvidedProtocol(const QString &connection
     d->providedProtocols.insertMulti(connectionManager, protocol);
 }
 
+
+#include "abstract-account-ui-plugin.moc"
+
diff --git a/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.h b/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.h
index 41de753..87eddd9 100644
--- a/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.h
@@ -32,10 +32,9 @@ class AbstractAccountUi;
 class KDE_EXPORT AbstractAccountUiPlugin : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(AbstractAccountUiPlugin);
 
 public:
-    AbstractAccountUiPlugin(QObject *parent = 0);
+    explicit AbstractAccountUiPlugin(QObject *parent = 0);
     virtual ~AbstractAccountUiPlugin();
 
     virtual const QMap<QString, QString> &providedProtocols() const;
@@ -46,6 +45,8 @@ protected:
     virtual void registerProvidedProtocol(const QString &connectionManager, const QString &protocol);
 
 private:
+    Q_DISABLE_COPY(AbstractAccountUiPlugin);
+
     class Private;
     Private * const d;
 };

-- 
ktp-accounts-kcm packaging