include cleanup

svn path=/trunk/KDE/kdebase/apps/; revision=663054

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index 6a25e7e42e5f1cac2e6f900cc1230869338771f9..f843ca0fa5c0c5307fcf9bb0e94883972ec023c3 100644 (file)
--- a/src/columnviewsettingspage.cpp
+++ b/src/columnviewsettingspage.cpp
@@ -26,14 +26,14 @@
 #include <kfontrequester.h>
 #include <klocale.h>
 
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QGridLayout>
-#include <QLabel>
-#include <QRadioButton>
-#include <QSpinBox>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpinBox>
 
 ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
                                                QWidget* parent) :

diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index 23c0d9dcfd82e7c9adad6c664629428c7f017deb..c7f4acf3e0a4cae99bc5eb44c01ffc1d7c565420 100644 (file)
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -26,14 +26,14 @@
 #include <kfontrequester.h>
 #include <klocale.h>
 
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QGridLayout>
-#include <QLabel>
-#include <QRadioButton>
-#include <QSpinBox>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpinBox>
 
 DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
                                                  QWidget* parent) :

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 8c1464d53b60163ac8203bacb4ea1857eebbd238..fc59eb08b3f33764fe1893fe449ebf8c9ce8a850 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -24,7 +24,7 @@
 #include <applicationadaptor.h>
 #include <kcmdlineargs.h>
 #include <kurl.h>
-#include <QDBusConnection>
+#include <QtDBus/QDBusConnection>
 
 DolphinApplication::DolphinApplication() :
     m_lastId(0)

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 734328bc653784ec351cb7c0d22030522bb7e12b..563f68f31c5f851633e37eaf4ba2da944f59efa8 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -28,8 +28,8 @@
 #include <kfileitem.h>
 #include <kfileitemdelegate.h>
 
-#include <QAbstractProxyModel>
-#include <QPoint>
+#include <QtGui/QAbstractProxyModel>
+#include <QtCore/QPoint>
 
 DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* controller) :
     QColumnView(parent),

diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h
index 15dddf47fca2b0076a44cd0e94841f6f7f9ee7f5..4c1aaf0a27bce6191c47fd46ccf3f8c1840e3f11 100644 (file)
--- a/src/dolphincolumnview.h
+++ b/src/dolphincolumnview.h
@@ -20,8 +20,8 @@
 #ifndef DOLPHINCOLUMNVIEW_H
 #define DOLPHINCOLUMNVIEW_H
 
-#include <QColumnView>
-#include <QStyleOptionViewItem>
+#include <QtGui/QColumnView>
+#include <QtGui/QStyleOption>
 
 class DolphinController;
 class DolphinView;

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index ae1656f691b1768633e268ddb9beeb41df9adc1a..0329fce773d54d3926c5b367ffc2355eb9bbd570 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -42,10 +42,10 @@
 #include <kstandardaction.h>
 #include <kstandarddirs.h>
 
-#include <QApplication>
-#include <QClipboard>
-#include <QDir>
-#include <Q3ValueList>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtCore/QDir>
+#include <Qt3Support/Q3ValueList>
 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        KFileItem* fileInfo,

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index ac165eef90f5dd4cf083738960cdc21aa6f91559..b8920b7e2101fdafda8f4e7dba49b3a3625f298a 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -25,9 +25,9 @@
 #include <kservice.h>
 #include <kurl.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
-#include <QVector>
+#include <QtCore/QVector>
 
 class KMenu;
 class KFileItem;

diff --git a/src/dolphincontroller.h b/src/dolphincontroller.h
index f9f4f4e4716d05daec5469e8274ebe41ef251cfe..b975558e239acd2b7bd22daba88a44000b5b66f2 100644 (file)
--- a/src/dolphincontroller.h
+++ b/src/dolphincontroller.h
@@ -22,7 +22,7 @@
 
 #include <dolphinview.h>
 #include <kurl.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <libdolphin_export.h>
 
 class KUrl;

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 4c4102e8bda2f3bec5cf72a23ce76478b205fc19..74963dc3dcfd61209e7f3519075517470cd25eff 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -30,7 +30,7 @@
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>
 
-#include <QHeaderView>
+#include <QtGui/QHeaderView>
 
 DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
     QTreeView(parent),

diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h
index 681a5e1f98ffb8058416d8002f52dfd2bd962952..e90a0bd89192b1469331ada8b972ddd4e975f3c6 100644 (file)
--- a/src/dolphindetailsview.h
+++ b/src/dolphindetailsview.h
@@ -22,8 +22,8 @@
 #define DOLPHINDETAILSVIEW_H
 
 #include <dolphinview.h>
-#include <QStyleOptionViewItem>
-#include <QTreeView>
+#include <QtGui/QStyleOption>
+#include <QtGui/QTreeView>
 #include <libdolphin_export.h>
 
 class DolphinController;

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 35789f75439e02cb934dd858baefdedaaaf14d4b..25a8581f4d8b2ddd793b9b4e18bddc9e85ba7f00 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -29,8 +29,8 @@
 #include <kfileitem.h>
 #include <kfileitemdelegate.h>
 
-#include <QAbstractProxyModel>
-#include <QPoint>
+#include <QtGui/QAbstractProxyModel>
+#include <QtCore/QPoint>
 
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
     KListView(parent),

diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index 36df119d7159be2f545394c63183d13cbcec111c..fce8f62bd4a5ce23fbdb9afd8b7202543efce5b1 100644 (file)
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -22,7 +22,7 @@
 
 #include <klistview.h>
 #include <kitemcategorizer.h>
-#include <QStyleOptionViewItem>
+#include <QtGui/QStyleOption>
 #include <libdolphin_export.h>
 
 class DolphinController;

diff --git a/src/dolphinitemcategorizer.cpp b/src/dolphinitemcategorizer.cpp
index 34806446b37f8bbea75820344ae7347f4f0636a9..05c23a01d606be2f4165710d1ac49309352506e4 100644 (file)
--- a/src/dolphinitemcategorizer.cpp
+++ b/src/dolphinitemcategorizer.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kdirmodel.h>
 
-#include <QSortFilterProxyModel>
+#include <QtGui/QSortFilterProxyModel>
 
 DolphinItemCategorizer::DolphinItemCategorizer() :
     KItemCategorizer()

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e4d219e8670bbfea8f2bbc8874a9a08f2b98bba2..d84775d59dadeb42edcc8fe13ebcd86cefaa7571 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -68,10 +68,10 @@
 #include <kstandardaction.h>
 #include <kurl.h>
 
-#include <QCloseEvent>
-#include <QClipboard>
-#include <QSplitter>
-#include <QDockWidget>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QClipboard>
+#include <QtGui/QSplitter>
+#include <QtGui/QDockWidget>
 
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 1d7e6058d1c3e09144d940e40282d8bd13351e76..35b1b5267866d81a213b26d62362d14a5ce67c09 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -29,7 +29,7 @@
 #include <ksortablelist.h>
 #include <konq_undo.h>
 
-#include <QList>
+#include <QtCore/QList>
 
 class DolphinApplication;
 class KNewMenu;

diff --git a/src/dolphinsortfilterproxymodel.h b/src/dolphinsortfilterproxymodel.h
index e7fc781828f65bd50358b02db4c574f7467afa53..437ebca126ddad172f14a7d1246822deff686fce 100644 (file)
--- a/src/dolphinsortfilterproxymodel.h
+++ b/src/dolphinsortfilterproxymodel.h
@@ -20,7 +20,7 @@
 #ifndef DOLPHINSORTFILTERPROXYMODEL_H
 #define DOLPHINSORTFILTERPROXYMODEL_H
 
-#include <QSortFilterProxyModel>
+#include <QtGui/QSortFilterProxyModel>
 #include <dolphinview.h>
 #include <libdolphin_export.h>
 

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index e2b4e68bab0c13849d5b71fbafecf23500bfa687..b0bb8e871f43130f2cb51e6e72178cf7cbde86d4 100644 (file)
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -23,9 +23,9 @@
 #include "statusbarmessagelabel.h"
 #include "statusbarspaceinfo.h"
 
-#include <QLabel>
-#include <QProgressBar>
-#include <QTimer>
+#include <QtGui/QLabel>
+#include <QtGui/QProgressBar>
+#include <QtCore/QTimer>
 
 #include <kiconloader.h>
 #include <kvbox.h>

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 64722e1e219a39feb0bae9f7009c6af15baedb59..c51dbb464f713a029628d41be58021bb0181d51c 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -20,14 +20,13 @@
 
 #include "dolphinview.h"
 
-#include <QApplication>
-#include <QClipboard>
-#include <QDropEvent>
-#include <QItemSelectionModel>
-#include <QMouseEvent>
-#include <QVBoxLayout>
-#include <QTimer>
-#include <QScrollBar>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QItemSelection>
+#include <QtGui/QBoxLayout>
+#include <QtCore/QTimer>
+#include <QtGui/QScrollBar>
 
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>

diff --git a/src/dolphinview.h b/src/dolphinview.h
index f23460fec2e79a9eff9f2b2357d5c5d3d3b7b0e4..9581f6601cb5b6a80c652f97469ff1c6a7140e39 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -29,12 +29,11 @@
 
 #include <kurlnavigator.h>
 
-#include <QDropEvent>
-#include <QLinkedList>
-#include <QListView>
-#include <QMouseEvent>
-#include <QVBoxLayout>
-#include <QWidget>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QLinkedList>
+#include <QtGui/QListView>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QWidget>
 
 class DolphinController;
 class FilterBar;

diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index f7c582262f85cbc1375bf16dbe5560d24c33bf94..f88bab2b2df569d0fae3ee720a83b9dc3a988bad 100644 (file)
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 #include "filterbar.h"
 
-#include <QBoxLayout>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QToolButton>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QLabel>
+#include <QtGui/QToolButton>
 
 #include <kdialog.h>
 #include <klocale.h>

diff --git a/src/filterbar.h b/src/filterbar.h
index 2dd02d28d4b6af7dcd2d2c65a41ee2dc31133a3d..8048a164a717032189e36ec4003e549a4493ee02 100644 (file)
--- a/src/filterbar.h
+++ b/src/filterbar.h
@@ -20,7 +20,7 @@
 #ifndef FILTERBAR_H
 #define FILTERBAR_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 class QLabel;
 class QToolButton;

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 66426b5c6a23fcbe2183a781f8865516e745b5c0..c094db9a0b65f46518f66e5d6e5f65378227239c 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -25,12 +25,12 @@
 #include <klocale.h>
 #include <kvbox.h>
 
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QRadioButton>
+#include <QtGui/QCheckBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QRadioButton>
 
 #include "dolphinsettings.h"
 #include "dolphinmainwindow.h"

diff --git a/src/generalviewsettingspage.cpp b/src/generalviewsettingspage.cpp
index 42a5cb9de1883a715f8fa1e21434d0f8cb4e2a95..7b4eba16987593f1fa8f25c460841fd957b5b046 100644 (file)
--- a/src/generalviewsettingspage.cpp
+++ b/src/generalviewsettingspage.cpp
@@ -23,12 +23,12 @@
 #include "dolphin_generalsettings.h"
 #include "viewproperties.h"
 
-#include <QLabel>
-#include <QGroupBox>
-#include <QRadioButton>
-#include <QSlider>
-#include <QSpinBox>
-#include <QVBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QGroupBox>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSlider>
+#include <QtGui/QSpinBox>
+#include <QtGui/QBoxLayout>
 
 #include <kconfiggroup.h>
 #include <kdialog.h>

diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp
index 22ce1102719b808191d249f9f7490dfe48418927..948cfc5e6400e535c4e63300214fde342f15a323 100644 (file)
--- a/src/iconsizedialog.cpp
+++ b/src/iconsizedialog.cpp
@@ -28,10 +28,10 @@
 #include <klocale.h>
 #include <kvbox.h>
 
-#include <QGroupBox>
-#include <QLabel>
-#include <QSlider>
-#include <QVBoxLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QSlider>
+#include <QtGui/QBoxLayout>
 
 IconSizeDialog::IconSizeDialog(QWidget* parent) :
     KDialog(parent),

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 862cf0c3c6b63eb78a901a04362dfb391d2f42a7..3bba6f12fc45aa177e4016a265400eb206109d08 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -30,14 +30,14 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 
-#include <QComboBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QListView>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QGridLayout>
-#include <QtDebug>
+#include <QtGui/QComboBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QListView>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpinBox>
+#include <QtGui/QGridLayout>
+#include <QtCore/QDebug>
 
 IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
                                              QWidget* parent) :

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index d900945e870eb4e085368f166155a7a0f053cb58..8d99ddecef2cce05809b7b7ae496a91ecf32ee82 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -21,17 +21,17 @@
 
 #include "infosidebarpage.h"
 
-#include <QLayout>
-#include <QPixmap>
-#include <QLabel>
-#include <QTimer>
-#include <QPushButton>
-#include <QMenu>
-#include <QPainter>
-#include <QFontMetrics>
-#include <QEvent>
-#include <QInputDialog>
-#include <QDir>
+#include <QtGui/QLayout>
+#include <QtGui/QPixmap>
+#include <QtGui/QLabel>
+#include <QtCore/QTimer>
+#include <QtGui/QPushButton>
+#include <QtGui/QMenu>
+#include <QtGui/QPainter>
+#include <QtGui/QFontMetrics>
+#include <QtCore/QEvent>
+#include <QtGui/QInputDialog>
+#include <QtCore/QDir>
 
 #include <kfileplacesmodel.h>
 #include <klocale.h>

diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h
index 2a0f2ead73e426ae77497eaa28758997d7144a7b..5aa4f5d07c7e47a1612b3d08d56148e0f76eae4b 100644 (file)
--- a/src/infosidebarpage.h
+++ b/src/infosidebarpage.h
@@ -23,10 +23,10 @@
 #include <sidebarpage.h>
 
 #include <QtGui/QPushButton>
-#include <QPixmap>
-#include <QEvent>
-#include <QLabel>
-#include <QList>
+#include <QtGui/QPixmap>
+#include <QtCore/QEvent>
+#include <QtGui/QLabel>
+#include <QtCore/QList>
 
 #include <kurl.h>
 #include <kmimetype.h>

diff --git a/src/klistview.cpp b/src/klistview.cpp
index a7244dfed4ca1da85d05f9fec3c277ca52ddc070..75c799a26aeebd99291396fcc4d2b7e32f6d34dd 100644 (file)
--- a/src/klistview.cpp
+++ b/src/klistview.cpp
@@ -20,10 +20,10 @@
 
 // NOTE: rectForIndex() not virtual on QListView !! relevant ?
 
-#include <QPainter>
-#include <QScrollBar>
-#include <QPaintEvent>
-#include <QSortFilterProxyModel>
+#include <QtGui/QPainter>
+#include <QtGui/QScrollBar>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QSortFilterProxyModel>
 
 #include <kdebug.h>
 

diff --git a/src/klistview.h b/src/klistview.h
index 0644e8637c1063710ce7856caf9b0000720de4b0..c8bd5215e83a3f87e0d82a279c1cfe19c87c5db2 100644 (file)
--- a/src/klistview.h
+++ b/src/klistview.h
@@ -21,7 +21,7 @@
 #ifndef __KLISTVIEW_H__
 #define __KLISTVIEW_H__
 
-#include <QListView>
+#include <QtGui/QListView>
 
 #include <libdolphin_export.h>
 

diff --git a/src/libdolphin_export.h b/src/libdolphin_export.h
index 05b22513bc0cb7c24e21937ad6d8284e3cafd077..99af8bed2dad897cf29c134a7043f27fc175dfc4 100644 (file)
--- a/src/libdolphin_export.h
+++ b/src/libdolphin_export.h
@@ -24,7 +24,7 @@
 #include <kdemacros.h>
 
 /* needed, because e.g. Q_OS_UNIX is so frequently used */
-#include <QtCore/qglobal.h>
+#include <QtCore/QBool>
 
 #ifdef MAKE_DOLPHINPRIVATE_LIB
 # define LIBDOLPHINPRIVATE_EXPORT KDE_EXPORT

diff --git a/src/metadatawidget.cpp b/src/metadatawidget.cpp
index 4859a893c8acee43716a85ab45b970dfa3834e1b..1bab4abd7bde897f46377fb1617ca03e594fce77 100644 (file)
--- a/src/metadatawidget.cpp
+++ b/src/metadatawidget.cpp
@@ -23,9 +23,9 @@
 
 #include <klocale.h>
 
-#include <QLabel>
-#include <QGridLayout>
-#include <QTextEdit>
+#include <QtGui/QLabel>
+#include <QtGui/QGridLayout>
+#include <QtGui/QTextEdit>
 
 #ifdef HAVE_KMETADATA
 #include <kmetadata/kmetadatatagwidget.h>

diff --git a/src/metadatawidget.h b/src/metadatawidget.h
index b51cb593d6f78b1d8552e0eaf6d30b085da00f4c..f66599ff58b593b44c68541812061744e54edbf6 100644 (file)
--- a/src/metadatawidget.h
+++ b/src/metadatawidget.h
@@ -20,7 +20,7 @@
 #ifndef METADATA_WIDGET_H
 #define METADATA_WIDGET_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 #include <kurl.h>
 

diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp
index b25dcdc67bdacb35091da2e41d43db42ab637a1f..79e2487a70d22ad5fc0158a7f65e14c1e8ffed32 100644 (file)
--- a/src/pixmapviewer.cpp
+++ b/src/pixmapviewer.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
-#include <QtGui/QPaintEvent>
+#include <QtGui/QKeyEvent>
 
 PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) :
     QWidget(parent),

diff --git a/src/pixmapviewer.h b/src/pixmapviewer.h
index df4bd13b393259218dc5d742d791636e8e397862..165c40455d78209eab383b24b826a48d9c6cce65 100644 (file)
--- a/src/pixmapviewer.h
+++ b/src/pixmapviewer.h
@@ -22,7 +22,7 @@
 
 #include <QtGui/QWidget>
 #include <QtGui/QPixmap>
-#include <QTimeLine>
+#include <QtCore/QTimeLine>
 
 class QPaintEvent;
 

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index 7bee7b9e7ab97cc05d815323006345ca9a9edbf2..51468f7a276ceaf3245c550dc4d6a2ca067e9b50 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -22,8 +22,8 @@
 #include <klineedit.h>
 #include <klocale.h>
 
-#include <QLabel>
-#include <QVBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QBoxLayout>
 
 RenameDialog::RenameDialog(const KUrl::List& items) :
     KDialog(),

diff --git a/src/sidebarpage.cpp b/src/sidebarpage.cpp
index 479bfcad0e9164f0b3a5f2fa286c3b450217fa5e..cb0e516e7d4708e6f4943f5ad577648ab78eb963 100644 (file)
--- a/src/sidebarpage.cpp
+++ b/src/sidebarpage.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "sidebarpage.h"
-#include <QWidget>
+#include <QtGui/QWidget>
 #include <kfileitem.h>
 #include <kurl.h>
 

diff --git a/src/sidebarpage.h b/src/sidebarpage.h
index 019f5dc1cc9ce9003763f489817b8938ff68667d..697e8de58d30688fec43271663ccc41b0014047f 100644 (file)
--- a/src/sidebarpage.h
+++ b/src/sidebarpage.h
@@ -21,7 +21,7 @@
 #ifndef _SIDEBARPAGE_H_
 #define _SIDEBARPAGE_H_
 
-#include <QWidget>
+#include <QtGui/QWidget>
 #include <kurl.h>
 #include <kfileitem.h>
 

diff --git a/src/sidebartreeview.cpp b/src/sidebartreeview.cpp
index 05889702e5b4ca7f1af6ffe13fc45fab47d1c137..b6f9dc4a615c2b9fb998c3759dd2ed8eee58e50e 100644 (file)
--- a/src/sidebartreeview.cpp
+++ b/src/sidebartreeview.cpp
@@ -22,9 +22,8 @@
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>
 
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QHeaderView>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QHeaderView>
 
 SidebarTreeView::SidebarTreeView(QWidget* parent) :
     QTreeView(parent)

diff --git a/src/sidebartreeview.h b/src/sidebartreeview.h
index d12737151a08d51878611d9444452c5d15d77ec3..045a256af20989a88352d48315b96f8f3164f026 100644 (file)
--- a/src/sidebartreeview.h
+++ b/src/sidebartreeview.h
@@ -21,7 +21,7 @@
 #define SIDEBARTREEVIEW_H
 
 #include <kurl.h>
-#include <QTreeView>
+#include <QtGui/QTreeView>
 
 /**
  * @brief Tree view widget which is used for the sidebar panel.

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index a8956caafd0b60e2d0d1ab08d3abcdcf8a74eea7..f5c632693801afdfa452dc356886780325417d45 100644 (file)
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -25,13 +25,12 @@
 #include <kicon.h>
 #include <klocale.h>
 
-#include <QFontMetrics>
-#include <QPainter>
-#include <QPaintEvent>
-#include <QPushButton>
-#include <QPixmap>
-#include <QResizeEvent>
-#include <QTimer>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QPainter>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QPushButton>
+#include <QtGui/QPixmap>
+#include <QtCore/QTimer>
 
 StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) :
     QWidget(parent),

diff --git a/src/statusbarmessagelabel.h b/src/statusbarmessagelabel.h
index d7751885a87023a9ab115266855873b1da2aa331..dcefdedfb373c39904f7136e1980f6381f3681d9 100644 (file)
--- a/src/statusbarmessagelabel.h
+++ b/src/statusbarmessagelabel.h
@@ -23,10 +23,10 @@
 
 #include <dolphinstatusbar.h>
 
-#include <QList>
-#include <QPixmap>
+#include <QtCore/QList>
+#include <QtGui/QPixmap>
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 class QPaintEvent;
 class QResizeEvent;

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 794d140787129469a7495b087e818e1757ab4c73..999f0ad54bc29b8b6de0aefc556b9711d67f11ec 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -22,7 +22,7 @@
 
 #include <QtCore/QTimer>
 #include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
+#include <QtGui/QKeyEvent>
 
 #include <kglobalsettings.h>
 #include <kdiskfreespace.h>

diff --git a/src/statusbarspaceinfo.h b/src/statusbarspaceinfo.h
index 8f0c60a134cfa56127813246bdfd22a1d1126f19..3ff75bb97561cf02a2e7cceb3a3db6d8f850285d 100644 (file)
--- a/src/statusbarspaceinfo.h
+++ b/src/statusbarspaceinfo.h
@@ -23,7 +23,7 @@
 #include <kurl.h>
 
 #include <QtGui/QColor>
-#include <QtGui/QPaintEvent>
+#include <QtGui/QKeyEvent>
 #include <QtGui/QWidget>
 
 class KDiskFreeSp;

diff --git a/src/terminalsidebarpage.cpp b/src/terminalsidebarpage.cpp
index 9331961bcd466d06349e6354463b3fca379d6e50..287f7d79d154dae6a4bbef0c7f6cdac617850819 100644 (file)
--- a/src/terminalsidebarpage.cpp
+++ b/src/terminalsidebarpage.cpp
@@ -23,7 +23,7 @@
 #include <kde_terminal_interface.h>
 #include <kparts/part.h>
 
-#include <QVBoxLayout>
+#include <QtGui/QBoxLayout>
 
 TerminalSidebarPage::TerminalSidebarPage(QWidget* parent) :
     SidebarPage(parent),

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index 96287d8d01f241edd6aec1451d3cedf2af1b1b90..e799b667f2530f0c2e962afdb36b82e24dae4ade 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -30,8 +30,8 @@
 
 #include "renamedialog.h"
 
-#include <QApplication>
-#include <QClipboard>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
 
 TreeViewContextMenu::TreeViewContextMenu(QWidget* parent,
                                          KFileItem* fileInfo) :

diff --git a/src/treeviewcontextmenu.h b/src/treeviewcontextmenu.h
index 88e1b03e987b0321fa20e7d2fc8154cb5e927332..678904c94ae2519e825ed8681d9bbe2cd044b0bf 100644 (file)
--- a/src/treeviewcontextmenu.h
+++ b/src/treeviewcontextmenu.h
@@ -20,7 +20,7 @@
 #ifndef TREEVIEWCONTEXTMENU_H
 #define TREEVIEWCONTEXTMENU_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class KMenu;
 class KFileItem;

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 0e6edff0867578671b8c7d8d4d729237da898823..1f537bd71928d08e5ab199ac2a2fda3cb6c51341 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -31,10 +31,10 @@
 #include <kdirmodel.h>
 #include <kfileitem.h>
 
-#include <QHeaderView>
-#include <QItemSelectionModel>
-#include <QTreeView>
-#include <QVBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QItemSelection>
+#include <QtGui/QTreeView>
+#include <QtGui/QBoxLayout>
 
 TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     SidebarPage(parent),

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 21f0c39da8844c35ed26a1d9bc9e2ee77eb86e1c..7996c6703e8fa53f003c2d26440e333482098c2c 100644 (file)
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -20,9 +20,9 @@
 
 #include <assert.h>
 
-#include <QDateTime>
-#include <QFile>
-#include <QFileInfo>
+#include <QtCore/QDate>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
 
 #include <kcomponentdata.h>
 #include <klocale.h>

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 99f40bfa92a1a1fc3a68add3d8ee5679d150e3aa..192ce4627435c0ef18586ecb425dba183cb9a431 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -34,14 +34,14 @@
 #include <kstandarddirs.h>
 #include <kurl.h>
 
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QRadioButton>
-#include <QVBoxLayout>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QBoxLayout>
 
 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     KDialog(dolphinView),

diff --git a/src/viewpropsprogressinfo.cpp b/src/viewpropsprogressinfo.cpp
index b01e2bc8468531d94ec129a5ec48a5a99c44a34d..8011dd301ed58f16bc9a5dfcece4cbfffd960375 100644 (file)
--- a/src/viewpropsprogressinfo.cpp
+++ b/src/viewpropsprogressinfo.cpp
@@ -22,10 +22,10 @@
 #include "applyviewpropsjob.h"
 #include "viewproperties.h"
 
-#include <QLabel>
-#include <QProgressBar>
-#include <QTimer>
-#include <QVBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QProgressBar>
+#include <QtCore/QTimer>
+#include <QtGui/QBoxLayout>
 
 #include <assert.h>
 #include <klocale.h>

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 59f101eb98b57122c91bb55509cf64a55129318c..9791588d6de139a6e2050058c4c61c2f8cda0bab 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -25,10 +25,10 @@
 #include "generalviewsettingspage.h"
 #include "iconsviewsettingspage.h"
 
-#include <QVBoxLayout>
-#include <QTabWidget>
-#include <QLayout>
-#include <QLabel>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QTabWidget>
+#include <QtGui/QLayout>
+#include <QtGui/QLabel>
 
 #include <kdialog.h>
 #include <klocale.h>