[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=69ec24a

The following commit has been merged in the master branch:
commit 69ec24acea30dd9ec0cb4c1d25bebe24e4343b3e
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Wed Jul 29 22:48:36 2009 +0000

    Q_DISABLE_COPY in private and explicit constructors.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1004369
---
 src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h | 3 ++-
 src/libkcmtelepathyaccounts/abstract-account-ui.h                | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
index 8a88bb9..a0bcff1 100644
--- a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
@@ -32,7 +32,6 @@
 class KDE_EXPORT AbstractAccountParametersWidget : public QWidget
 {
     Q_OBJECT
-    Q_DISABLE_COPY(AbstractAccountParametersWidget);
 
 public:
     explicit AbstractAccountParametersWidget(Tp::ProtocolParameterList parameters,
@@ -45,6 +44,8 @@ public:
 protected:
 
 private:
+    Q_DISABLE_COPY(AbstractAccountParametersWidget);
+
     class Private;
     Private * const d;
 };
diff --git a/src/libkcmtelepathyaccounts/abstract-account-ui.h b/src/libkcmtelepathyaccounts/abstract-account-ui.h
index c8f1687..c42ebac 100644
--- a/src/libkcmtelepathyaccounts/abstract-account-ui.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-ui.h
@@ -35,10 +35,9 @@ class AbstractAccountParametersWidget;
 class KDE_EXPORT AbstractAccountUi : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(AbstractAccountUi);
 
 public:
-    AbstractAccountUi(QObject *parent = 0);
+    explicit AbstractAccountUi(QObject *parent = 0);
     virtual ~AbstractAccountUi();
 
     virtual const QMap<QString, QVariant::Type> &supportedMandatoryParameters() const;
@@ -54,6 +53,8 @@ protected:
     virtual void registerSupportedOptionalParameter(const QString &name, QVariant::Type type);
 
 private:
+    Q_DISABLE_COPY(AbstractAccountUi);
+
     class Private;
     Private * const d;
 };

-- 
ktp-accounts-kcm packaging