[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=95e83fa

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

    Remove KDE/ prefix in some includes
---
 KTp/Models/presence-model.cpp                       | 10 +++++-----
 KTp/Widgets/contact-grid-dialog.cpp                 |  8 ++++----
 KTp/Widgets/contact-view-widget.cpp                 |  5 ++---
 KTp/debug.cpp                                       |  2 +-
 kpeople/datasourceplugin/im-persons-data-source.cpp |  2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/KTp/Models/presence-model.cpp b/KTp/Models/presence-model.cpp
index 58e9733..415bf0a 100644
--- a/KTp/Models/presence-model.cpp
+++ b/KTp/Models/presence-model.cpp
@@ -23,13 +23,13 @@
 #include <QString>
 #include <QFont>
 #include <QFontDatabase>
+#include <QIcon>
 #include <QtDBus/QtDBus>
 
-#include <KDE/KIcon>
-#include <KDE/KLocalizedString>
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KLocalizedString>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KDebug>
 
 namespace KTp
 {
diff --git a/KTp/Widgets/contact-grid-dialog.cpp b/KTp/Widgets/contact-grid-dialog.cpp
index 5c092d1..58a36de 100644
--- a/KTp/Widgets/contact-grid-dialog.cpp
+++ b/KTp/Widgets/contact-grid-dialog.cpp
@@ -22,10 +22,10 @@
 
 #include "contact-grid-dialog.h"
 
-#include <KDE/KLineEdit>
-#include <KDE/KPushButton>
-#include <KDE/KLocalizedString>
-#include <KDE/KDebug>
+#include <KLineEdit>
+#include <KPushButton>
+#include <KLocalizedString>
+#include <KDebug>
 
 #include <TelepathyQt/AccountManager>
 #include <TelepathyQt/AccountFactory>
diff --git a/KTp/Widgets/contact-view-widget.cpp b/KTp/Widgets/contact-view-widget.cpp
index cfb4dc0..9170f9e 100644
--- a/KTp/Widgets/contact-view-widget.cpp
+++ b/KTp/Widgets/contact-view-widget.cpp
@@ -20,9 +20,8 @@
 
 #include "contact-view-widget.h"
 
-#include <KDE/KIcon>
-#include <KDE/KLineEdit>
-#include <KDE/KDebug>
+#include <KLineEdit>
+#include <KDebug>
 
 #include <QTextOption>
 #include <QPainter>
diff --git a/KTp/debug.cpp b/KTp/debug.cpp
index 91c6eae..dce79f3 100644
--- a/KTp/debug.cpp
+++ b/KTp/debug.cpp
@@ -18,7 +18,7 @@
 
 #include "debug.h"
 
-#include <KDE/KDebug>
+#include <KDebug>
 #include <TelepathyQt/Debug>
 
 
diff --git a/kpeople/datasourceplugin/im-persons-data-source.cpp b/kpeople/datasourceplugin/im-persons-data-source.cpp
index 54e7c39..e389e59 100644
--- a/kpeople/datasourceplugin/im-persons-data-source.cpp
+++ b/kpeople/datasourceplugin/im-persons-data-source.cpp
@@ -33,7 +33,7 @@
 #include "KTp/types.h"
 
 #include <KPeople/AllContactsMonitor>
-#include <KDE/KABC/Addressee>
+#include <KABC/Addressee>
 
 #include <KDebug>
 #include <KPluginFactory>

-- 
ktp-common-internals packaging