include cleanup

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

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) :

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) :

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)

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),

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;

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,

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;

src/dolphincontroller.h

@@ -22,7 +22,7 @@
 
 #include <dolphinview.h>
 #include <kurl.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <libdolphin_export.h>
 
 class KUrl;

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),

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;

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),

src/dolphiniconsview.h

@@ -22,7 +22,7 @@
 
 #include <klistview.h>
 #include <kitemcategorizer.h>
-#include <QStyleOptionViewItem>
+#include <QtGui/QStyleOption>
 #include <libdolphin_export.h>
 
 class DolphinController;

src/dolphinitemcategorizer.cpp

@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kdirmodel.h>
 
-#include <QSortFilterProxyModel>
+#include <QtGui/QSortFilterProxyModel>
 
 DolphinItemCategorizer::DolphinItemCategorizer() :
     KItemCategorizer()

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),

src/dolphinmainwindow.h

@@ -29,7 +29,7 @@
 #include <ksortablelist.h>
 #include <konq_undo.h>
 
-#include <QList>
+#include <QtCore/QList>
 
 class DolphinApplication;
 class KNewMenu;

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>
 

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>

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>

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;

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>

src/filterbar.h

@@ -20,7 +20,7 @@
 #ifndef FILTERBAR_H
 #define FILTERBAR_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 class QLabel;
 class QToolButton;

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"

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>

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),

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) :

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>

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>

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>
 

src/klistview.h

@@ -21,7 +21,7 @@
 #ifndef __KLISTVIEW_H__
 #define __KLISTVIEW_H__
 
-#include <QListView>
+#include <QtGui/QListView>
 
 #include <libdolphin_export.h>
 

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

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>

src/metadatawidget.h

@@ -20,7 +20,7 @@
 #ifndef METADATA_WIDGET_H
 #define METADATA_WIDGET_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 #include <kurl.h>
 

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),

src/pixmapviewer.h

@@ -22,7 +22,7 @@
 
 #include <QtGui/QWidget>
 #include <QtGui/QPixmap>
-#include <QTimeLine>
+#include <QtCore/QTimeLine>
 
 class QPaintEvent;
 

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(),

src/sidebarpage.cpp

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "sidebarpage.h"
-#include <QWidget>
+#include <QtGui/QWidget>
 #include <kfileitem.h>
 #include <kurl.h>
 

src/sidebarpage.h

@@ -21,7 +21,7 @@
 #ifndef _SIDEBARPAGE_H_
 #define _SIDEBARPAGE_H_
 
-#include <QWidget>
+#include <QtGui/QWidget>
 #include <kurl.h>
 #include <kfileitem.h>
 

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)

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.

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),

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;

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>

src/statusbarspaceinfo.h

@@ -23,7 +23,7 @@
 #include <kurl.h>
 
 #include <QtGui/QColor>
-#include <QtGui/QPaintEvent>
+#include <QtGui/QKeyEvent>
 #include <QtGui/QWidget>
 
 class KDiskFreeSp;

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),

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) :

src/treeviewcontextmenu.h

@@ -20,7 +20,7 @@
 #ifndef TREEVIEWCONTEXTMENU_H
 #define TREEVIEWCONTEXTMENU_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class KMenu;
 class KFileItem;

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),

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>

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),

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>

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>