Additional work

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1150565 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

26 files changed, 55 insertions, 64 deletions

diff --git a/qtinterface/tqeditorfactory.h b/qtinterface/tqeditorfactory.h
index d5bdec4..fc638e3 100644
--- a/qtinterface/tqeditorfactory.h
+++ b/qtinterface/tqeditorfactory.h
@@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA.
 
 #ifdef USE_QT3
 
-// Reimplement the QAccel class
+// Reimplement the QEditorFactory class
 // For Qt3, no changes are needed
 
 #include <qeditorfactory.h>
@@ -35,10 +35,12 @@ Boston, MA 02110-1301, USA.
 
 #ifdef USE_QT4
 
-// Reimplement the QAccel class
-// For Qt4, no changes are needed
+// Reimplement the QEditorFactory class
+// For Qt4, some changes are needed
 
-#include <qeditorfactory.h>
+#include <Qt/q3editorfactory.h>
+
+#define QEditorFactory Q3EditorFactory
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqerrormessage.h b/qtinterface/tqerrormessage.h
index 99afd00..501cd26 100644
--- a/qtinterface/tqerrormessage.h
+++ b/qtinterface/tqerrormessage.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QErrorMessage class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qerrormessage.h>
+#include <Qt/qerrormessage.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqeucjpcodec.h b/qtinterface/tqeucjpcodec.h
index 0ae1c27..cf53e9a 100644
--- a/qtinterface/tqeucjpcodec.h
+++ b/qtinterface/tqeucjpcodec.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QEucJpCodec class
-// For Qt4, no changes are needed
-
-#include <qeucjpcodec.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqeuckrcodec.h b/qtinterface/tqeuckrcodec.h
index 5f8dba1..3cf3953 100644
--- a/qtinterface/tqeuckrcodec.h
+++ b/qtinterface/tqeuckrcodec.h
@@ -35,10 +35,7 @@ Boston, MA 02110-1301, USA.
 
 #ifdef USE_QT4
 
-// Reimplement the QEucKrCodec class
-// For Qt4, no changes are needed
-
-#include <qeuckrcodec.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqevent.h b/qtinterface/tqevent.h
index 6f9e77c..ab5840c 100644
--- a/qtinterface/tqevent.h
+++ b/qtinterface/tqevent.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QEvent class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qevent.h>
+#include <Qt/qevent.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqeventloop.h b/qtinterface/tqeventloop.h
index deb7305..fb7f1b7 100644
--- a/qtinterface/tqeventloop.h
+++ b/qtinterface/tqeventloop.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QEventLoop class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qeventloop.h>
+#include <Qt/qeventloop.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqfile.h b/qtinterface/tqfile.h
index 9e4242d..deef8ca 100644
--- a/qtinterface/tqfile.h
+++ b/qtinterface/tqfile.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QFile class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qfile.h>
+#include <Qt/qfile.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqfiledialog.h b/qtinterface/tqfiledialog.h
index 54a03bb..99643bd 100644
--- a/qtinterface/tqfiledialog.h
+++ b/qtinterface/tqfiledialog.h
@@ -36,9 +36,13 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QFileDialog class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qfiledialog.h>
+#include <Qt/q3filedialog.h>
+
+#define QFileDialog Q3FileDialog
+#define QFileIconProvider Q3FileDialog
+#define QFilePreview Q3FileDialog
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqfileinfo.h b/qtinterface/tqfileinfo.h
index 27cfba6..2a1a8f9 100644
--- a/qtinterface/tqfileinfo.h
+++ b/qtinterface/tqfileinfo.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QFileInfo class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qfileinfo.h>
+#include <Qt/qfileinfo.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqfocusdata.h b/qtinterface/tqfocusdata.h
index 2efdfd1..7d56fe7 100644
--- a/qtinterface/tqfocusdata.h
+++ b/qtinterface/tqfocusdata.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QFocusData class
-// For Qt4, no changes are needed
-
-#include <qfocusdata.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqfont.h b/qtinterface/tqfont.h
index 65e01ed..3061fb4 100644
--- a/qtinterface/tqfont.h
+++ b/qtinterface/tqfont.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QFont class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qfont.h>
+#include <Qt/qfont.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqfontdatabase.h b/qtinterface/tqfontdatabase.h
index 7c6bff8..027803b 100644
--- a/qtinterface/tqfontdatabase.h
+++ b/qtinterface/tqfontdatabase.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QFontDatabase class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qfontdatabase.h>
+#include <Qt/qfontdatabase.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqfontdialog.h b/qtinterface/tqfontdialog.h
index eba7c20..a5e7f86 100644
--- a/qtinterface/tqfontdialog.h
+++ b/qtinterface/tqfontdialog.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QFontDialog class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qfontdialog.h>
+#include <Qt/qfontdialog.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqfontinfo.h b/qtinterface/tqfontinfo.h
index 31d149a..9f893b3 100644
--- a/qtinterface/tqfontinfo.h
+++ b/qtinterface/tqfontinfo.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QFontInfo class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qfontinfo.h>
+#include <Qt/qfontinfo.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqfontmetrics.h b/qtinterface/tqfontmetrics.h
index 0c1a53f..72fc079 100644
--- a/qtinterface/tqfontmetrics.h
+++ b/qtinterface/tqfontmetrics.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QFontMetrics class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qfontmetrics.h>
+#include <Qt/qfontmetrics.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqframe.h b/qtinterface/tqframe.h
index 83af4fc..9ba1ded 100644
--- a/qtinterface/tqframe.h
+++ b/qtinterface/tqframe.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QFrame class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qframe.h>
+#include <Qt/qframe.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqftp.h b/qtinterface/tqftp.h
index 725fe3e..0f1df8f 100644
--- a/qtinterface/tqftp.h
+++ b/qtinterface/tqftp.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QFtp class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qftp.h>
+#include <Qt/qftp.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqgarray.h b/qtinterface/tqgarray.h
index 0c19f31..a7d5d48 100644
--- a/qtinterface/tqgarray.h
+++ b/qtinterface/tqgarray.h
@@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QGArray class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qgarray.h>
+#include <Qt/q3garray.h>
+
+#define QGArray Q3GArray
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqgb18030codec.h b/qtinterface/tqgb18030codec.h
index 4b4fca7..13e1281 100644
--- a/qtinterface/tqgb18030codec.h
+++ b/qtinterface/tqgb18030codec.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QGb18030Codec class
-// For Qt4, no changes are needed
-
-#include <qgb18030codec.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqgcache.h b/qtinterface/tqgcache.h
index 0a5c78e..659005c 100644
--- a/qtinterface/tqgcache.h
+++ b/qtinterface/tqgcache.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QGCache class
-// For Qt4, no changes are needed
-
-#include <qgcache.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqgdict.h b/qtinterface/tqgdict.h
index ad75978..a37fd8d 100644
--- a/qtinterface/tqgdict.h
+++ b/qtinterface/tqgdict.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QGDict class
-// For Qt4, no changes are needed
-
-#include <qgdict.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqgl.h b/qtinterface/tqgl.h
index 58270d4..22e9d48 100644
--- a/qtinterface/tqgl.h
+++ b/qtinterface/tqgl.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QGL class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qgl.h>
+#include <Qt/qgl.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqglcolormap.h b/qtinterface/tqglcolormap.h
index d674468..fa9f621 100644
--- a/qtinterface/tqglcolormap.h
+++ b/qtinterface/tqglcolormap.h
@@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QGLColormap class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
 
-#include <qglcolormap.h>
+#include <Qt/qglcolormap.h>
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqglist.h b/qtinterface/tqglist.h
index 5025efb..4b75c9f 100644
--- a/qtinterface/tqglist.h
+++ b/qtinterface/tqglist.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QGList class
-// For Qt4, no changes are needed
-
-#include <qglist.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqgplugin.h b/qtinterface/tqgplugin.h
index 39fe982..ca95d3c 100644
--- a/qtinterface/tqgplugin.h
+++ b/qtinterface/tqgplugin.h
@@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA.
 #ifdef USE_QT4
 
 // Reimplement the QGPlugin class
-// For Qt4, no changes are needed
-
-#include <qgplugin.h>
+// For Qt4, this class was removed!
 
 #endif // USE_QT4
 
diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h
index 36d8a58..59aec11 100644
--- a/qtinterface/tqt.h
+++ b/qtinterface/tqt.h
@@ -22,8 +22,8 @@ Boston, MA 02110-1301, USA.
 #ifndef TQT_H
 #define TQT_H
 
-//#define USE_QT3
-#define USE_QT4
+#define USE_QT3
+//#define USE_QT4
 
 #ifdef USE_QT4
 #define QT3_SUPPORT
@@ -32,4 +32,4 @@ Boston, MA 02110-1301, USA.
 //#include "kdemacros.h.in"
 //#define TQT_EXPORT KDE_EXPORT
 
-#endif /* TQT_H */
\ No newline at end of file
+#endif /* TQT_H */