[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=e1d808c

The following commit has been merged in the master branch:
commit e1d808c61f96d8ce299259a875324cfa2787f05f
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Oct 29 14:04:51 2014 +0100

    Remove KDE/ prefix in some includes
---
 app/chat-tab.cpp                        | 4 ++--
 app/invite-contact-dialog.cpp           | 8 ++++----
 lib/contact-delegate.cpp                | 2 +-
 logviewer/config/behavior-config.cpp    | 6 +++---
 logviewer/config/behavior-config.h      | 2 +-
 logviewer/dates-model.cpp               | 4 ++--
 logviewer/dates-view-delegate.cpp       | 2 +-
 logviewer/entity-filter-model.cpp       | 2 +-
 logviewer/entity-view-delegate.cpp      | 5 ++---
 logviewer/log-viewer.cpp                | 2 +-
 logviewer/person-entity-merge-model.cpp | 6 +++---
 11 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/app/chat-tab.cpp b/app/chat-tab.cpp
index 6426f6c..b868bb1 100644
--- a/app/chat-tab.cpp
+++ b/app/chat-tab.cpp
@@ -26,8 +26,8 @@
 #include <KTabWidget>
 #include <KDebug>
 #include <QStackedWidget>
-#include <KDE/KColorScheme>
-#include <KDE/KWindowSystem>
+#include <KColorScheme>
+#include <KWindowSystem>
 
 #include <TelepathyQt/Account>
 #include <TelepathyQt/TextChannel>
diff --git a/app/invite-contact-dialog.cpp b/app/invite-contact-dialog.cpp
index c24a288..ba7b250 100644
--- a/app/invite-contact-dialog.cpp
+++ b/app/invite-contact-dialog.cpp
@@ -24,10 +24,10 @@
 
 #include <QtCore/QPointer>
 
-#include <KDE/KLineEdit>
-#include <KDE/KPushButton>
-#include <KDE/KLocalizedString>
-#include <KDE/KDebug>
+#include <KLineEdit>
+#include <KPushButton>
+#include <KLocalizedString>
+#include <KDebug>
 
 #include <TelepathyQt/Contact>
 #include <TelepathyQt/TextChannel>
diff --git a/lib/contact-delegate.cpp b/lib/contact-delegate.cpp
index b42169e..a0986bc 100644
--- a/lib/contact-delegate.cpp
+++ b/lib/contact-delegate.cpp
@@ -32,7 +32,7 @@
 
 #include <KIconLoader>
 #include <KDebug>
-#include <KDE/KLocale>
+#include <KLocale>
 
 #include <KTp/types.h>
 
diff --git a/logviewer/config/behavior-config.cpp b/logviewer/config/behavior-config.cpp
index b0216fe..0434a70 100644
--- a/logviewer/config/behavior-config.cpp
+++ b/logviewer/config/behavior-config.cpp
@@ -21,9 +21,9 @@
 #include "ui_behavior-config.h"
 #include "message-view.h"
 
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KDebug>
 
 K_PLUGIN_FACTORY(KCMTelepathyLogViewerBehaviorConfigFactory, registerPlugin<BehaviorConfig>();)
 K_EXPORT_PLUGIN(KCMTelepathyLogViewerBehaviorConfigFactory("ktp_logviewer_behavior", "kcm_ktp_logviewer_behavior"))
diff --git a/logviewer/config/behavior-config.h b/logviewer/config/behavior-config.h
index de113fd..0b8acf5 100644
--- a/logviewer/config/behavior-config.h
+++ b/logviewer/config/behavior-config.h
@@ -20,7 +20,7 @@
 #ifndef BEHAVIORCONFIG_H
 #define BEHAVIORCONFIG_H
 
-#include <KDE/KCModule>
+#include <KCModule>
 
 namespace Ui
 {
diff --git a/logviewer/dates-model.cpp b/logviewer/dates-model.cpp
index 4476c88..e2d7ea5 100644
--- a/logviewer/dates-model.cpp
+++ b/logviewer/dates-model.cpp
@@ -25,9 +25,9 @@
 #include <KTp/Logger/pending-logger-dates.h>
 #include <TelepathyQt/Account>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <klocalizeddate.h>
-#include <KDE/KDebug>
+#include <KDebug>
 
 Q_DECLARE_METATYPE(Tp::AccountPtr)
 
diff --git a/logviewer/dates-view-delegate.cpp b/logviewer/dates-view-delegate.cpp
index 33e5820..d968aa9 100644
--- a/logviewer/dates-view-delegate.cpp
+++ b/logviewer/dates-view-delegate.cpp
@@ -23,7 +23,7 @@
 #include <QApplication>
 #include <QFontDatabase>
 
-#include <KDE/KIconLoader>
+#include <KIconLoader>
 
 #include <TelepathyQt/Account>
 
diff --git a/logviewer/entity-filter-model.cpp b/logviewer/entity-filter-model.cpp
index 82c3304..58eb444 100644
--- a/logviewer/entity-filter-model.cpp
+++ b/logviewer/entity-filter-model.cpp
@@ -24,7 +24,7 @@
 
 #include <TelepathyQt/Types>
 
-#include <KDE/KDebug>
+#include <KDebug>
 
 EntityFilterModel::EntityFilterModel(QObject *parent):
     QSortFilterProxyModel(parent)
diff --git a/logviewer/entity-view-delegate.cpp b/logviewer/entity-view-delegate.cpp
index 3dbb14c..f6c66cf 100644
--- a/logviewer/entity-view-delegate.cpp
+++ b/logviewer/entity-view-delegate.cpp
@@ -25,9 +25,8 @@
 #include <QApplication>
 #include <QFontDatabase>
 
-#include <KDE/KIconLoader>
-#include <KDE/KDebug>
-#include <KDE/KIcon>
+#include <KIconLoader>
+#include <KDebug>
 
 #include <TelepathyQt/Account>
 
diff --git a/logviewer/log-viewer.cpp b/logviewer/log-viewer.cpp
index e1a4648..b9e971b 100644
--- a/logviewer/log-viewer.cpp
+++ b/logviewer/log-viewer.cpp
@@ -50,7 +50,7 @@
 #include <KLocalizedString>
 #include <KIconLoader>
 
-#include <KDE/KCModuleProxy>
+#include <KCModuleProxy>
 
 #include "entity-model.h"
 #include "logs-import-dialog.h"
diff --git a/logviewer/person-entity-merge-model.cpp b/logviewer/person-entity-merge-model.cpp
index cfacca5..edfbbf2 100644
--- a/logviewer/person-entity-merge-model.cpp
+++ b/logviewer/person-entity-merge-model.cpp
@@ -27,9 +27,9 @@
 #include <TelepathyQt/Contact>
 #include <TelepathyQt/ContactManager>
 
-#include <KDE/KDebug>
-#include <KDE/KLocalizedString>
-#include <KDE/KIconLoader>
+#include <KDebug>
+#include <KLocalizedString>
+#include <KIconLoader>
 
 #include <QPixmap>
 

-- 
ktp-text-ui packaging