From kde-commits  Sun Oct 31 12:31:50 2010
From: Dario Freddi <drf () kde ! org>
Date: Sun, 31 Oct 2010 12:31:50 +0000
To: kde-commits
Subject: KDE/kdebase/workspace/powerdevil
Message-Id: <20101031123150.7D289AC89B () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=128852836902788

SVN commit 1191557 by dafre:

Cleanups in includes&friends, and also remove some more unneeded files

 M  +0 -2      CMakeLists.txt  
 D             config-powerdevil.h.cmake  
 M  +3 -2      daemon/actions/bundled/brightnesscontrol.cpp  
 M  +3 -3      daemon/actions/bundled/brightnesscontrolconfig.cpp  
 M  +1 -0      daemon/actions/bundled/brightnesscontrolconfig.h  
 M  +2 -1      daemon/actions/bundled/dimdisplay.cpp  
 M  +3 -2      daemon/actions/bundled/dimdisplayconfig.cpp  
 M  +3 -2      daemon/actions/bundled/disabledesktopeffects.cpp  
 M  +2 -0      daemon/actions/bundled/disabledesktopeffectsconfig.cpp  
 M  +4 -2      daemon/actions/bundled/handlebuttonevents.cpp  
 M  +2 -1      daemon/actions/bundled/handlebuttoneventsconfig.cpp  
 M  +3 -2      daemon/actions/bundled/runscript.cpp  
 M  +3 -1      daemon/actions/bundled/runscriptconfig.cpp  
 M  +5 -4      daemon/actions/bundled/suspendsession.cpp  
 M  +4 -1      daemon/actions/bundled/suspendsessionconfig.cpp  
 M  +1 -0      daemon/actions/dpms/powerdevildpmsaction.cpp  
 M  +1 -1      daemon/actions/dpms/powerdevildpmsactionconfig.cpp  
 M  +5 -4      daemon/kdedpowerdevil.cpp  
 M  +1 -1      daemon/powerdevilaction.cpp  
 M  +4 -4      daemon/powerdevilaction.h  
 M  +0 -1      daemon/powerdevilactionconfig.cpp  
 M  +3 -2      daemon/powerdevilactionconfig.h  
 M  +0 -1      daemon/powerdevilactionpool.h  
 M  +0 -1      daemon/powerdevilbackendinterface.cpp  
 M  +1 -1      daemon/powerdevilbackendinterface.h  
 M  +5 -3      daemon/powerdevilcore.h  
 M  +1 -1      daemon/powerdevilfdoconnector.h  
 M  +6 -5      daemon/powerdevilpolicyagent.cpp  
 M  +5 -5      daemon/powerdevilprofilegenerator.cpp  


--- trunk/KDE/kdebase/workspace/powerdevil/CMakeLists.txt #1191556:1191557
@@ -1,6 +1,4 @@
 
-configure_file(config-powerdevil.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-powerdevil.h )
-
 include_directories (
     ${CMAKE_CURRENT_SOURCE_DIR} 
     ${CMAKE_CURRENT_BINARY_DIR} 
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/brightnesscontrol.cpp #1191556:1191557
@@ -17,10 +17,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
+#include "brightnesscontrol.h"
 
-#include "brightnesscontrol.h"
+#include <powerdevilbackendinterface.h>
+
 #include <KConfigGroup>
-#include <powerdevilbackendinterface.h>
 #include <KLocalizedString>
 
 namespace PowerDevil {
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/brightnesscontrolconfig.cpp #1191556:1191557
@@ -17,15 +17,15 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
-
 #include "brightnesscontrolconfig.h"
 
-#include <KPluginFactory>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <KLocalizedString>
 #include <QSlider>
 
+#include <KPluginFactory>
+#include <KLocalizedString>
+
 K_PLUGIN_FACTORY(PowerDevilBrightnessControlConfigFactory, registerPlugin<PowerDevil::BundledActions::BrightnessControlConfig>(); )
 K_EXPORT_PLUGIN(PowerDevilBrightnessControlConfigFactory("powerdevilbrightnesscontrolaction_config"))
 
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/brightnesscontrolconfig.h #1191556:1191557
@@ -22,6 +22,7 @@
 #define POWERDEVIL_BUNDLEDACTIONS_BRIGHTNESSCONTROLCONFIG_H
 
 #include <powerdevilactionconfig.h>
+
 #include <kdemacros.h>
 
 class QSlider;
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/dimdisplay.cpp #1191556:1191557
@@ -17,9 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
+#include "dimdisplay.h"
 
-#include "dimdisplay.h"
 #include <powerdevilbackendinterface.h>
+
 #include <KConfigGroup>
 #include <KLocalizedString>
 #include <KDebug>
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/dimdisplayconfig.cpp #1191556:1191557
@@ -17,13 +17,14 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
+#include "dimdisplayconfig.h"
 
-#include "dimdisplayconfig.h"
-#include <KLocalizedString>
 #include <QHBoxLayout>
 #include <QLabel>
+
 #include <KIntSpinBox>
 #include <KPluginFactory>
+#include <KLocalizedString>
 
 K_PLUGIN_FACTORY(PowerDevilDimDisplayConfigFactory, registerPlugin<PowerDevil::BundledActions::DimDisplayConfig>(); )
 K_EXPORT_PLUGIN(PowerDevilDimDisplayConfigFactory("powerdevildimdisplayaction_config"))
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/disabledesktopeffects.cpp #1191556:1191557
@@ -17,12 +17,13 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
+#include "disabledesktopeffects.h"
 
-#include "disabledesktopeffects.h"
+#include <QtDBus/QDBusPendingReply>
 #include <QtDBus/QDBusInterface>
+
 #include <KConfigGroup>
 #include <KLocalizedString>
-#include <QDBusPendingReply>
 
 namespace PowerDevil {
 namespace BundledActions {
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/disabledesktopeffectsconfig.cpp #1191556:1191557
@@ -18,7 +18,9 @@
  ***************************************************************************/
 
 #include "disabledesktopeffectsconfig.h"
+
 #include <QHBoxLayout>
+
 #include <KComboBox>
 #include <KIntSpinBox>
 #include <KLocalizedString>
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/handlebuttonevents.cpp #1191556:1191557
@@ -19,11 +19,13 @@
 
 #include "handlebuttonevents.h"
 
-#include "screensaver_interface.h"
+#include <powerdevilactionpool.h>
+
 #include <KConfigGroup>
 #include <KIdleTime>
-#include <powerdevilactionpool.h>
 
+#include "screensaver_interface.h"
+
 namespace PowerDevil {
 namespace BundledActions {
 
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/handlebuttoneventsconfig.cpp #1191556:1191557
@@ -19,11 +19,12 @@
 
 #include "handlebuttoneventsconfig.h"
 
+#include <Solid/PowerManagement>
+
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KComboBox>
 #include <KIcon>
-#include <solid/powermanagement.h>
 
 K_PLUGIN_FACTORY(PowerDevilSuspendSessionConfigFactory, registerPlugin<PowerDevil::BundledActions::HandleButtonEventsConfig>(); )
 K_EXPORT_PLUGIN(PowerDevilSuspendSessionConfigFactory("powerdevilhandlebuttoneventsaction_config"))
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/runscript.cpp #1191556:1191557
@@ -17,11 +17,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
+#include "runscript.h"
 
-#include "runscript.h"
-#include <KConfigGroup>
 #include <QtCore/QProcess>
 
+#include <KConfigGroup>
+
 namespace PowerDevil {
 namespace BundledActions {
 
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/runscriptconfig.cpp #1191556:1191557
@@ -19,9 +19,11 @@
 
 
 #include "runscriptconfig.h"
+
+#include <QHBoxLayout>
+
 #include <KLocalizedString>
 #include <KUrlRequester>
-#include <QHBoxLayout>
 #include <KComboBox>
 #include <KIntSpinBox>
 #include <KPluginFactory>
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/suspendsession.cpp #1191556:1191557
@@ -19,16 +19,17 @@
 
 #include "suspendsession.h"
 
-#include "screensaver_interface.h"
+#include "powerdevilbackendinterface.h"
 
-#include "powerdevilbackendinterface.h"
-#include <kworkspace/kworkspace.h>
 #include <KConfigGroup>
-#include <powerdevilpolicyagent.h>
 #include <KLocalizedString>
 #include <KJob>
 #include <KDebug>
 
+#include <kworkspace/kworkspace.h>
+
+#include "screensaver_interface.h"
+
 namespace PowerDevil
 {
 namespace BundledActions
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/suspendsessionconfig.cpp #1191556:1191557
@@ -19,12 +19,15 @@
 
 
 #include "suspendsessionconfig.h"
+
 #include <QHBoxLayout>
+
+#include <Solid/PowerManagement>
+
 #include <KComboBox>
 #include <KIntSpinBox>
 #include <KLocalizedString>
 #include <KPluginFactory>
-#include <solid/powermanagement.h>
 #include <KIcon>
 
 K_PLUGIN_FACTORY(PowerDevilSuspendSessionConfigFactory, registerPlugin<PowerDevil::BundledActions::SuspendSessionConfig>(); )
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/dpms/powerdevildpmsaction.cpp #1191556:1191557
@@ -25,6 +25,7 @@
 #include <config-workspace.h>
 
 #include <QtGui/QX11Info>
+
 #include <KConfigGroup>
 #include <KPluginFactory>
 
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/dpms/powerdevildpmsactionconfig.cpp #1191556:1191557
@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
+#include "powerdevildpmsactionconfig.h"
 
-#include "powerdevildpmsactionconfig.h"
 #include <KIntSpinBox>
 #include <KLocalizedString>
 #include <KPluginFactory>
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/kdedpowerdevil.cpp #1191556:1191557
@@ -19,12 +19,13 @@
 
 #include "kdedpowerdevil.h"
 
-#include <kdemacros.h>
-#include <KAboutData>
-#include <KPluginFactory>
 #include "powerdevilcore.h"
+
 #include <QtCore/QTimer>
 
+#include <KAboutData>
+#include <KPluginFactory>
+
 K_PLUGIN_FACTORY( PowerDevilFactory,
                   registerPlugin<KDEDPowerDevil>(); )
 K_EXPORT_PLUGIN( PowerDevilFactory( "powerdevildaemon" ) )
@@ -52,7 +53,7 @@
                          KAboutData::License_GPL, ki18n("(c) 2010 MetalWorkers Co."),
                          KLocalizedString(), "http://www.kde.org");
 
-    aboutData.addAuthor(ki18n( "Dario Freddi" ), ki18n("Developer"), "drf@kde.org",
+    aboutData.addAuthor(ki18n( "Dario Freddi" ), ki18n("Maintainer"), "drf@kde.org",
                         "http://drfav.wordpress.com");
 
     new PowerDevil::Core(this, KComponentData(aboutData));
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilaction.cpp #1191556:1191557
@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
+#include "powerdevilaction.h"
 
-#include "powerdevilaction.h"
 #include "powerdevilcore.h"
 
 namespace PowerDevil
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilaction.h #1191556:1191557
@@ -21,13 +21,13 @@
 #ifndef POWERDEVIL_POWERDEVILACTION_H
 #define POWERDEVIL_POWERDEVILACTION_H
 
-#include <QObject>
-#include <QVariantMap>
+#include "powerdevilpolicyagent.h"
 
+#include <QtCore/QObject>
+#include <QtCore/QVariantMap>
+
 #include <kdemacros.h>
 
-#include "powerdevilpolicyagent.h"
-
 class KConfigGroup;
 
 namespace PowerDevil
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilactionconfig.cpp #1191556:1191557
@@ -17,7 +17,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
-
 #include "powerdevilactionconfig.h"
 
 namespace PowerDevil
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilactionconfig.h #1191556:1191557
@@ -21,11 +21,12 @@
 #ifndef POWERDEVIL_POWERDEVILACTIONCONFIG_H
 #define POWERDEVIL_POWERDEVILACTIONCONFIG_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
-#include <kdemacros.h>
 #include <KConfigGroup>
 
+#include <kdemacros.h>
+
 namespace PowerDevil {
 
 class KDE_EXPORT ActionConfig : public QObject
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilactionpool.h #1191556:1191557
@@ -21,7 +21,6 @@
 #ifndef POWERDEVIL_POWERDEVILACTIONPOOL_H
 #define POWERDEVIL_POWERDEVILACTIONPOOL_H
 
-#include <QObject>
 #include <QtCore/QHash>
 #include <QtCore/QStringList>
 
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilbackendinterface.cpp #1191556:1191557
@@ -17,7 +17,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
-
 #include "powerdevilbackendinterface.h"
 
 namespace PowerDevil
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilbackendinterface.h #1191556:1191557
@@ -21,7 +21,7 @@
 #ifndef POWERDEVIL_BACKENDINTERFACE_H
 #define POWERDEVIL_BACKENDINTERFACE_H
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtCore/QHash>
 
 #include <kdemacros.h>
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilcore.h #1191556:1191557
@@ -21,11 +21,13 @@
 #ifndef POWERDEVILCORE_H
 #define POWERDEVILCORE_H
 
-#include <KComponentData>
-#include <QWeakPointer>
-#include <QtCore/QStringList>
 #include "powerdevilbackendinterface.h"
 
+#include <QtCore/QWeakPointer>
+#include <QtCore/QStringList>
+
+#include <KComponentData>
+
 class QTimer;
 class KNotification;
 namespace Solid {
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilfdoconnector.h #1191556:1191557
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2008 by Kevin Ottens <ervin@kde.org>                    *
- *   Copyright (C) 2008 by Dario Freddi <drf@kde.org>                      *
+ *   Copyright (C) 2008-2010 by Dario Freddi <drf@kde.org>                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilpolicyagent.cpp #1191556:1191557
@@ -20,14 +20,15 @@
 
 #include "powerdevilpolicyagent.h"
 
-#include <KGlobal>
 #include <QtDBus/QDBusConnection>
-#include <KDebug>
 #include <QtDBus/QDBusInterface>
-#include <QDBusPendingReply>
-#include <QDBusConnectionInterface>
-#include <QDBusServiceWatcher>
+#include <QtDBus/QDBusPendingReply>
+#include <QtDBus/QDBusConnectionInterface>
+#include <QtDBus/QDBusServiceWatcher>
 
+#include <KGlobal>
+#include <KDebug>
+
 #include "powermanagementpolicyagentadaptor.h"
 
 namespace PowerDevil
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilprofilegenerator.cpp #1191556:1191557
@@ -21,15 +21,15 @@
 
 #include <PowerDevilSettings.h>
 
+#include <Solid/Device>
+#include <Solid/Battery>
+#include <Solid/PowerManagement>
+
 #include <KConfigGroup>
 #include <KSharedConfig>
 #include <KLocalizedString>
-
-#include <Solid/Device>
-#include <Solid/Battery>
-#include <solid/powermanagement.h>
 #include <KNotification>
-#include <kicon.h>
+#include <KIcon>
 
 namespace PowerDevil {