[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:05:57 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=9c844dc
The following commit has been merged in the master branch:
commit 9c844dcce3d5060400ffd72f0a834e4b58bd2fb6
Author: Martin Klapetek <mklapetek at kde.org>
Date: Wed Aug 6 13:14:44 2014 +0200
Remove the Qt module from the include headers
---
.../abstract-account-parameters-widget.cpp | 12 ++++++------
.../abstract-account-parameters-widget.h | 6 +++---
src/KCMTelepathyAccounts/abstract-account-ui-plugin.h | 6 +++---
src/KCMTelepathyAccounts/abstract-account-ui.h | 8 ++++----
src/KCMTelepathyAccounts/account-edit-widget.cpp | 4 ++--
src/KCMTelepathyAccounts/account-edit-widget.h | 5 +++--
src/KCMTelepathyAccounts/dictionary.h | 4 ++--
src/KCMTelepathyAccounts/feedback-widget.cpp | 16 ++++++++--------
.../generic-advanced-options-widget.cpp | 4 +++-
src/KCMTelepathyAccounts/parameter-edit-delegate.cpp | 10 +++++-----
src/KCMTelepathyAccounts/parameter-edit-model.cpp | 3 +--
src/KCMTelepathyAccounts/parameter-edit-model.h | 2 +-
src/KCMTelepathyAccounts/parameter-item.h | 6 +++---
src/KCMTelepathyAccounts/plugin-manager.h | 4 ++--
src/KCMTelepathyAccounts/profile-item.h | 2 +-
src/KCMTelepathyAccounts/profile-list-model.h | 2 +-
src/KCMTelepathyAccounts/profile-select-widget.cpp | 4 ++--
src/KCMTelepathyAccounts/profile-select-widget.h | 2 +-
.../simple-profile-select-widget.cpp | 8 ++++----
src/KCMTelepathyAccounts/simple-profile-select-widget.h | 2 +-
src/KCMTelepathyAccounts/unsigned-integer-edit.cpp | 2 +-
src/KCMTelepathyAccounts/unsigned-integer-edit.h | 4 ++--
src/KCMTelepathyAccounts/validated-line-edit.cpp | 14 +++++++-------
src/KCMTelepathyAccounts/validated-line-edit.h | 2 +-
24 files changed, 67 insertions(+), 65 deletions(-)
diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
index 3ecfbc4..f96217b 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
@@ -26,13 +26,13 @@
#include <KLocalizedString>
-#include <QtCore/QMap>
-#include <QtGui/QLineEdit>
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QSpinBox>
-#include <QtGui/QDataWidgetMapper>
#include <QDebug>
+#include <QMap>
+#include <QLineEdit>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QSpinBox>
+#include <QDataWidgetMapper>
class AbstractAccountParametersWidget::Private
diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
index 0c9fb9e..8e19d31 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
@@ -25,9 +25,9 @@
#include "kcm_telepathy_accounts_export.h"
-#include <QtCore/QMap>
-#include <QtCore/QVariant>
-#include <QtGui/QWidget>
+#include <QMap>
+#include <QVariant>
+#include <QWidget>
#include <TelepathyQt/ConnectionManager>
diff --git a/src/KCMTelepathyAccounts/abstract-account-ui-plugin.h b/src/KCMTelepathyAccounts/abstract-account-ui-plugin.h
index 7bd79a4..4c1af97 100644
--- a/src/KCMTelepathyAccounts/abstract-account-ui-plugin.h
+++ b/src/KCMTelepathyAccounts/abstract-account-ui-plugin.h
@@ -23,9 +23,9 @@
#include "kcm_telepathy_accounts_export.h"
-#include <QtCore/QMap>
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QMap>
+#include <QObject>
+#include <QString>
class AbstractAccountUi;
diff --git a/src/KCMTelepathyAccounts/abstract-account-ui.h b/src/KCMTelepathyAccounts/abstract-account-ui.h
index dff2277..7a160e9 100644
--- a/src/KCMTelepathyAccounts/abstract-account-ui.h
+++ b/src/KCMTelepathyAccounts/abstract-account-ui.h
@@ -23,10 +23,10 @@
#include "kcm_telepathy_accounts_export.h"
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QObject>
-#include <QtCore/QVariant>
+#include <QList>
+#include <QMap>
+#include <QObject>
+#include <QVariant>
#include <TelepathyQt/ConnectionManager>
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index 4998a14..52723bf 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -34,9 +34,9 @@
#include <KMessageWidget>
#include <TelepathyQt/Profile>
-#include <QtCore/QList>
-#include <QtGui/QCheckBox>
+#include <QList>
+#include <QCheckBox>
#include <QDialog>
class AccountEditWidget::Private
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.h b/src/KCMTelepathyAccounts/account-edit-widget.h
index 7b7e714..9a4f35a 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.h
+++ b/src/KCMTelepathyAccounts/account-edit-widget.h
@@ -24,12 +24,13 @@
#define KCM_TELEPATHY_ACCOUNTS_ACCOUNT_EDIT_WIDGET_H
#include "kcm_telepathy_accounts_export.h"
+#include "parameter-edit-model.h"
-#include <QtGui/QWidget>
#include <KMessageWidget>
+#include <QWidget>
+
#include <TelepathyQt/ConnectionManager>
-#include "parameter-edit-model.h"
enum ConnectOnLoadType{
doConnectOnAdd,
diff --git a/src/KCMTelepathyAccounts/dictionary.h b/src/KCMTelepathyAccounts/dictionary.h
index 71ae54a..8ea6e4c 100644
--- a/src/KCMTelepathyAccounts/dictionary.h
+++ b/src/KCMTelepathyAccounts/dictionary.h
@@ -21,8 +21,8 @@
#ifndef TELEPATHY_ACCOUNTS_KCM_DICTIONARY_H
#define TELEPATHY_ACCOUNTS_KCM_DICTIONARY_H
-#include <QtCore/QMap>
-#include <QtCore/QString>
+#include <QMap>
+#include <QString>
class Dictionary
{
diff --git a/src/KCMTelepathyAccounts/feedback-widget.cpp b/src/KCMTelepathyAccounts/feedback-widget.cpp
index 525ca8c..75915be 100644
--- a/src/KCMTelepathyAccounts/feedback-widget.cpp
+++ b/src/KCMTelepathyAccounts/feedback-widget.cpp
@@ -23,18 +23,18 @@
#include "feedback-widget.h"
-#include <KPushButton>
#include <KLocalizedString>
#include <KColorScheme>
-#include <QtGui/QWidget>
-#include <QtGui/QLabel>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QPainter>
-#include <QtCore/QTimer>
#include <QIcon>
+#include <QPushButton>
+#include <QWidget>
+#include <QLabel>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QTimer>
FeedbackWidget::FeedbackWidget(QWidget *parent)
: KMessageWidget(parent)
diff --git a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
index e17dacf..5d5d568 100644
--- a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
+++ b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
@@ -18,10 +18,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <QtGui/QHBoxLayout>
#include <KLocalizedString>
#include <QTabWidget>
+#include <QTabBar>
+#include <QHBoxLayout>
+
#include "generic-advanced-options-widget.h"
class GenericAdvancedOptionsWidget::Private
diff --git a/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp b/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
index f26cdd5..ba01336 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
@@ -24,12 +24,12 @@
#include <QDebug>
-#include <QtGui/QApplication>
-#include <QtGui/QCheckBox>
-#include <QtGui/QLabel>
-#include <QtGui/QSpinBox>
-#include <QtGui/QPainter>
#include <QLineEdit>
+#include <QApplication>
+#include <QCheckBox>
+#include <QLabel>
+#include <QSpinBox>
+#include <QPainter>
ParameterEditDelegate::ParameterEditDelegate(QAbstractItemView *itemView, QObject *parent)
: KWidgetItemDelegate(itemView, parent)
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.cpp b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
index 5f5bfca..248d867 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
@@ -24,12 +24,11 @@
#include "parameter-item.h"
-#include <KApplication>
#include <KLocalizedString>
#include <KMessageWidget>
-#include <QtGui/QValidator>
#include <QDebug>
+#include <QValidator>
#include <TelepathyQt/Profile>
#include <TelepathyQt/ConnectionManager>
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.h b/src/KCMTelepathyAccounts/parameter-edit-model.h
index 90b0fe6..431b4b1 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.h
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.h
@@ -25,7 +25,7 @@
#include "kcm_telepathy_accounts_export.h"
-#include <QtCore/QAbstractListModel>
+#include <QAbstractListModel>
#include <TelepathyQt/Profile>
#include <TelepathyQt/ProtocolParameter>
diff --git a/src/KCMTelepathyAccounts/parameter-item.h b/src/KCMTelepathyAccounts/parameter-item.h
index 0cf185c..1d659d1 100644
--- a/src/KCMTelepathyAccounts/parameter-item.h
+++ b/src/KCMTelepathyAccounts/parameter-item.h
@@ -21,9 +21,9 @@
#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_PARAMETER_ITEM_H
#define LIB_KCM_TELEPATHY_ACCOUNTS_PARAMETER_ITEM_H
-#include <QtCore/QObject>
-#include <QtCore/QVariant>
-#include <QtGui/QValidator>
+#include <QObject>
+#include <QVariant>
+#include <QValidator>
#include <TelepathyQt/ConnectionManager>
#include <TelepathyQt/Profile>
diff --git a/src/KCMTelepathyAccounts/plugin-manager.h b/src/KCMTelepathyAccounts/plugin-manager.h
index 94b2856..1476d76 100644
--- a/src/KCMTelepathyAccounts/plugin-manager.h
+++ b/src/KCMTelepathyAccounts/plugin-manager.h
@@ -23,8 +23,8 @@
#include "kcm_telepathy_accounts_export.h"
-#include <QtCore/QList>
-#include <QtCore/QObject>
+#include <QList>
+#include <QObject>
class AbstractAccountUi;
class AbstractAccountUiPlugin;
diff --git a/src/KCMTelepathyAccounts/profile-item.h b/src/KCMTelepathyAccounts/profile-item.h
index 00be545..3dcb313 100644
--- a/src/KCMTelepathyAccounts/profile-item.h
+++ b/src/KCMTelepathyAccounts/profile-item.h
@@ -24,7 +24,7 @@
#include "kcm_telepathy_accounts_export.h"
-#include <QtCore/QObject>
+#include <QObject>
#include <QIcon>
#include <TelepathyQt/Profile>
diff --git a/src/KCMTelepathyAccounts/profile-list-model.h b/src/KCMTelepathyAccounts/profile-list-model.h
index 8b313d1..6c86951 100644
--- a/src/KCMTelepathyAccounts/profile-list-model.h
+++ b/src/KCMTelepathyAccounts/profile-list-model.h
@@ -24,7 +24,7 @@
#include "kcm_telepathy_accounts_export.h"
-#include <QtCore/QAbstractListModel>
+#include <QAbstractListModel>
#include <TelepathyQt/ConnectionManager>
diff --git a/src/KCMTelepathyAccounts/profile-select-widget.cpp b/src/KCMTelepathyAccounts/profile-select-widget.cpp
index 1927981..0577feb 100644
--- a/src/KCMTelepathyAccounts/profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/profile-select-widget.cpp
@@ -28,8 +28,8 @@
#include <QDebug>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QItemSelectionModel>
+#include <QSortFilterProxyModel>
+#include <QItemSelectionModel>
class ProfileSelectWidget::Private
{
diff --git a/src/KCMTelepathyAccounts/profile-select-widget.h b/src/KCMTelepathyAccounts/profile-select-widget.h
index 39036c1..0a49b91 100644
--- a/src/KCMTelepathyAccounts/profile-select-widget.h
+++ b/src/KCMTelepathyAccounts/profile-select-widget.h
@@ -25,7 +25,7 @@
#include "kcm_telepathy_accounts_export.h"
#include "profile-list-model.h"
-#include <QtGui/QWidget>
+#include <QWidget>
namespace Tp {
class PendingOperation;
diff --git a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
index c30105f..7959507 100644
--- a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
@@ -30,11 +30,11 @@
#include <TelepathyQt/ProfileManager>
#include <TelepathyQt/Feature>
-#include <QtCore/QSignalMapper>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QItemSelectionModel>
-#include <QtGui/QCommandLinkButton>
#include <QDebug>
+#include <QSignalMapper>
+#include <QSortFilterProxyModel>
+#include <QItemSelectionModel>
+#include <QCommandLinkButton>
class SimpleProfileSelectWidget::Private
{
diff --git a/src/KCMTelepathyAccounts/simple-profile-select-widget.h b/src/KCMTelepathyAccounts/simple-profile-select-widget.h
index 52eede1..05a8df0 100644
--- a/src/KCMTelepathyAccounts/simple-profile-select-widget.h
+++ b/src/KCMTelepathyAccounts/simple-profile-select-widget.h
@@ -24,7 +24,7 @@
#include "kcm_telepathy_accounts_export.h"
#include "profile-list-model.h"
-#include <QtGui/QWidget>
+#include <QWidget>
namespace Tp {
class PendingOperation;
diff --git a/src/KCMTelepathyAccounts/unsigned-integer-edit.cpp b/src/KCMTelepathyAccounts/unsigned-integer-edit.cpp
index d07c96d..e9f3205 100644
--- a/src/KCMTelepathyAccounts/unsigned-integer-edit.cpp
+++ b/src/KCMTelepathyAccounts/unsigned-integer-edit.cpp
@@ -20,8 +20,8 @@
#include "unsigned-integer-edit.h"
-#include <QtGui/QIntValidator>
#include <QDebug>
+#include <QIntValidator>
UnsignedIntegerEdit::UnsignedIntegerEdit(QWidget *parent)
: QLineEdit(parent)
diff --git a/src/KCMTelepathyAccounts/unsigned-integer-edit.h b/src/KCMTelepathyAccounts/unsigned-integer-edit.h
index b9fc463..ef4a7f6 100644
--- a/src/KCMTelepathyAccounts/unsigned-integer-edit.h
+++ b/src/KCMTelepathyAccounts/unsigned-integer-edit.h
@@ -23,8 +23,8 @@
#include "kcm_telepathy_accounts_export.h"
-#include <QtCore/QPair>
-#include <QtGui/QValidator>
+#include <QPair>
+#include <QValidator>
#include <QLineEdit>
diff --git a/src/KCMTelepathyAccounts/validated-line-edit.cpp b/src/KCMTelepathyAccounts/validated-line-edit.cpp
index f121333..7769c13 100644
--- a/src/KCMTelepathyAccounts/validated-line-edit.cpp
+++ b/src/KCMTelepathyAccounts/validated-line-edit.cpp
@@ -25,15 +25,15 @@
#include <KLocalizedString>
#include <KIconLoader>
-#include <QtGui/QWidget>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QPainter>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QPersistentModelIndex>
#include <QIcon>
#include <QLineEdit>
+#include <QWidget>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QAbstractItemModel>
+#include <QPersistentModelIndex>
class ValidationIconWidget : public QWidget
{
diff --git a/src/KCMTelepathyAccounts/validated-line-edit.h b/src/KCMTelepathyAccounts/validated-line-edit.h
index 48b41d6..94bca30 100644
--- a/src/KCMTelepathyAccounts/validated-line-edit.h
+++ b/src/KCMTelepathyAccounts/validated-line-edit.h
@@ -23,7 +23,7 @@
#include <QLineEdit>
#include <kdemacros.h>
-#include <QtGui/QValidator>
+#include <QValidator>
class QLabel;
class QHBoxLayout;
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list