[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=01ce10e
The following commit has been merged in the master branch:
commit 01ce10e06f2a5dc9853cf2e78f3d624ddab40d45
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Fri Sep 16 17:55:02 2011 +0100
Use Q_EMIT instead of emit
Reviewed by: David Edmundson <kde at davidedmundson.co.uk>
---
adiumxtra-protocol-handler/chat-style-installer.cpp | 6 +++---
adiumxtra-protocol-handler/emoticon-set-installer.cpp | 6 +++---
app/chat-window.cpp | 4 ++--
lib/channel-contact-model.cpp | 8 ++++----
lib/chat-search-bar.cpp | 10 +++++-----
lib/chat-text-edit.cpp | 4 ++--
lib/chat-widget.cpp | 4 ++--
lib/chat-window-style-manager.cpp | 2 +-
8 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/adiumxtra-protocol-handler/chat-style-installer.cpp b/adiumxtra-protocol-handler/chat-style-installer.cpp
index dcb7d45..e43b179 100644
--- a/adiumxtra-protocol-handler/chat-style-installer.cpp
+++ b/adiumxtra-protocol-handler/chat-style-installer.cpp
@@ -105,7 +105,7 @@ BundleInstaller::BundleStatus ChatStyleInstaller::install()
m_status = status;
- emit(finished(status));
+ Q_EMIT finished(status);
return status;
}
@@ -149,12 +149,12 @@ void ChatStyleInstaller::showResult()
notification->sendEvent();
- emit(showedResult());
+ Q_EMIT showedResult();
}
void ChatStyleInstaller::ignoreRequest()
{
kDebug();
- emit(ignoredRequest());
+ Q_EMIT ignoredRequest();
}
diff --git a/adiumxtra-protocol-handler/emoticon-set-installer.cpp b/adiumxtra-protocol-handler/emoticon-set-installer.cpp
index a060e6f..b8e9652 100644
--- a/adiumxtra-protocol-handler/emoticon-set-installer.cpp
+++ b/adiumxtra-protocol-handler/emoticon-set-installer.cpp
@@ -93,7 +93,7 @@ BundleInstaller::BundleStatus EmoticonSetInstaller::install()
// we trust in KEmoticons as it gives us no status information
// installTheme only returns a list of installed themes if we compare the list before and after
// the style could have been updated and the list would not have changed
- emit(finished(BundleInstallOk));
+ Q_EMIT finished(BundleInstallOk);
return BundleInstallOk;
}
@@ -130,12 +130,12 @@ void EmoticonSetInstaller::showResult()
notification->sendEvent();
- emit(showedResult());
+ Q_EMIT showedResult();
}
void EmoticonSetInstaller::ignoreRequest()
{
kDebug();
- emit(ignoredRequest());
+ Q_EMIT ignoredRequest();
}
diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 43e2969..a308b8a 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -87,7 +87,7 @@ ChatWindow::ChatWindow()
ChatWindow::~ChatWindow()
{
- emit aboutToClose(this);
+ Q_EMIT aboutToClose(this);
}
void ChatWindow::tabBarContextMenu(int index, const QPoint& globalPos)
@@ -115,7 +115,7 @@ void ChatWindow::tabBarContextMenu(int index, const QPoint& globalPos)
if(result == &close) {
destroyTab(m_tabWidget->widget(index));
} else if (result == &dettach) {
- emit detachRequested(qobject_cast<ChatTab*>(m_tabWidget->widget(index)));
+ Q_EMIT detachRequested(qobject_cast<ChatTab*>(m_tabWidget->widget(index)));
} else if (result == &moveLeft) {
m_tabWidget->moveTab(index, index - 1);
} else if (result == &moveRight) {
diff --git a/lib/channel-contact-model.cpp b/lib/channel-contact-model.cpp
index f604a82..bf25b1b 100644
--- a/lib/channel-contact-model.cpp
+++ b/lib/channel-contact-model.cpp
@@ -112,9 +112,9 @@ void ChannelContactModel::onContactPresenceChanged(const Tp::Presence &presence)
Tp::ContactPtr contact(qobject_cast<Tp::Contact*>(sender()));
QModelIndex index = createIndex(m_contacts.lastIndexOf(contact), 0);
- emit dataChanged(index, index);
+ Q_EMIT dataChanged(index, index);
- emit contactPresenceChanged(contact, presence);
+ Q_EMIT contactPresenceChanged(contact, presence);
}
void ChannelContactModel::onContactAliasChanged(const QString &alias)
@@ -122,9 +122,9 @@ void ChannelContactModel::onContactAliasChanged(const QString &alias)
Tp::ContactPtr contact(qobject_cast<Tp::Contact*>(sender()));
QModelIndex index = createIndex(m_contacts.lastIndexOf(contact), 0);
- emit dataChanged(index, index);
+ Q_EMIT dataChanged(index, index);
- emit contactAliasChanged(contact, alias);
+ Q_EMIT contactAliasChanged(contact, alias);
}
void ChannelContactModel::addContacts(const Tp::Contacts &contacts)
diff --git a/lib/chat-search-bar.cpp b/lib/chat-search-bar.cpp
index 4904f0f..528472f 100644
--- a/lib/chat-search-bar.cpp
+++ b/lib/chat-search-bar.cpp
@@ -80,7 +80,7 @@ void ChatSearchBar::enableSearchButtons(bool enable)
{
m_nextButton->setEnabled(enable);
m_previousButton->setEnabled(enable);
- emit enableSearchButtonsSignal(enable);
+ Q_EMIT enableSearchButtonsSignal(enable);
}
QWebPage::FindFlags ChatSearchBar::findFlags()
@@ -103,7 +103,7 @@ void ChatSearchBar::onNextButtonClicked()
{
// no need to call this if search bar is hidden
if(isVisible()) {
- emit(findNextSignal(m_searchInput->text(), findFlags()));
+ Q_EMIT findNextSignal(m_searchInput->text(), findFlags());
}
}
@@ -111,7 +111,7 @@ void ChatSearchBar::onPreviousButtonClicked()
{
// no need to call this if search bar is hidden
if(isVisible()) {
- emit(findPreviousSignal(m_searchInput->text(), findFlags()));
+ Q_EMIT findPreviousSignal(m_searchInput->text(), findFlags());
}
}
@@ -158,13 +158,13 @@ void ChatSearchBar::textChanged(const QString& text)
} else {
enableSearchButtons(false);
}
- emit(findTextSignal(text, findFlags()));
+ Q_EMIT findTextSignal(text, findFlags());
}
void ChatSearchBar::toggleCaseSensitive(bool toggle)
{
m_caseSensitive = toggle;
- emit(flagsChangedSignal(m_searchInput->text(), findFlags()));
+ Q_EMIT flagsChangedSignal(m_searchInput->text(), findFlags());
}
diff --git a/lib/chat-text-edit.cpp b/lib/chat-text-edit.cpp
index 1086e47..1f19d9d 100644
--- a/lib/chat-text-edit.cpp
+++ b/lib/chat-text-edit.cpp
@@ -73,12 +73,12 @@ void ChatTextEdit::keyPressEvent(QKeyEvent* e)
switch (e->key()) {
case Qt::Key_PageUp :
case Qt::Key_PageDown :
- emit scrollEventRecieved(e);
+ Q_EMIT scrollEventRecieved(e);
break;
default :
if (e->matches(QKeySequence::Find)) {
- emit findTextShortcutPressed();
+ Q_EMIT findTextShortcutPressed();
}
}
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index bb34b51..c88fa8c 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -806,9 +806,9 @@ void ChatWidget::findTextInChat(const QString& text, QWebPage::FindFlags flags)
d->ui.chatArea->findText(QString(), flags);
if(d->ui.chatArea->findText(text, flags)) {
- emit(searchTextComplete(true));
+ Q_EMIT searchTextComplete(true);
} else {
- emit(searchTextComplete(false));
+ Q_EMIT searchTextComplete(false);
}
}
diff --git a/lib/chat-window-style-manager.cpp b/lib/chat-window-style-manager.cpp
index 745001f..0bfedad 100644
--- a/lib/chat-window-style-manager.cpp
+++ b/lib/chat-window-style-manager.cpp
@@ -409,7 +409,7 @@ void ChatWindowStyleManager::slotDirectoryFinished()
kDebug() << "Starting another directory.";
d->styleDirLister->openUrl(d->styleDirs.pop(), KDirLister::Keep);
} else {
- emit loadStylesFinished();
+ Q_EMIT loadStylesFinished();
}
}
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list