[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=7f96246

The following commit has been merged in the master branch:
commit 7f962464bc4f083ff10b138f10c4f955bb514020
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date:   Sat Mar 12 00:16:11 2011 +0100

    Remove a ton of unnceccesary includes.
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
    REVIEW: 100842
---
 butterfly/butterfly-account-ui.cpp     | 1 -
 gabble/gabble-account-ui-plugin.cpp    | 3 ---
 haze/haze-skype-account-ui.cpp         | 3 ---
 haze/icq-main-options-widget.cpp       | 4 ----
 haze/icq-main-options-widget.h         | 2 --
 haze/myspaceim-main-options-widget.cpp | 2 --
 haze/skype-main-options-widget.cpp     | 3 +--
 haze/yahoo-main-options-widget.cpp     | 3 ++-
 idle/idle-account-ui.cpp               | 1 -
 sunshine/sunshine-account-ui.cpp       | 2 --
 10 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/butterfly/butterfly-account-ui.cpp b/butterfly/butterfly-account-ui.cpp
index 0e36ca6..fff3ddd 100644
--- a/butterfly/butterfly-account-ui.cpp
+++ b/butterfly/butterfly-account-ui.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "butterfly-account-ui.h"
-
 #include "main-options-widget.h"
 
 #include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
diff --git a/gabble/gabble-account-ui-plugin.cpp b/gabble/gabble-account-ui-plugin.cpp
index 087c2b9..344ca2e 100644
--- a/gabble/gabble-account-ui-plugin.cpp
+++ b/gabble/gabble-account-ui-plugin.cpp
@@ -19,11 +19,8 @@
  */
 
 #include "gabble-account-ui-plugin.h"
-
 #include "gabble-account-ui.h"
 
-#include <KCMTelepathyAccounts/PluginMacros>
-
 #include <KDebug>
 #include <KGenericFactory>
 
diff --git a/haze/haze-skype-account-ui.cpp b/haze/haze-skype-account-ui.cpp
index 05de4df..f0dcdc5 100644
--- a/haze/haze-skype-account-ui.cpp
+++ b/haze/haze-skype-account-ui.cpp
@@ -23,9 +23,6 @@
 #include "skype-main-options-widget.h"
 #include "skype-advanced-settings-widget.h"
 
-#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
-
 #include <KDebug>
 
 HazeSkypeAccountUi::HazeSkypeAccountUi(QObject *parent)
diff --git a/haze/icq-main-options-widget.cpp b/haze/icq-main-options-widget.cpp
index a536596..e9c7a76 100644
--- a/haze/icq-main-options-widget.cpp
+++ b/haze/icq-main-options-widget.cpp
@@ -22,10 +22,6 @@
 
 #include <KDebug>
 
-#include <QVariant>
-#include <QCheckBox>
-#include <QComboBox>
-
 IcqMainOptionsWidget::IcqMainOptionsWidget(ParameterEditModel *model,
                                      QWidget *parent)
  : AbstractAccountParametersWidget(model, parent)
diff --git a/haze/icq-main-options-widget.h b/haze/icq-main-options-widget.h
index 6c3c0cf..89574e7 100644
--- a/haze/icq-main-options-widget.h
+++ b/haze/icq-main-options-widget.h
@@ -25,8 +25,6 @@
 
 #include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
 
-#include <QString>
-
 class IcqMainOptionsWidget : public AbstractAccountParametersWidget
 {
     Q_OBJECT
diff --git a/haze/myspaceim-main-options-widget.cpp b/haze/myspaceim-main-options-widget.cpp
index 0f23d02..d4df4b0 100644
--- a/haze/myspaceim-main-options-widget.cpp
+++ b/haze/myspaceim-main-options-widget.cpp
@@ -24,8 +24,6 @@
 
 #include <KDebug>
 
-#include <QVariant>
-
 MySpaceIMMainOptionsWidget::MySpaceIMMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
  : AbstractAccountParametersWidget(model, parent)
 {
diff --git a/haze/skype-main-options-widget.cpp b/haze/skype-main-options-widget.cpp
index f68fe1d..fe163b0 100644
--- a/haze/skype-main-options-widget.cpp
+++ b/haze/skype-main-options-widget.cpp
@@ -23,9 +23,8 @@
 #include <KCMTelepathyAccounts/ParameterEditModel>
 
 #include <KDebug>
-#include <QDir>
 
-#include <QVariant>
+#include <QDir>
 
 SkypeMainOptionsWidget::SkypeMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
  : AbstractAccountParametersWidget(model, parent)
diff --git a/haze/yahoo-main-options-widget.cpp b/haze/yahoo-main-options-widget.cpp
index 8beec3c..108a023 100644
--- a/haze/yahoo-main-options-widget.cpp
+++ b/haze/yahoo-main-options-widget.cpp
@@ -20,9 +20,10 @@
 
 #include "yahoo-main-options-widget.h"
 
-#include <KDebug>
 #include <KCMTelepathyAccounts/ParameterEditModel>
 
+#include <KDebug>
+
 YahooMainOptionsWidget::YahooMainOptionsWidget(ParameterEditModel* model, QWidget* parent)
         : AbstractAccountParametersWidget(model, parent)
 {
diff --git a/idle/idle-account-ui.cpp b/idle/idle-account-ui.cpp
index b5c4182..8672f2a 100644
--- a/idle/idle-account-ui.cpp
+++ b/idle/idle-account-ui.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "idle-account-ui.h"
-
 #include "main-options-widget.h"
 #include "advanced-options-widget.h"
 
diff --git a/sunshine/sunshine-account-ui.cpp b/sunshine/sunshine-account-ui.cpp
index 1da7fe3..deace76 100644
--- a/sunshine/sunshine-account-ui.cpp
+++ b/sunshine/sunshine-account-ui.cpp
@@ -22,9 +22,7 @@
 #include "sunshine-main-options-widget.h"
 #include "sunshine-advanced-options-widget.h"
 
-#include <KCMTelepathyAccounts/ParameterEditModel>
 #include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
 
 #include <KDebug>
 

-- 
ktp-accounts-kcm packaging