[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:01:12 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=b6998d7
The following commit has been merged in the master branch:
commit b6998d74f942a3630b574a672982ff63c965a520
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Thu Dec 29 17:49:31 2011 +0100
Fix Qt includes style
---
plugins/butterfly/butterfly-account-ui-plugin.h | 2 +-
plugins/gabble/gabble-account-ui-plugin.h | 2 +-
plugins/haze/haze-account-ui-plugin.h | 2 +-
plugins/haze/skype-main-options-widget.cpp | 2 +-
plugins/idle/idle-account-ui-plugin.h | 2 +-
plugins/rakia/rakia-account-ui-plugin.h | 2 +-
plugins/salut/salut-account-ui-plugin.h | 2 +-
plugins/sunshine/sunshine-account-ui-plugin.h | 2 +-
.../abstract-account-parameters-widget.cpp | 15 ++++++++-------
src/KCMTelepathyAccounts/account-edit-widget.h | 2 +-
.../generic-advanced-options-widget.cpp | 2 +-
src/KCMTelepathyAccounts/profile-select-widget.cpp | 4 ++--
src/KCMTelepathyAccounts/simple-profile-select-widget.cpp | 8 ++++----
src/accounts-list-delegate.cpp | 12 ++++++------
src/avatar-button.cpp | 2 +-
src/kcm-telepathy-accounts.cpp | 4 ++--
src/salut-enabler.cpp | 2 +-
src/salut-enabler.h | 2 +-
src/salut-message-widget.cpp | 6 +++---
19 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/plugins/butterfly/butterfly-account-ui-plugin.h b/plugins/butterfly/butterfly-account-ui-plugin.h
index 60ce412..0788706 100644
--- a/plugins/butterfly/butterfly-account-ui-plugin.h
+++ b/plugins/butterfly/butterfly-account-ui-plugin.h
@@ -23,7 +23,7 @@
#include <KCMTelepathyAccounts/AbstractAccountUiPlugin>
-#include <QVariantList>
+#include <QtCore/QVariantList>
class ButterflyAccountUiPlugin : public AbstractAccountUiPlugin
{
diff --git a/plugins/gabble/gabble-account-ui-plugin.h b/plugins/gabble/gabble-account-ui-plugin.h
index 9b06598..954a9ed 100644
--- a/plugins/gabble/gabble-account-ui-plugin.h
+++ b/plugins/gabble/gabble-account-ui-plugin.h
@@ -23,7 +23,7 @@
#include <KCMTelepathyAccounts/AbstractAccountUiPlugin>
-#include <QVariantList>
+#include <QtCore/QVariantList>
class GabbleAccountUiPlugin : public AbstractAccountUiPlugin
{
diff --git a/plugins/haze/haze-account-ui-plugin.h b/plugins/haze/haze-account-ui-plugin.h
index c487108..7d8c8b5 100644
--- a/plugins/haze/haze-account-ui-plugin.h
+++ b/plugins/haze/haze-account-ui-plugin.h
@@ -23,7 +23,7 @@
#include <KCMTelepathyAccounts/AbstractAccountUiPlugin>
-#include <QVariantList>
+#include <QtCore/QVariantList>
class HazeAccountUiPlugin : public AbstractAccountUiPlugin
{
diff --git a/plugins/haze/skype-main-options-widget.cpp b/plugins/haze/skype-main-options-widget.cpp
index aef1ac1..87a3448 100644
--- a/plugins/haze/skype-main-options-widget.cpp
+++ b/plugins/haze/skype-main-options-widget.cpp
@@ -22,7 +22,7 @@
#include <KCMTelepathyAccounts/ParameterEditModel>
-#include <QDir>
+#include <QtCore/QDir>
SkypeMainOptionsWidget::SkypeMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
: AbstractAccountParametersWidget(model, parent)
diff --git a/plugins/idle/idle-account-ui-plugin.h b/plugins/idle/idle-account-ui-plugin.h
index c689b61..5453570 100644
--- a/plugins/idle/idle-account-ui-plugin.h
+++ b/plugins/idle/idle-account-ui-plugin.h
@@ -23,7 +23,7 @@
#include <KCMTelepathyAccounts/AbstractAccountUiPlugin>
-#include <QVariantList>
+#include <QtCore/QVariantList>
class IdleAccountUiPlugin : public AbstractAccountUiPlugin
{
diff --git a/plugins/rakia/rakia-account-ui-plugin.h b/plugins/rakia/rakia-account-ui-plugin.h
index b29aad3..812d1f6 100644
--- a/plugins/rakia/rakia-account-ui-plugin.h
+++ b/plugins/rakia/rakia-account-ui-plugin.h
@@ -23,7 +23,7 @@
#include <KCMTelepathyAccounts/AbstractAccountUiPlugin>
-#include <QVariantList>
+#include <QtCore/QVariantList>
class RakiaAccountUiPlugin : public AbstractAccountUiPlugin
{
diff --git a/plugins/salut/salut-account-ui-plugin.h b/plugins/salut/salut-account-ui-plugin.h
index ed9bf6b..6b0efbc 100644
--- a/plugins/salut/salut-account-ui-plugin.h
+++ b/plugins/salut/salut-account-ui-plugin.h
@@ -23,7 +23,7 @@
#include <KCMTelepathyAccounts/AbstractAccountUiPlugin>
-#include <QVariantList>
+#include <QtCore/QVariantList>
class SalutAccountUiPlugin : public AbstractAccountUiPlugin
{
diff --git a/plugins/sunshine/sunshine-account-ui-plugin.h b/plugins/sunshine/sunshine-account-ui-plugin.h
index c0d1e72..346cde1 100644
--- a/plugins/sunshine/sunshine-account-ui-plugin.h
+++ b/plugins/sunshine/sunshine-account-ui-plugin.h
@@ -23,7 +23,7 @@
#include <KCMTelepathyAccounts/AbstractAccountUiPlugin>
-#include <QVariantList>
+#include <QtCore/QVariantList>
class SunshineAccountUiPlugin : public AbstractAccountUiPlugin
{
diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
index c697ea9..b61e836 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
@@ -24,14 +24,15 @@
#include "parameter-edit-model.h"
#include "validated-line-edit.h"
-#include <KDebug>
-#include <QLineEdit>
-#include <QCheckBox>
-#include <QComboBox>
#include <KLocalizedString>
-#include <QSpinBox>
-#include <QDataWidgetMapper>
-#include <QMap>
+#include <KDebug>
+
+#include <QtCore/QMap>
+#include <QtGui/QLineEdit>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QSpinBox>
+#include <QtGui/QDataWidgetMapper>
class AbstractAccountParametersWidget::Private
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.h b/src/KCMTelepathyAccounts/account-edit-widget.h
index 09322ba..5db8119 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.h
+++ b/src/KCMTelepathyAccounts/account-edit-widget.h
@@ -24,7 +24,7 @@
#include "kcm_telepathy_accounts_export.h"
-#include <QWidget>
+#include <QtGui/QWidget>
#include <KMessageWidget>
#include <TelepathyQt/ConnectionManager>
diff --git a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
index 73783eb..005b489 100644
--- a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
+++ b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
@@ -20,7 +20,7 @@
#include <KTabWidget>
#include <KLocale>
-#include <QHBoxLayout>
+#include <QtGui/QHBoxLayout>
#include "generic-advanced-options-widget.h"
diff --git a/src/KCMTelepathyAccounts/profile-select-widget.cpp b/src/KCMTelepathyAccounts/profile-select-widget.cpp
index 3b83ff7..be0d41f 100644
--- a/src/KCMTelepathyAccounts/profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/profile-select-widget.cpp
@@ -32,8 +32,8 @@
#include <TelepathyQt/ProfileManager>
#include <TelepathyQt/Feature>
-#include <QSortFilterProxyModel>
-#include <QItemSelectionModel>
+#include <QtGui/QSortFilterProxyModel>
+#include <QtGui/QItemSelectionModel>
class ProfileSelectWidget::Private
{
diff --git a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
index d36598b..88fef12 100644
--- a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
@@ -32,10 +32,10 @@
#include <TelepathyQt/ProfileManager>
#include <TelepathyQt/Feature>
-#include <QSortFilterProxyModel>
-#include <QItemSelectionModel>
-#include <QCommandLinkButton>
-#include <QSignalMapper>
+#include <QtCore/QSignalMapper>
+#include <QtGui/QSortFilterProxyModel>
+#include <QtGui/QItemSelectionModel>
+#include <QtGui/QCommandLinkButton>
class SimpleProfileSelectWidget::Private
{
diff --git a/src/accounts-list-delegate.cpp b/src/accounts-list-delegate.cpp
index d033e27..e818582 100644
--- a/src/accounts-list-delegate.cpp
+++ b/src/accounts-list-delegate.cpp
@@ -22,14 +22,14 @@
#include "accounts-list-model.h"
-#include <QApplication>
-#include <QPainter>
-#include <QCheckBox>
-#include <QAbstractItemView>
+#include <QtGui/QApplication>
+#include <QtGui/QPainter>
+#include <QtGui/QCheckBox>
+#include <QtGui/QAbstractItemView>
+#include <QtGui/QSortFilterProxyModel>
-#include <KDebug>
#include <KLocale>
-#include <QSortFilterProxyModel>
+#include <KDebug>
#include "account-item.h"
diff --git a/src/avatar-button.cpp b/src/avatar-button.cpp
index e5829ff..803fef8 100644
--- a/src/avatar-button.cpp
+++ b/src/avatar-button.cpp
@@ -20,7 +20,7 @@
#include "avatar-button.h"
-#include <QWidgetAction>
+#include <QtGui/QWidgetAction>
#include <KFileDialog>
#include <KMenu>
diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index b3dca3e..106a648 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -31,8 +31,8 @@
#include <KTp/wallet-interface.h>
-#include <QLabel>
-#include <QSortFilterProxyModel>
+#include <QtGui/QLabel>
+#include <QtGui/QSortFilterProxyModel>
#include <KGenericFactory>
#include <KIcon>
diff --git a/src/salut-enabler.cpp b/src/salut-enabler.cpp
index db24b9e..10a16d0 100644
--- a/src/salut-enabler.cpp
+++ b/src/salut-enabler.cpp
@@ -31,7 +31,7 @@
#include <KUser>
#include <KLocalizedString>
-#include <QFrame>
+#include <QtGui/QFrame>
#include "salut-details-dialog.h"
#include "salut-message-widget.h"
diff --git a/src/salut-enabler.h b/src/salut-enabler.h
index 5834ef5..7d4d640 100644
--- a/src/salut-enabler.h
+++ b/src/salut-enabler.h
@@ -21,7 +21,7 @@
#ifndef SALUT_ENABLER_H
#define SALUT_ENABLER_H
-#include <QObject>
+#include <QtCore/QObject>
#include <TelepathyQt/Types>
#include <KMessageWidget>
diff --git a/src/salut-message-widget.cpp b/src/salut-message-widget.cpp
index e0f8cf6..6fa34fe 100644
--- a/src/salut-message-widget.cpp
+++ b/src/salut-message-widget.cpp
@@ -26,9 +26,9 @@
#include <KIcon>
#include <KAction>
-#include <QLayout>
-#include <QWidgetAction>
-#include <QVBoxLayout>
+#include <QtGui/QLayout>
+#include <QtGui/QWidgetAction>
+#include <QtGui/QVBoxLayout>
SalutMessageWidget::SalutMessageWidget(QWidget *parent)
: KMessageWidget(parent)
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list