generic: misc cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index 4763881..deff873 100644 (file)
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -43,6 +43,7 @@
 #include <kactionmenu.h>
 #include <ktoolbarpopupaction.h>
 #include <kaction.h>
+#include <kguiitem.h>
 #include <KToggleAction>
 #include <kactioncollection.h>
 #include <kdebug.h>

diff --git a/ark/app/extractHereDndPlugin.cpp b/ark/app/extractHereDndPlugin.cpp
index 02c7b04..b5b43e0 100644 (file)
--- a/ark/app/extractHereDndPlugin.cpp
+++ b/ark/app/extractHereDndPlugin.cpp
@@ -28,6 +28,7 @@
 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <KLocale>
+#include <KIcon>
 #include <kfileitemlistproperties.h>
 
 K_PLUGIN_FACTORY(ExtractHerePluginFactory,

diff --git a/bluedevil/src/monolithic/monolithic.cpp b/bluedevil/src/monolithic/monolithic.cpp
index 3ce46ac..807a921 100644 (file)
--- a/bluedevil/src/monolithic/monolithic.cpp
+++ b/bluedevil/src/monolithic/monolithic.cpp
@@ -19,9 +19,10 @@
 #include "monolithic.h"
 #include "audio_interface.h"
 
-#include <KDebug>
+#include <kdebug.h>
 #include <kmenu.h>
 #include <kaction.h>
+#include <kicon.h>
 #include <kprocess.h>
 #include <ktoolinvocation.h>
 #include <klocalizedstring.h>

diff --git a/filelight/src/app/historyAction.cpp b/filelight/src/app/historyAction.cpp
index a64c801..d53a4a7 100644 (file)
--- a/filelight/src/app/historyAction.cpp
+++ b/filelight/src/app/historyAction.cpp
@@ -22,6 +22,7 @@
 #include "historyAction.h"
 
 #include <KAction>
+#include <KIcon>
 #include <KActionCollection>
 #include <KConfig>
 #include <KConfigGroup>

diff --git a/gwenview/lib/documentview/documentviewcontroller.cpp b/gwenview/lib/documentview/documentviewcontroller.cpp
index 91725b9..16271ed 100644 (file)
--- a/gwenview/lib/documentview/documentviewcontroller.cpp
+++ b/gwenview/lib/documentview/documentviewcontroller.cpp
@@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // KDE
 #include <KAction>
+#include <KIcon>
 #include <KActionCategory>
 #include <KDebug>
 #include <KLocale>

diff --git a/kdeplasma-addons/applets/kimpanel/src/kimpanelstatusbargraphics.cpp b/kdeplasma-addons/applets/kimpanel/src/kimpanelstatusbargraphics.cpp
index 3b0e075..e4d24ef 100644 (file)
--- a/kdeplasma-addons/applets/kimpanel/src/kimpanelstatusbargraphics.cpp
+++ b/kdeplasma-addons/applets/kimpanel/src/kimpanelstatusbargraphics.cpp
@@ -32,6 +32,7 @@
 
 // KDE
 #include <KIcon>
+#include <KIconLoader>
 #include <Plasma/ToolTipContent>
 #include <Plasma/ToolTipManager>
 #include <Plasma/PaintUtils>

diff --git a/kget/ui/droptarget.cpp b/kget/ui/droptarget.cpp
index dedff9d..296b53a 100644 (file)
--- a/kget/ui/droptarget.cpp
+++ b/kget/ui/droptarget.cpp
@@ -339,7 +339,7 @@ void DropTarget::toggleSticky()
     pop_sticky->setChecked(Settings::dropSticky());
 
     if ( Settings::dropSticky() )
-        KWindowSystem::setState(winId(), KWindowSystem::SkipTaskbar | KWindowSystem::StaysOnTop | KWindowSystem::Sticky);
+        KWindowSystem::setState(winId(), KWindowSystem::SkipTaskbar | KWindowSystem::KeepAbove | KWindowSystem::Sticky);
     else
         KWindowSystem::clearState(winId(), KWindowSystem::Sticky);
 }

diff --git a/kgpg/groupedit.cpp b/kgpg/groupedit.cpp
index aba4ca1..e4b0cdd 100644 (file)
--- a/kgpg/groupedit.cpp
+++ b/kgpg/groupedit.cpp
@@ -21,6 +21,7 @@
 
 #include <KAction>
 #include <KActionCollection>
+#include <KIcon>
 #include <QHeaderView>
 #include <QSortFilterProxyModel>
 

diff --git a/kmix/gui/kmixdockwidget.cpp b/kmix/gui/kmixdockwidget.cpp
index c532965..a52ce1d 100644 (file)
--- a/kmix/gui/kmixdockwidget.cpp
+++ b/kmix/gui/kmixdockwidget.cpp
@@ -299,7 +299,7 @@ void KMixDockWidget::activate(const QPoint &pos)
 
 
        KWindowSystem::setType(dockAreaPopup->winId(), NET::Dock);
-       KWindowSystem::setState(dockAreaPopup->winId(), NET::StaysOnTop | NET::SkipTaskbar | NET::SkipPager);
+       KWindowSystem::setState(dockAreaPopup->winId(), NET::KeepAbove | NET::SkipTaskbar | NET::SkipPager);
        dockAreaPopup->show();
        dockAreaPopup->move(x, y);
 }

diff --git a/kmix/gui/mdwmoveaction.cpp b/kmix/gui/mdwmoveaction.cpp
index 4fafdf1..b8a171a 100644 (file)
--- a/kmix/gui/mdwmoveaction.cpp
+++ b/kmix/gui/mdwmoveaction.cpp
@@ -24,6 +24,9 @@
 #include "mdwmoveaction.h"
 #include "core/mixdevice.h"
 
+// KDE
+#include <KIcon>
+
 // Qt
 #include <QString>
 

diff --git a/kolourpaint/commands/kpCommandHistoryBase.cpp b/kolourpaint/commands/kpCommandHistoryBase.cpp
index f3c3712..627c72f 100644 (file)
--- a/kolourpaint/commands/kpCommandHistoryBase.cpp
+++ b/kolourpaint/commands/kpCommandHistoryBase.cpp
@@ -47,6 +47,7 @@
 #include <ktoolbarpopupaction.h>
 #include <kactioncollection.h>
 #include <kconfiggroup.h>
+#include <kicon.h>
 
 #include <kpCommand.h>
 #include <kpCommandEnvironment.h>

diff --git a/kolourpaint/tools/kpToolZoom.cpp b/kolourpaint/tools/kpToolZoom.cpp
index 102ffe0..ab8780b 100644 (file)
--- a/kolourpaint/tools/kpToolZoom.cpp
+++ b/kolourpaint/tools/kpToolZoom.cpp
@@ -35,6 +35,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
+#include <kicon.h>
 
 #include <kpDefs.h>
 #include <kpDocument.h>

diff --git a/kompare/libkomparediff2/komparemodellist.cpp b/kompare/libkomparediff2/komparemodellist.cpp
index d75c5f6..f356b1f 100644 (file)
--- a/kompare/libkomparediff2/komparemodellist.cpp
+++ b/kompare/libkomparediff2/komparemodellist.cpp
@@ -36,6 +36,7 @@
 #include <kmimetype.h>
 #include <ktemporaryfile.h>
 #include <kstandardaction.h>
+#include <kicon.h>
 
 #include "difference.h"
 #include "diffhunk.h"

diff --git a/kuassel/src/qtui/bufferwidget.cpp b/kuassel/src/qtui/bufferwidget.cpp
index 10185ff..46a6c4c 100644 (file)
--- a/kuassel/src/qtui/bufferwidget.cpp
+++ b/kuassel/src/qtui/bufferwidget.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QIcon>
+#include <KIcon>
 #include <QLayout>
 #include <QtGui/qevent.h>
 #include <QMenu>

diff --git a/kuassel/src/qtui/chatitem.cpp b/kuassel/src/qtui/chatitem.cpp
index 6750153..cd2e06a 100644 (file)
--- a/kuassel/src/qtui/chatitem.cpp
+++ b/kuassel/src/qtui/chatitem.cpp
@@ -23,7 +23,7 @@
 #include <QDesktopServices>
 #include <QFontMetrics>
 #include <QtGui/qgraphicssceneevent.h>
-#include <QIcon>
+#include <KIcon>
 #include <QPainter>
 #include <QPalette>
 #include <QTextLayout>

diff --git a/kuassel/src/qtui/chatscene.cpp b/kuassel/src/qtui/chatscene.cpp
index 78e52d2..17a9ad2 100644 (file)
--- a/kuassel/src/qtui/chatscene.cpp
+++ b/kuassel/src/qtui/chatscene.cpp
@@ -23,7 +23,7 @@
 #include <QDesktopServices>
 #include <QDrag>
 #include <QtGui/qgraphicssceneevent.h>
-#include <QIcon>
+#include <KIcon>
 #include <QMenu>
 #include <QMenuBar>
 #include <QMimeData>

diff --git a/kuassel/src/qtui/chatviewsearchbar.cpp b/kuassel/src/qtui/chatviewsearchbar.cpp
index cc1c1d6..18689fd 100644 (file)
--- a/kuassel/src/qtui/chatviewsearchbar.cpp
+++ b/kuassel/src/qtui/chatviewsearchbar.cpp
@@ -20,7 +20,7 @@
 
 #include "chatviewsearchbar.h"
 
-#include <QIcon>
+#include <KIcon>
 
 #include "action.h"
 #include "actioncollection.h"

diff --git a/kuassel/src/qtui/inputwidget.cpp b/kuassel/src/qtui/inputwidget.cpp
index 332361f..481aa79 100644 (file)
--- a/kuassel/src/qtui/inputwidget.cpp
+++ b/kuassel/src/qtui/inputwidget.cpp
@@ -20,7 +20,7 @@
 
 #include "inputwidget.h"
 
-#include <QIcon>
+#include <KIcon>
 
 #include "action.h"
 #include "actioncollection.h"

diff --git a/kuassel/src/qtui/qtui.cpp b/kuassel/src/qtui/qtui.cpp
index f9b6158..7b5877b 100644 (file)
--- a/kuassel/src/qtui/qtui.cpp
+++ b/kuassel/src/qtui/qtui.cpp
@@ -18,6 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include <KGlobal>
+
 #include "qtui.h"
 
 #include "abstractnotificationbackend.h"

diff --git a/kuassel/src/qtui/systemtray.cpp b/kuassel/src/qtui/systemtray.cpp
index 519fef5..5c08347 100644 (file)
--- a/kuassel/src/qtui/systemtray.cpp
+++ b/kuassel/src/qtui/systemtray.cpp
@@ -28,9 +28,10 @@
 #include "client.h"
 #include "qtui.h"
 
-#  include <KMenu>
-#  include <KWindowInfo>
-#  include <KWindowSystem>
+#include <KIcon>
+#include <KMenu>
+#include <KWindowInfo>
+#include <KWindowSystem>
 
 SystemTray::SystemTray(QWidget *parent)
     : QObject(parent),

diff --git a/kuassel/src/uisupport/contextmenuactionprovider.cpp b/kuassel/src/uisupport/contextmenuactionprovider.cpp
index f6a7fdb..ba568f6 100644 (file)
--- a/kuassel/src/uisupport/contextmenuactionprovider.cpp
+++ b/kuassel/src/uisupport/contextmenuactionprovider.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QIcon>
+#include <KIcon>
 #include <QInputDialog>
 #include <QMenu>
 #include <QMessageBox>

diff --git a/kuassel/src/uisupport/networkmodelcontroller.cpp b/kuassel/src/uisupport/networkmodelcontroller.cpp
index 3609392..ebc4cc9 100644 (file)
--- a/kuassel/src/uisupport/networkmodelcontroller.cpp
+++ b/kuassel/src/uisupport/networkmodelcontroller.cpp
@@ -21,7 +21,7 @@
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QIcon>
+#include <KIcon>
 #include <QLabel>
 #include <QLineEdit>
 #include <QInputDialog>

diff --git a/kuassel/src/uisupport/toolbaractionprovider.cpp b/kuassel/src/uisupport/toolbaractionprovider.cpp
index 885e21a..9d8a3bf 100644 (file)
--- a/kuassel/src/uisupport/toolbaractionprovider.cpp
+++ b/kuassel/src/uisupport/toolbaractionprovider.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QIcon>
+#include <KIcon>
 #include <QMenu>
 #include <QToolBar>
 

diff --git a/kvkbd/src/themeloader.cpp b/kvkbd/src/themeloader.cpp
index fee8d32..98e37c0 100644 (file)
--- a/kvkbd/src/themeloader.cpp
+++ b/kvkbd/src/themeloader.cpp
@@ -22,9 +22,6 @@
 #include <QMessageBox>
 #include <QString>
 #include <QFile>
-
-
-
 #include <QtXml/qdom.h>
 #include <QFileInfo>
 #include <QDir>
@@ -33,9 +30,9 @@
 #include <KUniqueApplication>
 #include <KStandardDirs>
 #include <KAction>
+#include <KIcon>
 #include <KToggleAction>
 
-
 #include <iostream>
 using namespace std;
 

diff --git a/plasma-nm/editor/connectioneditor.cpp b/plasma-nm/editor/connectioneditor.cpp
index 505191e..4be8d4d 100644 (file)
--- a/plasma-nm/editor/connectioneditor.cpp
+++ b/plasma-nm/editor/connectioneditor.cpp
@@ -47,6 +47,7 @@
 #include <KFileDialog>
 #include <KShell>
 #include <KFilterProxySearchLine>
+#include <QTimer>
 
 #include <NetworkManagerQt/Settings>
 #include <NetworkManagerQt/Connection>