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

svn path=/trunk/KDE/kdebase/nsplugins/; revision=539617

kdepasswd/kcm/chfacedlg.cpp

@@ -25,14 +25,14 @@
  * @author Braden MacDonald
  */
 
-#include <qstring.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <QString>
+#include <QLayout>
+#include <QLabel>
 #include <qpixmap.h>
 #include <qimage.h>
-#include <qpushbutton.h>
-#include <qdir.h>
-#include <qcheckbox.h>
+#include <QPushButton>
+#include <QDir>
+#include <QCheckBox>
 //Added by qt3to4:
 #include <QVBoxLayout>
 #include <QHBoxLayout>

kdepasswd/kcm/chfacedlg.h

@@ -28,7 +28,7 @@
 #ifndef CHFACEDLG_H
 #define CHFACEDLG_H
 
-#include <qobject.h>
+#include <QObject>
 //Added by qt3to4:
 #include <QPixmap>
 #include <kdialogbase.h>

kdepasswd/kcm/main.cpp

@@ -20,13 +20,13 @@
  *
  */
 
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qlineedit.h>
+#include <QLayout>
+#include <QLabel>
+#include <QLineEdit>
 #include <qevent.h>
 #include <qpixmap.h>
 #include <qstringlist.h>
-#include <qlayout.h>
+#include <QLayout>
 //Added by qt3to4:
 #include <QDragEnterEvent>
 #include <QVBoxLayout>

kdialog/kdialog.cpp

@@ -24,10 +24,10 @@
 #include <stdlib.h>
 #include <iostream>
 
-#include <qfile.h>
-#include <qdatastream.h>
-#include <qregexp.h>
-#include <qtimer.h>
+#include <QFile>
+#include <QDataStream>
+#include <QRegExp>
+#include <QTimer>
 #include <qdesktopwidget.h>
 #include <kmessagebox.h>
 #include <kapplication.h>

kdialog/klistboxdialog.cpp

@@ -17,7 +17,7 @@
 //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
-#include <qlabel.h>
+#include <QLabel>
 #include <q3listbox.h>
 #include <kvbox.h>
 

kdialog/widgets.cpp

@@ -30,10 +30,10 @@
 #include <kdebug.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <qlabel.h>
+#include <QLabel>
 #include <ktextedit.h>
 #include <kvbox.h>
-#include <qfile.h>
+#include <QFile>
 #include <qdesktopwidget.h>
 #include <qtextstream.h>
 #include <QTextCursor>

keditbookmarks/actionsimpl.h

@@ -20,7 +20,7 @@
 #ifndef __actionsimpl_h
 #define __actionsimpl_h
 
-#include <qobject.h>
+#include <QObject>
 
 class ActionsImpl : public QObject
 {

keditbookmarks/bookmarkinfo.cpp

@@ -24,11 +24,11 @@
 
 #include <stdlib.h>
 
-#include <qtimer.h>
+#include <QTimer>
 #include <qclipboard.h>
 #include <qsplitter.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <QLayout>
+#include <QLabel>
 //Added by qt3to4:
 #include <QVBoxLayout>
 #include <QGridLayout>

keditbookmarks/bookmarkinfo.h

@@ -22,7 +22,7 @@
 #define __bookmarkinfo_h
 
 #include <kbookmark.h>
-#include <qwidget.h>
+#include <QWidget>
 
 class BookmarkListView;
 class EditCommand;

keditbookmarks/bookmarkiterator.cpp

@@ -24,7 +24,7 @@
 #include "toplevel.h"
 
 #include <kdebug.h>
-#include <qtimer.h>
+#include <QTimer>
 #include <assert.h>
 
 BookmarkIterator::BookmarkIterator(QList<KBookmark> bks) : m_bklist(bks) {

keditbookmarks/bookmarkiterator.h

@@ -20,7 +20,7 @@
 #ifndef __bookmarkiterator_h
 #define __bookmarkiterator_h
 
-#include <qobject.h>
+#include <QObject>
 #include <QList>
 #include <kbookmark.h>
 

keditbookmarks/exporters.cpp

@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 
-#include <qfile.h>
+#include <QFile>
 //Added by qt3to4:
 #include <QTextStream>
 

keditbookmarks/importers.cpp

@@ -24,7 +24,7 @@
 #include "commands.h"
 #include "toplevel.h"
 
-#include <qregexp.h>
+#include <QRegExp>
 #include <kdebug.h>
 #include <klocale.h>
 

keditbookmarks/importers.h

@@ -26,7 +26,7 @@
 
 #include <kcommand.h>
 
-#include <qobject.h>
+#include <QObject>
 #include <QString>
 
 class KBookmark;

keditbookmarks/kbookmarkmerger.cpp

@@ -32,9 +32,9 @@
 
 #include <dcopclient.h>
 
-#include <qdir.h>
+#include <QDir>
 #include <qdom.h>
-#include <qfile.h>
+#include <QFile>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>

keditbookmarks/testlink.cpp

@@ -24,7 +24,7 @@
 #include "commands.h"
 #include "bookmarkiterator.h"
 
-#include <qtimer.h>
+#include <QTimer>
 #include <qpainter.h>
 
 #include <kdebug.h>

keditbookmarks/testlink.h

@@ -20,7 +20,7 @@
 #ifndef __testlink_h
 #define __testlink_h
 
-#include <qobject.h>
+#include <QObject>
 
 #include <kio/job.h>
 #include <kbookmark.h>

keditbookmarks/toplevel.cpp

@@ -34,8 +34,8 @@
 
 #include <qclipboard.h>
 #include <qsplitter.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <QLayout>
+#include <QLabel>
 
 #include <kaction.h>
 #include <kactioncollection.h>

kfind/kdatecombo.cpp

@@ -4,7 +4,7 @@
  *
  ***********************************************************************/
 
-#include <qtimer.h>
+#include <QTimer>
 //Added by qt3to4:
 #include <QMouseEvent>
 #include <QKeyEvent>

kfind/kdatecombo.h

@@ -7,9 +7,9 @@
 #ifndef KDATECOMBO_H
 #define KDATECOMBO_H
 
-#include <qwidget.h>
-#include <qcombobox.h>
-#include <qdatetime.h>
+#include <QWidget>
+#include <QComboBox>
+#include <QDateTime>
 
 /**
   *@author Beppe Grimaldi

kfind/kfind.cpp

@@ -26,15 +26,15 @@
  **********************************************************************/
 
 #include <kpushbutton.h>
-#include <qlayout.h>
+#include <QLayout>
 #include <kvbox.h>
 
 #include <kdialog.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kseparator.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
+#include <QLineEdit>
+#include <QCheckBox>
 #include <kstdguiitem.h>
 
 #include "kftabdlg.h"

kfind/kfind.h

@@ -7,7 +7,7 @@
 #ifndef KFIND_H
 #define KFIND_H
 
-#include <qwidget.h>
+#include <QWidget>
 #include <kfileitem.h>
 #include <kdirlister.h>
 

kfind/kfinddlg.cpp

@@ -4,8 +4,8 @@
  *
  **********************************************************************/
 
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <QLayout>
+#include <QPushButton>
 
 #include <klocale.h>
 #include <kglobal.h>

kfind/kfindpart.cpp

@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include <qdir.h>
+#include <QDir>
 #include <kinstance.h>
 
 class KonqDirPart;

kfind/kftabdlg.cpp

@@ -6,14 +6,14 @@
 
 #include <qbuttongroup.h>
 #include <qradiobutton.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
+#include <QLabel>
+#include <QLayout>
+#include <QCheckBox>
 #include <qwhatsthis.h>
-#include <qtooltip.h>
-#include <qcombobox.h>
-#include <qspinbox.h>
-#include <qpushbutton.h>
+#include <QToolTip>
+#include <QComboBox>
+#include <QSpinBox>
+#include <QPushButton>
 #include <qapplication.h>
 
 #include <kcalendarsystem.h>

kfind/kfwin.cpp

@@ -16,7 +16,7 @@
 
 #include <qtextstream.h>
 #include <qfileinfo.h>
-#include <qdir.h>
+#include <QDir>
 #include <qclipboard.h>
 #include <qpixmap.h>
 #include <q3dragobject.h>

kfind/kquery.h

@@ -3,11 +3,11 @@
 
 #include <time.h>
 
-#include <qobject.h>
-#include <qregexp.h>
+#include <QObject>
+#include <QRegExp>
 #include <QQueue>
 #include <QList>
-#include <qdir.h>
+#include <QDir>
 #include <qstringlist.h>
 
 #include <kio/job.h>

kfind/main.cpp

@@ -1,5 +1,5 @@
-#include <qdir.h>
-#include <qfile.h>
+#include <QDir>
+#include <QFile>
 
 #include <kapplication.h>
 #include <klocale.h>

konqueror/KonquerorIface.cc

@@ -28,7 +28,7 @@
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <qfile.h>
+#include <QFile>
 //Added by qt3to4:
 #ifdef Q_WS_X11
 #include <QX11Info>

konqueror/about/konq_aboutpage.cc

@@ -17,8 +17,8 @@
 #include <ktoolinvocation.h>
 
 #include <assert.h>
-#include <qfile.h>
-#include <qdir.h>
+#include <QFile>
+#include <QDir>
 
 K_EXPORT_COMPONENT_FACTORY( konq_aboutpage, KonqAboutPageFactory )
 

konqueror/client/kfmclient.cc

@@ -23,7 +23,7 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include <qdir.h>
+#include <QDir>
 
 #include <ktoolinvocation.h>
 #include <kio/job.h>
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <kservice.h>
-#include <qregexp.h>
+#include <QRegExp>
 
 #include "kfmclient.h"
 #include "KonquerorIface_stub.h"

konqueror/delayedinitializer.cc

@@ -19,7 +19,7 @@
 
 
 #include "delayedinitializer.h"
-#include <qtimer.h>
+#include <QTimer>
 //Added by qt3to4:
 #include <QEvent>
 

konqueror/delayedinitializer.h

@@ -20,7 +20,7 @@
 #ifndef __delayedinitializer_h__
 #define __delayedinitializer_h__
 
-#include <qobject.h>
+#include <QObject>
 //Added by qt3to4:
 #include <QEvent>
 

konqueror/iconview/konq_iconview.cc

@@ -25,7 +25,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include <qfile.h>
+#include <QFile>
 
 #include <kactioncollection.h>
 #include <kactionmenu.h>
@@ -46,8 +46,8 @@
 #include <ktrader.h>
 #include <ktoggleaction.h>
 
-#include <qregexp.h>
-#include <qdatetime.h>
+#include <QRegExp>
+#include <QDateTime>
 
 #include <config.h>
 

konqueror/konq_extensionmanager.cc

@@ -14,8 +14,8 @@
     *************************************************************************
 */
 
-#include <qlayout.h>
-#include <qtimer.h>
+#include <QLayout>
+#include <QTimer>
 //Added by qt3to4:
 #include <QVBoxLayout>
 

konqueror/konq_factory.cc

@@ -31,8 +31,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-#include <qwidget.h>
-#include <qfile.h>
+#include <QWidget>
+#include <QFile>
 
 #include <assert.h>
 

konqueror/konq_factory.h

@@ -22,7 +22,7 @@
 #ifndef __konq_factory_h__
 #define __konq_factory_h__
 
-#include <qstring.h>
+#include <QString>
 #include <qstringlist.h>
 
 #include <klibloader.h>

konqueror/konq_frame.cc

@@ -19,7 +19,7 @@
 #include <math.h>
 
 #include <qpainter.h>
-#include <qlayout.h>
+#include <QLayout>
 #include <qtoolbutton.h>
 #include <qtabbar.h>
 #include <qmenu.h>

konqueror/konq_frame.h

@@ -22,11 +22,11 @@
 #include "konq_factory.h"
 
 #include <qpointer.h>
-#include <qcolor.h>
-#include <qwidget.h>
+#include <QColor>
+#include <QWidget>
 #include <qsplitter.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
+#include <QCheckBox>
+#include <QLabel>
 //Added by qt3to4:
 #include <QPixmap>
 #include <QPaintEvent>

konqueror/konq_guiclients.h

@@ -21,7 +21,7 @@
 #define __konq_guiclients_h__
 
 #include <kxmlguiclient.h>
-#include <qobject.h>
+#include <QObject>
 #include <qhash.h>
 #include <ktrader.h>
 

konqueror/konq_main.cc

@@ -31,9 +31,9 @@
 #include <kdebug.h>
 #include <kcmdlineargs.h>
 #include <dcopclient.h>
-#include <qfile.h>
+#include <QFile>
 #include <QApplication>
-#include <qwidget.h>
+#include <QWidget>
 
 #ifdef Q_WS_X11
 #include <QX11Info>

konqueror/konq_mainwindow.cc

@@ -59,10 +59,10 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <qfile.h>
+#include <QFile>
 #include <qclipboard.h>
 #include <qmetaobject.h>
-#include <qlayout.h>
+#include <QLayout>
 #include <qfileinfo.h>
 #ifdef Q_WS_X11
 #include <QX11Info>

konqueror/konq_mainwindow.h

@@ -22,9 +22,9 @@
 #ifndef __konq_mainwindow_h__
 #define __konq_mainwindow_h__
 
-#include <qmap.h>
-#include <qpoint.h>
-#include <qtimer.h>
+#include <QMap>
+#include <QPoint>
+#include <QTimer>
 #include <qpointer.h>
 //Added by qt3to4:
 #include <QPixmap>

konqueror/konq_misc.cc

@@ -18,7 +18,7 @@
 */
 
 #include <qstyle.h>
-#include <qdir.h>
+#include <QDir>
 //Added by qt3to4:
 #include <QMouseEvent>
 #include <QDragEnterEvent>

konqueror/konq_misc.h

@@ -111,7 +111,7 @@ public:
 
 };
 
-#include <qlabel.h>
+#include <QLabel>
 
 class KonqDraggableLabel : public QLabel
 {

konqueror/konq_profiledlg.cc

@@ -21,12 +21,12 @@
 #include "konq_viewmgr.h"
 #include "konq_settingsxt.h"
 
-#include <qcheckbox.h>
-#include <qdir.h>
+#include <QCheckBox>
+#include <QDir>
 #include <kvbox.h>
-#include <qlabel.h>
+#include <QLabel>
 #include <q3header.h>
-#include <qlineedit.h>
+#include <QLineEdit>
 
 #include <k3listview.h>
 #include <kdebug.h>

konqueror/konq_profiledlg.h

@@ -23,7 +23,7 @@
 #include <kdialogbase.h>
 
 #include <q3listview.h>
-#include <qmap.h>
+#include <QMap>
 //Added by qt3to4:
 #include <QGridLayout>
 

konqueror/konq_tabs.cc

@@ -25,7 +25,7 @@
 #include <qclipboard.h>
 #include <qmenu.h>
 #include <qtoolbutton.h>
-#include <qtooltip.h>
+#include <QToolTip>
 //Added by qt3to4:
 #include <QDragMoveEvent>
 #include <QDropEvent>

konqueror/konq_view.cc

@@ -42,7 +42,7 @@
 
 #include <qapplication.h>
 #include <qmetaobject.h>
-#include <qobject.h>
+#include <QObject>
 //Added by qt3to4:
 #include <QByteArray>
 #include <QEvent>

konqueror/konq_view.h

@@ -24,8 +24,8 @@
 #include "konq_factory.h"
 
 #include <qlist.h>
-#include <qstring.h>
-#include <qobject.h>
+#include <QString>
+#include <QObject>
 #include <qstringlist.h>
 #include <qpointer.h>
 //Added by qt3to4:

konqueror/konq_viewmgr.h

@@ -23,8 +23,8 @@
 #include "konq_factory.h"
 
 #include <qnamespace.h>
-#include <qobject.h>
-#include <qmap.h>
+#include <QObject>
+#include <QMap>
 #include <qpointer.h>
 
 #include <ktrader.h>

konqueror/kttsplugin/khtmlkttsd.cpp

@@ -24,8 +24,8 @@
 #include <kiconloader.h>
 #include <qmessagebox.h>
 #include <klocale.h>
-#include <qstring.h>
-#include <qtimer.h>
+#include <QString>
+#include <QTimer>
 #include <kspeech.h>
 #include <qbuffer.h>
 

konqueror/listview/konq_infolistviewitem.h

@@ -21,7 +21,7 @@
 #define __konq_infolistviewitems_h__
 
 #include "konq_listview.h"
-#include <qstring.h>
+#include <QString>
 #include <kicontheme.h>
 
 // for mode_t

konqueror/listview/konq_infolistviewwidget.h

@@ -22,7 +22,7 @@
 #include "konq_listviewwidget.h"
 
 #include <kurl.h>
-#include <qmap.h>
+#include <QMap>
 #include <qpair.h>
 
 namespace KIO {class MetaInfoJob;}

konqueror/listview/konq_listview.cc

@@ -41,7 +41,7 @@
 #include <qapplication.h>
 #include <qclipboard.h>
 #include <q3header.h>
-#include <qregexp.h>
+#include <QRegExp>
 
 #include <assert.h>
 #include <string.h>

konqueror/listview/konq_listviewitems.h

@@ -21,7 +21,7 @@
 #define __konq_listviewitems_h__
 
 #include <k3listview.h>
-#include <qstring.h>
+#include <QString>
 #include <kicontheme.h>
 
 

konqueror/listview/konq_listviewwidget.cc

@@ -35,10 +35,10 @@
 #include <q3header.h>
 #include <qpainter.h>
 #include <qstyle.h>
-#include <qtimer.h>
+#include <QTimer>
 #include <qevent.h>
 #include <qcursor.h>
-#include <qtooltip.h>
+#include <QToolTip>
 #include <qdrag.h>
 
 #include <stdlib.h>

konqueror/listview/konq_textviewitem.h

@@ -21,7 +21,7 @@
 #define __konq_textviewitem_h__
 
 #include <qlistview.h>
-#include <qstring.h>
+#include <QString>
 #include <kio/global.h>
 #include <klocale.h>
 #include "konq_listviewitems.h"

konqueror/listview/konq_treeviewitem.h

@@ -20,7 +20,7 @@
 #ifndef __konq_treeviewitem_h__
 #define __konq_treeviewitem_h__
 
-#include <qstring.h>
+#include <QString>
 #include "konq_listviewitems.h"
 
 class KFileItem;

konqueror/preloader/preloader.h

@@ -21,7 +21,7 @@
 #define _KONQUEROR_PRELOADER_H
 
 #include <kdedmodule.h>
-#include <qtimer.h>
+#include <QTimer>
 
 class KonqyPreloader
     : public KDEDModule

konqueror/settings/css/kcmcss.cpp

@@ -1,7 +1,7 @@
 
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qlayout.h>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLayout>
 #include <qradiobutton.h>
 #include <q3textbrowser.h>
 //Added by qt3to4:

konqueror/settings/css/kcmcss.h

@@ -19,7 +19,7 @@
 #define __KCMCSS_H__
 
 
-#include <qmap.h>
+#include <QMap>
 
 #include <kcmodule.h>
 

konqueror/settings/css/template.cpp

@@ -1,6 +1,6 @@
 
 
-#include <qfile.h>
+#include <QFile>
 //Added by qt3to4:
 #include <QTextStream>
 

konqueror/settings/css/template.h

@@ -2,8 +2,8 @@
 #define __TEMPLATE_H__
 
 
-#include <qstring.h>
-#include <qmap.h>
+#include <QString>
+#include <QMap>
 
 class CSSTemplate
 {

konqueror/settings/ebrowsing/filteropts.cpp

@@ -21,8 +21,8 @@
 
 #include <unistd.h>
 
-#include <qlayout.h>
-#include <qlabel.h>
+#include <QLayout>
+#include <QLabel>
 
 #include <dcopclient.h>
 #include <klocale.h>

konqueror/settings/ebrowsing/main.cpp

@@ -23,8 +23,8 @@
 
 #include <unistd.h>
 
-#include <qlayout.h>
-#include <qmap.h>
+#include <QLayout>
+#include <QMap>
 #include <qtabwidget.h>
 //Added by qt3to4:
 #include <QVBoxLayout>

konqueror/settings/ebrowsing/plugins/ikws/ikwsopts.cpp

@@ -17,11 +17,11 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <qcheckbox.h>
-#include <qfile.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <QCheckBox>
+#include <QFile>
+#include <QLabel>
+#include <QLayout>
+#include <QPushButton>
 //Added by qt3to4:
 #include <QVBoxLayout>
 

konqueror/settings/ebrowsing/plugins/ikws/ikwsopts.h

@@ -20,7 +20,7 @@
 #ifndef __IKWSOPTS_H___
 #define __IKWSOPTS_H___
 
-#include <qlayout.h>
+#include <QLayout>
 #include <qtabwidget.h>
 
 #include <kcmodule.h>

konqueror/settings/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp

@@ -26,7 +26,7 @@
 
 #include <unistd.h>
 
-#include <qregexp.h>
+#include <QRegExp>
 #include <qtextcodec.h>
 
 #include <kurl.h>

konqueror/settings/ebrowsing/plugins/ikws/searchproviderdlg.cpp

@@ -16,9 +16,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <QLabel>
+#include <QLayout>
+#include <QPushButton>
 
 #include <kapplication.h>
 #include <klocale.h>

konqueror/settings/ebrowsing/plugins/localdomain/localdomainurifilter.cpp

@@ -26,8 +26,8 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
-#include <qregexp.h>
-#include <qfile.h>
+#include <QRegExp>
+#include <QFile>
 
 #define HOSTPORT_PATTERN "[a-zA-Z0-9][a-zA-Z0-9+-]*(?:\\:[0-9]{1,5})?(?:/[\\w:@&=+$,-.!~*'()]*)*"
 

konqueror/settings/ebrowsing/plugins/localdomain/localdomainurifilter.h

@@ -26,7 +26,7 @@
 #include <dcopobject.h>
 #include <kgenericfactory.h>
 #include <kurifilter.h>
-#include <qregexp.h>
+#include <QRegExp>
 
 class KInstance;
 class KProcess;

konqueror/settings/ebrowsing/plugins/shorturi/kshorturifilter.cpp

@@ -26,8 +26,8 @@
 #include <pwd.h>
 #include <sys/stat.h>
 
-#include <qdir.h>
-#include <qregexp.h>
+#include <QDir>
+#include <QRegExp>
 //Added by qt3to4:
 #include <QList>
 

konqueror/settings/filetypes/filegroupdetails.cpp

@@ -17,7 +17,7 @@
 */
 #include "filegroupdetails.h"
 #include "typeslistitem.h"
-#include <qlayout.h>
+#include <QLayout>
 #include <qradiobutton.h>
 #include <q3buttongroup.h>
 #include <qwhatsthis.h>

konqueror/settings/filetypes/filegroupdetails.h

@@ -18,7 +18,7 @@
 #ifndef _FILEGROUPDETAILS_H
 #define _FILEGROUPDETAILS_H
 
-#include <qwidget.h>
+#include <QWidget>
 class TypesListItem;
 class Q3ButtonGroup;
 

konqueror/settings/filetypes/filetypedetails.cpp

@@ -1,5 +1,5 @@
-#include <qcheckbox.h>
-#include <qlayout.h>
+#include <QCheckBox>
+#include <QLayout>
 #include <qradiobutton.h>
 
 //Added by qt3to4:

konqueror/settings/filetypes/filetypesview.cpp

@@ -1,8 +1,8 @@
 
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qtimer.h>
+#include <QLabel>
+#include <QLayout>
+#include <QPushButton>
+#include <QTimer>
 //Added by qt3to4:
 #include <QGridLayout>
 #include <QHBoxLayout>

konqueror/settings/filetypes/filetypesview.h

@@ -2,7 +2,7 @@
 #define _FILETYPESVIEW_H
 
 #include <q3ptrlist.h>
-#include <qmap.h>
+#include <QMap>
 //Added by qt3to4:
 #include <QLabel>
 #include <QStackedWidget>

konqueror/settings/filetypes/keditfiletype.cpp

@@ -19,7 +19,7 @@
 #include "typeslistitem.h"
 #include "keditfiletype.h"
 
-#include <qfile.h>
+#include <QFile>
 
 #include <dcopclient.h>
 #include <kapplication.h>

konqueror/settings/filetypes/kservicelistwidget.cpp

@@ -20,8 +20,8 @@
 
 #include <unistd.h>
 
-#include <qpushbutton.h>
-#include <qlayout.h>
+#include <QPushButton>
+#include <QLayout>
 
 //Added by qt3to4:
 #include <QGridLayout>

konqueror/settings/filetypes/kserviceselectdlg.cpp

@@ -22,7 +22,7 @@
 
 #include <klocale.h>
 #include <kvbox.h>
-#include <qlabel.h>
+#include <QLabel>
 
 KServiceSelectDlg::KServiceSelectDlg( const QString& /*serviceType*/, const QString& /*value*/, QWidget *parent )
     : KDialogBase( parent, "serviceSelectDlg", true,

konqueror/settings/filetypes/newtypedlg.cpp

@@ -1,8 +1,8 @@
 
-#include <qlayout.h>
-#include <qlabel.h>
+#include <QLayout>
+#include <QLabel>
 
-#include <qcombobox.h>
+#include <QComboBox>
 //Added by qt3to4:
 #include <QVBoxLayout>
 #include <QFrame>

konqueror/settings/filetypes/newtypedlg.h

@@ -1,7 +1,7 @@
 #ifndef _NEWTYPEDLG_H
 #define _NEWTYPEDLG_H
 
-#include <qstring.h>
+#include <QString>
 #include <qstringlist.h>
 #include <kdialogbase.h>
 

konqueror/settings/kio/cache.cpp

@@ -19,10 +19,10 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
+#include <QLabel>
+#include <QLayout>
+#include <QCheckBox>
+#include <QPushButton>
 #include <qradiobutton.h>
 //Added by qt3to4:
 #include <QVBoxLayout>

konqueror/settings/kio/kcookiesmain.cpp

@@ -3,7 +3,7 @@
 // First version of cookies configuration by Waldo Bastian <bastian@kde.org>
 // This dialog box created by David Faure <faure@kde.org>
 
-#include <qlayout.h>
+#include <QLayout>
 #include <qtabwidget.h>
 
 #include <klocale.h>

konqueror/settings/kio/kcookiesmanagement.cpp

@@ -20,12 +20,12 @@
  */
 
 #include <qapplication.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <QLayout>
+#include <QPushButton>
 #include <q3groupbox.h>
-#include <qlabel.h>
-#include <qtimer.h>
-#include <qdatetime.h>
+#include <QLabel>
+#include <QTimer>
+#include <QDateTime>
 #include <qtoolbutton.h>
 #include <QVBoxLayout>
 #include <QList>

konqueror/settings/kio/kcookiespolicies.cpp

@@ -23,9 +23,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
+#include <QLayout>
+#include <QCheckBox>
+#include <QPushButton>
 #include <qradiobutton.h>
 #include <qtoolbutton.h>
 //Added by qt3to4:

konqueror/settings/kio/kcookiespolicies.h

@@ -26,7 +26,7 @@
 #ifndef __KCOOKIESPOLICIES_H
 #define __KCOOKIESPOLICIES_H
 
-#include <qmap.h>
+#include <QMap>
 #include <kcmodule.h>
 
 #include "policydlg.h"

konqueror/settings/kio/kenvvarproxydlg.cpp

@@ -21,10 +21,10 @@
 
 #include <stdlib.h>
 
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
+#include <QLabel>
+#include <QLayout>
+#include <QCheckBox>
+#include <QPushButton>
 
 #include <kdebug.h>
 #include <klocale.h>

konqueror/settings/kio/kenvvarproxydlg.h

@@ -21,7 +21,7 @@
 #ifndef KENVVAR_PROXY_DIALOG_H
 #define KENVVAR_PROXY_DIALOG_H
 
-#include <qmap.h>
+#include <QMap>
 
 #include "kproxydlgbase.h"
 

konqueror/settings/kio/kmanualproxydlg.cpp

@@ -19,11 +19,11 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
+#include <QLabel>
+#include <QLayout>
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QPushButton>
 
 #include <kdebug.h>
 #include <klocale.h>

konqueror/settings/kio/kproxydlg.cpp

@@ -19,10 +19,10 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qregexp.h>
-#include <qcheckbox.h>
+#include <QLabel>
+#include <QLayout>
+#include <QRegExp>
+#include <QCheckBox>
 #include <qradiobutton.h>
 #include <qtabwidget.h>
 //Added by qt3to4:

konqueror/settings/kio/kproxydlg.h

@@ -22,7 +22,7 @@
 #ifndef _KPROXYDIALOG_H
 #define _KPROXYDIALOG_H
 
-#include <qstring.h>
+#include <QString>
 
 #include <kcmodule.h>
 

konqueror/settings/kio/kproxydlgbase.h

@@ -22,8 +22,8 @@
 #ifndef KPROXY_DIALOG_BASE_H
 #define KPROXY_DIALOG_BASE_H
 
-#include <qmap.h>
-#include <qstring.h>
+#include <QMap>
+#include <QString>
 #include <qstringlist.h>
 
 #include <kdialogbase.h>

konqueror/settings/kio/main.cpp

@@ -20,9 +20,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <qfile.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <QFile>
+#include <QLabel>
+#include <QLayout>
 #include <qtabwidget.h>
 
 #include <kcmoduleloader.h>

konqueror/settings/kio/netpref.cpp

@@ -1,5 +1,5 @@
-#include <qlayout.h>
-#include <qcheckbox.h>
+#include <QLayout>
+#include <QCheckBox>
 
 #include <q3groupbox.h>
 //Added by qt3to4:

konqueror/settings/kio/policydlg.cpp

@@ -16,10 +16,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <qpushbutton.h>
+#include <QPushButton>
 #include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <QLayout>
+#include <QLabel>
 #include <qvalidator.h>
 
 #include <klineedit.h>

konqueror/settings/kio/policydlg.h

@@ -19,7 +19,7 @@
 #ifndef _POLICYDLG_H
 #define _POLICYDLG_H
 
-#include <qstring.h>
+#include <QString>
 
 #include <kdialogbase.h>
 

konqueror/settings/kio/smbrodlg.cpp

@@ -18,8 +18,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <qlayout.h>
-#include <qlabel.h>
+#include <QLayout>
+#include <QLabel>
 #include <qtextcodec.h>
 
 #include <klocale.h>

konqueror/settings/kio/smbrodlg.h

@@ -21,9 +21,9 @@
 #ifndef __SMBRODLG_H
 #define __SMBRODLG_H
 
-#include <qwidget.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
+#include <QWidget>
+#include <QLineEdit>
+#include <QCheckBox>
 
 #include <kcmodule.h>