[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=40c9e1a

The following commit has been merged in the master branch:
commit 40c9e1ad44dde1d67456f8518a8d6a0296cbae6b
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Wed Oct 12 21:21:07 2011 +0200

    Fix style and remove unnecessary debug output
    
    Reviewed-by: David Edmundson, Daniele Elmo Domenichelli
---
 lib/chat-widget.cpp       |  5 ++---
 lib/chat-window-style.cpp |  3 +--
 lib/logmanager.cpp        | 12 ++++--------
 lib/logmanager.h          |  1 -
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index f1470fe..8b1d376 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -111,7 +111,7 @@ public:
     Tp::AccountPtr account;
     Ui::ChatWidget ui;
     ChannelContactModel *contactModel;
-    LogManager* logManager;
+    LogManager *logManager;
 
     KComponentData telepathyComponentData();
 };
@@ -463,8 +463,7 @@ void ChatWidget::windowActivated()
 void ChatWidget::onHistoryFetched(const QList<AdiumThemeContentInfo> &messages)
 {
     kDebug() << "found" << messages.count() << "messages in history";
-    Q_FOREACH(const AdiumThemeContentInfo &message, messages)
-    {
+    Q_FOREACH(const AdiumThemeContentInfo &message, messages) {
         d->ui.chatArea->addContentMessage(message);
     }
 
diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index 422db26..e86e93a 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -337,8 +337,7 @@ void ChatWindowStyle::readStyleFiles()
 
     // load all files
     QFile fileAccess;
-    Q_FOREACH(const QLatin1String &fileName, templateFiles)
-    {
+    Q_FOREACH(const QLatin1String &fileName, templateFiles) {
         QString path = d->baseHref + fileName;
         // Load template file
         if (QFile::exists(path)) {
diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index ae09703..4641e0f 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -1,5 +1,4 @@
 /*
-    <one line to give the library's name and an idea of what it does.>
     Copyright (C) 2011  Dominik Schmidt <kde at dominik-schmidt.de>
 
     This library is free software; you can redistribute it and/or
@@ -45,10 +44,10 @@
 #include <TelepathyQt4/ReceivedMessage>
 
 LogManager::LogManager(const Tp::AccountPtr &account, const Tp::ContactPtr &contact, QObject *parent)
-    : QObject(parent)
-    , m_account(account)
-    , m_contact(contact)
-    , m_fetchAmount(10)
+    : QObject(parent),
+    m_account(account),
+    m_contact(contact),
+    m_fetchAmount(10)
 {
 
 #ifdef TELEPATHY_LOGGER_QT4_FOUND
@@ -125,9 +124,6 @@ void LogManager::onDatesFinished(Tpl::PendingOperation* po)
 
         kDebug() << pd->account()->uniqueIdentifier() << pd->entity()->identifier() << dates;
 
-        kWarning() << "requesting log for" << pd->account()->uniqueIdentifier() << pd->entity()->identifier() << "on" << date;
-        Tpl::PendingEvents* events = m_logManager->queryEvents( pd->account(), pd->entity(), Tpl::EventTypeMaskAny, date);
-
         connect(events, SIGNAL(finished(Tpl::PendingOperation*)), SLOT(onEventsFinished(Tpl::PendingOperation*)));
     } else {
         QList<AdiumThemeContentInfo> messages;
diff --git a/lib/logmanager.h b/lib/logmanager.h
index 2e1e4d6..f91276c 100644
--- a/lib/logmanager.h
+++ b/lib/logmanager.h
@@ -1,5 +1,4 @@
 /*
-    <one line to give the library's name and an idea of what it does.>
     Copyright (C) 2011  Dominik Schmidt <kde at dominik-schmidt.de>
 
     This library is free software; you can redistribute it and/or

-- 
ktp-text-ui packaging