[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=0bda963

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

    Remove KDE/ prefix in some includes
    
    Also remove an unused method
---
 dialogs/custom-presence-dialog.cpp | 9 ++++-----
 dialogs/custom-presence-dialog.h   | 4 ----
 dialogs/remove-contact-dialog.cpp  | 1 -
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dialogs/custom-presence-dialog.cpp b/dialogs/custom-presence-dialog.cpp
index 1d05cf9..67e812d 100644
--- a/dialogs/custom-presence-dialog.cpp
+++ b/dialogs/custom-presence-dialog.cpp
@@ -27,11 +27,10 @@
 #include <QSortFilterProxyModel>
 #include <QtCore/QModelIndex>
 
-#include <KDE/KDialog>
-#include <KDE/KLocalizedString>
-#include <KDE/KConfig>
-#include <KDE/KSharedConfigPtr>
-#include <KDE/KIcon>
+#include <KDialog>
+#include <KLocalizedString>
+#include <KConfig>
+#include <KSharedConfigPtr>
 
 #include <TelepathyQt/Presence>
 #include <QLineEdit>
diff --git a/dialogs/custom-presence-dialog.h b/dialogs/custom-presence-dialog.h
index 4c2cca6..5b785b0 100644
--- a/dialogs/custom-presence-dialog.h
+++ b/dialogs/custom-presence-dialog.h
@@ -26,7 +26,6 @@
 #include <KDialog>
 
 class QPushButton;
-class KIcon;
 class QListView;
 
 namespace KTp {
@@ -52,9 +51,6 @@ private:
     ///Setup the initial dialog
     void setupDialog();
 
-    ///Returns corresponding icon for index read from the config file
-    static KIcon iconForIndex(int index);
-
     ///ListWidget to display custom presence's
     QListView  *m_listView;
 
diff --git a/dialogs/remove-contact-dialog.cpp b/dialogs/remove-contact-dialog.cpp
index 6536c5d..2c88887 100644
--- a/dialogs/remove-contact-dialog.cpp
+++ b/dialogs/remove-contact-dialog.cpp
@@ -21,7 +21,6 @@
 #include "remove-contact-dialog.h"
 #include "ui_remove-contact-dialog.h"
 
-#include <KIcon>
 #include <KLocalizedString>
 
 #include <QCheckBox>

-- 
ktp-contact-list packaging