#include <q...h> -> #include <Q...>

svn path=/trunk/KDE/kdebase/nsplugins/; revision=540496
2024-11-05 18:47:12 +00:00 · 2006-05-13 16:33:18 +00:00 · 2006-05-13 16:33:18 +00:00 · a0b412c7fd
commit a0b412c7fd
parent f22506614f
127 changed files with 199 additions and 199 deletions
--- a/kdepasswd/kcm/chfacedlg.cpp
+++ b/kdepasswd/kcm/chfacedlg.cpp
@ -28,8 +28,8 @@
 #include <QString>
 #include <QLayout>
 #include <QLabel>
-#include <qpixmap.h>
-#include <qimage.h>
+#include <QPixmap>
+#include <QImage>
 #include <QPushButton>
 #include <QDir>
 #include <QCheckBox>
--- a/kdepasswd/kcm/main.cpp
+++ b/kdepasswd/kcm/main.cpp
@ -23,9 +23,9 @@
 #include <QLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <qevent.h>
-#include <qpixmap.h>
-#include <qstringlist.h>
+#include <QEvent>
+#include <QPixmap>
+#include <QStringList>
 #include <QLayout>
 //Added by qt3to4:
 #include <QDragEnterEvent>
--- a/kdepasswd/passwd.h
+++ b/kdepasswd/passwd.h
@ -9,7 +9,7 @@
 #ifndef __Passwd_h_Included__
 #define __Passwd_h_Included__

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

 /**
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@ -41,7 +41,7 @@
 #include "widgets.h"

 #include <klocale.h>
-#include <qdialog.h>
+#include <QDialog>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <kfiledialog.h>
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@ -35,7 +35,7 @@
 #include <kvbox.h>
 #include <QFile>
 #include <qdesktopwidget.h>
-#include <qtextstream.h>
+#include <QTextStream>
 #include <QTextCursor>

 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
--- a/keditbookmarks/actionsimpl.cpp
+++ b/keditbookmarks/actionsimpl.cpp
@ -31,8 +31,8 @@

 #include <stdlib.h>

-#include <qclipboard.h>
-#include <qpainter.h>
+#include <QClipboard>
+#include <QPainter>

 #include <dcopclient.h>
 #include <dcopref.h>
--- a/keditbookmarks/bookmarkinfo.cpp
+++ b/keditbookmarks/bookmarkinfo.cpp
@ -25,8 +25,8 @@
 #include <stdlib.h>

 #include <QTimer>
-#include <qclipboard.h>
-#include <qsplitter.h>
+#include <QClipboard>
+#include <QSplitter>
 #include <QLayout>
 #include <QLabel>
 //Added by qt3to4:
@ -51,7 +51,7 @@

 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
-#include <qevent.h>
+#include <QEvent>

 // SHUFFLE all these functions around, the order is just plain stupid
 void BookmarkInfoWidget::showBookmark(const KBookmark &bk) {
--- a/keditbookmarks/dcop.cpp
+++ b/keditbookmarks/dcop.cpp
@ -25,8 +25,8 @@

 #include <stdlib.h>

-#include <qclipboard.h>
-#include <qpainter.h>
+#include <QClipboard>
+#include <QPainter>

 #include <klocale.h>
 #include <kbookmarkmanager.h>
--- a/keditbookmarks/testlink.cpp
+++ b/keditbookmarks/testlink.cpp
@ -25,7 +25,7 @@
 #include "bookmarkiterator.h"

 #include <QTimer>
-#include <qpainter.h>
+#include <QPainter>

 #include <kdebug.h>

--- a/keditbookmarks/toplevel.cpp
+++ b/keditbookmarks/toplevel.cpp
@ -32,8 +32,8 @@

 #include <stdlib.h>

-#include <qclipboard.h>
-#include <qsplitter.h>
+#include <QClipboard>
+#include <QSplitter>
 #include <QLayout>
 #include <QLabel>

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

-#include <qbuttongroup.h>
-#include <qradiobutton.h>
+#include <QButtonGroup>
+#include <QRadioButton>
 #include <QLabel>
 #include <QLayout>
 #include <QCheckBox>
-#include <qwhatsthis.h>
+#include <QWhatsThis>
 #include <QToolTip>
 #include <QComboBox>
 #include <QSpinBox>
 #include <QPushButton>
-#include <qapplication.h>
+#include <QApplication>

 #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.h>
-#include <qvalidator.h> // for KDigitValidator
+#include <QTabWidget>
+#include <QValidator> // for KDigitValidator

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

-#include <qtextstream.h>
-#include <qfileinfo.h>
+#include <QTextStream>
+#include <QFileInfo>
 #include <QDir>
-#include <qclipboard.h>
-#include <qpixmap.h>
+#include <QClipboard>
+#include <QPixmap>
 #include <q3dragobject.h>
 #include <QTextDocument>
 #include <q3ptrlist.h>
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@ -1,7 +1,7 @@
 #include <stdlib.h>

-#include <qfileinfo.h>
-#include <qtextstream.h>
+#include <QFileInfo>
+#include <QTextStream>
 #include <QListIterator>
 #include <kdebug.h>
 #include <kfileitem.h>
--- a/kfind/kquery.h
+++ b/kfind/kquery.h
@ -8,7 +8,7 @@
 #include <QQueue>
 #include <QList>
 #include <QDir>
-#include <qstringlist.h>
+#include <QStringList>

 #include <kio/job.h>
 #include <kurl.h>
--- a/konqueror/KonqViewIface.h
+++ b/konqueror/KonqViewIface.h
@ -22,7 +22,7 @@
 #define __KonqViewIface_h__

 #include <dcopobject.h>
-#include <qstringlist.h>
+#include <QStringList>
 #include <dcopref.h>

 class KonqView;
--- a/konqueror/KonquerorIface.h
+++ b/konqueror/KonquerorIface.h
@ -24,7 +24,7 @@
 #include <dcopobject.h>
 #include <dcopref.h>

-#include <qstringlist.h>
+#include <QStringList>
 /**
 * DCOP interface for konqueror
 */
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@ -1,6 +1,6 @@
 #include "konq_aboutpage.h"

-#include <qtextcodec.h>
+#include <QTextCodec>
 //Added by qt3to4:
 #include <QTextStream>

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

 #include <konq_historymgr.h>
 #include <kactionmenu.h>
-#include <qlist.h>
+#include <QList>

 class HistoryEntry;
 class QMenu;
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@ -17,8 +17,8 @@
   Boston, MA 02110-1301, USA.
 */

-#include <qpainter.h>
-#include <qstyle.h>
+#include <QPainter>
+#include <QStyle>
 //Added by qt3to4:
 #include <QPixmap>
 #include <QPaintEvent>
--- a/konqueror/konq_combo.h
+++ b/konqueror/konq_combo.h
@ -20,7 +20,7 @@
 #ifndef KONQ_COMBO_H
 #define KONQ_COMBO_H

-#include <qevent.h>
+#include <QEvent>
 //Added by qt3to4:
 #include <QPixmap>
 #include <QMouseEvent>
--- a/konqueror/konq_factory.h
+++ b/konqueror/konq_factory.h
@ -23,7 +23,7 @@
 #define __konq_factory_h__

 #include <QString>
-#include <qstringlist.h>
+#include <QStringList>

 #include <klibloader.h>
 #include <ktrader.h>
--- a/konqueror/konq_frame.cc
+++ b/konqueror/konq_frame.cc
@ -31,10 +31,10 @@
 #include <ksqueezedtextlabel.h>
 #include <kstdaccel.h>

-#include <qpainter.h>
-#include <qtoolbutton.h>
+#include <QPainter>
+#include <QToolButton>
 #include <qtabbar.h>
-#include <qmenu.h>
+#include <QMenu>
 #include <qkeysequence.h>
 #include <QProgressBar>
 //Added by qt3to4:
--- a/konqueror/konq_frame.h
+++ b/konqueror/konq_frame.h
@ -21,7 +21,7 @@

 #include "konq_factory.h"

-#include <qpointer.h>
+#include <QPointer>
 #include <QColor>
 #include <QWidget>
 #include <QCheckBox>
--- a/konqueror/konq_guiclients.h
+++ b/konqueror/konq_guiclients.h
@ -22,7 +22,7 @@

 #include <kxmlguiclient.h>
 #include <QObject>
-#include <qhash.h>
+#include <QHash>
 #include <ktrader.h>

 class KAction;
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@ -60,10 +60,10 @@
 #include <unistd.h>

 #include <QFile>
-#include <qclipboard.h>
-#include <qmetaobject.h>
+#include <QClipboard>
+#include <QMetaObject>
 #include <QLayout>
-#include <qfileinfo.h>
+#include <QFileInfo>
 #ifdef Q_WS_X11
 #include <QX11Info>
 #endif
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@ -25,7 +25,7 @@
 #include <QMap>
 #include <QPoint>
 #include <QTimer>
-#include <qpointer.h>
+#include <QPointer>
 //Added by qt3to4:
 #include <QPixmap>
 #include <QByteArray>
--- a/konqueror/konq_misc.cc
+++ b/konqueror/konq_misc.cc
@ -17,7 +17,7 @@
   Boston, MA 02110-1301, USA.
 */

-#include <qstyle.h>
+#include <QStyle>
 #include <QDir>
 //Added by qt3to4:
 #include <QMouseEvent>
--- a/konqueror/konq_openurlrequest.h
+++ b/konqueror/konq_openurlrequest.h
@ -1,7 +1,7 @@
 #ifndef __konqopenurlrequest_h
 #define __konqopenurlrequest_h

-#include <qstringlist.h>
+#include <QStringList>

 #include <kparts/browserextension.h>

--- a/konqueror/konq_run.h
+++ b/konqueror/konq_run.h
@ -21,7 +21,7 @@
 #define __kfm_run_h__

 #include <kparts/browserrun.h>
-#include <qpointer.h>
+#include <QPointer>
 #include <kservice.h>
 #include "konq_openurlrequest.h"

--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@ -21,10 +21,10 @@

 #include "konq_tabs.h"

-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qmenu.h>
-#include <qtoolbutton.h>
+#include <QApplication>
+#include <QClipboard>
+#include <QMenu>
+#include <QToolButton>
 #include <QToolTip>
 //Added by qt3to4:
 #include <QDragMoveEvent>
@ -46,7 +46,7 @@
 #include <kstdaccel.h>
 #include <qtabbar.h>

-#include <qstyle.h>
+#include <QStyle>

 #define DUPLICATE_ID 3
 #define RELOAD_ID 4
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@ -40,8 +40,8 @@
 #include <kcursor.h>
 #include <q3scrollview.h>

-#include <qapplication.h>
-#include <qmetaobject.h>
+#include <QApplication>
+#include <QMetaObject>
 #include <QObject>
 //Added by qt3to4:
 #include <QByteArray>
--- a/konqueror/konq_view.h
+++ b/konqueror/konq_view.h
@ -23,11 +23,11 @@
 #include "konq_mainwindow.h"
 #include "konq_factory.h"

-#include <qlist.h>
+#include <QList>
 #include <QString>
 #include <QObject>
-#include <qstringlist.h>
-#include <qpointer.h>
+#include <QStringList>
+#include <QPointer>
 //Added by qt3to4:
 #include <QEvent>

--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cc
@ -26,7 +26,7 @@
 #include "konq_events.h"
 #include "konq_settingsxt.h"

-#include <qfileinfo.h>
+#include <QFileInfo>

 #include <kaccelgen.h>
 #include <kactionmenu.h>
--- a/konqueror/konq_viewmgr.h
+++ b/konqueror/konq_viewmgr.h
@ -25,7 +25,7 @@
 #include <qnamespace.h>
 #include <QObject>
 #include <QMap>
-#include <qpointer.h>
+#include <QPointer>

 #include <ktrader.h>

--- a/konqueror/kttsplugin/khtmlkttsd.cpp
+++ b/konqueror/kttsplugin/khtmlkttsd.cpp
@ -22,12 +22,12 @@
 #include <kaction.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <qmessagebox.h>
+#include <QMessageBox>
 #include <klocale.h>
 #include <QString>
 #include <QTimer>
 #include <kspeech.h>
-#include <qbuffer.h>
+#include <QBuffer>

 #include <kapplication.h>
 #include <dcopclient.h>
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <assert.h>
 #include <stdio.h>
-#include <qpainter.h>
+#include <QPainter>
 #include <q3header.h>
 #include <kiconloader.h>
 #include "konq_infolistviewitem.h"
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@ -30,7 +30,7 @@
 #include <kuserprofile.h>
 #include <kio/metainfojob.h>

-#include <qstringlist.h>
+#include <QStringList>

 KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent,
                                                QWidget* parentWidget)
--- a/konqueror/listview/konq_infolistviewwidget.h
+++ b/konqueror/listview/konq_infolistviewwidget.h
@ -23,7 +23,7 @@

 #include <kurl.h>
 #include <QMap>
-#include <qpair.h>
+#include <QPair>

 namespace KIO {class MetaInfoJob;}
 class KonqListView;
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@ -38,8 +38,8 @@
 #include <ktoggleaction.h>
 #include <kprotocolinfo.h>

-#include <qapplication.h>
-#include <qclipboard.h>
+#include <QApplication>
+#include <QClipboard>
 #include <q3header.h>
 #include <QRegExp>

--- a/konqueror/listview/konq_listview.h
+++ b/konqueror/listview/konq_listview.h
@ -28,8 +28,8 @@
 #include <kmimetyperesolver.h>


-#include <qlistview.h>
-#include <qstringlist.h>
+#include <QListView>
+#include <QStringList>

 #include <konq_propsview.h>
 #include "konq_listviewwidget.h"
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <assert.h>
 #include <stdio.h>
-#include <qpainter.h>
+#include <QPainter>
 #include <q3header.h>
 #include <kiconloader.h>
 #include <QDateTime>
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@ -33,11 +33,11 @@
 #include <ktoggleaction.h>

 #include <q3header.h>
-#include <qpainter.h>
-#include <qstyle.h>
+#include <QPainter>
+#include <QStyle>
 #include <QTimer>
-#include <qevent.h>
-#include <qcursor.h>
+#include <QEvent>
+#include <QCursor>
 #include <QToolTip>
 #include <qdrag.h>

--- a/konqueror/listview/konq_textviewitem.h
+++ b/konqueror/listview/konq_textviewitem.h
@ -20,7 +20,7 @@
 #ifndef __konq_textviewitem_h__
 #define __konq_textviewitem_h__

-#include <qlistview.h>
+#include <QListView>
 #include <QString>
 #include <kio/global.h>
 #include <klocale.h>
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h
@ -21,7 +21,7 @@
 #ifndef REMOTEENCODING_PLUGIN_H
 #define REMOTEENCODING_PLUGIN_H

-#include <qstringlist.h>
+#include <QStringList>
 #include <kurl.h>
 #include <klibloader.h>
 #include <kparts/plugin.h>
--- a/konqueror/settings/css/kcmcss.cpp
+++ b/konqueror/settings/css/kcmcss.cpp
@ -2,7 +2,7 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QLayout>
-#include <qradiobutton.h>
+#include <QRadioButton>
 #include <q3textbrowser.h>
 //Added by qt3to4:
 #include <QVBoxLayout>
--- a/konqueror/settings/ebrowsing/main.cpp
+++ b/konqueror/settings/ebrowsing/main.cpp
@ -25,7 +25,7 @@

 #include <QLayout>
 #include <QMap>
-#include <qtabwidget.h>
+#include <QTabWidget>
 //Added by qt3to4:
 #include <QVBoxLayout>

--- a/konqueror/settings/ebrowsing/plugins/ikws/ikwsopts.h
+++ b/konqueror/settings/ebrowsing/plugins/ikws/ikwsopts.h
@ -21,7 +21,7 @@
 #define __IKWSOPTS_H___

 #include <QLayout>
-#include <qtabwidget.h>
+#include <QTabWidget>

 #include <kcmodule.h>
 #include <kservice.h>
--- a/konqueror/settings/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/konqueror/settings/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@ -27,7 +27,7 @@
 #include <unistd.h>

 #include <QRegExp>
-#include <qtextcodec.h>
+#include <QTextCodec>

 #include <kurl.h>
 #include <kdebug.h>
--- a/konqueror/settings/ebrowsing/plugins/ikws/kuriikwsfiltereng.h
+++ b/konqueror/settings/ebrowsing/plugins/ikws/kuriikwsfiltereng.h
@ -26,7 +26,7 @@
 #define __KURISearchFILTERENGINE_H__


-#include <qstringlist.h>
+#include <QStringList>
 //Added by qt3to4:

 #include <kservice.h>
--- a/konqueror/settings/filetypes/filegroupdetails.cpp
+++ b/konqueror/settings/filetypes/filegroupdetails.cpp
@ -18,9 +18,9 @@
 #include "filegroupdetails.h"
 #include "typeslistitem.h"
 #include <QLayout>
-#include <qradiobutton.h>
+#include <QRadioButton>
 #include <q3buttongroup.h>
-#include <qwhatsthis.h>
+#include <QWhatsThis>
 #include <kdialog.h>
 #include <klocale.h>

--- a/konqueror/settings/filetypes/filetypedetails.cpp
+++ b/konqueror/settings/filetypes/filetypedetails.cpp
@ -1,6 +1,6 @@
 #include <QCheckBox>
 #include <QLayout>
-#include <qradiobutton.h>
+#include <QRadioButton>

 //Added by qt3to4:
 #include <QVBoxLayout>
--- a/konqueror/settings/filetypes/filetypedetails.h
+++ b/konqueror/settings/filetypes/filetypedetails.h
@ -1,7 +1,7 @@
 #ifndef _FILETYPEDETAILS_H
 #define _FILETYPEDETAILS_H

-#include <qtabwidget.h>
+#include <QTabWidget>
 class TypesListItem;
 class KIconButton;
 class QLineEdit;
--- a/konqueror/settings/filetypes/newtypedlg.h
+++ b/konqueror/settings/filetypes/newtypedlg.h
@ -2,7 +2,7 @@
 #define _NEWTYPEDLG_H

 #include <QString>
-#include <qstringlist.h>
+#include <QStringList>
 #include <kdialogbase.h>

 class KLineEdit;
--- a/konqueror/settings/kio/cache.cpp
+++ b/konqueror/settings/kio/cache.cpp
@ -23,7 +23,7 @@
 #include <QLayout>
 #include <QCheckBox>
 #include <QPushButton>
-#include <qradiobutton.h>
+#include <QRadioButton>
 //Added by qt3to4:
 #include <QVBoxLayout>

--- a/konqueror/settings/kio/kcookiesmain.cpp
+++ b/konqueror/settings/kio/kcookiesmain.cpp
@ -4,7 +4,7 @@
 // This dialog box created by David Faure <faure@kde.org>

 #include <QLayout>
-#include <qtabwidget.h>
+#include <QTabWidget>

 #include <klocale.h>
 #include <kapplication.h>
--- a/konqueror/settings/kio/kcookiesmanagement.cpp
+++ b/konqueror/settings/kio/kcookiesmanagement.cpp
@ -19,14 +19,14 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */

-#include <qapplication.h>
+#include <QApplication>
 #include <QLayout>
 #include <QPushButton>
 #include <q3groupbox.h>
 #include <QLabel>
 #include <QTimer>
 #include <QDateTime>
-#include <qtoolbutton.h>
+#include <QToolButton>
 #include <QVBoxLayout>
 #include <QList>

--- a/konqueror/settings/kio/kcookiesmanagement.h
+++ b/konqueror/settings/kio/kcookiesmanagement.h
@ -25,7 +25,7 @@
 #define __KCOOKIESMANAGEMENT_H

 #include <q3dict.h>
-#include <qstringlist.h>
+#include <QStringList>
 #include <q3listview.h>
 #include <Q3PtrList>

--- a/konqueror/settings/kio/kcookiespolicies.cpp
+++ b/konqueror/settings/kio/kcookiespolicies.cpp
@ -26,8 +26,8 @@
 #include <QLayout>
 #include <QCheckBox>
 #include <QPushButton>
-#include <qradiobutton.h>
-#include <qtoolbutton.h>
+#include <QRadioButton>
+#include <QToolButton>
 //Added by qt3to4:
 #include <QVBoxLayout>

--- a/konqueror/settings/kio/kproxydlg.cpp
+++ b/konqueror/settings/kio/kproxydlg.cpp
@ -23,8 +23,8 @@
 #include <QLayout>
 #include <QRegExp>
 #include <QCheckBox>
-#include <qradiobutton.h>
-#include <qtabwidget.h>
+#include <QRadioButton>
+#include <QTabWidget>
 //Added by qt3to4:
 #include <QVBoxLayout>

--- a/konqueror/settings/kio/kproxydlgbase.h
+++ b/konqueror/settings/kio/kproxydlgbase.h
@ -24,7 +24,7 @@

 #include <QMap>
 #include <QString>
-#include <qstringlist.h>
+#include <QStringList>

 #include <kdialogbase.h>
 #include <kprotocolmanager.h>
--- a/konqueror/settings/kio/main.cpp
+++ b/konqueror/settings/kio/main.cpp
@ -23,7 +23,7 @@
 #include <QFile>
 #include <QLabel>
 #include <QLayout>
-#include <qtabwidget.h>
+#include <QTabWidget>

 #include <kcmoduleloader.h>
 #include <klocale.h>
--- a/konqueror/settings/kio/policydlg.cpp
+++ b/konqueror/settings/kio/policydlg.cpp
@ -17,10 +17,10 @@
 */

 #include <QPushButton>
-#include <qwhatsthis.h>
+#include <QWhatsThis>
 #include <QLayout>
 #include <QLabel>
-#include <qvalidator.h>
+#include <QValidator>

 #include <klineedit.h>
 #include <kcombobox.h>
--- a/konqueror/settings/kio/smbrodlg.cpp
+++ b/konqueror/settings/kio/smbrodlg.cpp
@ -20,7 +20,7 @@

 #include <QLayout>
 #include <QLabel>
-#include <qtextcodec.h>
+#include <QTextCodec>

 #include <klocale.h>
 #include <kconfig.h>
--- a/konqueror/settings/konq/browser.cpp
+++ b/konqueror/settings/konq/browser.cpp
@ -17,7 +17,7 @@
 */

 #include <QLayout>
-#include <qtabwidget.h>
+#include <QTabWidget>
 #include <QFile>
 //Added by qt3to4:
 #include <QVBoxLayout>
--- a/konqueror/settings/konq/desktop.cpp
+++ b/konqueror/settings/konq/desktop.cpp
@ -22,7 +22,7 @@
 #include <QLayout>

 #include <QCheckBox>
-#include <qslider.h>
+#include <QSlider>
 //Added by qt3to4:
 #include <QVBoxLayout>
 #include <QHBoxLayout>
--- a/konqueror/settings/konq/desktopbehavior_impl.cpp
+++ b/konqueror/settings/konq/desktopbehavior_impl.cpp
@ -28,7 +28,7 @@
 #include <QComboBox>
 #include <QPushButton>
 #include <q3buttongroup.h>
-#include <qtabwidget.h>
+#include <QTabWidget>

 //Added by qt3to4:
 #include <QVBoxLayout>
--- a/konqueror/settings/konq/fontopts.h
+++ b/konqueror/settings/konq/fontopts.h
@ -34,7 +34,7 @@
 #ifndef __KONQFONT_OPTIONS_H__
 #define __KONQFONT_OPTIONS_H__

-#include <qstringlist.h>
+#include <QStringList>
 #include <QSpinBox>

 #include <kcmodule.h>
--- a/konqueror/settings/konqhtml/advancedTabDialog.cpp
+++ b/konqueror/settings/konqhtml/advancedTabDialog.cpp
@ -17,12 +17,12 @@
 *  along with this program; if not, write to the Free Software
 */

-#include <qbuttongroup.h>
+#include <QButtonGroup>
 #include <QCheckBox>
 #include <QLayout>
 #include <kpushbutton.h>
-#include <qradiobutton.h>
-#include <qslider.h>
+#include <QRadioButton>
+#include <QSlider>

 #include <kapplication.h>
 #include <dcopclient.h>
--- a/konqueror/settings/konqhtml/appearance.cpp
+++ b/konqueror/settings/konqhtml/appearance.cpp
@ -1,5 +1,5 @@

-#include <qfontdatabase.h>
+#include <QFontDatabase>
 #include <QLabel>
 #include <QLayout>
 #include <q3groupbox.h>
--- a/konqueror/settings/konqhtml/filteropts.cpp
+++ b/konqueror/settings/konqhtml/filteropts.cpp
@ -30,7 +30,7 @@
 #include <QLineEdit>
 #include <QLabel>
 #include <QCheckBox>
-#include <qtextstream.h>
+#include <QTextStream>
 #include <QRegExp>

 #include "filteropts.h"
--- a/konqueror/settings/konqhtml/jspolicies.cpp
+++ b/konqueror/settings/konqhtml/jspolicies.cpp
@ -22,7 +22,7 @@
 #include <q3buttongroup.h>
 #include <QLabel>
 #include <QLayout>
-#include <qradiobutton.h>
+#include <QRadioButton>

 //Added by qt3to4:
 #include <QGridLayout>
--- a/konqueror/settings/konqhtml/main.cpp
+++ b/konqueror/settings/konqhtml/main.cpp
@ -27,7 +27,7 @@

 #include <kapplication.h>
 #include <dcopclient.h>
-#include <qtabwidget.h>
+#include <QTabWidget>
 #include <QLayout>

 #include "jsopts.h"
--- a/konqueror/settings/konqhtml/pluginopts.cpp
+++ b/konqueror/settings/konqhtml/pluginopts.cpp
@ -11,9 +11,9 @@
 #include <QLayout>
 #include <qprogressdialog.h>
 #include <QRegExp>
-#include <qslider.h>
+#include <QSlider>
 #include <q3groupbox.h>
-#include <qtextstream.h>
+#include <QTextStream>

 #include <dcopclient.h>
 #include <kapplication.h>
--- a/konqueror/settings/konqhtml/policydlg.h
+++ b/konqueror/settings/konqhtml/policydlg.h
@ -8,7 +8,7 @@
 #include <kdialogbase.h>

 #include <QLineEdit>
-#include <qstringlist.h>
+#include <QStringList>

 class QLabel;
 class QComboBox;
--- a/konqueror/settings/performance/kcmperformance.cpp
+++ b/konqueror/settings/performance/kcmperformance.cpp
@ -17,7 +17,7 @@
 */

 #include <QLayout>
-#include <qtabwidget.h>
+#include <QTabWidget>
 #include <QVBoxLayout>

 #include <klocale.h>
--- a/konqueror/settings/performance/konqueror.cpp
+++ b/konqueror/settings/performance/konqueror.cpp
@ -21,7 +21,7 @@
 #include <dcopref.h>
 #include <kconfig.h>

-#include <qradiobutton.h>
+#include <QRadioButton>
 #include <QSpinBox>
 #include <QLabel>
 #include <QCheckBox>
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
@ -24,7 +24,7 @@
 #include <signal.h>
 #include <stdlib.h>

-#include <qsocketnotifier.h>
+#include <QSocketNotifier>

 #include <kinputdialog.h>
 #include <kglobalsettings.h>
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@ -19,7 +19,7 @@

 #include <konq_events.h>
 #include <kdebug.h>
-#include <qapplication.h>
+#include <QApplication>
 #include <kacceleratormanager.h>

 KonqSidebar::KonqSidebar( QWidget *parentWidget, QObject *parent, bool universalMode )
--- a/konqueror/sidebar/konqsidebar.h
+++ b/konqueror/sidebar/konqsidebar.h
@ -21,7 +21,7 @@
 #include <kparts/factory.h>
 #include <kparts/event.h>
 #include <kparts/browserextension.h>
-#include <qpointer.h>
+#include <QPointer>
 #include "sidebar_widget.h"
 #include "konqsidebariface_p.h"

--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@ -25,7 +25,7 @@
 #include <kparts/part.h>
 #include <kparts/browserextension.h>
 #include <kio/job.h>
-#include <qpointer.h>
+#include <QPointer>
 #include <kfileitem.h>

 class KonqSidebarPluginPrivate;
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@ -21,7 +21,7 @@
 #include <QDir>
 #include <QPushButton>
 #include <QLayout>
-#include <qstringlist.h>
+#include <QStringList>
 #include <QSplitter>
 #include <Q3PopupMenu>

--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@ -20,7 +20,7 @@
 #include <q3ptrvector.h>
 #include <QTimer>
 #include <QString>
-#include <qpointer.h>
+#include <QPointer>

 #include <k3dockwidget.h>
 #include <kurl.h>
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@ -16,9 +16,9 @@
   Boston, MA 02110-1301, USA.
 */

-#include <qclipboard.h>
-#include <qcursor.h>
-#include <qmenu.h>
+#include <QClipboard>
+#include <QCursor>
+#include <QMenu>
 //Added by qt3to4:
 #include <QGridLayout>
 #include <QDropEvent>
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@ -24,13 +24,13 @@
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kuserprofile.h>
-#include <qapplication.h>
-#include <qclipboard.h>
+#include <QApplication>
+#include <QClipboard>
 #include <kio/paste.h>
 #include <QFile>
-#include <qpainter.h>
+#include <QPainter>
 #include <kiconloader.h>
-#include <qcursor.h>
+#include <QCursor>
 #include <konqmimedata.h>

 #define MYMODULE static_cast<KonqSidebarDirTreeModule*>(module())
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
@ -21,7 +21,7 @@

 #include "konq_sidebartreeitem.h"
 #include <kurl.h>
-#include <qstringlist.h>
+#include <QStringList>
 class QDropEvent;
 class KFileItem;

--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
@ -21,7 +21,7 @@

 #include <konq_sidebartreemodule.h>
 #include <kfileitem.h>
-#include <qpixmap.h>
+#include <QPixmap>
 #include <q3dict.h>
 #include <q3ptrdict.h>

--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@ -19,7 +19,7 @@
 #include <kbookmark.h>
 #include <kprotocolinfo.h>
 #include <konq_faviconmgr.h>
-#include <qpainter.h>
+#include <QPainter>

 #include <assert.h>

--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@ -17,8 +17,8 @@
   Boston, MA 02110-1301, USA.
 */

-#include <qapplication.h>
-#include <qmenu.h>
+#include <QApplication>
+#include <QMenu>

 #include <kaction.h>
 #include <kactioncollection.h>
--- a/konqueror/sidebar/trees/history_module/history_module.h
+++ b/konqueror/sidebar/trees/history_module/history_module.h
@ -22,7 +22,7 @@
 #include <QDateTime>
 #include <QObject>
 #include <q3dict.h>
-#include <qpixmap.h>
+#include <QPixmap>

 #include <kglobal.h>
 #include <klocale.h>
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@ -24,7 +24,7 @@
 #include <QComboBox>
 #include <QLayout>
 #include <QPushButton>
-#include <qradiobutton.h>
+#include <QRadioButton>

 #include <dcopclient.h>
 #include <dcopref.h>
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@ -20,11 +20,11 @@

 #include "konq_sidebartreemodule.h"

-#include <qclipboard.h>
-#include <qcursor.h>
+#include <QClipboard>
+#include <QCursor>
 #include <QDir>
 #include <q3header.h>
-#include <qmenu.h>
+#include <QMenu>
 #include <QTimer>
 //Added by qt3to4:
 #include <QPixmap>
--- a/konqueror/sidebar/trees/konq_sidebartreeitem.h
+++ b/konqueror/sidebar/trees/konq_sidebartreeitem.h
@ -20,8 +20,8 @@
 #ifndef konq_treeitem_h
 #define konq_treeitem_h

-#include <qlistview.h>
-#include <qstringlist.h>
+#include <QListView>
+#include <QStringList>
 #include <Q3ListViewItem>
 #include <Q3DragObject>
 #include <kurl.h>
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@ -26,9 +26,9 @@
 #include <k3urldrag.h>
 #include <q3cstring.h>
 #include <kmimetype.h>
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qcursor.h>
+#include <QApplication>
+#include <QClipboard>
+#include <QCursor>
 #include <qmimedata.h>
 #include <konqmimedata.h>

--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@ -9,9 +9,9 @@
 #include <kiconloader.h>
 #include <k3listviewsearchline.h>

-#include <qclipboard.h>
-#include <qtoolbutton.h>
-#include <qapplication.h>
+#include <QClipboard>
+#include <QToolButton>
+#include <QApplication>

 KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name):
                   KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name)
--- a/konqueror/sidebar/trees/konqsidebar_tree.h
+++ b/konqueror/sidebar/trees/konqsidebar_tree.h
@ -8,7 +8,7 @@
 #include <kparts/browserextension.h>
 #include <kdialogbase.h>
 #include <QComboBox>
-#include <qstringlist.h>
+#include <QStringList>
 #include <klocale.h>
 #include <QLineEdit>
 class KonqSidebarTree;
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@ -17,7 +17,7 @@
 */

 #include "web_module.h"
-#include <qfileinfo.h>
+#include <QFileInfo>
 #include <QSpinBox>
 #include <QTimer>

--- a/kwrite/kwritemain.cpp
+++ b/kwrite/kwritemain.cpp
@ -58,13 +58,13 @@
 #include <kxmlguifactory.h>

 #include <QStackedWidget>
-#include <qpainter.h>
+#include <QPainter>
 #include <QLabel>
-#include <qcursor.h>
+#include <QCursor>
 #include <QMenu>
-#include <qpixmap.h>
+#include <QPixmap>
 #include <QTimer>
-#include <qtextcodec.h>
+#include <QTextCodec>
 #include <QLayout>
 //Added by qt3to4:
 #include <QDragEnterEvent>
--- a/lib/konq/favicons/favicons.cpp
+++ b/lib/konq/favicons/favicons.cpp
@ -20,10 +20,10 @@
 #include <string.h>
 #include <time.h>

-#include <qbuffer.h>
+#include <QBuffer>
 #include <QFile>
 #include <qcache.h>
-#include <qimage.h>
+#include <QImage>
 #include <QTimer>
 #include <QImageReader>

--- a/lib/konq/kfileivi.cc
+++ b/lib/konq/kfileivi.cc
@ -23,7 +23,7 @@
 #include "konq_operations.h"
 #include "konq_settings.h"

-#include <qpainter.h>
+#include <QPainter>
 //Added by qt3to4:
 #include <QPixmap>
 #include <QList>
--- a/Show more
+++ b/Show more