clean up includes

SVN_SILENT


svn path=/trunk/kdereview/filelight/; revision=1089798

src/app/historyAction.cpp

@@ -22,12 +22,11 @@
 #include "historyAction.h"
 
 #include <KAction>
+#include <KActionCollection>
 #include <KConfig>
+#include <KConfigGroup>
 #include <KLocale>
-#include <KActionCollection>
 #include <KStandardShortcut>
-#include <KConfigGroup>
-
 
 inline HistoryAction::HistoryAction(const KIcon &icon, const QString &text, KActionCollection *ac)
         : KAction(icon, text, ac)

src/app/historyAction.h

@@ -23,8 +23,8 @@
 #define HISTORYACTION_H
 
 #include <KAction>
-#include <KUrl>
 #include <QStringList>
+#include <KUrl>
 
 class KConfigGroup;
 class KActionCollection;

src/app/main.cpp

@@ -22,11 +22,11 @@
 #include "define.h"
 #include "mainWindow.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
-#include <kurl.h>
+#include <KAboutData>
+#include <KApplication>
+#include <KCmdLineArgs>
+#include <KLocale>
+#include <KUrl>
 
 static KAboutData about(
     APP_NAME,

src/part/Config.cpp

@@ -19,7 +19,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***********************************************************************/
 
-
 #include "Config.h"
 
 #include <KConfig>
@@ -28,7 +27,6 @@
 #include <KSharedConfig>
 #include <KSharedPtr>
 
-
 bool Config::scanAcrossMounts;
 bool Config::scanRemoteMounts;
 bool Config::scanRemovableMedia;

src/part/Config.h

@@ -22,11 +22,10 @@
 #ifndef Config_H
 #define Config_H
 
-#include <QStringList>
+#include <QtCore/QStringList>
 
 class KConfig;
 
-
 namespace Filelight
 {
 enum MapScheme { Rainbow, HighContrast, KDE, FileDensity, ModTime };

src/part/fileTree.cpp

@@ -24,8 +24,6 @@
 #include <KGlobal>
 #include <KLocale>
 
-
-
 //static definitions
 const uint File::DENOMINATOR[4] = { 1<<0, 1<<10, 1<<20, 1<<30 };
 static const char PREFIX[4]   = { 'K', 'M', 'G', 'T' };

src/part/fileTree.h

@@ -22,16 +22,13 @@
 #ifndef FILETREE_H
 #define FILETREE_H
 
-#include <QByteArray> //qstrdup
-#include <QFile>    //decodeName()
+#include <QtCore/QByteArray> //qstrdup
+#include <QtCore/QFile> //decodeName()
 
 #include <stdlib.h>
 
-
 //TODO these are pointlessly general purpose now, make them incredibly specific
 
-
-
 typedef unsigned long int FileSize;
 typedef unsigned long int Dirsize;  //**** currently unused
 

src/part/localLister.cpp

@@ -27,9 +27,9 @@
 
 #include <KDebug>
 
-#include <QApplication> //postEvent()
-#include <QFile>
-#include <QByteArray>
+#include <QtGui/QApplication> //postEvent()
+#include <QtCore/QFile>
+#include <QtCore/QByteArray>
 
 #include <kde_file.h>
 #include <dirent.h>

src/part/localLister.h

@@ -22,8 +22,8 @@
 #ifndef LOCALLISTER_H
 #define LOCALLISTER_H
 
-#include <QThread>
-#include <QByteArray>
+#include <QtCore/QByteArray>
+#include <QtCore/QThread>
 
 class Folder;
 template<class T> class Chain;

src/part/part.cpp

@@ -39,10 +39,9 @@
 #include <KStatusBar>
 #include <KParts/GenericFactory>
 
-
-#include <QFile>        //encodeName()
-#include <QTimer>       //postInit() hack
-#include <QByteArray>
+#include <QtCore/QFile>        //encodeName()
+#include <QtCore/QTimer>       //postInit() hack
+#include <QtCore/QByteArray>
 
 #include <unistd.h>       //access()
 #include <iostream>

src/part/part.h

@@ -27,7 +27,7 @@
 #include <KParts/Part>
 #include <KUrl>
 
-#include <QLabel>
+#include <QtGui/QLabel>
 
 class KAboutData;
 using KParts::StatusBarExtension;

src/part/progressBox.cpp

@@ -28,7 +28,7 @@
 #include <KIO/Job>
 #include <KLocale>
 
-#include <QLabel>
+#include <QtGui/QLabel>
 
 
 ProgressBox::ProgressBox(QWidget *parent, QObject *part)

src/part/progressBox.h

@@ -22,8 +22,8 @@
 #ifndef PROGRESSBOX_H
 #define PROGRESSBOX_H
 
-#include <QLabel>
-#include <QTimer>
+#include <QtGui/QLabel>
+#include <QtCore/QTimer>
 
 
 class ProgressBox : public QLabel

src/part/radialMap/builder.cpp

@@ -19,12 +19,13 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***********************************************************************/
 
-#include "builder.h"
 #include "part/Config.h"
 #include "part/fileTree.h"
-#include <kglobal.h> //locale object
-#include <klocale.h>
 #include "widget.h"
+#include "builder.h"
+
+#include <KGlobal> //locale object
+#include <KLocale>
 
 
 //**** REMOVE NEED FOR the +1 with MAX_RING_DEPTH uses

src/part/radialMap/map.cpp

@@ -19,14 +19,15 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***********************************************************************/
 
+#include <QtGui/QApplication>    //make()
+#include <QtGui/QImage>          //make() & paint()
+#include <QtGui/QFont>           //ctor
+#include <QtGui/QFontMetrics>    //ctor
+#include <QtGui/QPainter>
+
 #include <KCursor>         //make()
 #include <KDebug>
 #include <KGlobalSettings> //kdeColours
-#include <QPainter>
-#include <QApplication>    //make()
-#include <QImage>          //make() & paint()
-#include <QFont>           //ctor
-#include <QFontMetrics>    //ctor
 
 #include "builder.h"
 #include "part/Config.h"

src/part/radialMap/map.h

@@ -24,12 +24,12 @@
 
 #include "part/fileTree.h"
 
-#include <QPixmap>
-#include <QRect>
-#include <QString>
-
 #include <KColorScheme>
 
+#include <QtGui/QPixmap>
+#include <QtCore/QRect>
+#include <QtCore/QString>
+
 namespace RadialMap {
 class Segment;
 

src/part/radialMap/radialMap.h

@@ -22,11 +22,10 @@
 #ifndef RADIALMAP_H
 #define RADIALMAP_H
 
-#include <qcolor.h>
+#include <QColor>
 
 class File;
 
-
 namespace RadialMap
 {
 class Segment //all angles are in 16ths of degrees

src/part/radialMap/segmentTip.cpp

@@ -24,16 +24,15 @@
 #include "part/fileTree.h"
 #include "part/Config.h"
 
-#include <cstdlib>
-
 #include <KApplication>    //installing eventFilters
 #include <KGlobal>
 #include <KLocale>
 #include <KWindowSystem>
 
-#include <QPainter>
-#include <QEvent>
-#include <QToolTip>
+#include <QtGui/QPainter>
+#include <QtGui/QToolTip>
+
+#include <cstdlib>
 
 namespace RadialMap {
 

src/part/radialMap/segmentTip.h

@@ -22,8 +22,8 @@
 #ifndef SEGMENTTIP_H
 #define SEGMENTTIP_H
 
-#include <QEvent>
-#include <QWidget>
+#include <QtCore/QEvent>
+#include <QtGui/QWidget>
 
 class File;
 class Folder;

src/part/radialMap/widget.cpp

@@ -21,19 +21,20 @@
 
 #include "widget.h"
 
-#include <KCursor>        //ctor
-#include <KUrl>
-#include <QApplication>   //sendEvent
-#include <QBitmap>        //ctor - finding cursor size
-#include <QCursor>        //slotPostMouseEvent()
-#include <QTimer>         //member
-#include <QWidget>
-
 #include "part/Config.h"
 #include "part/fileTree.h"
 #include "radialMap.h" //constants
 #include "map.h"
 
+#include <KCursor>        //ctor
+#include <KUrl>
+
+#include <QtGui/QApplication>   //sendEvent
+#include <QtGui/QBitmap>        //ctor - finding cursor size
+#include <QtGui/QCursor>        //slotPostMouseEvent()
+#include <QtCore/QTimer>         //member
+#include <QtGui/QWidget>
+
 
 RadialMap::Widget::Widget(QWidget *parent, bool isSummary)
         : QWidget(parent)

src/part/radialMap/widget.h

@@ -22,15 +22,15 @@
 #ifndef WIDGET_H
 #define WIDGET_H
 
+#include <KJob>
 #include <KUrl>
-#include <QTimer>
-#include <QResizeEvent>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QMouseEvent>
-#include <QPaintEvent>
 
-#include <KJob>
+#include <QtGui/QDragEnterEvent>
+#include <QtGui/QDropEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QResizeEvent>
+#include <QtCore/QTimer>
 
 #include "segmentTip.h"
 #include "map.h"

src/part/radialMap/widgetEvents.cpp

@@ -24,13 +24,11 @@
 #include "radialMap.h"   //class Segment
 #include "widget.h"
 
-#include <cmath>         //::segmentAt()
-
 #include <KCursor>     //::mouseMoveEvent()
 #include <KDebug>
 #include <KIconLoader> //::mousePressEvent()
-#include <KIO/Job>     //::mousePressEvent()
 #include <KJob>
+#include <KIO/Job>     //::mousePressEvent()
 #include <KIO/DeleteJob>
 #include <KIO/JobUiDelegate>
 #include <KLocale>
@@ -39,15 +37,17 @@
 #include <KRun>        //::mousePressEvent()
 #include <KUrl>
 
-#include <QApplication> //QApplication::setOverrideCursor()
-#include <QClipboard>
-#include <QPainter>
-#include <QTimer>      //::resizeEvent()
-#include <QDropEvent>
-#include <QPaintEvent>
-#include <QResizeEvent>
-#include <QMouseEvent>
-#include <QDragEnterEvent>
+#include <QtGui/QApplication> //QApplication::setOverrideCursor()
+#include <QtGui/QClipboard>
+#include <QtGui/QPainter>
+#include <QtCore/QTimer>      //::resizeEvent()
+#include <QtGui/QDropEvent>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QResizeEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QDragEnterEvent>
+
+#include <cmath>         //::segmentAt()
 
 void RadialMap::Widget::resizeEvent(QResizeEvent*)
 {

src/part/remoteLister.cpp

@@ -26,9 +26,9 @@
 #include <KDebug>
 #include <KDirLister>
 
-#include <QLinkedList>
-#include <QTimer>
-#include <QWidget>
+#include <QtCore/QLinkedList>
+#include <QtCore/QTimer>
+#include <QtGui/QWidget>
 
 namespace Filelight
 {

src/part/scan.cpp

@@ -27,7 +27,7 @@
 
 #include <KDebug>
 
-#include <QApplication>
+#include <QtGui/QApplication>
 
 namespace Filelight
 {

src/part/scan.h

@@ -23,8 +23,8 @@
 #define SCAN_H
 
 #include <KUrl>
-#include <QObject>
-#include <QMutex>
+#include <QtCore/QObject>
+#include <QtCore/QMutex>
 
 class QThread;
 class Folder;

src/part/settingsDialog.cpp

@@ -26,13 +26,13 @@
 #include <KLocale>
 #include <KMessageBox>
 
-#include <QApplication> //Getting desktop width
-#include <QCheckBox>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QVBoxLayout>
-#include <QCloseEvent>
-#include <QDir>
+#include <QtGui/QApplication> //Getting desktop width
+#include <QtGui/QCheckBox>
+#include <QtGui/QPushButton>
+#include <QtGui/QRadioButton>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QCloseEvent>
+#include <QtCore/QDir>
 
 SettingsDialog::SettingsDialog(QWidget *parent) : KDialog(parent)
 {

src/part/settingsDialog.h

@@ -24,8 +24,8 @@
 
 #include "ui_dialog.h" //generated by uic
 
-#include <QTimer>
-#include <QCloseEvent>
+#include <QtCore/QTimer>
+#include <QtGui/QCloseEvent>
 
 
 class SettingsDialog : public KDialog, public Ui::Dialog

src/part/summaryWidget.cpp

@@ -38,12 +38,12 @@
 
 #include <KDiskFreeSpaceInfo>
 
-#include <QLabel>
-#include <QApplication>
-#include <QByteArray>
-#include <QList>
-#include <QMouseEvent>
-#include <QLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QApplication>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QLayout>
 
 struct Disk
 {

src/part/summaryWidget.h

@@ -22,10 +22,10 @@
 #ifndef SUMMARYWIDGET_H
 #define SUMMARYWIDGET_H
 
-#include <QWidget>
-
 #include <KUrl>
 
+#include <QtGui/QWidget>
+
 class SummaryWidget : public QWidget
 {
     Q_OBJECT