[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=13a7580

The following commit has been merged in the master branch:
commit 13a7580b54ccd1820034a6fb2460ac68a173d86c
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Fri Oct 7 22:17:38 2011 +0530

    Follow KDE code styling policies for including headers
---
 abstract-contact-delegate.cpp      |  2 +-
 abstract-contact-delegate.h        |  2 +-
 dialogs/custom-presence-dialog.cpp | 20 ++++++++++----------
 presence-model.cpp                 | 13 ++++++-------
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/abstract-contact-delegate.cpp b/abstract-contact-delegate.cpp
index 9bf133a..7b01a57 100644
--- a/abstract-contact-delegate.cpp
+++ b/abstract-contact-delegate.cpp
@@ -20,7 +20,7 @@
 
 #include "abstract-contact-delegate.h"
 
-#include <QApplication>
+#include <QtGui/QApplication>
 #include <QtGui/QStyle>
 #include <QtGui/QPainter>
 #include <QtGui/QToolTip>
diff --git a/abstract-contact-delegate.h b/abstract-contact-delegate.h
index 5f73670..920fd48 100644
--- a/abstract-contact-delegate.h
+++ b/abstract-contact-delegate.h
@@ -22,7 +22,7 @@
 #ifndef ABSTRACT_CONTACT_DELEGATE_H
 #define ABSTRACT_CONTACT_DELEGATE_H
 
-#include <QStyledItemDelegate>
+#include <QtGui/QStyledItemDelegate>
 
 
 class AbstractContactDelegate : public QStyledItemDelegate
diff --git a/dialogs/custom-presence-dialog.cpp b/dialogs/custom-presence-dialog.cpp
index 935d7ab..4f47923 100644
--- a/dialogs/custom-presence-dialog.cpp
+++ b/dialogs/custom-presence-dialog.cpp
@@ -23,19 +23,19 @@
 
 #include "presence-model.h"
 
-#include <QListView>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QSortFilterProxyModel>
-#include <QModelIndex>
+#include <QtGui/QListView>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QPushButton>
+#include <QtGui/QSortFilterProxyModel>
+#include <QtCore/QModelIndex>
 
 
 
-#include <KDialog>
-#include <KLocalizedString>
-#include <KConfig>
-#include <KSharedConfigPtr>
+#include <KDE/KDialog>
+#include <KDE/KLocalizedString>
+#include <KDE/KConfig>
+#include <KDE/KSharedConfigPtr>
 
 #include <TelepathyQt4/Presence>
 
diff --git a/presence-model.cpp b/presence-model.cpp
index 8803079..ee1cc81 100644
--- a/presence-model.cpp
+++ b/presence-model.cpp
@@ -1,14 +1,13 @@
 #include "presence-model.h"
 
-#include <QFont>
-#include <QUuid>
+#include <QtGui/QFont>
 
-#include <KIcon>
-#include <KLocalizedString>
+#include <KDE/KIcon>
+#include <KDE/KLocalizedString>
 
-#include <KConfig>
-#include <KConfigGroup>
-#include <KGlobalSettings>
+#include <KDE/KConfig>
+#include <KDE/KConfigGroup>
+#include <KDE/KGlobalSettings>
 
 
 

-- 
ktp-contact-list packaging