[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:19:47 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=b607d47

The following commit has been merged in the master branch:
commit b607d477668384d3d7c6089d0f1a01b7e9274a8d
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Sep 16 17:45:08 2011 +0100

    Use Q_SLOTS instead of slots
    
    Reviewed by: David Edmundson <kde at davidedmundson.co.uk>
---
 app/chat-tab.h                  | 4 ++--
 app/chat-window.h               | 6 +++---
 app/telepathy-chat-ui.h         | 2 +-
 config/appearance-config.h      | 4 ++--
 config/behavior-config.h        | 4 ++--
 lib/adium-theme-view.h          | 2 +-
 lib/channel-contact-model.h     | 2 +-
 lib/chat-search-bar.h           | 4 ++--
 lib/chat-text-edit.h            | 4 ++--
 lib/chat-widget.h               | 6 +++---
 lib/chat-window-style-manager.h | 4 ++--
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/chat-tab.h b/app/chat-tab.h
index 9b5fc59..0bb9dcf 100644
--- a/app/chat-tab.h
+++ b/app/chat-tab.h
@@ -47,10 +47,10 @@ public:
     /** returns currently set chatWindow */
     ChatWindow* chatWindow() const;
 
-public slots:
+public Q_SLOTS:
     void showOnTop();
 
-private slots:
+private Q_SLOTS:
     /** connect account's connection status.
      * This re-enables open chats if user goes offline and then back online */
     void onConnectionStatusChanged(Tp::ConnectionStatus);
diff --git a/app/chat-window.h b/app/chat-window.h
index 5288e59..4ec5dcb 100644
--- a/app/chat-window.h
+++ b/app/chat-window.h
@@ -63,10 +63,10 @@ signals:
     void aboutToClose(ChatWindow *window);
     void detachRequested(ChatTab *tab);
 
-public slots:
+public Q_SLOTS:
     void destroyTab(QWidget *chatWidget);
 
-private slots:
+private Q_SLOTS:
     void tabBarContextMenu(int  index, const QPoint &  globalPos);
     void closeCurrentTab();
     void onAudioCallTriggered();                                /** start an audio call */
@@ -85,7 +85,7 @@ private slots:
     void onTabIconChanged(const KIcon &newIcon);
     void onVideoCallTriggered();                                /** start a video call */
 
-protected slots:
+protected Q_SLOTS:
     void showSettingsDialog();
     void showNotificationsDialog();
 
diff --git a/app/telepathy-chat-ui.h b/app/telepathy-chat-ui.h
index 42f522c..0efe6fb 100644
--- a/app/telepathy-chat-ui.h
+++ b/app/telepathy-chat-ui.h
@@ -51,7 +51,7 @@ public:
 
     virtual bool bypassApproval() const;
 
-private slots:
+private Q_SLOTS:
     void removeWindow(ChatWindow *window);
     void dettachTab(ChatTab *tab);
 
diff --git a/config/appearance-config.h b/config/appearance-config.h
index 6402955..e3da64c 100644
--- a/config/appearance-config.h
+++ b/config/appearance-config.h
@@ -39,13 +39,13 @@ public:
 				const QVariantList& args = QVariantList());
     ~AppearanceConfig();
 
-public slots:
+public Q_SLOTS:
     void save();
 
 protected:
     void changeEvent(QEvent *e);
 
-private slots:
+private Q_SLOTS:
     void sendDemoMessages();
     void onStylesLoaded();
     void updateVariantsList();
diff --git a/config/behavior-config.h b/config/behavior-config.h
index dd8cc3d..55d2fea 100644
--- a/config/behavior-config.h
+++ b/config/behavior-config.h
@@ -38,14 +38,14 @@ public:
     explicit BehaviorConfig(QWidget *parent = 0, const QVariantList &args = QVariantList());
     virtual ~BehaviorConfig();
 
-public slots:
+public Q_SLOTS:
     virtual void load();
     virtual void save();
 
 protected:
     virtual void changeEvent(QEvent *e);
 
-private slots:
+private Q_SLOTS:
     void onRadioSelected(int id);
 
 private:
diff --git a/lib/adium-theme-view.h b/lib/adium-theme-view.h
index 0507128..10afd2e 100644
--- a/lib/adium-theme-view.h
+++ b/lib/adium-theme-view.h
@@ -64,7 +64,7 @@ public:
     void setHeaderDisplayed(bool);
     /* .. font, backgrounds, everything else.*/
 
-public slots:
+public Q_SLOTS:
     void addContentMessage(const AdiumThemeContentInfo&);
     void addStatusMessage(const AdiumThemeStatusInfo&);
     void onLinkClicked(const QUrl &);
diff --git a/lib/channel-contact-model.h b/lib/channel-contact-model.h
index d0c2cb5..abaf554 100644
--- a/lib/channel-contact-model.h
+++ b/lib/channel-contact-model.h
@@ -50,7 +50,7 @@ protected:
     int rowCount(const QModelIndex &parent) const;
     QVariant data(const QModelIndex &index, int role) const;
 
-private slots:
+private Q_SLOTS:
     void onGroupMembersChanged(const Tp::Contacts &groupMembersAdded,
                              const Tp::Contacts &groupLocalPendingMembersAdded,
                              const Tp::Contacts &groupRemotePendingMembersAdded,
diff --git a/lib/chat-search-bar.h b/lib/chat-search-bar.h
index daf909f..d955de3 100644
--- a/lib/chat-search-bar.h
+++ b/lib/chat-search-bar.h
@@ -42,7 +42,7 @@ public:
 
     KLineEdit *searchBar() const;
 
-public slots:
+public Q_SLOTS:
     void onNextButtonClicked();
     void onPreviousButtonClicked();
 
@@ -51,7 +51,7 @@ public slots:
     /** toggle search bar visibility */
     void toggleView(bool toggle);
 
-private slots:
+private Q_SLOTS:
     /** called when user writes in search bar
      * this emits a signal for chat-window with the text to search for
      * and the appropriate flags for the search criteria
diff --git a/lib/chat-text-edit.h b/lib/chat-text-edit.h
index c643db2..8160925 100644
--- a/lib/chat-text-edit.h
+++ b/lib/chat-text-edit.h
@@ -39,7 +39,7 @@ protected:
     // reimplemented
     void resizeEvent(QResizeEvent*);
 
-private slots:
+private Q_SLOTS:
     void recalculateSize();
     void updateScrollBar();
 
@@ -47,7 +47,7 @@ signals:
     void findTextShortcutPressed();
     void scrollEventRecieved(QKeyEvent*);
 
-public slots:
+public Q_SLOTS:
     /** wraps setFontWeight to a simple on/off bold) */
     void setFontBold(bool);
 };
diff --git a/lib/chat-widget.h b/lib/chat-widget.h
index 7f43764..a2fc368 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -76,7 +76,7 @@ public:
 
     int unreadMessageCount() const;
 
-public slots:
+public Q_SLOTS:
     /** toggle the search bar visibility */
     void toggleSearchBar() const;
 
@@ -86,7 +86,7 @@ protected:
     void showEvent(QShowEvent *e);
     void keyPressEvent(QKeyEvent *e);
 
-protected slots:
+protected Q_SLOTS:
     /** Show the received message in the chat window*/
     void handleIncomingMessage(const Tp::ReceivedMessage &message);
 
@@ -136,7 +136,7 @@ signals:
     /** Emitted when a notification for the chat window has been activated*/
     void notificationClicked();
 
-private slots:
+private Q_SLOTS:
     /** received when user changes search criteria or when searching for text */
     void findTextInChat(const QString &text, QWebPage::FindFlags flags);
     void findNextTextInChat(const QString &text, QWebPage::FindFlags flags);
diff --git a/lib/chat-window-style-manager.h b/lib/chat-window-style-manager.h
index 21efa90..52c4793 100644
--- a/lib/chat-window-style-manager.h
+++ b/lib/chat-window-style-manager.h
@@ -80,7 +80,7 @@ public:
      */
     QMap<QString, QString> getAvailableStyles() const;
 
-public slots:
+public Q_SLOTS:
     /**
      * Install a new style into user style directory
      * Note that you must pass a path to a archive.
@@ -130,7 +130,7 @@ signals:
      */
     void loadStylesFinished();
 
-private slots:
+private Q_SLOTS:
     /**
      * KDirLister found new files.
      * @param dirList new files found.

-- 
ktp-text-ui packaging



More information about the pkg-kde-commits mailing list