Qt3 -> Qt4 style includes.

qdrawutil.h doesn't seem to have a purely Qt4-style equivalent, so including the directory there disambiguates it from the Qt3 header.

svn path=/trunk/KDE/kdebase/workspace/; revision=770116

client.h

@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <config-X11.h>
 
-#include <qframe.h>
+#include <QFrame>
 #include <QPixmap>
 #include <netwm.h>
 #include <kdebug.h>

clients/modernsystem/modernsys.cpp

@@ -24,7 +24,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <QLayout>
-#include <qdrawutil.h>
+#include <QtGui/qdrawutil.h>
 //Added by qt3to4:
 #include <QPixmap>
 #include <QPaintEvent>

clients/oxygen/oxygenclient.cpp

@@ -33,11 +33,11 @@
 #include <KDebug>
 #include <KColorUtils>
 
-#include <qbitmap.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qtooltip.h>
+#include <QBitmap>
+#include <QLabel>
+#include <QLayout>
+#include <QPainter>
+#include <QToolTip>
 //Added by qt3to4:
 #include <QBoxLayout>
 #include <QGridLayout>

clients/plastik/plastikclient.cpp

@@ -30,7 +30,7 @@
 #include <QLayout>
 #include <QPainter>
 #include <QPixmap>
-#include <qdesktopwidget.h>
+#include <QDesktopWidget>
 
 #include "plastikclient.h"
 #include "plastikbutton.h"

clients/redmond/redmond.cpp

@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "redmond.h"
 
-#include <qdrawutil.h>
+#include <QtGui/qdrawutil.h>
 #include <QDateTime>
 //Added by qt3to4:
 #include <QPixmap>

effects/desktopgrid.cpp

@@ -27,7 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <klocale.h>
 #include <kconfiggroup.h>
 #include <netwm_def.h>
-#include <qevent.h>
+#include <QEvent>
+#include <QMouseEvent>
 
 namespace KWin
 {

effects/desktopgrid.h

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_DESKTOPGRID_H
 
 #include <kwineffects.h>
-#include <qobject.h>
+#include <QObject>
 
 namespace KWin
 {

effects/presentwindows.cpp

@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kdebug.h>
 
 #include <QMouseEvent>
-#include <qpainter.h>
+#include <QPainter>
 
 #include <math.h>
 #include <assert.h>

effects/showfps.h

@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <qdatetime.h>
+#include <QDateTime>
 
 namespace KWin
 {

kcmkwin/kwinoptions/windows.cpp

@@ -33,14 +33,16 @@
 #include <QRadioButton>
 #include <QLabel>
 #include <QComboBox>
-#include <qdesktopwidget.h>
+#include <QDesktopWidget>
 //Added by qt3to4:
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QBoxLayout>
 #include <QVBoxLayout>
-#include <kmessagebox.h>
+#include <QTabWidget>
+#include <QtDBus/QtDBus>
 
+#include <kmessagebox.h>
 #include <klocale.h>
 #include <kcolorbutton.h>
 #include <kconfig.h>
@@ -49,8 +51,6 @@
 #include <kdialog.h>
 #include <kglobal.h>
 #include <kprocess.h>
-#include <QTabWidget>
-#include <QtDBus/QtDBus>
 
 #include <X11/X.h>
 #include <X11/Xlib.h>

popupinfo.cpp

@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kdebug.h>
 #include <klocale.h>
 #include <QApplication>
-#include <qdesktopwidget.h>
+#include <QDesktopWidget>
 #include <kstringhandler.h>
 #include <kglobalsettings.h>
 #include <QX11Info>

scene.h

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_SCENE_H
 #define KWIN_SCENE_H
 
-#include <qdatetime.h>
+#include <QDateTime>
 
 #include "toplevel.h"
 #include "utils.h"

sm.cpp

@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "workspace.h"
 #include "client.h"
 #include <QSocketNotifier>
-#include <qsessionmanager.h>
+#include <QSessionManager>
 #include <kdebug.h>
 
 namespace KWin

sm.h

@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <ksessionmanager.h>
 #include <X11/SM/SMlib.h>
 #include <netwm_def.h>
-#include <qrect.h>
+#include <QRect>
 
 class QSocketNotifier;
 

tabbox.cpp

@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kconfig.h>
 #include <klocale.h>
 #include <QApplication>
-#include <qdesktopwidget.h>
+#include <QDesktopWidget>
 #include <QAction>
 #include <stdarg.h>
 #include <kdebug.h>

toplevel.h

@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <config-X11.h>
 
 #include <assert.h>
-#include <qobject.h>
+#include <QObject>
 #include <kdecoration.h>
 #include <kdebug.h>
 

workspace.h

@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QCursor>
 #include <netwm.h>
 #include <kxmessages.h>
-#include <qdatetime.h>
+#include <QDateTime>
 #include <kmanagerselection.h>
 
 #include "utils.h"