cleanup includes

kmag.cpp

@@ -21,42 +21,29 @@
  *                                                                         *
  ***************************************************************************/
 
-// include files for QT
+// include files for Qt
 #include <QApplication>
+#include <QClipboard>
 #include <QDebug>
-#include <QDir>
+#include <QDesktopWidget>
 #include <QFileDialog>
 #include <QImageReader>
-#include <QPointer>
-#include <QPrintDialog>
+#include <QMenuBar>
 #include <QPainter>
-#include <QLayout>
-#include <QClipboard>
-#include <QContextMenuEvent>
-#include <QPixmap>
-#include <QDesktopWidget>
+#include <QPrintDialog>
 #include <QTemporaryFile>
 
 // include files for KDE
-#include <kxmlguiclient.h>
-#include <ktoolbar.h>
-#include <ktoggleaction.h>
-#include <kactioncollection.h>
-#include <kselectaction.h>
-#include <kdeversion.h>
-#include <kxmlguifactory.h>
-#include <kstandardshortcut.h>
-#include <kshortcutsdialog.h>
-#include <kmessagebox.h>
-#include <kmenubar.h>
-#include <klocale.h>
-#include <kconfig.h>
-#include <kconfiggroup.h>
-#include <kstandardaction.h>
-#include <khelpmenu.h>
+#include <KActionCollection>
+#include <KConfigGroup>
+#include <KEditToolBar>
+#include <KLocalizedString>
+#include <KMessageBox>
+#include <KSelectAction>
+#include <KShortcutsDialog>
+#include <KToggleAction>
+#include <KXMLGUIFactory>
 #include <KIO/FileCopyJob>
-#include <kmenu.h>
-#include <kedittoolbar.h>
 
 // application specific includes
 #include "kmag.h"

kmag.h

@@ -28,14 +28,14 @@
 #include "focustrackconfig.h"
 
 // include files for Qt
-#include <QContextMenuEvent>
 #include <QPrinter>
 
 // include files for KDE
-#include <kxmlguiwindow.h>
-#include <ktoggleaction.h>
-#include <kselectaction.h>
 #include <ksharedconfig.h>
+#include <kxmlguiwindow.h>
+
+class KToggleAction;
+class KSelectAction;
 
 /**
   * The base class for Kmag application windows. It sets up the main

kmagselrect.cpp

@@ -18,17 +18,14 @@
  ***************************************************************************/
 
 #include "kmagselrect.h"
-#include "kmagselrect.moc"
 
 #include <QApplication>
-#include <QCursor>
-#include <QPixmap>
 #include <QBitmap>
-#include <QMouseEvent>
-#include <QLabel>
+#include <QCursor>
 #include <QDesktopWidget>
+#include <QMouseEvent>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 static uchar line_bits[] = {0x2d, 0x96, 0x4b, 0xa5, 0xd2, 0x69, 0xb4, 0x5a};
 

kmagselrect.h

@@ -20,13 +20,10 @@
 #ifndef KMAGSELRECT_H
 #define KMAGSELRECT_H
 
-#include <stdlib.h>
-
-// Qt includes
-#include <QRect>
 #include <QWidget>
 #include <QLabel>
-#include <QMouseEvent>
+
+class QMouseEvent;
 
 class KMagSelWinCorner : public QLabel
 {

kmagzoomview.cpp

@@ -24,29 +24,17 @@
 
 // application specific includes
 #include "kmagzoomview.h"
-#include "kmagzoomview.moc"
 #include "colorsim.h"
 
 // include files for Qt
 #include <QApplication>
 #include <QBitmap>
-#include <QCursor>
-#include <QPainter>
-#include <QWidget>
-#include <QScrollBar>
-#include <QPixmap>
-#include <QFocusEvent>
-#include <QHideEvent>
-#include <QKeyEvent>
-#include <QShowEvent>
-#include <QResizeEvent>
-#include <QMouseEvent>
 #include <QDesktopWidget>
-#include <QDBusConnection>
+#include <QScrollBar>
 
 // include files for KDE
-#include <kcursor.h>
-#include <klocale.h>
+#include <KLocalizedString>
+
 #ifdef QAccessibilityClient_FOUND
 #include <qaccessibilityclient/accessibleobject.h>
 #endif