[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=597c8f7

The following commit has been merged in the master branch:
commit 597c8f76fd1f6de245ab19a0d229e1b7d481eb1a
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Dec 28 10:47:41 2011 +0100

    use Q_SLOTS instead of slots
---
 plugins/rakia/rakia-advanced-options-widget.h | 2 +-
 src/KCMTelepathyAccounts/feedback-widget.h    | 2 +-
 src/KCMTelepathyAccounts/profile-list-model.h | 2 +-
 src/account-identity-dialog.h                 | 4 ++--
 src/accounts-list-delegate.h                  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/rakia/rakia-advanced-options-widget.h b/plugins/rakia/rakia-advanced-options-widget.h
index a2f450f..8ccc961 100644
--- a/plugins/rakia/rakia-advanced-options-widget.h
+++ b/plugins/rakia/rakia-advanced-options-widget.h
@@ -35,7 +35,7 @@ public:
     virtual ~RakiaAdvancedOptionsWidget();
     virtual void submit();
 
-public slots:
+public Q_SLOTS:
     void updateKeepalive(int index);
 
 private:
diff --git a/src/KCMTelepathyAccounts/feedback-widget.h b/src/KCMTelepathyAccounts/feedback-widget.h
index f9dfdd5..eea5594 100644
--- a/src/KCMTelepathyAccounts/feedback-widget.h
+++ b/src/KCMTelepathyAccounts/feedback-widget.h
@@ -39,7 +39,7 @@ public:
     FeedbackWidget(QWidget *parent = 0);
     virtual ~FeedbackWidget();
 
-public slots:
+public Q_SLOTS:
     void setMessage(const QString &text, const QString &comment, KMessageWidget::MessageType type);
     void setText(const QString &text, KMessageWidget::MessageType type);
 };
diff --git a/src/KCMTelepathyAccounts/profile-list-model.h b/src/KCMTelepathyAccounts/profile-list-model.h
index a0a678d..e3c7cdd 100644
--- a/src/KCMTelepathyAccounts/profile-list-model.h
+++ b/src/KCMTelepathyAccounts/profile-list-model.h
@@ -53,7 +53,7 @@ public:
 
     void setProfileManager(Tp::ProfileManagerPtr profileManager);
 
-private slots:
+private Q_SLOTS:
     void onConnectionManagerNamesFetched(Tp::PendingOperation*);
 
 private:
diff --git a/src/account-identity-dialog.h b/src/account-identity-dialog.h
index a5bcb4e..72b04f4 100644
--- a/src/account-identity-dialog.h
+++ b/src/account-identity-dialog.h
@@ -22,11 +22,11 @@ public:
     /** Returns if the user has changed settings*/
     bool hasChanged() const;
 
-public slots:
+public Q_SLOTS:
     /** Updates the account to user selection*/
     void apply();
 
-private slots:
+private Q_SLOTS:
     void onNicknameChanged(const QString &nickname);
     void onAvatarChanged(const Tp::Avatar &avatar);
     void onEdited();
diff --git a/src/accounts-list-delegate.h b/src/accounts-list-delegate.h
index c4e9a55..2c8b638 100644
--- a/src/accounts-list-delegate.h
+++ b/src/accounts-list-delegate.h
@@ -39,7 +39,7 @@ public:
 Q_SIGNALS:
     void itemChecked(const QModelIndex &index, bool checked);
 
-private slots:
+private Q_SLOTS:
     void onCheckBoxToggled(bool checked);
 
 private:

-- 
ktp-accounts-kcm packaging