include cleanup

svn path=/trunk/KDE/kdebase/konqueror/; revision=652987
2024-11-05 18:47:12 +00:00 · 2007-04-12 13:02:58 +00:00 · 2007-04-12 13:02:58 +00:00 · 0b5a5f290c
commit 0b5a5f290c
parent 81a41e3e78
77 changed files with 84 additions and 93 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,7 +1,7 @@
 add_subdirectory( dolphin )
 add_subdirectory( kwrite )
 add_subdirectory( kdialog )
-add_subdirectory( keditbookmarks )
+#add_subdirectory( keditbookmarks )
 if(NOT WIN32)
  add_subdirectory( konsole )
 endif(NOT WIN32)
--- a/dolphin/src/infosidebarpage.h
+++ b/dolphin/src/infosidebarpage.h
@ -22,7 +22,7 @@

 #include <sidebarpage.h>

-#include <qpushbutton.h>
+#include <QtGui/QPushButton>
 #include <QPixmap>
 #include <QEvent>
 #include <QLabel>
--- a/dolphin/src/pixmapviewer.cpp
+++ b/dolphin/src/pixmapviewer.cpp
@ -22,7 +22,7 @@

 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <qpainter.h>
+#include <QtGui/QPainter>
 //Added by qt3to4:
 #include <QPixmap>
 #include <QPaintEvent>
--- a/dolphin/src/pixmapviewer.h
+++ b/dolphin/src/pixmapviewer.h
@ -21,8 +21,8 @@
 #ifndef PIXMAPVIEWER_H
 #define PIXMAPVIEWER_H

-#include <qwidget.h>
-#include <qpixmap.h>
+#include <QtGui/QWidget>
+#include <QtGui/QPixmap>
 //Added by qt3to4:
 #include <QPaintEvent>

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

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

 /**
 * @brief Base class for the settings pages of the Dolphin settings dialog.
--- a/dolphin/src/statusbarspaceinfo.h
+++ b/dolphin/src/statusbarspaceinfo.h
@ -21,7 +21,7 @@
 #define STATUSBARSPACEINFO_H

 #include <kurl.h>
-#include <qcolor.h>
+#include <QtGui/QColor>

 #include <QPaintEvent>
 #include <QWidget>
--- a/dolphin/src/viewproperties.cpp
+++ b/dolphin/src/viewproperties.cpp
@ -28,7 +28,6 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kcomponentdata.h>

 #include "viewproperties.h"
 #include "dolphinsettings.h"
--- a/dolphin/src/viewproperties.h
+++ b/dolphin/src/viewproperties.h
@ -24,7 +24,7 @@
 #include <dolphinview.h>
 #include <kfileitemdelegate.h>
 #include <kurl.h>
-#include <qdatetime.h>
+#include <QtCore/QDate>
 #include <libdolphin_export.h>
 #include "dolphin_directoryviewpropertysettings.h"

--- a/dolphin/src/viewsettingspage.h
+++ b/dolphin/src/viewsettingspage.h
@ -20,7 +20,7 @@
 #ifndef VIEWSETTINGSPAGE_H
 #define VIEWSETTINGSPAGE_H

-#include <qwidget.h>
+#include <QtGui/QWidget>
 #include <settingspagebase.h>

 class ColumnViewSettingsPage;
--- a/kdepasswd/kcm/chfnprocess.cpp
+++ b/kdepasswd/kcm/chfnprocess.cpp
@ -18,7 +18,6 @@

 #include <kdesu/process.h>
 #include <kdebug.h>
-#include <kdebug.h>
 #include "chfnprocess.h"


--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@ -29,7 +29,7 @@
 #include <QRegExp>
 #include <QTimer>
 #include <QFileDialog>
-#include <qdesktopwidget.h>
+#include <QtGui/QDesktopWidget>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kdebug.h>
@ -37,7 +37,6 @@
 #include <kmainwindow.h>
 #include <kpassivepopup.h>
 #include <krecentdocument.h>
-#include <kapplication.h>

 #include "widgets.h"

--- a/kdialog/klistboxdialog.cpp
+++ b/kdialog/klistboxdialog.cpp
@ -18,7 +18,7 @@
 //

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

 #include "klistboxdialog.h"
--- a/kdialog/klistboxdialog.h
+++ b/kdialog/klistboxdialog.h
@ -23,7 +23,7 @@

 #include <kdialog.h>

-#include <q3listbox.h>
+#include <Qt3Support/Q3ListBox>

 class KListBoxDialog : public KDialog
 {
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@ -34,7 +34,7 @@
 #include <ktextedit.h>
 #include <kvbox.h>
 #include <QFile>
-#include <qdesktopwidget.h>
+#include <QtGui/QDesktopWidget>
 #include <QTextStream>
 #include <QTextCursor>

--- a/keditbookmarks/bookmarkmodel.cpp
+++ b/keditbookmarks/bookmarkmodel.cpp
@ -28,7 +28,6 @@
 #include <QPixmap>
 #include <QStringList>
 #include <QMimeData>
-#include <kdebug.h>

 int BookmarkModel::count = 0;
 BookmarkModel* BookmarkModel::s_bookmarkModel = 0L;
--- a/keditbookmarks/dcop.h
+++ b/keditbookmarks/dcop.h
@ -21,7 +21,7 @@
 #ifndef __dcop_h
 #define __dcop_h

-#include <qobject.h>
+#include <QtCore/QObject>

 class KBookmarkEditorIface : public QObject
 {
--- a/keditbookmarks/kbookmarkmerger.cpp
+++ b/keditbookmarks/kbookmarkmerger.cpp
@ -33,7 +33,7 @@


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

 #ifdef Q_WS_X11
--- a/keditbookmarks/toplevel.cpp
+++ b/keditbookmarks/toplevel.cpp
@ -52,7 +52,7 @@
 #include <kstandardaction.h>

 #include <assert.h>
-#include <qglobal.h>
+#include <QtCore/QBool>



--- a/kfind/kfindpart.h
+++ b/kfind/kfindpart.h
@ -24,7 +24,7 @@
 #include <kparts/part.h>
 #include <kfileitem.h>
 #include <kdebug.h>
-#include <q3ptrlist.h>
+#include <Qt3Support/Q3PtrList>
 #include <konq_dirpart.h>

 class KQuery;
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@ -31,7 +31,6 @@
 #include <kiconloader.h>
 #include "kquery.h"
 #include "kftabdlg.h"
-#include <kservicetypetrader.h>
 // Static utility functions
 static void save_pattern(QComboBox *, const QString &, const QString &);

--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@ -19,9 +19,9 @@
 #include <QDir>
 #include <QClipboard>
 #include <QPixmap>
-#include <q3dragobject.h>
+#include <Qt3Support/Q3ColorDrag>
 #include <QTextDocument>
-#include <q3ptrlist.h>
+#include <Qt3Support/Q3PtrList>
 #include <QDateTime>

 #include <kfiledialog.h>
--- a/konqueror/iconview/konq_iconview.h
+++ b/konqueror/iconview/konq_iconview.h
@ -24,8 +24,8 @@
 #include <konq_operations.h>
 #include <konq_dirpart.h>
 #include <k3mimetyperesolver.h>
-#include <q3ptrdict.h>
-#include <q3ptrlist.h>
+#include <Qt3Support/Q3PtrDict>
+#include <Qt3Support/Q3PtrList>
 #include <kfileivi.h>

 class KonqPropsView;
--- a/konqueror/konq_actions.cc
+++ b/konqueror/konq_actions.cc
@ -30,7 +30,6 @@
 #include <kiconloader.h>
 #include <kmenu.h>
 #include <kapplication.h>
-#include <ktoolbar.h>

 #include "konq_view.h"
 #include "konq_settingsxt.h"
--- a/konqueror/konq_frame.cc
+++ b/konqueror/konq_frame.cc
@ -34,9 +34,9 @@

 #include <QPainter>
 #include <QToolButton>
-#include <qtabbar.h>
+#include <QtGui/QTabBar>
 #include <QMenu>
-#include <qkeysequence.h>
+#include <QtGui/QKeySequence>
 #include <QProgressBar>
 //Added by qt3to4:
 #include <QPixmap>
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cc
@ -25,7 +25,7 @@
 #include <QDir>
 #include <kvbox.h>
 #include <QLabel>
-#include <q3header.h>
+#include <Qt3Support/Q3Header>
 #include <QLineEdit>

 #include <k3listview.h>
--- a/konqueror/konq_profiledlg.h
+++ b/konqueror/konq_profiledlg.h
@ -22,7 +22,7 @@

 #include <kdialog.h>

-#include <q3listview.h>
+#include <Qt3Support/Q3CheckListItem>
 #include <QMap>
 //Added by qt3to4:
 #include <QGridLayout>
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@ -45,7 +45,7 @@
 #include <kacceleratormanager.h>
 #include <konq_pixmapprovider.h>
 #include <kstandardshortcut.h>
-#include <qtabbar.h>
+#include <QtGui/QTabBar>

 #include <QStyle>

--- a/konqueror/konq_viewmgr.h
+++ b/konqueror/konq_viewmgr.h
@ -22,7 +22,7 @@

 #include "konq_factory.h"

-#include <qnamespace.h>
+#include <QtCore/QCOORD>
 #include <QObject>
 #include <QMap>
 #include <QPointer>
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@ -26,7 +26,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <QPainter>
-#include <q3header.h>
+#include <Qt3Support/Q3Header>
 #include <kiconloader.h>
 #include "konq_infolistviewitem.h"
 #include "konq_infolistviewwidget.h"
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@ -41,7 +41,7 @@

 #include <QApplication>
 #include <QClipboard>
-#include <q3header.h>
+#include <Qt3Support/Q3Header>
 #include <QRegExp>

 #include <assert.h>
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@ -25,7 +25,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <QPainter>
-#include <q3header.h>
+#include <Qt3Support/Q3Header>
 #include <kiconloader.h>
 #include <QDateTime>

--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@ -33,14 +33,14 @@
 #include <kmessagebox.h>
 #include <ktoggleaction.h>

-#include <q3header.h>
+#include <Qt3Support/Q3Header>
 #include <QPainter>
 #include <QStyle>
 #include <QTimer>
 #include <QEvent>
 #include <QCursor>
 #include <QToolTip>
-#include <qdrag.h>
+#include <QtGui/QDrag>

 #include <stdlib.h>
 #include <assert.h>
--- a/konqueror/listview/konq_textviewwidget.cc
+++ b/konqueror/listview/konq_textviewwidget.cc
@ -20,7 +20,7 @@
 #include "konq_listview.h"
 #include "konq_textviewitem.h"

-#include <q3header.h>
+#include <Qt3Support/Q3Header>

 #include <kdebug.h>
 #include <kdirlister.h>
--- a/konqueror/listview/konq_treeviewwidget.h
+++ b/konqueror/listview/konq_treeviewwidget.h
@ -21,7 +21,7 @@

 #include "konq_listviewwidget.h"
 #include "konq_treeviewitem.h"
-#include <q3dict.h>
+#include <Qt3Support/Q3Dict>
 #include <kurl.h>
 #include <k3listview.h>

--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@ -36,7 +36,6 @@
 #include <kgenericfactory.h>
 #include <kprotocolinfo.h>
 #include <kprotocolmanager.h>
-#include <kprotocolmanager.h>
 #include <kio/slaveconfig.h>
 #include <kio/scheduler.h>
 #include <konq_dirpart.h>
--- a/konqueror/settings/css/kcmcss.cpp
+++ b/konqueror/settings/css/kcmcss.cpp
@ -3,7 +3,7 @@
 #include <QComboBox>
 #include <QLayout>
 #include <QRadioButton>
-#include <q3textbrowser.h>
+#include <Qt3Support/Q3TextBrowser>
 //Added by qt3to4:
 #include <QVBoxLayout>

--- a/konqueror/settings/filetypes/filegroupdetails.cpp
+++ b/konqueror/settings/filetypes/filegroupdetails.cpp
@ -19,7 +19,7 @@
 #include "typeslistitem.h"
 #include <QLayout>
 #include <QRadioButton>
-#include <q3buttongroup.h>
+#include <Qt3Support/Q3ButtonGroup>
 #include <QWhatsThis>
 #include <kdialog.h>
 #include <klocale.h>
--- a/konqueror/settings/filetypes/filetypesview.h
+++ b/konqueror/settings/filetypes/filetypesview.h
@ -1,7 +1,7 @@
 #ifndef FILETYPESVIEW_H
 #define FILETYPESVIEW_H

-#include <q3ptrlist.h>
+#include <Qt3Support/Q3PtrList>
 #include <QMap>
 #include <QLabel>
 #include <QStackedWidget>
--- a/konqueror/settings/filetypes/kservicelistwidget.h
+++ b/konqueror/settings/filetypes/kservicelistwidget.h
@ -21,8 +21,8 @@
 #ifndef _KSERVICELISTWIDGET_H
 #define _KSERVICELISTWIDGET_H

-#include <q3groupbox.h>
-#include <qlistwidget.h>
+#include <Qt3Support/Q3GroupBox>
+#include <QtGui/QListWidget>
 #include <kservice.h>
 class TypesListItem;
 class QLineEdit;
--- a/konqueror/settings/filetypes/typeslistitem.h
+++ b/konqueror/settings/filetypes/typeslistitem.h
@ -20,7 +20,7 @@
 #ifndef _TYPESLISTITEM_H
 #define _TYPESLISTITEM_H

-#include <q3listview.h>
+#include <Qt3Support/Q3CheckListItem>

 #include <kmimetype.h>

--- a/konqueror/settings/kio/kcookiesmanagement.cpp
+++ b/konqueror/settings/kio/kcookiesmanagement.cpp
@ -22,7 +22,7 @@
 #include <QApplication>
 #include <QLayout>
 #include <QPushButton>
-#include <q3groupbox.h>
+#include <Qt3Support/Q3GroupBox>
 #include <QLabel>
 #include <QTimer>
 #include <QDateTime>
--- a/konqueror/settings/kio/kcookiesmanagement.h
+++ b/konqueror/settings/kio/kcookiesmanagement.h
@ -24,9 +24,9 @@
 #ifndef __KCOOKIESMANAGEMENT_H
 #define __KCOOKIESMANAGEMENT_H

-#include <q3dict.h>
+#include <Qt3Support/Q3Dict>
 #include <QStringList>
-#include <q3listview.h>
+#include <Qt3Support/Q3CheckListItem>
 #include <Q3PtrList>

 #include <kcmodule.h>
--- a/konqueror/settings/kio/netpref.cpp
+++ b/konqueror/settings/kio/netpref.cpp
@ -1,7 +1,7 @@
 #include <QLayout>
 #include <QCheckBox>

-#include <q3groupbox.h>
+#include <Qt3Support/Q3GroupBox>
 //Added by qt3to4:
 #include <QVBoxLayout>

--- a/konqueror/settings/konq/desktop.cpp
+++ b/konqueror/settings/konq/desktop.cpp
@ -18,7 +18,7 @@
 */

 #include <QLabel>
-#include <q3groupbox.h>
+#include <Qt3Support/Q3GroupBox>
 #include <QLayout>

 #include <QCheckBox>
--- a/konqueror/settings/konq/desktopbehavior_impl.cpp
+++ b/konqueror/settings/konq/desktopbehavior_impl.cpp
@ -27,7 +27,7 @@
 #include <QLabel>
 #include <QComboBox>
 #include <QPushButton>
-#include <q3buttongroup.h>
+#include <Qt3Support/Q3ButtonGroup>
 #include <QTabWidget>
 #include <QDBusInterface>

--- a/konqueror/settings/konq/kcustommenueditor.cpp
+++ b/konqueror/settings/konq/kcustommenueditor.cpp
@ -18,10 +18,10 @@
 */

 #include <khbox.h>
-#include <qregexp.h>
-#include <qimage.h>
-#include <qpushbutton.h>
-#include <qdir.h>
+#include <QtCore/QRegExp>
+#include <QtGui/QImage>
+#include <QtGui/QPushButton>
+#include <QtCore/QDir>

 #include <kdialogbuttonbox.h>
 #include <klocale.h>
--- a/konqueror/settings/konqhtml/domainlistview.h
+++ b/konqueror/settings/konqhtml/domainlistview.h
@ -22,7 +22,7 @@
 #ifndef __DOMAINLISTVIEW_H__
 #define __DOMAINLISTVIEW_H__

-#include <q3groupbox.h>
+#include <Qt3Support/Q3GroupBox>
 #include <QMap>
 #include <kconfig.h>

--- a/konqueror/settings/konqhtml/filteropts.cpp
+++ b/konqueror/settings/konqhtml/filteropts.cpp
@ -24,7 +24,7 @@
 #include <QListWidget>
 #include <QLayout>
 #include <QPushButton>
-#include <q3groupbox.h>
+#include <Qt3Support/Q3GroupBox>
 #include <khbox.h>
 #include <QLineEdit>
 #include <QLabel>
--- a/konqueror/settings/konqhtml/htmlopts.cpp
+++ b/konqueror/settings/konqhtml/htmlopts.cpp
@ -6,7 +6,7 @@
 // (c) 2001 Waldo Bastian <bastian@kde.org>

 #include <QLayout>//CT - 12Nov1998
-#include <q3groupbox.h>
+#include <Qt3Support/Q3GroupBox>
 #include <QLabel>
 #include <QPushButton>
 #include <QDBusMessage>
--- a/konqueror/settings/konqhtml/javaopts.cpp
+++ b/konqueror/settings/konqhtml/javaopts.cpp
@ -22,7 +22,7 @@
 #include <khbox.h>

 #include <QLayout>
-#include <q3groupbox.h>
+#include <Qt3Support/Q3GroupBox>
 #include <QLabel>

 #include "htmlopts.h"
--- a/konqueror/settings/konqhtml/jsopts.cpp
+++ b/konqueror/settings/konqhtml/jsopts.cpp
@ -12,7 +12,7 @@
 // (c) Leo Savernik 2002-2003

 #include <QLayout>
-#include <q3groupbox.h>
+#include <Qt3Support/Q3GroupBox>
 #include <kconfig.h>
 #include <k3listview.h>
 #include <kdebug.h>
--- a/konqueror/settings/konqhtml/jspolicies.cpp
+++ b/konqueror/settings/konqhtml/jspolicies.cpp
@ -19,7 +19,7 @@

 */

-#include <q3buttongroup.h>
+#include <Qt3Support/Q3ButtonGroup>
 #include <QLabel>
 #include <QLayout>
 #include <QRadioButton>
--- a/konqueror/settings/konqhtml/jspolicies.h
+++ b/konqueror/settings/konqhtml/jspolicies.h
@ -22,7 +22,7 @@
 #ifndef __JSPOLICIES_H__
 #define __JSPOLICIES_H__

-#include <q3groupbox.h>
+#include <Qt3Support/Q3GroupBox>
 #include <QString>

 #include <khtml_settings.h>
--- a/konqueror/settings/konqhtml/pluginopts.cpp
+++ b/konqueror/settings/konqhtml/pluginopts.cpp
@ -9,10 +9,10 @@

 #include <QLabel>
 #include <QLayout>
-#include <qprogressdialog.h>
+#include <QtGui/QProgressDialog>
 #include <QRegExp>
 #include <QSlider>
-#include <q3groupbox.h>
+#include <Qt3Support/Q3GroupBox>
 #include <QTextStream>
 #include <QDBusMessage>
 #include <QDBusConnection>
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.h
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.h
@ -21,7 +21,7 @@
 #define SHELLCOMMANDEXECUTOR_H

 #include <QString>
-#include <q3textview.h>
+#include <Qt3Support/Q3TextView>

 class PtyProcess;
 class QSocketNotifier;
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@ -39,7 +39,6 @@
 #include <kmenu.h>
 #include <k3process.h>
 #include <kurlrequesterdialog.h>
-#include <kinputdialog.h>
 #include <kfiledialog.h>
 #include <kdesktopfile.h>
 #include "konqsidebar.h"
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@ -17,7 +17,7 @@
 #ifndef _SIDEBAR_WIDGET_
 #define _SIDEBAR_WIDGET_

-#include <q3ptrvector.h>
+#include <Qt3Support/Q3PtrVector>
 #include <QTimer>
 #include <QString>
 #include <QPointer>
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
@ -22,8 +22,8 @@
 #include <konq_sidebartreemodule.h>
 #include <kfileitem.h>
 #include <QPixmap>
-#include <q3dict.h>
-#include <q3ptrdict.h>
+#include <Qt3Support/Q3Dict>
+#include <Qt3Support/Q3PtrDict>

 class KDirLister;
 class KonqSidebarTree;
--- a/konqueror/sidebar/trees/history_module/history_module.h
+++ b/konqueror/sidebar/trees/history_module/history_module.h
@ -21,7 +21,7 @@

 #include <QDateTime>
 #include <QObject>
-#include <q3dict.h>
+#include <Qt3Support/Q3Dict>
 #include <QPixmap>

 #include <kglobal.h>
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@ -23,7 +23,7 @@
 #include <QClipboard>
 #include <QCursor>
 #include <QDir>
-#include <q3header.h>
+#include <Qt3Support/Q3Header>
 #include <QMenu>
 #include <QTimer>
 //Added by qt3to4:
--- a/konqueror/sidebar/trees/konq_sidebartree.h
+++ b/konqueror/sidebar/trees/konq_sidebartree.h
@ -25,7 +25,7 @@
 #include "konqsidebar_tree.h"
 #include <QMap>
 #include <QPoint>
-#include <q3strlist.h>
+#include <Qt3Support/Q3StrIList>
 #include <QToolTip>
 //Added by qt3to4:
 #include <QPixmap>
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@ -28,7 +28,7 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QCursor>
-#include <qmimedata.h>
+#include <QtCore/QMimeData>
 #include <konqmimedata.h>
 #include <kdesktopfile.h>

--- a/lib/konq/favicons/favicons.cpp
+++ b/lib/konq/favicons/favicons.cpp
@ -22,7 +22,7 @@

 #include <QBuffer>
 #include <QFile>
-#include <qcache.h>
+#include <QtCore/QCache>
 #include <QImage>
 #include <QTimer>
 #include <QImageReader>
--- a/lib/konq/kivdirectoryoverlay.cc
+++ b/lib/konq/kivdirectoryoverlay.cc
@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */

-#include <q3dict.h>
+#include <Qt3Support/Q3Dict>
 #include <QPixmap>
 #include <QPainter>
 #include <QBitmap>
--- a/lib/konq/kivdirectoryoverlay.h
+++ b/lib/konq/kivdirectoryoverlay.h
@ -23,7 +23,7 @@
 #include <kfileitem.h>
 #include <libkonq_export.h>

-#include <q3dict.h>
+#include <Qt3Support/Q3Dict>
 //Added by qt3to4:
 #include <QTimerEvent>

--- a/lib/konq/konq_filetip.cc
+++ b/lib/konq/konq_filetip.cc
@ -30,7 +30,7 @@
 #include <QToolTip>
 #include <QLayout>
 #include <QPainter>
-#include <q3scrollview.h>
+#include <Qt3Support/Q3ScrollView>
 #include <QTimer>
 //Added by qt3to4:
 #include <QPixmap>
--- a/lib/konq/konq_filetip.h
+++ b/lib/konq/konq_filetip.h
@ -22,7 +22,7 @@
 #ifndef KONQ_FILETIP_H
 #define KONQ_FILETIP_H

-#include <q3frame.h>
+#include <Qt3Support/Q3Frame>
 #include <QPixmap>
 //Added by qt3to4:
 #include <QLabel>
--- a/lib/konq/konq_operations.cc
+++ b/lib/konq/konq_operations.cc
@ -48,7 +48,6 @@
 #include <kdebug.h>
 #include <kfileitem.h>
 #include <kdesktopfile.h>
-#include <kglobalsettings.h>
 #include <kimageio.h>

 #include <konq_iconviewwidget.h>
--- a/lib/konq/konq_propsview.cc
+++ b/lib/konq/konq_propsview.cc
@ -22,8 +22,8 @@

 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <qpixmapcache.h>
-#include <q3iconview.h>
+#include <QtGui/QPixmapCache>
+#include <Qt3Support/Q3IconDrag>
 //Added by qt3to4:
 #include <QPixmap>
 #include <unistd.h>
--- a/lib/konq/konq_undo_p.h
+++ b/lib/konq/konq_undo_p.h
@ -21,7 +21,7 @@
 #ifndef KONQ_UNDO_P_H
 #define KONQ_UNDO_P_H

-#include <qstack.h>
+#include <QtCore/QStack>
 #include <QUndoCommand>

 struct KonqBasicOperation
--- a/lib/konq/konqmimedata.cpp
+++ b/lib/konq/konqmimedata.cpp
@ -17,7 +17,7 @@
 */

 #include "konqmimedata.h"
-#include <qmimedata.h>
+#include <QtCore/QMimeData>
 #include <kdebug.h>

 void KonqMimeData::populateMimeData( QMimeData* mimeData,
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@ -39,7 +39,7 @@
 #include <QLayout>
 #include <QObject>
 #include <QPushButton>
-#include <qx11embed_x11.h>
+#include <QtGui/QX11EmbedContainer>
 #include <QTextStream>
 #include <QRegExp>

--- a/nsplugins/nspluginloader.h
+++ b/nsplugins/nspluginloader.h
@ -30,10 +30,10 @@

 #include <QString>
 #include <QStringList>
-#include <q3dict.h>
+#include <Qt3Support/Q3Dict>
 #include <QObject>
 #include <QWidget>
-#include <qx11embed_x11.h>
+#include <QtGui/QX11EmbedContainer>
 //Added by qt3to4:
 #include <QGridLayout>
 #include <QResizeEvent>
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <unistd.h>

-#include <q3dict.h>
+#include <Qt3Support/Q3Dict>
 #include <QDir>
 #include <QFile>
 #include <QTimer>
--- a/nsplugins/viewer/nsplugin.h
+++ b/nsplugins/viewer/nsplugin.h
@ -29,9 +29,9 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <q3ptrqueue.h>
+#include <Qt3Support/Q3PtrQueue>
 #include <QMap>
-#include <q3intdict.h>
+#include <Qt3Support/Q3IntDict>
 #include <QPointer>
 //Added by qt3to4:
 #include <Q3PtrList>
--- a/nsplugins/viewer/qxteventloop.h
+++ b/nsplugins/viewer/qxteventloop.h
@ -36,7 +36,7 @@
 #ifndef QXTEVENTLOOP_H
 #define QXTEVENTLOOP_H

-#include <qglobal.h>
+#include <QtCore/QBool>

 #include <QEventLoop>
 #include <QSocketNotifier>
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@ -34,7 +34,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <q3ptrlist.h>
+#include <Qt3Support/Q3PtrList>
 #include <QSocketNotifier>
 //Added by qt3to4:
 #include <QEvent>