From kde-commits  Mon Jun 30 23:29:21 2008
From: Jan Hambrecht <jaham () gmx ! net>
Date: Mon, 30 Jun 2008 23:29:21 +0000
To: kde-commits
Subject: koffice/libs/main
Message-Id: <1214868561.729752.24958.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=121486857220590

SVN commit 826564 by jaham:

krazy: include fixes


 M  +3 -4      KoChild.h  
 M  +3 -4      KoContainerHandler.cpp  
 M  +4 -5      KoContainerHandler.h  
 M  +8 -9      KoDocument.cpp  
 M  +5 -5      KoFilterChain.h  
 M  +4 -4      KoFilterManager.h  
 M  +5 -6      KoFrame.h  
 M  +4 -5      KoGlobal.cpp  
 M  +1 -1      KoGridData.h  
 M  +2 -2      KoGuidesData.h  
 M  +3 -3      KoID.h  
 M  +4 -4      KoPictureCollection.h  
 M  +1 -1      KoQueryTrader.h  
 M  +8 -8      KoRTree.h  
 M  +0 -2      KoTemplates.cpp  
 M  +8 -8      KoView.h  


--- trunk/koffice/libs/main/KoChild.h #826563:826564
@@ -19,10 +19,9 @@
 #ifndef __koChild_h__
 #define __koChild_h__
 
-#include <QObject>
-#include <QMatrix>
-//Added by qt3to4:
-#include <QPolygon>
+#include <QtCore/QObject>
+#include <QtGui/QMatrix>
+#include <QtGui/QPolygon>
 #include "komain_export.h"
 
 /**
--- trunk/koffice/libs/main/KoContainerHandler.cpp #826563:826564
@@ -23,10 +23,9 @@
 #include <math.h>
 #include <kcursor.h>
 #include <kdebug.h>
-//Added by qt3to4:
-#include <QMouseEvent>
-#include <QKeyEvent>
-#include <QEvent>
+#include <QtCore/QEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
 
 KoEventHandler::KoEventHandler( QObject* target )
 {
--- trunk/koffice/libs/main/KoContainerHandler.h #826563:826564
@@ -20,13 +20,12 @@
 #ifndef HANDLER_H
 #define HANDLER_H
 
-#include <QObject>
-//Added by qt3to4:
-#include <QMouseEvent>
-#include <QEvent>
-#include <KoDocumentChild.h>
+#include <QtCore/QObject>
+#include "KoDocumentChild.h"
 
 class QMatrix;
+class QEvent;
+class QMouseEvent;
 
 class KoView;
 class KoPartResizeHandlerPrivate;
--- trunk/koffice/libs/main/KoDocument.cpp #826563:826564
@@ -40,7 +40,6 @@
 
 #include <kdialog.h>
 #include <kfileitem.h>
-#include <kdebug.h>
 #include <kio/job.h>
 #include <kio/jobuidelegate.h>
 #include <kio/netaccess.h>
@@ -55,14 +54,14 @@
 #include <kdeprintdialog.h>
 #include <knotification.h>
 
-#include <QBuffer>
-#include <QDir>
-#include <QFileInfo>
-#include <QPainter>
-#include <QTimer>
-#include <QDBusConnection>
-#include <QLayout>
-#include <QApplication>
+#include <QtCore/QBuffer>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtGui/QPainter>
+#include <QtCore/QTimer>
+#include <QtDBus/QDBusConnection>
+#include <QtGui/QLayout>
+#include <QtGui/QApplication>
 #include <QtGui/QPrinter>
 #include <QtGui/QPrintDialog>
 
--- trunk/koffice/libs/main/KoFilterChain.h #826563:826564
@@ -19,12 +19,12 @@
 #ifndef __koffice_filter_chain_h__
 #define __koffice_filter_chain_h__
 
-#include <q3asciidict.h>
-#include <q3ptrlist.h>
-#include <QStringList>
+#include <Qt3Support/Q3AsciiDict>
+#include <Qt3Support/Q3PtrList>
+#include <QtCore/QStringList>
 
-#include <KoFilter.h>
-#include <KoQueryTrader.h>
+#include "KoFilter.h"
+#include "KoQueryTrader.h"
 #include <KoStoreDevice.h>
 #include "komain_export.h"
 
--- trunk/koffice/libs/main/KoFilterManager.h #826563:826564
@@ -22,11 +22,11 @@
 #ifndef __koffice_filter_manager_h__
 #define __koffice_filter_manager_h__
 
-#include <QObject>
-#include <QMap>
-#include <QByteArray>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QByteArray>
 
-#include <KoFilterChain.h>
+#include "KoFilterChain.h"
 #include "komain_export.h"
 class KoDocument;
 
--- trunk/koffice/libs/main/KoFrame.h #826563:826564
@@ -20,12 +20,11 @@
 #ifndef __koFrame_h__
 #define __koFrame_h__
 
-#include <QWidget>
-//Added by qt3to4:
-#include <QMouseEvent>
-#include <QResizeEvent>
-#include <QEvent>
-#include <QPaintEvent>
+#include <QtGui/QWidget>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QResizeEvent>
+#include <QtCore/QEvent>
+#include <QtGui/QPaintEvent>
 
 class KoView;
 class KoFramePrivate;
--- trunk/koffice/libs/main/KoGlobal.cpp #826563:826564
@@ -22,11 +22,11 @@
 
 #include <config-prefix.h>
 
-#include <QPaintDevice>
-#include <QFont>
-#include <QFontInfo>
+#include <QtGui/QPaintDevice>
+#include <QtGui/QFont>
+#include <QtGui/QFontInfo>
 #ifdef Q_WS_X11
-#include <QX11Info>
+#include <QtGui/QX11Info>
 #endif
 
 #include <kdebug.h>
@@ -38,7 +38,6 @@
 #include <kstandarddirs.h>
 #include <k3staticdeleter.h>
 #include <kimageio.h>
-#include <kstandarddirs.h>
 
 
 KoGlobal* KoGlobal::s_global = 0L;
--- trunk/koffice/libs/main/KoGridData.h #826563:826564
@@ -22,7 +22,7 @@
 #define KOGRIDDATA_H
 
 #include "komain_export.h"
-#include <QColor>
+#include <QtGui/QColor>
 
 class QPainter;
 class QRectF;
--- trunk/koffice/libs/main/KoGuidesData.h #826563:826564
@@ -22,8 +22,8 @@
 #define KOGUIDESDATA_H
 
 #include "komain_export.h"
-#include <QList>
-#include <qnamespace.h>
+#include <QtCore/QList>
+#include <QtCore/Qt>
 
 class QPainter;
 class KoViewConverter;
--- trunk/koffice/libs/main/KoID.h #826563:826564
@@ -22,9 +22,9 @@
 #ifndef _KO_ID_H_
 #define _KO_ID_H_
 
-#include <QString>
-#include <QMetaType>
-#include <QDebug>
+#include <QtCore/QString>
+#include <QtCore/QMetaType>
+#include <QtCore/QDebug>
 
 /**
  * A KoID is a combination of a user-visible string and a string that uniquely
--- trunk/koffice/libs/main/KoPictureCollection.h #826563:826564
@@ -22,10 +22,10 @@
 #ifndef koPictureCollection_h
 #define koPictureCollection_h
 
-#include <QMap>
-#include <QDomDocument>
-#include <QDomElement>
-#include <q3valuelist.h>
+#include <QtCore/QMap>
+#include <QtXml/QDomDocument>
+#include <QtXml/QDomElement>
+#include <Qt3Support/Q3ValueList>
 
 #include "KoPicture.h"
 
--- trunk/koffice/libs/main/KoQueryTrader.h #826563:826564
@@ -23,7 +23,7 @@
 
 #include <kservice.h>
 #include <ksharedptr.h>
-#include <qlist.h>
+#include <QtCore/QList>
 #include "komain_export.h"
 
 class QObject;
--- trunk/koffice/libs/main/KoRTree.h #826563:826564
@@ -24,17 +24,17 @@
 
 #include <KDebug>
 
-#include <QPair>
-#include <QMap>
-#include <QList>
-#include <QVector>
-#include <QPointF>
-#include <QRectF>
-#include <qvarlengtharray.h>
+#include <QtCore/QPair>
+#include <QtCore/QMap>
+#include <QtCore/QList>
+#include <QtCore/QVector>
+#include <QtCore/QPointF>
+#include <QtCore/QRectF>
+#include <QtCore/QVarLengthArray>
 
 // #define KOFFICE_RTREE_DEBUG
 #ifdef KOFFICE_RTREE_DEBUG
-#include <QPainter>
+#include <QtGui/QPainter>
 #endif
 
 /**
--- trunk/koffice/libs/main/KoTemplates.cpp #826563:826564
@@ -19,8 +19,6 @@
 
 #include "KoTemplates.h"
 
-#include <KoTemplates.h>
-
 #include <QDir>
 #include <QImage>
 #include <QPixmap>
--- trunk/koffice/libs/main/KoView.h #826563:826564
@@ -20,18 +20,18 @@
 #ifndef __koView_h__
 #define __koView_h__
 
-#include <QWidget>
-#include <QPointer>
-//Added by qt3to4:
-#include <QCustomEvent>
+#include <QtGui/QWidget>
+#include <QtCore/QPointer>
+#include <QtCore/QCustomEvent>
 
 #include <kparts/part.h>
 
-#include <KoChild.h>
+#include "KoChild.h"
 #include "komain_export.h"
-#include <KoDocumentChild.h>
-#include <KoFrame.h>
-#include <KoViewChild.h>
+#include "KoDocumentChild.h"
+#include "KoFrame.h"
+#include "KoViewChild.h"
+
 class KoDocument;
 class KoMainWindow;
 class KoPrintJob;