include cleanup

svn path=/trunk/KDE/kdebase/apps/; revision=663054
2024-11-05 18:47:12 +00:00 · 2007-05-09 22:23:52 +00:00 · 2007-05-09 22:23:52 +00:00 · 52d6d2f9ce
commit 52d6d2f9ce
parent 693a3f73aa
265 changed files with 828 additions and 872 deletions
--- a/dolphin/src/columnviewsettingspage.cpp
+++ b/dolphin/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) :
--- a/dolphin/src/detailsviewsettingspage.cpp
+++ b/dolphin/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) :
--- a/dolphin/src/dolphinapplication.cpp
+++ b/dolphin/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)
--- a/dolphin/src/dolphincolumnview.cpp
+++ b/dolphin/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),
--- a/dolphin/src/dolphincolumnview.h
+++ b/dolphin/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;
--- a/dolphin/src/dolphincontextmenu.cpp
+++ b/dolphin/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,
--- a/dolphin/src/dolphincontextmenu.h
+++ b/dolphin/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;
--- a/dolphin/src/dolphincontroller.h
+++ b/dolphin/src/dolphincontroller.h
@ -22,7 +22,7 @@

 #include <dolphinview.h>
 #include <kurl.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <libdolphin_export.h>

 class KUrl;
--- a/dolphin/src/dolphindetailsview.cpp
+++ b/dolphin/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),
--- a/dolphin/src/dolphindetailsview.h
+++ b/dolphin/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;
--- a/dolphin/src/dolphiniconsview.cpp
+++ b/dolphin/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),
--- a/dolphin/src/dolphiniconsview.h
+++ b/dolphin/src/dolphiniconsview.h
@ -22,7 +22,7 @@

 #include <klistview.h>
 #include <kitemcategorizer.h>
-#include <QStyleOptionViewItem>
+#include <QtGui/QStyleOption>
 #include <libdolphin_export.h>

 class DolphinController;
--- a/dolphin/src/dolphinitemcategorizer.cpp
+++ b/dolphin/src/dolphinitemcategorizer.cpp
@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kdirmodel.h>

-#include <QSortFilterProxyModel>
+#include <QtGui/QSortFilterProxyModel>

 DolphinItemCategorizer::DolphinItemCategorizer() :
    KItemCategorizer()
--- a/dolphin/src/dolphinmainwindow.cpp
+++ b/dolphin/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),
--- a/dolphin/src/dolphinmainwindow.h
+++ b/dolphin/src/dolphinmainwindow.h
@ -29,7 +29,7 @@
 #include <ksortablelist.h>
 #include <konq_undo.h>

-#include <QList>
+#include <QtCore/QList>

 class DolphinApplication;
 class KNewMenu;
--- a/dolphin/src/dolphinsortfilterproxymodel.h
+++ b/dolphin/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>

--- a/dolphin/src/dolphinstatusbar.cpp
+++ b/dolphin/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>
--- a/dolphin/src/dolphinview.cpp
+++ b/dolphin/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>
--- a/dolphin/src/dolphinview.h
+++ b/dolphin/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;
--- a/dolphin/src/filterbar.cpp
+++ b/dolphin/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>
--- a/dolphin/src/filterbar.h
+++ b/dolphin/src/filterbar.h
@ -20,7 +20,7 @@
 #ifndef FILTERBAR_H
 #define FILTERBAR_H

-#include <QWidget>
+#include <QtGui/QWidget>

 class QLabel;
 class QToolButton;
--- a/dolphin/src/generalsettingspage.cpp
+++ b/dolphin/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"
--- a/dolphin/src/generalviewsettingspage.cpp
+++ b/dolphin/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>
--- a/dolphin/src/iconsizedialog.cpp
+++ b/dolphin/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),
--- a/dolphin/src/iconsviewsettingspage.cpp
+++ b/dolphin/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) :
--- a/dolphin/src/infosidebarpage.cpp
+++ b/dolphin/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>
--- a/dolphin/src/infosidebarpage.h
+++ b/dolphin/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>
--- a/dolphin/src/klistview.cpp
+++ b/dolphin/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>

--- a/dolphin/src/klistview.h
+++ b/dolphin/src/klistview.h
@ -21,7 +21,7 @@
 #ifndef __KLISTVIEW_H__
 #define __KLISTVIEW_H__

-#include <QListView>
+#include <QtGui/QListView>

 #include <libdolphin_export.h>

--- a/dolphin/src/libdolphin_export.h
+++ b/dolphin/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
--- a/dolphin/src/metadatawidget.cpp
+++ b/dolphin/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>
--- a/dolphin/src/metadatawidget.h
+++ b/dolphin/src/metadatawidget.h
@ -20,7 +20,7 @@
 #ifndef METADATA_WIDGET_H
 #define METADATA_WIDGET_H

-#include <QWidget>
+#include <QtGui/QWidget>

 #include <kurl.h>

--- a/dolphin/src/pixmapviewer.cpp
+++ b/dolphin/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),
--- a/dolphin/src/pixmapviewer.h
+++ b/dolphin/src/pixmapviewer.h
@ -22,7 +22,7 @@

 #include <QtGui/QWidget>
 #include <QtGui/QPixmap>
-#include <QTimeLine>
+#include <QtCore/QTimeLine>

 class QPaintEvent;

--- a/dolphin/src/renamedialog.cpp
+++ b/dolphin/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(),
--- a/dolphin/src/sidebarpage.cpp
+++ b/dolphin/src/sidebarpage.cpp
@ -19,7 +19,7 @@
 ***************************************************************************/

 #include "sidebarpage.h"
-#include <QWidget>
+#include <QtGui/QWidget>
 #include <kfileitem.h>
 #include <kurl.h>

--- a/dolphin/src/sidebarpage.h
+++ b/dolphin/src/sidebarpage.h
@ -21,7 +21,7 @@
 #ifndef _SIDEBARPAGE_H_
 #define _SIDEBARPAGE_H_

-#include <QWidget>
+#include <QtGui/QWidget>
 #include <kurl.h>
 #include <kfileitem.h>

--- a/dolphin/src/sidebartreeview.cpp
+++ b/dolphin/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)
--- a/dolphin/src/sidebartreeview.h
+++ b/dolphin/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.
--- a/dolphin/src/statusbarmessagelabel.cpp
+++ b/dolphin/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),
--- a/dolphin/src/statusbarmessagelabel.h
+++ b/dolphin/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;
--- a/dolphin/src/statusbarspaceinfo.cpp
+++ b/dolphin/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>
--- a/dolphin/src/statusbarspaceinfo.h
+++ b/dolphin/src/statusbarspaceinfo.h
@ -23,7 +23,7 @@
 #include <kurl.h>

 #include <QtGui/QColor>
-#include <QtGui/QPaintEvent>
+#include <QtGui/QKeyEvent>
 #include <QtGui/QWidget>

 class KDiskFreeSp;
--- a/dolphin/src/terminalsidebarpage.cpp
+++ b/dolphin/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),
--- a/dolphin/src/treeviewcontextmenu.cpp
+++ b/dolphin/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) :
--- a/dolphin/src/treeviewcontextmenu.h
+++ b/dolphin/src/treeviewcontextmenu.h
@ -20,7 +20,7 @@
 #ifndef TREEVIEWCONTEXTMENU_H
 #define TREEVIEWCONTEXTMENU_H

-#include <QObject>
+#include <QtCore/QObject>

 class KMenu;
 class KFileItem;
--- a/dolphin/src/treeviewsidebarpage.cpp
+++ b/dolphin/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),
--- a/dolphin/src/viewproperties.cpp
+++ b/dolphin/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>
--- a/dolphin/src/viewpropertiesdialog.cpp
+++ b/dolphin/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),
--- a/dolphin/src/viewpropsprogressinfo.cpp
+++ b/dolphin/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>
--- a/dolphin/src/viewsettingspage.cpp
+++ b/dolphin/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>
--- a/kappfinder/common.cpp
+++ b/kappfinder/common.cpp
@ -24,8 +24,8 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>

-#include <QDir>
-#include <QFile>
+#include <QtCore/QDir>
+#include <QtCore/QFile>

 #include <stdlib.h>

--- a/kappfinder/common.h
+++ b/kappfinder/common.h
@ -22,8 +22,8 @@
 #ifndef COMMON_H
 #define COMMON_H

-#include <Qt3Support/Q3CheckListItem>
-#include <QList>
+#include <Qt3Support/Q3ListView>
+#include <QtCore/QList>


 class AppLnkCache
--- a/kappfinder/main_install.cpp
+++ b/kappfinder/main_install.cpp
@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>

-#include <QStringList>
+#include <QtCore/QStringList>

 #include <stdio.h>

--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@ -32,13 +32,13 @@
 #include <kstandarddirs.h>
 #include <kstandardguiitem.h>

-#include <QLabel>
-#include <QLayout>
-#include <QPushButton>
-#include <QDir>
-#include <QRegExp>
-#include <QProgressBar>
-#include <QVBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QLayout>
+#include <QtGui/QPushButton>
+#include <QtCore/QDir>
+#include <QtCore/QRegExp>
+#include <QtGui/QProgressBar>
+#include <QtGui/QBoxLayout>

 #include "toplevel.h"

--- a/kappfinder/toplevel.h
+++ b/kappfinder/toplevel.h
@ -24,10 +24,10 @@

 #include <kdialog.h>

-#include <QStringList>
+#include <QtCore/QStringList>
 //Added by qt3to4:
-#include <QLabel>
-#include <QList>
+#include <QtGui/QLabel>
+#include <QtCore/QList>
 #include "common.h"

 class QProgressBar;
--- a/kdepasswd/kcm/chfacedlg.cpp
+++ b/kdepasswd/kcm/chfacedlg.cpp
@ -27,16 +27,15 @@

 #include "chfacedlg.h"

-#include <QLayout>
-#include <QLabel>
-#include <QPixmap>
-#include <QImage>
-#include <QPushButton>
-#include <QDir>
-#include <QCheckBox>
+#include <QtGui/QLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QPixmap>
+#include <QtGui/QImage>
+#include <QtGui/QPushButton>
+#include <QtCore/QDir>
+#include <QtGui/QCheckBox>
 //Added by qt3to4:
-#include <QVBoxLayout>
-#include <QHBoxLayout>
+#include <QtGui/QBoxLayout>

 #include <klocale.h>
 #include <kfiledialog.h>
--- a/kdepasswd/kcm/chfacedlg.h
+++ b/kdepasswd/kcm/chfacedlg.h
@ -28,8 +28,8 @@
 #ifndef CHFACEDLG_H
 #define CHFACEDLG_H

-#include <QObject>
-#include <QPixmap>
+#include <QtCore/QObject>
+#include <QtGui/QPixmap>

 #include <KDialog>
 #include <K3IconView> // declaration below
--- a/kdepasswd/kcm/chfnprocess.h
+++ b/kdepasswd/kcm/chfnprocess.h
@ -11,7 +11,7 @@
 #ifndef CHFNPROC_H
 #define CHFNPROC_H

-#include <QByteArray>
+#include <QtCore/QByteRef>
 #include <kdesu/process.h>

 class ChfnProcess : public PtyProcess
--- a/kdepasswd/kcm/main.cpp
+++ b/kdepasswd/kcm/main.cpp
@ -22,16 +22,15 @@

 #include "main.h"

-#include <QLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QEvent>
-#include <QPixmap>
-#include <QStringList>
+#include <QtGui/QLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtCore/QEvent>
+#include <QtGui/QPixmap>
+#include <QtCore/QStringList>
 //Added by qt3to4:
-#include <QDragEnterEvent>
-#include <QVBoxLayout>
-#include <QDropEvent>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QBoxLayout>

 #include <kpushbutton.h>
 #include <kguiitem.h>
--- a/kdepasswd/kcm/main.h
+++ b/kdepasswd/kcm/main.h
@ -24,9 +24,9 @@

 #include "ui_main_widget.h"
 //Added by qt3to4:
-#include <QPixmap>
-#include <QEvent>
-#include <QDropEvent>
+#include <QtGui/QPixmap>
+#include <QtCore/QEvent>
+#include <QtGui/QKeyEvent>

 #include "chfacedlg.h"

--- a/kdepasswd/passwd.h
+++ b/kdepasswd/passwd.h
@ -9,7 +9,7 @@
 #ifndef __Passwd_h_Included__
 #define __Passwd_h_Included__

-#include <QByteArray>
+#include <QtCore/QByteRef>
 #include <kdesu/process.h>

 /**
--- a/kdepasswd/passwddlg.h
+++ b/kdepasswd/passwddlg.h
@ -11,7 +11,7 @@

 #include <kpassworddialog.h>
 #include <knewpassworddialog.h>
-#include <QByteArray>
+#include <QtCore/QByteRef>

 class KDEpasswd1Dialog
    : public KPasswordDialog
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@ -24,11 +24,11 @@
 #include <stdlib.h>
 #include <iostream>

-#include <QFile>
-#include <QDataStream>
-#include <QRegExp>
-#include <QTimer>
-#include <QFileDialog>
+#include <QtCore/QFile>
+#include <QtCore/QDataStream>
+#include <QtCore/QRegExp>
+#include <QtCore/QTimer>
+#include <QtGui/QFileDialog>
 #include <QtGui/QDesktopWidget>
 #include <kmessagebox.h>
 #include <kapplication.h>
@ -41,7 +41,7 @@
 #include "widgets.h"

 #include <klocale.h>
-#include <QDialog>
+#include <QtGui/QDialog>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <kfiledialog.h>
--- a/kdialog/klistboxdialog.cpp
+++ b/kdialog/klistboxdialog.cpp
@ -17,7 +17,7 @@
 //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //

-#include <QLabel>
+#include <QtGui/QLabel>
 #include <Qt3Support/Q3ListBox>
 #include <kvbox.h>

--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@ -30,13 +30,13 @@
 #include <kdebug.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <QLabel>
+#include <QtGui/QLabel>
 #include <ktextedit.h>
 #include <kvbox.h>
-#include <QFile>
+#include <QtCore/QFile>
 #include <QtGui/QDesktopWidget>
-#include <QTextStream>
-#include <QTextCursor>
+#include <QtCore/QTextStream>
+#include <QtGui/QTextCursor>

 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
 #include <netwm.h>
--- a/kdialog/widgets.h
+++ b/kdialog/widgets.h
@ -21,9 +21,9 @@
 #ifndef WIDGETS_H
 #define WIDGETS_H

-#include <QByteArray>
-#include <QWidget>
-#include <QStringList>
+#include <QtCore/QByteRef>
+#include <QtGui/QWidget>
+#include <QtCore/QStringList>

 namespace Widgets
 {
--- a/keditbookmarks/actionsimpl.cpp
+++ b/keditbookmarks/actionsimpl.cpp
@ -31,9 +31,9 @@

 #include <stdlib.h>

-#include <QClipboard>
-#include <QMimeData>
-#include <QPainter>
+#include <QtGui/QClipboard>
+#include <QtCore/QMimeData>
+#include <QtGui/QPainter>

 #include <kdebug.h>
 #include <kapplication.h>
--- a/keditbookmarks/actionsimpl.h
+++ b/keditbookmarks/actionsimpl.h
@ -20,7 +20,7 @@
 #ifndef __actionsimpl_h
 #define __actionsimpl_h

-#include <QObject>
+#include <QtCore/QObject>

 class ActionsImpl : public QObject
 {
--- a/keditbookmarks/bookmarkinfo.cpp
+++ b/keditbookmarks/bookmarkinfo.cpp
@ -24,9 +24,9 @@

 #include <stdlib.h>

-#include <QTimer>
-#include <QLabel>
-#include <QGridLayout>
+#include <QtCore/QTimer>
+#include <QtGui/QLabel>
+#include <QtGui/QGridLayout>

 #include <klocale.h>
 #include <kdebug.h>
@ -42,7 +42,7 @@

 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
-#include <QEvent>
+#include <QtCore/QEvent>

 // SHUFFLE all these functions around, the order is just plain stupid
 void BookmarkInfoWidget::showBookmark(const KBookmark &bk) {
--- a/keditbookmarks/bookmarkinfo.h
+++ b/keditbookmarks/bookmarkinfo.h
@ -22,7 +22,7 @@
 #define __bookmarkinfo_h

 #include <kbookmark.h>
-#include <QWidget>
+#include <QtGui/QWidget>

 class BookmarkListView;
 class EditCommand;
--- a/keditbookmarks/bookmarkiterator.cpp
+++ b/keditbookmarks/bookmarkiterator.cpp
@ -24,7 +24,7 @@
 #include "toplevel.h"

 #include <kdebug.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <assert.h>

 BookmarkIterator::BookmarkIterator(QList<KBookmark> bks) : m_bklist(bks) {
--- a/keditbookmarks/bookmarkiterator.h
+++ b/keditbookmarks/bookmarkiterator.h
@ -20,8 +20,8 @@
 #ifndef __bookmarkiterator_h
 #define __bookmarkiterator_h

-#include <QObject>
-#include <QList>
+#include <QtCore/QObject>
+#include <QtCore/QList>
 #include <kbookmark.h>

 class KEBListViewItem;
--- a/keditbookmarks/bookmarklistview.cpp
+++ b/keditbookmarks/bookmarklistview.cpp
@ -22,13 +22,12 @@
 #include "bookmarkmodel.h"
 #include "toplevel.h"
 #include "settings.h"
-#include <QHeaderView>
-#include <QItemSelectionModel>
-#include <QMenu>
-#include <QContextMenuEvent>
-#include <QBrush>
-#include <QPalette>
-#include <QItemSelectionModel>
+#include <QtGui/QHeaderView>
+#include <QtGui/QItemSelection>
+#include <QtGui/QMenu>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QBrush>
+#include <QtGui/QPalette>

 #include <kdebug.h>

--- a/keditbookmarks/bookmarklistview.h
+++ b/keditbookmarks/bookmarklistview.h
@ -19,7 +19,7 @@
 #ifndef __bookmarklistview_h
 #define __bookmarklistview_h

-#include <QTreeView>
+#include <QtGui/QTreeView>

 struct SelcAbilities {
    bool itemSelected:1;
--- a/keditbookmarks/bookmarkmodel.cpp
+++ b/keditbookmarks/bookmarkmodel.cpp
@ -24,10 +24,10 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <QIcon>
-#include <QPixmap>
-#include <QStringList>
-#include <QMimeData>
+#include <QtGui/QIcon>
+#include <QtGui/QPixmap>
+#include <QtCore/QStringList>
+#include <QtCore/QMimeData>

 int BookmarkModel::count = 0;
 BookmarkModel* BookmarkModel::s_bookmarkModel = 0L;
--- a/keditbookmarks/bookmarkmodel.h
+++ b/keditbookmarks/bookmarkmodel.h
@ -19,10 +19,9 @@
 #ifndef __bookmarkmodel_h
 #define __bookmarkmodel_h

-#include <QAbstractItemModel>
-#include <QModelIndex>
-#include <QVariant>
-#include <QVector>
+#include <QtCore/QModelIndex>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
 #include <kbookmark.h>
 #include "toplevel.h"
 #include "treeitem.h"
--- a/keditbookmarks/commands.h
+++ b/keditbookmarks/commands.h
@ -24,7 +24,7 @@
 #include <k3command.h>
 #include <kbookmark.h>
 //Added by qt3to4:
-#include <QMap>
+#include <QtCore/QMap>


 // Interface adds the affectedBookmarks method
--- a/keditbookmarks/exporters.cpp
+++ b/keditbookmarks/exporters.cpp
@ -24,9 +24,9 @@
 #include <klocale.h>
 #include <kapplication.h>

-#include <QFile>
+#include <QtCore/QFile>
 //Added by qt3to4:
-#include <QTextStream>
+#include <QtCore/QTextStream>

 HTMLExporter::HTMLExporter() 
    : m_out(&m_string, QIODevice::WriteOnly) {
--- a/keditbookmarks/exporters.h
+++ b/keditbookmarks/exporters.h
@ -21,7 +21,7 @@

 #include <kbookmark.h>
 //Added by qt3to4:
-#include <QTextStream>
+#include <QtCore/QTextStream>

 class HTMLExporter : private KBookmarkGroupTraverser {
 public:
--- a/keditbookmarks/importers.cpp
+++ b/keditbookmarks/importers.cpp
@ -24,7 +24,7 @@
 #include "commands.h"
 #include "toplevel.h"

-#include <QRegExp>
+#include <QtCore/QRegExp>
 #include <kdebug.h>
 #include <klocale.h>

--- a/keditbookmarks/importers.h
+++ b/keditbookmarks/importers.h
@ -26,7 +26,7 @@

 #include <k3command.h>

-#include <QObject>
+#include <QtCore/QObject>


 class KBookmark;
--- a/keditbookmarks/kbookmarkmerger.cpp
+++ b/keditbookmarks/kbookmarkmerger.cpp
@ -32,9 +32,9 @@
 #include <klocale.h>


-#include <QDir>
+#include <QtCore/QDir>
 #include <Qt/qdom.h>
-#include <QFile>
+#include <QtCore/QFile>

 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
--- a/keditbookmarks/kebsearchline.cpp
+++ b/keditbookmarks/kebsearchline.cpp
@ -20,9 +20,9 @@

 #include <kicon.h>

-#include <QHeaderView>
-#include <QHBoxLayout>
-#include <QContextMenuEvent>
+#include <QtGui/QHeaderView>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QKeyEvent>


 KEBSearchLine::KEBSearchLine(QWidget *parent, K3ListView *listView)
--- a/keditbookmarks/kebsearchline.h
+++ b/keditbookmarks/kebsearchline.h
@ -26,16 +26,16 @@
 #include <kiconloader.h>
 #include <kdebug.h>

-#include <QTimer>
-#include <QAbstractItemView>
-#include <QListView>
-#include <QTreeView>
-#include <QMenu>
-#include <QAction>
-#include <QToolButton>
-#include <QApplication>
-#include <QLabel>
-#include <QLinkedList>
+#include <QtCore/QTimer>
+#include <QtGui/QAbstractItemView>
+#include <QtGui/QListView>
+#include <QtGui/QTreeView>
+#include <QtGui/QMenu>
+#include <QtGui/QAction>
+#include <QtGui/QToolButton>
+#include <QtGui/QApplication>
+#include <QtGui/QLabel>
+#include <QtCore/QLinkedList>



--- a/keditbookmarks/testlink.cpp
+++ b/keditbookmarks/testlink.cpp
@ -24,8 +24,8 @@
 #include "commands.h"
 #include "bookmarkiterator.h"

-#include <QTimer>
-#include <QPainter>
+#include <QtCore/QTimer>
+#include <QtGui/QPainter>

 #include <kdebug.h>

--- a/keditbookmarks/testlink.h
+++ b/keditbookmarks/testlink.h
@ -20,7 +20,7 @@
 #ifndef __testlink_h
 #define __testlink_h

-#include <QObject>
+#include <QtCore/QObject>

 #include <kio/job.h>
 #include <kbookmark.h>
--- a/keditbookmarks/toplevel.cpp
+++ b/keditbookmarks/toplevel.cpp
@ -32,10 +32,10 @@

 #include <stdlib.h>

-#include <QClipboard>
-#include <QSplitter>
-#include <QLayout>
-#include <QLabel>
+#include <QtGui/QClipboard>
+#include <QtGui/QSplitter>
+#include <QtGui/QLayout>
+#include <QtGui/QLabel>

 #include <kaction.h>
 #include <kactioncollection.h>
@ -188,7 +188,7 @@ QString CurrentMgr::makeTimeStr(int b)
 }

 /* -------------------------- */
-#include <QDBusConnection>
+#include <QtDBus/QDBusConnection>
 KEBApp *KEBApp::s_topLevel = 0;

 KEBApp::KEBApp(
--- a/keditbookmarks/toplevel.h
+++ b/keditbookmarks/toplevel.h
@ -23,7 +23,7 @@
 #include <kxmlguiwindow.h>
 #include <k3command.h>
 #include <kbookmark.h>
-#include <QMenu>
+#include <QtGui/QMenu>
 #include <kxmlguifactory.h>
 #include "bookmarklistview.h"

--- a/keditbookmarks/treeitem.cpp
+++ b/keditbookmarks/treeitem.cpp
@ -18,7 +18,7 @@

 #include "treeitem.h"
 #include <kdebug.h>
-#include <QVector>
+#include <QtCore/QVector>

 TreeItem::TreeItem(KBookmark bk, TreeItem * parent)
    : mparent(parent), mbk(bk)
--- a/keditbookmarks/treeitem.h
+++ b/keditbookmarks/treeitem.h
@ -19,7 +19,7 @@
 #ifndef __treeitem_h
 #define __treeitem_h

-#include <QList>
+#include <QtCore/QList>
 #include <kbookmark.h>

 //#define DEBUG_STUPID_QT
--- a/kfind/kdatecombo.cpp
+++ b/kfind/kdatecombo.cpp
@ -4,11 +4,10 @@
 *
 ***********************************************************************/

-#include <QTimer>
+#include <QtCore/QTimer>
 //Added by qt3to4:
-#include <QMouseEvent>
-#include <QKeyEvent>
-#include <QEvent>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QEvent>

 #include <kglobal.h>
 #include <klocale.h>
--- a/kfind/kdatecombo.h
+++ b/kfind/kdatecombo.h
@ -7,9 +7,9 @@
 #ifndef KDATECOMBO_H
 #define KDATECOMBO_H

-#include <QWidget>
-#include <QComboBox>
-#include <QDateTime>
+#include <QtGui/QWidget>
+#include <QtGui/QComboBox>
+#include <QtCore/QDate>

 /**
  *@author Beppe Grimaldi
--- a/kfind/kfind.cpp
+++ b/kfind/kfind.cpp
@ -25,9 +25,9 @@

 **********************************************************************/

-#include <QLayout>
-#include <QLineEdit>
-#include <QCheckBox>
+#include <QtGui/QLayout>
+#include <QtGui/QLineEdit>
+#include <QtGui/QCheckBox>

 #include <kpushbutton.h>
 #include <kvbox.h>
--- a/kfind/kfind.h
+++ b/kfind/kfind.h
@ -7,7 +7,7 @@
 #ifndef KFIND_H
 #define KFIND_H

-#include <QWidget>
+#include <QtGui/QWidget>

 class QString;
 class KPushButton;
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@ -4,8 +4,8 @@
 *
 **********************************************************************/

-#include <QLayout>
-#include <QPushButton>
+#include <QtGui/QLayout>
+#include <QtGui/QPushButton>

 #include <klocale.h>
 #include <kglobal.h>
--- a/kfind/kfindpart.cpp
+++ b/kfind/kfindpart.cpp
@ -28,7 +28,7 @@
 #include <kdirlister.h>
 #include <kcomponentdata.h>

-#include <QDir>
+#include <QtCore/QDir>

 class KonqDirPart;

--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@ -4,18 +4,18 @@
 *
 **********************************************************************/

-#include <QButtonGroup>
-#include <QRadioButton>
-#include <QLabel>
-#include <QLayout>
-#include <QCheckBox>
-#include <QWhatsThis>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QRadioButton>
+#include <QtGui/QLabel>
+#include <QtGui/QLayout>
+#include <QtGui/QCheckBox>
+#include <QtGui/QWhatsThis>

-#include <QComboBox>
-#include <QSpinBox>
-#include <QPushButton>
-#include <QApplication>
-#include <QDesktopWidget>
+#include <QtGui/QComboBox>
+#include <QtGui/QSpinBox>
+#include <QtGui/QPushButton>
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopWidget>

 #include <kcalendarsystem.h>
 #include <kglobal.h>
--- a/kfind/kftabdlg.h
+++ b/kfind/kftabdlg.h
@ -7,8 +7,8 @@
 #ifndef KFTABDLG_H
 #define KFTABDLG_H

-#include <QTabWidget>
-#include <QValidator> // for KDigitValidator
+#include <QtGui/QTabWidget>
+#include <QtGui/QValidator> // for KDigitValidator

 #include <kurl.h>
 #include <kmimetype.h>
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@ -14,15 +14,15 @@
 #include <sys/stat.h>
 #include <time.h>

-#include <QTextStream>
-#include <QFileInfo>
-#include <QDir>
-#include <QClipboard>
-#include <QPixmap>
-#include <Qt3Support/Q3ColorDrag>
-#include <QTextDocument>
+#include <QtCore/QTextStream>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+#include <QtGui/QClipboard>
+#include <QtGui/QPixmap>
+#include <Qt3Support/Q3UriDrag>
+#include <QtGui/QTextDocument>
 #include <Qt3Support/Q3PtrList>
-#include <QDateTime>
+#include <QtCore/QDate>

 #include <kfiledialog.h>
 #include <klocale.h>
--- a/Show more
+++ b/Show more