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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6f6be1fd58c7e5b928eed14492ff84782ec10f4a
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Jan 12 19:21:09 2015 +0100

    [app] Remove kDebugs, most of them seem unneeded/not helpful
---
 app/chat-tab.cpp              |  5 ++---
 app/chat-window.cpp           | 15 ---------------
 app/invite-contact-dialog.cpp |  1 -
 app/telepathy-chat-ui.cpp     | 12 +++---------
 4 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/app/chat-tab.cpp b/app/chat-tab.cpp
index b868bb1..80e73e8 100644
--- a/app/chat-tab.cpp
+++ b/app/chat-tab.cpp
@@ -24,7 +24,6 @@
 #include "defines.h"
 
 #include <KTabWidget>
-#include <KDebug>
 #include <QStackedWidget>
 #include <KColorScheme>
 #include <KWindowSystem>
@@ -70,11 +69,11 @@ ChatWindow* ChatTab::chatWindow() const
 
 void ChatTab::showOnTop()
 {
-    kDebug() << "Show this widget on top" << title();
     if (m_chatWindow) {
         m_chatWindow->focusChat(this);
     } else {
-        kError() << "Attempting to focus chatTab without chatWindow being set!";
+        //FIXME: remove?
+        qCritical() << "Attempting to focus chatTab without chatWindow being set!";
     }
 
     m_chatWindow->raise();
diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 0232d31..f5c24d6 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -33,7 +33,6 @@
 #include <KLocale>
 #include <KApplication>
 #include <KActionCollection>
-#include <KDebug>
 #include <KFileDialog>
 #include <KColorScheme>
 #include <KTabBar>
@@ -197,7 +196,6 @@ void ChatWindow::tabBarContextMenu(int index, const QPoint& globalPos)
 
 void ChatWindow::focusChat(ChatTab *tab)
 {
-    kDebug();
     m_tabWidget->setCurrentWidget(tab);
 }
 
@@ -245,8 +243,6 @@ QList<ChatTab*> ChatWindow::tabs() const
 
 void ChatWindow::removeTab(ChatTab *tab)
 {
-    kDebug();
-
     tab->stopOtrSession();
     removeChatTabSignals(tab);
 
@@ -266,8 +262,6 @@ void ChatWindow::onTabMiddleClicked(int index)
 
 void ChatWindow::addTab(ChatTab *tab)
 {
-    kDebug();
-
     setupChatTabSignals(tab);
     tab->setZoomFactor(m_zoomFactor);
 
@@ -293,8 +287,6 @@ void ChatWindow::addTab(ChatTab *tab)
 
 void ChatWindow::destroyTab(QWidget* chatWidget)
 {
-    kDebug();
-
     ChatTab *tab = qobject_cast<ChatTab*>(chatWidget);
     Q_ASSERT(tab);
 
@@ -360,8 +352,6 @@ void ChatWindow::onBlockContactTriggered()
 
 void ChatWindow::onCurrentIndexChanged(int index)
 {
-    kDebug() << index;
-
     if (index == -1) {
         close();
         return;
@@ -376,7 +366,6 @@ void ChatWindow::onCurrentIndexChanged(int index)
         setWindowIcon(currentChatTab->icon());
     }
 
-    kDebug() << "Current spell dictionary is" << currentChatTab->spellDictionary();
     m_spellDictCombo->setCurrentByDictionary(currentChatTab->spellDictionary());
 
     if (currentChatTab->isActiveWindow()) {
@@ -580,8 +569,6 @@ void ChatWindow::onCollaborateDocumentTriggered()
 
 void ChatWindow::onTabStateChanged()
 {
-    kDebug();
-
     QIcon windowIcon;
     ChatTab *sender = qobject_cast<ChatTab*>(QObject::sender());
     if (sender) {
@@ -737,8 +724,6 @@ void ChatWindow::onClearViewTriggered()
 
 void ChatWindow::showSettingsDialog()
 {
-    kDebug();
-
     KSettings::Dialog *dialog = new KSettings::Dialog(this);
 
     KPageWidgetItem *configPage = dialog->addModule(QLatin1String("kcm_ktp_chat_appearance"));
diff --git a/app/invite-contact-dialog.cpp b/app/invite-contact-dialog.cpp
index 6c851bf..da9102b 100644
--- a/app/invite-contact-dialog.cpp
+++ b/app/invite-contact-dialog.cpp
@@ -27,7 +27,6 @@
 #include <KLineEdit>
 #include <KPushButton>
 #include <KLocalizedString>
-#include <KDebug>
 
 #include <TelepathyQt/Contact>
 #include <TelepathyQt/TextChannel>
diff --git a/app/telepathy-chat-ui.cpp b/app/telepathy-chat-ui.cpp
index f6f287b..c45bb44 100644
--- a/app/telepathy-chat-ui.cpp
+++ b/app/telepathy-chat-ui.cpp
@@ -26,10 +26,10 @@
 #include "text-chat-config.h"
 #include "defines.h"
 
-#include <KDebug>
 #include <KConfigGroup>
 #include <KWindowSystem>
 
+#include <QDebug>
 #include <QEventLoopLocker>
 
 #include <TelepathyQt/ChannelClassSpec>
@@ -52,7 +52,6 @@ TelepathyChatUi::TelepathyChatUi(int &argc, char *argv[])
     : KTp::TelepathyHandlerApplication(argc, argv, -1, -1),
       AbstractClientHandler(channelClassList())
 {
-    kDebug();
     m_eventLoopLocker = 0;
     m_notifyFilter = new NotifyFilter;
     ChatWindow *window = createWindow();
@@ -116,7 +115,6 @@ void TelepathyChatUi::handleChannels(const Tp::MethodInvocationContextPtr<> & co
         const QDateTime &userActionTime,
         const Tp::AbstractClientHandler::HandlerInfo &handlerInfo)
 {
-    kDebug();
     Q_UNUSED(connection);
     Q_UNUSED(userActionTime);
     Q_UNUSED(handlerInfo);
@@ -140,12 +138,11 @@ void TelepathyChatUi::handleChannels(const Tp::MethodInvocationContextPtr<> & co
 
     //find the relevant channelRequest
     Q_FOREACH(const Tp::ChannelRequestPtr channelRequest, channelRequests) {
-        kDebug() << channelRequest->hints().allHints();
         windowRaise = !channelRequest->hints().hint(QLatin1String("org.kde.telepathy"), QLatin1String("suppressWindowRaise")).toBool();
     }
 
-    kDebug() << "Incomming channel" << textChannel->targetId();
-    kDebug() << "raise window hint set to: " << windowRaise;
+    qDebug() << "Incomming channel" << textChannel->targetId();
+    qDebug() << "raise window hint set to: " << windowRaise;
 
     Tp::TextChannelPtr oldTextChannel;
     const bool isKnown = isHiddenChannel(account, textChannel, &oldTextChannel);
@@ -233,7 +230,6 @@ bool TelepathyChatUi::bypassApproval() const
 
 void TelepathyChatUi::onTabAboutToClose(ChatTab *tab)
 {
-    kDebug() << tab;
     const Tp::TextChannelPtr channel = tab->textChannel();
 
     // Close 1-on-1 chats, but keep group chats opened if user has configured so
@@ -259,7 +255,6 @@ void TelepathyChatUi::onWindowAboutToClose(ChatWindow* window)
 
 void TelepathyChatUi::takeChannel(const Tp::TextChannelPtr& channel, const Tp::AccountPtr& account, bool ref)
 {
-    kDebug() << channel->targetId();
     m_channelAccountMap.insert(channel, account);
     connectChannelNotifications(channel, true);
     connectAccountNotifications(account, true);
@@ -271,7 +266,6 @@ void TelepathyChatUi::takeChannel(const Tp::TextChannelPtr& channel, const Tp::A
 
 void TelepathyChatUi::releaseChannel(const Tp::TextChannelPtr& channel, const Tp::AccountPtr& account, bool unref)
 {
-    kDebug() << channel->targetId();
     m_channelAccountMap.remove(channel);
     connectChannelNotifications(channel, false);
     if (m_channelAccountMap.keys(account).count() == 0) {

-- 
ktp-text-ui packaging