[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=0f16adf

The following commit has been merged in the master branch:
commit 0f16adfe8d9e294d21166db2be5ff69d83877e48
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Aug 30 08:53:35 2012 +0200

    Cleanup
---
 filters/images/images-filter.h   | 6 +++---
 lib/abstract-message-filter.cpp  | 2 +-
 lib/adium-theme-content-info.cpp | 1 -
 lib/adium-theme-view.cpp         | 3 ---
 lib/message-processor.cpp        | 4 ++--
 lib/message-processor.h          | 5 +----
 6 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/filters/images/images-filter.h b/filters/images/images-filter.h
index 89c56ac..bbf3b44 100644
--- a/filters/images/images-filter.h
+++ b/filters/images/images-filter.h
@@ -16,8 +16,8 @@
  *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#ifndef FORMAT_FILTER_H
-#define FORMAT_FILTER_H
+#ifndef IMAGES_FILTER_H
+#define IMAGES_FILTER_H
 #include <KTp/AbstractMessageFilter>
 
 class ImagesFilter : public AbstractMessageFilter
@@ -34,4 +34,4 @@ private:
     Private *d;
 };
 
-#endif // FORMAT_FILTER_H
+#endif // IMAGES_FILTER_H
diff --git a/lib/abstract-message-filter.cpp b/lib/abstract-message-filter.cpp
index 2a3a897..1f733e6 100644
--- a/lib/abstract-message-filter.cpp
+++ b/lib/abstract-message-filter.cpp
@@ -25,4 +25,4 @@ AbstractMessageFilter::AbstractMessageFilter(QObject* parent)
 
 AbstractMessageFilter::~AbstractMessageFilter()
 {
-}
\ No newline at end of file
+}
diff --git a/lib/adium-theme-content-info.cpp b/lib/adium-theme-content-info.cpp
index 6fbb676..bad23e1 100644
--- a/lib/adium-theme-content-info.cpp
+++ b/lib/adium-theme-content-info.cpp
@@ -36,7 +36,6 @@ AdiumThemeContentInfo::AdiumThemeContentInfo()
     : AdiumThemeMessageInfo(),
     d(new AdiumThemeContentInfoPrivate)
 {
-
 }
 
 
diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index f129697..df2b6d7 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -642,6 +642,3 @@ const QString AdiumThemeView::variantPath() const
 {
     return m_variantPath;
 }
-
-
-
diff --git a/lib/message-processor.cpp b/lib/message-processor.cpp
index 25e8c70..9262d69 100644
--- a/lib/message-processor.cpp
+++ b/lib/message-processor.cpp
@@ -60,7 +60,7 @@ MessageProcessor::~MessageProcessor()
 
 Message MessageProcessor::processIncomingMessage(Message receivedMessage)
 {
-    Q_FOREACH(AbstractMessageFilter *filter, MessageProcessor::m_filters) {
+    Q_FOREACH (AbstractMessageFilter *filter, MessageProcessor::m_filters) {
         kDebug() << "running filter :" << filter->metaObject()->className();
         filter->filterMessage(receivedMessage);
     }
@@ -69,7 +69,7 @@ Message MessageProcessor::processIncomingMessage(Message receivedMessage)
 
 Message MessageProcessor::processOutgoingMessage(Message sentMessage)
 {
-    Q_FOREACH(AbstractMessageFilter *filter, MessageProcessor::m_filters) {
+    Q_FOREACH  (AbstractMessageFilter *filter, MessageProcessor::m_filters) {
         filter->filterMessage(sentMessage);
     }
     return sentMessage;
diff --git a/lib/message-processor.h b/lib/message-processor.h
index 425ad97..6d2e1ca 100644
--- a/lib/message-processor.h
+++ b/lib/message-processor.h
@@ -53,10 +53,7 @@ protected:
     explicit MessageProcessor();
 
 private:
-
-
-
-
+    // TODO Move in a private class
     void loadFilters();
     static MessageProcessor* s_instance;
     QList<AbstractMessageFilter*> m_filters;

-- 
ktp-text-ui packaging