summaryrefslogtreecommitdiffstats
path: root/qtinterface
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-21 21:18:36 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-21 21:18:36 +0000
commit5e266f8f85ead4c33f7a9d227a82b0461df7e09a (patch)
tree29ee823e9a8b87b3213db0a14fbe7148edcd5365 /qtinterface
parentce4313a6257fee35d97e07d22956f42916d4905c (diff)
downloadtqtinterface-5e266f8f85ead4c33f7a9d227a82b0461df7e09a.tar.gz
tqtinterface-5e266f8f85ead4c33f7a9d227a82b0461df7e09a.zip
Significant upgrades to the TQT system; kdelibs and kdebase now build and run correctly through TQT and Qt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1152745 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'qtinterface')
-rw-r--r--qtinterface/Makefile.am11
-rw-r--r--qtinterface/TODO13
-rwxr-xr-xqtinterface/dcopidl-tqt11
-rwxr-xr-xqtinterface/dcopidl2cpp-tqt28
-rwxr-xr-xqtinterface/dcopidlng-tqt11
-rwxr-xr-xqtinterface/mcopidl-tqt11
-rwxr-xr-xqtinterface/moc-tqt11
-rw-r--r--qtinterface/tqaccel.h2
-rw-r--r--qtinterface/tqapplication.h229
-rw-r--r--qtinterface/tqasciicache.h2
-rw-r--r--qtinterface/tqasciidict.h6
-rw-r--r--qtinterface/tqbitarray.h2
-rw-r--r--qtinterface/tqcache.h2
-rw-r--r--qtinterface/tqcanvas.h17
-rw-r--r--qtinterface/tqcleanuphandler.h2
-rw-r--r--qtinterface/tqcolor.h4
-rw-r--r--qtinterface/tqcstring.h2
-rw-r--r--qtinterface/tqdatabrowser.h2
-rw-r--r--qtinterface/tqdatatable.h2
-rw-r--r--qtinterface/tqdataview.h4
-rw-r--r--qtinterface/tqdatetimeedit.h2
-rw-r--r--qtinterface/tqdeepcopy.h2
-rw-r--r--qtinterface/tqdict.h2
-rw-r--r--qtinterface/tqdns.h2
-rw-r--r--qtinterface/tqdockarea.h2
-rw-r--r--qtinterface/tqdockwindow.h2
-rw-r--r--qtinterface/tqdragobject.h2
-rw-r--r--qtinterface/tqdropsite.h2
-rw-r--r--qtinterface/tqeditorfactory.h2
-rw-r--r--qtinterface/tqfiledialog.h4
-rw-r--r--qtinterface/tqgarray.h2
-rw-r--r--qtinterface/tqgrid.h4
-rw-r--r--qtinterface/tqgridview.h2
-rw-r--r--qtinterface/tqguardedptr.h2
-rw-r--r--qtinterface/tqhbox.h2
-rw-r--r--qtinterface/tqhbuttongroup.h2
-rw-r--r--qtinterface/tqheader.h2
-rw-r--r--qtinterface/tqhgroupbox.h2
-rw-r--r--qtinterface/tqhttp.h5
-rw-r--r--qtinterface/tqiconset.h2
-rw-r--r--qtinterface/tqiconview.h5
-rw-r--r--qtinterface/tqintcache.h4
-rw-r--r--qtinterface/tqintdict.h4
-rw-r--r--qtinterface/tqlistbox.h5
-rw-r--r--qtinterface/tqlistview.h7
-rw-r--r--qtinterface/tqlocalfs.h2
-rw-r--r--qtinterface/tqmainwindow.h2
-rw-r--r--qtinterface/tqmemarray.h4
-rw-r--r--qtinterface/tqmultilineedit.h4
-rw-r--r--qtinterface/tqnetworkprotocol.h7
-rw-r--r--qtinterface/tqpaintdevicemetrics.h4
-rw-r--r--qtinterface/tqpainter.h4
-rw-r--r--qtinterface/tqpicture.h2
-rw-r--r--qtinterface/tqpointarray.h2
-rw-r--r--qtinterface/tqpopupmenu.h2
-rw-r--r--qtinterface/tqprogressbar.h4
-rw-r--r--qtinterface/tqprogressdialog.h2
-rw-r--r--qtinterface/tqptrcollection.h4
-rw-r--r--qtinterface/tqptrdict.h5
-rw-r--r--qtinterface/tqptrlist.h4
-rw-r--r--qtinterface/tqptrqueue.h2
-rw-r--r--qtinterface/tqptrstack.h2
-rw-r--r--qtinterface/tqptrvector.h2
-rw-r--r--qtinterface/tqrangecontrol.h2
-rw-r--r--qtinterface/tqscrollview.h2
-rw-r--r--qtinterface/tqserversocket.h2
-rw-r--r--qtinterface/tqshared.h2
-rw-r--r--qtinterface/tqsimplerichtext.h2
-rw-r--r--qtinterface/tqsocket.h2
-rw-r--r--qtinterface/tqsocketdevice.h2
-rw-r--r--qtinterface/tqsortedlist.h2
-rw-r--r--qtinterface/tqsqlcursor.h2
-rw-r--r--qtinterface/tqsqlfield.h2
-rw-r--r--qtinterface/tqsqlform.h2
-rw-r--r--qtinterface/tqsqlpropertymap.h4
-rw-r--r--qtinterface/tqsqlselectcursor.h2
-rw-r--r--qtinterface/tqstrlist.h4
-rw-r--r--qtinterface/tqstylesheet.h2
-rw-r--r--qtinterface/tqsyntaxhighlighter.h2
-rwxr-xr-xqtinterface/tqt-replace17
-rw-r--r--qtinterface/tqt.h984
-rw-r--r--qtinterface/tqtabdialog.h2
-rw-r--r--qtinterface/tqtable.h6
-rw-r--r--qtinterface/tqtextedit.h4
-rw-r--r--qtinterface/tqtextview.h2
-rw-r--r--qtinterface/tqtimer.h74
-rw-r--r--qtinterface/tqtoolbar.h2
-rw-r--r--qtinterface/tqurloperator.h8
-rw-r--r--qtinterface/tqvaluelist.h2
-rw-r--r--qtinterface/tqvaluestack.h2
-rw-r--r--qtinterface/tqvaluevector.h4
-rw-r--r--qtinterface/tqvbox.h4
-rw-r--r--qtinterface/tqvbuttongroup.h2
-rw-r--r--qtinterface/tqvgroupbox.h2
-rw-r--r--qtinterface/tqwhatsthis.h2
-rw-r--r--qtinterface/tqwidgetfactory.h2
-rw-r--r--qtinterface/tqwidgetstack.h2
-rw-r--r--qtinterface/tqwmatrix.h2
98 files changed, 1117 insertions, 544 deletions
diff --git a/qtinterface/Makefile.am b/qtinterface/Makefile.am
index 43c1ff2..97841eb 100644
--- a/qtinterface/Makefile.am
+++ b/qtinterface/Makefile.am
@@ -25,7 +25,7 @@ KDE_OPTIONS = qtonly
INCLUDES = $(all_includes)
-bin_PROGRAMS =
+bin_PROGRAMS =
check_PROGRAMS =
lib_LTLIBRARIES = libtqt.la
@@ -131,3 +131,12 @@ METASOURCES = AUTO
DOXYGEN_REFERENCES = tqt
DOXYGEN_EXCLUDE = KDE-ICE
include ../admin/Doxyfile.am
+
+install-exec-local:
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ cp -Rp "$(srcdir)/tqt-replace" "$(DESTDIR)$(bindir)/"
+ cp -Rp "$(srcdir)/moc-tqt" "$(DESTDIR)$(bindir)/"
+ cp -Rp "$(srcdir)/mcopidl-tqt" "$(DESTDIR)$(bindir)/"
+ cp -Rp "$(srcdir)/dcopidl-tqt" "$(DESTDIR)$(bindir)/"
+ cp -Rp "$(srcdir)/dcopidlng-tqt" "$(DESTDIR)$(bindir)/"
+ cp -Rp "$(srcdir)/dcopidl2cpp-tqt" "$(DESTDIR)$(bindir)/" \ No newline at end of file
diff --git a/qtinterface/TODO b/qtinterface/TODO
index 34906e3..4f94baf 100644
--- a/qtinterface/TODO
+++ b/qtinterface/TODO
@@ -46,4 +46,15 @@ This may have something to do with the template class junk
Weird headers with no classes (???):
-tqdrawutil \ No newline at end of file
+tqdrawutil
+
+
+
+
+Here's the latest proposed structure of the library...
+
+All of Trinity now uses TQ<something>, e.g. QTimer is now TQTimer. Depending on the QT3 or QT4 flag, certain defines are set in tqt.h like the following:
+#define TQCString QCString (for Qt3)
+#define TQCString Q3CString (for Qt4)
+
+If needed, the TQ function can subclass the Q or Q3 function and reimplement the missing features. However, the vast majority of classes (those that have not changed much) will be handled with the simple #define statements, greatly simplifying and speeding implementation. \ No newline at end of file
diff --git a/qtinterface/dcopidl-tqt b/qtinterface/dcopidl-tqt
new file mode 100755
index 0000000..ea2443c
--- /dev/null
+++ b/qtinterface/dcopidl-tqt
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [[ $1 == "" ]]; then
+ echo "Usage: dcopidl-tqt <dcopidl_binary> <input_file>"
+else
+ cp -Rp $2 $2.bkp
+# tqt-replace $2
+ $1 $2
+ cp -Rp $2.bkp $2
+ rm -f $2.bkp
+fi
diff --git a/qtinterface/dcopidl2cpp-tqt b/qtinterface/dcopidl2cpp-tqt
new file mode 100755
index 0000000..e41d002
--- /dev/null
+++ b/qtinterface/dcopidl2cpp-tqt
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+if [[ $1 == "" ]]; then
+ echo "Usage: dcopidl2cpp-tqt <dcopidl2cpp_binary> <options> <input_kidl_file>"
+else
+ # This is more complicated than the others, as the kidl file must be parsed and the input files extracted
+
+ # Extract the source working directory and all input files
+ INPUT_FILES=$(cat ${BASH_ARGV[0]} | grep "<SOURCE>" | sed 's/<SOURCE>//g' | sed 's/<\/SOURCE>//g' | xargs)
+ INPUT_DIR=${INPUT_FILES%/*}
+
+ # Redirect all input files
+ for curfile in $INPUT_FILES
+ do
+ cp -Rp "$curfile" "$curfile.bkp"
+# tqt-replace "$curfile"
+ done
+
+ # Execute the dcopidl2cpp command
+ $@
+
+ # Undo input file redirection
+ for curfile in $INPUT_FILES
+ do
+ cp -Rp "$curfile.bkp" "$curfile"
+ rm -f "$curfile.bkp"
+ done
+fi
diff --git a/qtinterface/dcopidlng-tqt b/qtinterface/dcopidlng-tqt
new file mode 100755
index 0000000..230f975
--- /dev/null
+++ b/qtinterface/dcopidlng-tqt
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [[ $1 == "" ]]; then
+ echo "Usage: dcopidlng-tqt <dcopidlng_binary> <options> <input_file>"
+else
+ cp -Rp ${BASH_ARGV[0]} ${BASH_ARGV[0]}.bkp
+# tqt-replace ${BASH_ARGV[0]}
+ $@
+ cp -Rp ${BASH_ARGV[0]}.bkp ${BASH_ARGV[0]}
+ rm -f ${BASH_ARGV[0]}.bkp
+fi
diff --git a/qtinterface/mcopidl-tqt b/qtinterface/mcopidl-tqt
new file mode 100755
index 0000000..3b390c5
--- /dev/null
+++ b/qtinterface/mcopidl-tqt
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [[ $1 == "" ]]; then
+ echo "Usage: mcopidl-tqt <mcopidl_binary> <options> <input_file>"
+else
+ cp -Rp ${BASH_ARGV[0]} ${BASH_ARGV[0]}.bkp
+# tqt-replace ${BASH_ARGV[0]}
+ $@
+ cp -Rp ${BASH_ARGV[0]}.bkp ${BASH_ARGV[0]}
+ rm -f ${BASH_ARGV[0]}.bkp
+fi
diff --git a/qtinterface/moc-tqt b/qtinterface/moc-tqt
new file mode 100755
index 0000000..e8c3d53
--- /dev/null
+++ b/qtinterface/moc-tqt
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [[ $1 == "" ]]; then
+ echo "Usage: moc-tqt <moc_binary> <input_file> <output_file>"
+else
+ cp -Rp $2 $2.bkp
+ tqt-replace $2
+ $1 $2 -o $3
+ cp -Rp $2.bkp $2
+ rm -f $2.bkp
+fi
diff --git a/qtinterface/tqaccel.h b/qtinterface/tqaccel.h
index 5a6c38c..002a49f 100644
--- a/qtinterface/tqaccel.h
+++ b/qtinterface/tqaccel.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3accel.h>
-#define QAccel Q3Accel
-
#endif // USE_QT4
#endif /* TQACCEL_H */ \ No newline at end of file
diff --git a/qtinterface/tqapplication.h b/qtinterface/tqapplication.h
index 5a3b53f..4ab78c3 100644
--- a/qtinterface/tqapplication.h
+++ b/qtinterface/tqapplication.h
@@ -39,236 +39,7 @@ Boston, MA 02110-1301, USA.
// Reimplement the QApplication class
// For Qt4, some changes are needed
-// Linker tricks required to override a class without changing its name
-#define QApplication IQApplication
#include <Qt/qapplication.h>
-#undef QApplication
-
-class QApplication : public IQApplication {
-// This is taken straight from the Qt header file, with all Q_OBJECT, slot, and similar keywords stripped out.
-// Also, all inline functions must be converted to simple declarations.
-// This is the last and most obnoxious part of the linker tricks mentioned above
-// Essentially, the compiler needs to know that these Q functions exist so that the above I functions
-// are not attempted to link. Instead, these empty declarations allow the linker to pull in the complete Q function
-// from the Qt toolkit in use. Convoluted, yes, but it should make maintinance MUCH easier as the Qt API changes.
-public:
- enum Type { Tty, GuiClient, GuiServer };
-
-#ifdef Q_WS_S60
- typedef CApaApplication * (*QS60MainApplicationFactory)();
-#endif
-
-#ifndef qdoc
- QApplication(int &argc, char **argv, int = QT_VERSION);
- QApplication(int &argc, char **argv, bool GUIenabled, int = QT_VERSION);
- QApplication(int &argc, char **argv, Type, int = QT_VERSION);
-#if defined(Q_WS_X11)
- QApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0, int = QT_VERSION);
- QApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0, int = QT_VERSION);
-#endif
-#if defined(Q_WS_S60)
- QApplication(QApplication::QS60MainApplicationFactory factory, int &argc, char **argv, int = QT_VERSION);
-#endif
-#endif
- virtual ~QApplication();
-
- static Type type();
-
- static QStyle *style();
- static void setStyle(QStyle*);
- static QStyle *setStyle(const QString&);
- enum ColorSpec { NormalColor=0, CustomColor=1, ManyColor=2 };
- static int colorSpec();
- static void setColorSpec(int);
- static void setGraphicsSystem(const QString &);
-
-#ifndef QT_NO_CURSOR
- static QCursor *overrideCursor();
- static void setOverrideCursor(const QCursor &);
- static void changeOverrideCursor(const QCursor &);
- static void restoreOverrideCursor();
-#endif
- static QPalette palette();
- static QPalette palette(const QWidget *);
- static QPalette palette(const char *className);
- static void setPalette(const QPalette &, const char* className = 0);
- static QFont font();
- static QFont font(const QWidget*);
- static QFont font(const char *className);
- static void setFont(const QFont &, const char* className = 0);
- static QFontMetrics fontMetrics();
-
- static void setWindowIcon(const QIcon &icon);
- static QIcon windowIcon();
-
- static QWidgetList allWidgets();
- static QWidgetList topLevelWidgets();
-
- static QDesktopWidget *desktop();
-
- static QWidget *activePopupWidget();
- static QWidget *activeModalWidget();
-#ifndef QT_NO_CLIPBOARD
- static QClipboard *clipboard();
-#endif
- static QWidget *focusWidget();
-
- static QWidget *activeWindow();
- static void setActiveWindow(QWidget* act);
-
- static QWidget *widgetAt(const QPoint &p);
- static inline QWidget *widgetAt(int x, int y) { return widgetAt(QPoint(x, y)); }
- static QWidget *topLevelAt(const QPoint &p);
- static inline QWidget *topLevelAt(int x, int y) { return topLevelAt(QPoint(x, y)); }
-
- static void syncX();
- static void beep();
- static void alert(QWidget *widget, int duration = 0);
-
- static Qt::KeyboardModifiers keyboardModifiers();
- static Qt::MouseButtons mouseButtons();
-
- static void setDesktopSettingsAware(bool);
- static bool desktopSettingsAware();
-
- static void setCursorFlashTime(int);
- static int cursorFlashTime();
-
- static void setDoubleClickInterval(int);
- static int doubleClickInterval();
-
- static void setKeyboardInputInterval(int);
- static int keyboardInputInterval();
-
-#ifndef QT_NO_WHEELEVENT
- static void setWheelScrollLines(int);
- static int wheelScrollLines();
-#endif
- static void setGlobalStrut(const QSize &);
- static QSize globalStrut();
-
- static void setStartDragTime(int ms);
- static int startDragTime();
- static void setStartDragDistance(int l);
- static int startDragDistance();
-
- static void setLayoutDirection(Qt::LayoutDirection direction);
- static Qt::LayoutDirection layoutDirection();
-
- static inline bool isRightToLeft() { return layoutDirection() == Qt::RightToLeft; }
- static inline bool isLeftToRight() { return layoutDirection() == Qt::LeftToRight; }
-
- static bool isEffectEnabled(Qt::UIEffect);
- static void setEffectEnabled(Qt::UIEffect, bool enable = true);
-
-#if defined(Q_WS_MAC)
- virtual bool macEventFilter(EventHandlerCallRef, EventRef);
-#endif
-#if defined(Q_WS_X11)
- virtual bool x11EventFilter(XEvent *);
- virtual int x11ClientMessage(QWidget*, XEvent*, bool passive_only);
- int x11ProcessEvent(XEvent*);
-#endif
-#if defined(Q_OS_SYMBIAN)
- int symbianProcessEvent(const QSymbianEvent *event);
- virtual bool symbianEventFilter(const QSymbianEvent *event);
-#endif
-#if defined(Q_WS_QWS)
- virtual bool qwsEventFilter(QWSEvent *);
- int qwsProcessEvent(QWSEvent*);
- void qwsSetCustomColors(QRgb *colortable, int start, int numColors);
-#ifndef QT_NO_QWS_MANAGER
- static QDecoration &qwsDecoration();
- static void qwsSetDecoration(QDecoration *);
- static QDecoration *qwsSetDecoration(const QString &decoration);
-#endif
-#endif
-
-
-#if defined(Q_WS_WIN)
- void winFocus(QWidget *, bool);
- static void winMouseButtonUp();
-#endif
-#ifndef QT_NO_SESSIONMANAGER
- // session management
- bool isSessionRestored() const;
- QString sessionId() const;
- QString sessionKey() const;
- virtual void commitData(QSessionManager& sm);
- virtual void saveState(QSessionManager& sm);
-#endif
- void setInputContext(QInputContext *);
- QInputContext *inputContext() const;
-
- static QLocale keyboardInputLocale();
- static Qt::LayoutDirection keyboardInputDirection();
-
- static int exec();
- bool notify(QObject *, QEvent *);
-
-
- static void setQuitOnLastWindowClosed(bool quit);
- static bool quitOnLastWindowClosed();
-
-#ifdef QT_KEYPAD_NAVIGATION
- static Q_DECL_DEPRECATED void setKeypadNavigationEnabled(bool);
- static bool keypadNavigationEnabled();
- static void setNavigationMode(Qt::NavigationMode mode);
- static Qt::NavigationMode navigationMode();
-#endif
-
- void lastWindowClosed();
- void focusChanged(QWidget *old, QWidget *now);
- void fontDatabaseChanged();
-#ifndef QT_NO_SESSIONMANAGER
- void commitDataRequest(QSessionManager &sessionManager);
- void saveStateRequest(QSessionManager &sessionManager);
-#endif
-
-public:
- QString styleSheet() const;
-#ifndef QT_NO_STYLE_STYLESHEET
- void setStyleSheet(const QString& sheet);
-#endif
-#ifdef Q_WS_WINCE
- void setAutoMaximizeThreshold(const int threshold);
- int autoMaximizeThreshold() const;
-#endif
- void setAutoSipEnabled(const bool enabled);
- bool autoSipEnabled() const;
- static void closeAllWindows();
- static void aboutQt();
-
-protected:
-#if defined(Q_WS_QWS)
- void setArgs(int, char **);
-#endif
- bool event(QEvent *);
- bool compressEvent(QEvent *, QObject *receiver, QPostEventList *);
-
-#if defined(Q_INTERNAL_QAPP_SRC) || defined(qdoc)
- QApplication(int &argc, char **argv);
- QApplication(int &argc, char **argv, bool GUIenabled);
- QApplication(int &argc, char **argv, Type);
-#if defined(Q_WS_X11)
- QApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0);
- QApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0);
-#endif
-#if defined(Q_WS_S60) || defined(qdoc)
- QApplication(QApplication::QS60MainApplicationFactory factory, int &argc, char **argv);
-#endif
-#endif
-
-// End Qt header file copy
-
-// This is where the new member functions should be placed
-// Unlike the above copied block, these members must be defined in the associated .cpp file,
-// and they should usually do something. Feel free to include as many Qt files as needed
-// in the cpp source file, but DO NOT include them in this header file.
-public:
- void processOneEvent();
- enum ColorMode {ColorSpec};
-};
#endif // USE_QT4
diff --git a/qtinterface/tqasciicache.h b/qtinterface/tqasciicache.h
index 01e71fd..dfbcc76 100644
--- a/qtinterface/tqasciicache.h
+++ b/qtinterface/tqasciicache.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3asciicache.h>
-#define QAsciiCache Q3AsciiCache
-
#endif // USE_QT4
#endif /* TQASCIICACHE_H */ \ No newline at end of file
diff --git a/qtinterface/tqasciidict.h b/qtinterface/tqasciidict.h
index 8a6a877..5cfe505 100644
--- a/qtinterface/tqasciidict.h
+++ b/qtinterface/tqasciidict.h
@@ -40,12 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3asciidict.h>
-#define QAsciiDict Q3AsciiDict
-#define QAsciiDictIterator Q3AsciiDictIterator
-
-// template<class type>
-// class QAsciiDict : public Q3AsciiDict<type> {};
-
#endif // USE_QT4
#endif /* TQASCIIDICT_H */ \ No newline at end of file
diff --git a/qtinterface/tqbitarray.h b/qtinterface/tqbitarray.h
index 3286e0f..659ad89 100644
--- a/qtinterface/tqbitarray.h
+++ b/qtinterface/tqbitarray.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/qbitarray.h>
-#define QBitVal QBitRef
-
#endif // USE_QT4
#endif /* TQBITARRAY_H */ \ No newline at end of file
diff --git a/qtinterface/tqcache.h b/qtinterface/tqcache.h
index 6a39380..49f698b 100644
--- a/qtinterface/tqcache.h
+++ b/qtinterface/tqcache.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3cache.h>
-#define QCache Q3Cache
-
#endif // USE_QT4
#endif /* TQCACHE_H */ \ No newline at end of file
diff --git a/qtinterface/tqcanvas.h b/qtinterface/tqcanvas.h
index 2d2ff11..3dc4c09 100644
--- a/qtinterface/tqcanvas.h
+++ b/qtinterface/tqcanvas.h
@@ -36,25 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QCanvas class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3canvas.h>
-#define QCanvas Q3Canvas
-#define QCanvasEllipse Q3CanvasEllipse
-#define QCanvasItem Q3CanvasItem
-#define QCanvasItemList Q3CanvasItemList
-#define QCanvasLine Q3CanvasLine
-#define QCanvasPixmap Q3CanvasPixmap
-#define QCanvasPixmapArray Q3CanvasPixmapArray
-#define QCanvasPolygon Q3CanvasPolygon
-#define QCanvasPolygonalItem Q3CanvasPolygonalItem
-#define QCanvasRectangle Q3CanvasRectangle
-#define QCanvasSpline Q3CanvasSpline
-#define QCanvasSprite Q3CanvasSprite
-#define QCanvasText Q3CanvasText
-#define QCanvasView Q3CanvasView
-
#endif // USE_QT4
#endif /* TQCANVAS_H */ \ No newline at end of file
diff --git a/qtinterface/tqcleanuphandler.h b/qtinterface/tqcleanuphandler.h
index 87f54bf..153a73f 100644
--- a/qtinterface/tqcleanuphandler.h
+++ b/qtinterface/tqcleanuphandler.h
@@ -33,7 +33,7 @@ Boston, MA 02110-1301, USA.
#endif // USE_QT3
-#ifdef USE_QT3
+#ifdef USE_QT4
// Reimplement the QCleanupHandler class
// For Qt4, some changes are needed
diff --git a/qtinterface/tqcolor.h b/qtinterface/tqcolor.h
index 4c3dacc..9dd8601 100644
--- a/qtinterface/tqcolor.h
+++ b/qtinterface/tqcolor.h
@@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA.
// Reimplement the QColor class
// For Qt3, no changes are needed
-#include <Qt/qcolor.h>
+#include <qcolor.h>
#endif // USE_QT3
@@ -38,7 +38,7 @@ Boston, MA 02110-1301, USA.
// Reimplement the QColor class
// For Qt4, no changes are needed
-#include <qcolor.h>
+#include <Qt/qcolor.h>
#endif // USE_QT4
diff --git a/qtinterface/tqcstring.h b/qtinterface/tqcstring.h
index 455c1cf..1ecbea2 100644
--- a/qtinterface/tqcstring.h
+++ b/qtinterface/tqcstring.h
@@ -47,8 +47,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3cstring.h>
-#define QCString Q3CString
-
#endif // USE_QT4
#endif /* TQCSTRING_H */ \ No newline at end of file
diff --git a/qtinterface/tqdatabrowser.h b/qtinterface/tqdatabrowser.h
index 6bc05ed..261317c 100644
--- a/qtinterface/tqdatabrowser.h
+++ b/qtinterface/tqdatabrowser.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3databrowser.h>
-#define QDataBrowser Q3DataBrowser
-
#endif // USE_QT4
#endif /* TQDATABROWSER_H */ \ No newline at end of file
diff --git a/qtinterface/tqdatatable.h b/qtinterface/tqdatatable.h
index 314e0ad..ae16ac8 100644
--- a/qtinterface/tqdatatable.h
+++ b/qtinterface/tqdatatable.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3datatable.h>
-#define QDataTable Q3DataTable
-
#endif // USE_QT4
#endif /* TQDATATABLE_H */ \ No newline at end of file
diff --git a/qtinterface/tqdataview.h b/qtinterface/tqdataview.h
index eb331f1..7500971 100644
--- a/qtinterface/tqdataview.h
+++ b/qtinterface/tqdataview.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QDataView class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3dataview.h>
-#define QDataView Q3DataView
-
#endif // USE_QT4
#endif /* TQDATAVIEW_H */ \ No newline at end of file
diff --git a/qtinterface/tqdatetimeedit.h b/qtinterface/tqdatetimeedit.h
index 1239645..92609ec 100644
--- a/qtinterface/tqdatetimeedit.h
+++ b/qtinterface/tqdatetimeedit.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3datetimeedit.h>
-#define QDateTimeEdit Q3DateTimeEditBase
-
#endif // USE_QT4
#endif /* TQDATETIMEEDIT_H */ \ No newline at end of file
diff --git a/qtinterface/tqdeepcopy.h b/qtinterface/tqdeepcopy.h
index 13aaecf..e6a7836 100644
--- a/qtinterface/tqdeepcopy.h
+++ b/qtinterface/tqdeepcopy.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3deepcopy.h>
-#define QDeepCopy Q3DeepCopy
-
#endif // USE_QT4
#endif /* TQDEEPCOPY_H */ \ No newline at end of file
diff --git a/qtinterface/tqdict.h b/qtinterface/tqdict.h
index ee146d4..d4e5c6c 100644
--- a/qtinterface/tqdict.h
+++ b/qtinterface/tqdict.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3dict.h>
-#define QDict Q3Dict
-
#endif // USE_QT4
#endif /* TQDICT_H */ \ No newline at end of file
diff --git a/qtinterface/tqdns.h b/qtinterface/tqdns.h
index a54c5d2..2c74600 100644
--- a/qtinterface/tqdns.h
+++ b/qtinterface/tqdns.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3dns.h>
-#define QDns Q3Dns
-
#endif // USE_QT4
#endif /* TQDNS_H */ \ No newline at end of file
diff --git a/qtinterface/tqdockarea.h b/qtinterface/tqdockarea.h
index 660ae58..9005e04 100644
--- a/qtinterface/tqdockarea.h
+++ b/qtinterface/tqdockarea.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3dockarea.h>
-#define QDockArea Q3DockArea
-
#endif // USE_QT4
#endif /* TQDOCKAREA_H */ \ No newline at end of file
diff --git a/qtinterface/tqdockwindow.h b/qtinterface/tqdockwindow.h
index 31334b9..569d3bd 100644
--- a/qtinterface/tqdockwindow.h
+++ b/qtinterface/tqdockwindow.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3dockwindow.h>
-#define QDockWindow Q3DockWindow
-
#endif // USE_QT4
#endif /* TQDOCKWINDOW_H */ \ No newline at end of file
diff --git a/qtinterface/tqdragobject.h b/qtinterface/tqdragobject.h
index 0c8cd2b..30cb9a1 100644
--- a/qtinterface/tqdragobject.h
+++ b/qtinterface/tqdragobject.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3dragobject.h>
-#define QDragObject Q3DragObject
-
#endif // USE_QT4
#endif /* TQDRAGOBJECT_H */ \ No newline at end of file
diff --git a/qtinterface/tqdropsite.h b/qtinterface/tqdropsite.h
index 772d3aa..b27f0fc 100644
--- a/qtinterface/tqdropsite.h
+++ b/qtinterface/tqdropsite.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3dropsite.h>
-#define QDropSite Q3DropSite
-
#endif // USE_QT4
#endif /* TQDROPSITE_H */ \ No newline at end of file
diff --git a/qtinterface/tqeditorfactory.h b/qtinterface/tqeditorfactory.h
index fc638e3..2bea765 100644
--- a/qtinterface/tqeditorfactory.h
+++ b/qtinterface/tqeditorfactory.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3editorfactory.h>
-#define QEditorFactory Q3EditorFactory
-
#endif // USE_QT4
#endif /* TQEDITORFACTORY_H */ \ No newline at end of file
diff --git a/qtinterface/tqfiledialog.h b/qtinterface/tqfiledialog.h
index 99643bd..a800d40 100644
--- a/qtinterface/tqfiledialog.h
+++ b/qtinterface/tqfiledialog.h
@@ -40,10 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3filedialog.h>
-#define QFileDialog Q3FileDialog
-#define QFileIconProvider Q3FileDialog
-#define QFilePreview Q3FileDialog
-
#endif // USE_QT4
#endif /* TQFILEDIALOG_H */ \ No newline at end of file
diff --git a/qtinterface/tqgarray.h b/qtinterface/tqgarray.h
index a7d5d48..813dc8a 100644
--- a/qtinterface/tqgarray.h
+++ b/qtinterface/tqgarray.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3garray.h>
-#define QGArray Q3GArray
-
#endif // USE_QT4
#endif /* TQGARRAY_H */ \ No newline at end of file
diff --git a/qtinterface/tqgrid.h b/qtinterface/tqgrid.h
index cbc2010..3097917 100644
--- a/qtinterface/tqgrid.h
+++ b/qtinterface/tqgrid.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QGrid class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3grid.h>
-#define QGrid Q3Grid
-
#endif // USE_QT4
#endif /* TQGRID_H */ \ No newline at end of file
diff --git a/qtinterface/tqgridview.h b/qtinterface/tqgridview.h
index 774b69d..49b572c 100644
--- a/qtinterface/tqgridview.h
+++ b/qtinterface/tqgridview.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3gridview.h>
-#define QGridView Q3GridView
-
#endif // USE_QT4
#endif /* TQGRIDVIEW_H */ \ No newline at end of file
diff --git a/qtinterface/tqguardedptr.h b/qtinterface/tqguardedptr.h
index df5c452..a8b82c8 100644
--- a/qtinterface/tqguardedptr.h
+++ b/qtinterface/tqguardedptr.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/qpointer.h>
-#define QGuardedPtr QPointer
-
#endif // USE_QT4
#endif /* TQGUARDEDPTR_H */ \ No newline at end of file
diff --git a/qtinterface/tqhbox.h b/qtinterface/tqhbox.h
index 132771e..eeda409 100644
--- a/qtinterface/tqhbox.h
+++ b/qtinterface/tqhbox.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3hbox.h>
-#define QHBox Q3HBox
-
#endif // USE_QT4
#endif /* TQHBOX_H */ \ No newline at end of file
diff --git a/qtinterface/tqhbuttongroup.h b/qtinterface/tqhbuttongroup.h
index 1e7e6e0..04c50dd 100644
--- a/qtinterface/tqhbuttongroup.h
+++ b/qtinterface/tqhbuttongroup.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3buttongroup.h>
-#define QHButtonGroup Q3HButtonGroup
-
#endif // USE_QT4
#endif /* TQHBUTTONGROUP_H */ \ No newline at end of file
diff --git a/qtinterface/tqheader.h b/qtinterface/tqheader.h
index 7b0146b..f33af50 100644
--- a/qtinterface/tqheader.h
+++ b/qtinterface/tqheader.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3header.h>
-#define QHeader Q3Header
-
#endif // USE_QT4
#endif /* TQHEADER_H */ \ No newline at end of file
diff --git a/qtinterface/tqhgroupbox.h b/qtinterface/tqhgroupbox.h
index 8158aad..14085e5 100644
--- a/qtinterface/tqhgroupbox.h
+++ b/qtinterface/tqhgroupbox.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3hgroupbox.h>
-#define QHGroupBox Q3HGroupBox
-
#endif // USE_QT4
#endif /* TQHGROUPBOX_H */ \ No newline at end of file
diff --git a/qtinterface/tqhttp.h b/qtinterface/tqhttp.h
index ffda32f..12b46f0 100644
--- a/qtinterface/tqhttp.h
+++ b/qtinterface/tqhttp.h
@@ -40,11 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3http.h>
-#define QHttp Q3Http
-#define QHttpHeader Q3HttpHeader
-#define QHttpRequestHeader Q3HttpRequestHeader
-#define QHttpResponseHeader Q3HttpResponseHeader
-
#endif // USE_QT4
#endif /* TQHTTP_H */ \ No newline at end of file
diff --git a/qtinterface/tqiconset.h b/qtinterface/tqiconset.h
index 71a3aef..c1e4d57 100644
--- a/qtinterface/tqiconset.h
+++ b/qtinterface/tqiconset.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/qicon.h>
-#define QIconSet QIcon
-
#endif // USE_QT4
#endif /* TQICONSET_H */ \ No newline at end of file
diff --git a/qtinterface/tqiconview.h b/qtinterface/tqiconview.h
index ac10e8c..fceebd1 100644
--- a/qtinterface/tqiconview.h
+++ b/qtinterface/tqiconview.h
@@ -40,11 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3iconview.h>
-#define QIconView Q3IconView
-#define QIconViewItem Q3IconViewItem
-#define QIconDrag Q3IconDrag
-#define QIconDragItem Q3IconDragItem
-
#endif // USE_QT4
#endif /* TQICONVIEW_H */ \ No newline at end of file
diff --git a/qtinterface/tqintcache.h b/qtinterface/tqintcache.h
index d2615ee..da63504 100644
--- a/qtinterface/tqintcache.h
+++ b/qtinterface/tqintcache.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QIntCache class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3intcache.h>
-#define QIntCache Q3IntCache
-
#endif // USE_QT4
#endif /* TQINTCACHE_H */ \ No newline at end of file
diff --git a/qtinterface/tqintdict.h b/qtinterface/tqintdict.h
index ee70748..5e7fd1b 100644
--- a/qtinterface/tqintdict.h
+++ b/qtinterface/tqintdict.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QIntDict class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3intdict.h>
-#define QIntDict Q3IntDict
-
#endif // USE_QT4
#endif /* TQINTDICT_H */ \ No newline at end of file
diff --git a/qtinterface/tqlistbox.h b/qtinterface/tqlistbox.h
index 29d7045..6045977 100644
--- a/qtinterface/tqlistbox.h
+++ b/qtinterface/tqlistbox.h
@@ -40,11 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3listbox.h>
-#define QListBox Q3ListBox
-#define QListBoxItem Q3ListBoxItem
-#define QListBoxText Q3ListBoxText
-#define QListBoxPixmap Q3ListBoxPixmap
-
#endif // USE_QT4
#endif /* TQLISTBOX_H */ \ No newline at end of file
diff --git a/qtinterface/tqlistview.h b/qtinterface/tqlistview.h
index fbdb295..c6a0430 100644
--- a/qtinterface/tqlistview.h
+++ b/qtinterface/tqlistview.h
@@ -36,15 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QListView class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3listview.h>
-#define QListView Q3ListView
-#define QListViewItem Q3ListViewItem
-#define QCheckListItem Q3CheckListItem
-#define QListViewItemIterator Q3ListViewItemIterator
-
#endif // USE_QT4
#endif /* TQLISTVIEW_H */ \ No newline at end of file
diff --git a/qtinterface/tqlocalfs.h b/qtinterface/tqlocalfs.h
index 63a2092..d811b74 100644
--- a/qtinterface/tqlocalfs.h
+++ b/qtinterface/tqlocalfs.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3localfs.h>
-#define QLocalFs Q3LocalFs
-
#endif // USE_QT4
#endif /* TQLOCALFS_H */ \ No newline at end of file
diff --git a/qtinterface/tqmainwindow.h b/qtinterface/tqmainwindow.h
index b04f35a..edb0530 100644
--- a/qtinterface/tqmainwindow.h
+++ b/qtinterface/tqmainwindow.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3mainwindow.h>
-#define QMainWindow Q3MainWindow
-
#endif // USE_QT4
#endif /* TQMAINWINDOW_H */ \ No newline at end of file
diff --git a/qtinterface/tqmemarray.h b/qtinterface/tqmemarray.h
index d6f126c..5fc1be7 100644
--- a/qtinterface/tqmemarray.h
+++ b/qtinterface/tqmemarray.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QMemArray class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3memarray.h>
-#define QMemArray Q3MemArray
-
#endif // USE_QT4
#endif /* TQMEMARRAY_H */ \ No newline at end of file
diff --git a/qtinterface/tqmultilineedit.h b/qtinterface/tqmultilineedit.h
index 4815678..1c20bf1 100644
--- a/qtinterface/tqmultilineedit.h
+++ b/qtinterface/tqmultilineedit.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QMultiLineEdit class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3multilineedit.h>
-#define QMultiLineEdit Q3MultiLineEdit
-
#endif // USE_QT4
#endif /* TQMULTILINEEDIT_H */ \ No newline at end of file
diff --git a/qtinterface/tqnetworkprotocol.h b/qtinterface/tqnetworkprotocol.h
index 4bfecc5..cddc99a 100644
--- a/qtinterface/tqnetworkprotocol.h
+++ b/qtinterface/tqnetworkprotocol.h
@@ -36,15 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QNetworkProtocol class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3networkprotocol.h>
-#define QNetworkProtocol Q3NetworkProtocol
-#define QNetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase
-#define QNetworkProtocolFactory Q3NetworkProtocolFactory
-#define QNetworkOperation Q3NetworkOperation
-
#endif // USE_QT4
#endif /* TQNETWORKPROTOCOL_H */ \ No newline at end of file
diff --git a/qtinterface/tqpaintdevicemetrics.h b/qtinterface/tqpaintdevicemetrics.h
index ac51f42..40629f5 100644
--- a/qtinterface/tqpaintdevicemetrics.h
+++ b/qtinterface/tqpaintdevicemetrics.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QPaintDeviceMetrics class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3paintdevicemetrics.h>
-#define QPaintDeviceMetrics Q3PaintDeviceMetrics
-
#endif // USE_QT4
#endif /* TQPAINTDEVICEMETRICS_H */ \ No newline at end of file
diff --git a/qtinterface/tqpainter.h b/qtinterface/tqpainter.h
index 57dad86..b1c626b 100644
--- a/qtinterface/tqpainter.h
+++ b/qtinterface/tqpainter.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QPainter class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3painter.h>
-#define QPainter Q3Painter
-
#endif // USE_QT4
#endif /* TQPAINTER_H */ \ No newline at end of file
diff --git a/qtinterface/tqpicture.h b/qtinterface/tqpicture.h
index 560f5a0..6d86929 100644
--- a/qtinterface/tqpicture.h
+++ b/qtinterface/tqpicture.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3picture.h>
-#define QPicture Q3Picture
-
#endif // USE_QT4
#endif /* TQPICTURE_H */ \ No newline at end of file
diff --git a/qtinterface/tqpointarray.h b/qtinterface/tqpointarray.h
index 3477a67..5d3805b 100644
--- a/qtinterface/tqpointarray.h
+++ b/qtinterface/tqpointarray.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3pointarray.h>
-#define QPointArray Q3PointArray
-
#endif // USE_QT4
#endif /* TQPOINTARRAY_H */ \ No newline at end of file
diff --git a/qtinterface/tqpopupmenu.h b/qtinterface/tqpopupmenu.h
index 1862306..8514556 100644
--- a/qtinterface/tqpopupmenu.h
+++ b/qtinterface/tqpopupmenu.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3popupmenu.h>
-#define QPopupMenu Q3PopupMenu
-
#endif // USE_QT4
#endif /* TQPOPUPMENU_H */ \ No newline at end of file
diff --git a/qtinterface/tqprogressbar.h b/qtinterface/tqprogressbar.h
index 5012072..9de64b9 100644
--- a/qtinterface/tqprogressbar.h
+++ b/qtinterface/tqprogressbar.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QProgressBar class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/qprogressbar.h>
-#define QProgressBar Q3ProgressBar
-
#endif // USE_QT4
#endif /* TQPROGRESSBAR_H */ \ No newline at end of file
diff --git a/qtinterface/tqprogressdialog.h b/qtinterface/tqprogressdialog.h
index 53f8513..2297cb3 100644
--- a/qtinterface/tqprogressdialog.h
+++ b/qtinterface/tqprogressdialog.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3progressdialog.h>
-#define QProgressDialog Q3ProgressDialog
-
#endif // USE_QT4
#endif /* TQPROGRESSDIALOG_H */ \ No newline at end of file
diff --git a/qtinterface/tqptrcollection.h b/qtinterface/tqptrcollection.h
index 675015a..7309de8 100644
--- a/qtinterface/tqptrcollection.h
+++ b/qtinterface/tqptrcollection.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QPtrCollection class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3ptrcollection.h>
-#define QPtrCollection Q3PtrCollection
-
#endif // USE_QT4
#endif /* TQPTRCOLLECTION_H */ \ No newline at end of file
diff --git a/qtinterface/tqptrdict.h b/qtinterface/tqptrdict.h
index 187e889..07a47e8 100644
--- a/qtinterface/tqptrdict.h
+++ b/qtinterface/tqptrdict.h
@@ -36,13 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QPtrDict class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3ptrdict.h>
-#define QPtrDict Q3PtrDict
-#define QPtrDictIterator Q3PtrDictIterator
-
#endif // USE_QT4
#endif /* TQPTRDICT_H */ \ No newline at end of file
diff --git a/qtinterface/tqptrlist.h b/qtinterface/tqptrlist.h
index 9b05dfd..37d338c 100644
--- a/qtinterface/tqptrlist.h
+++ b/qtinterface/tqptrlist.h
@@ -40,10 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3ptrlist.h>
-#define QPtrList Q3PtrList
-#define QPtrListIterator Q3PtrListIterator
-#define QPtrListStdIterator Q3PtrListStdIterator
-
#endif // USE_QT4
#endif /* TQPTRLIST_H */ \ No newline at end of file
diff --git a/qtinterface/tqptrqueue.h b/qtinterface/tqptrqueue.h
index c935339..05cd55f 100644
--- a/qtinterface/tqptrqueue.h
+++ b/qtinterface/tqptrqueue.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3ptrqueue.h>
-#define QPtrQueue Q3PtrQueue
-
#endif // USE_QT4
#endif /* TQPTRQUEUE_H */ \ No newline at end of file
diff --git a/qtinterface/tqptrstack.h b/qtinterface/tqptrstack.h
index a884ac8..349681f 100644
--- a/qtinterface/tqptrstack.h
+++ b/qtinterface/tqptrstack.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3ptrstack.h>
-#define QPtrStack Q3PtrStack
-
#endif // USE_QT4
#endif /* TQPTRSTACK_H */ \ No newline at end of file
diff --git a/qtinterface/tqptrvector.h b/qtinterface/tqptrvector.h
index 9fab17a..70e76b1 100644
--- a/qtinterface/tqptrvector.h
+++ b/qtinterface/tqptrvector.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3ptrvector.h>
-#define QPtrVector Q3PtrVector
-
#endif // USE_QT4
#endif /* TQPTRVECTOR_H */ \ No newline at end of file
diff --git a/qtinterface/tqrangecontrol.h b/qtinterface/tqrangecontrol.h
index c887a4d..2433df0 100644
--- a/qtinterface/tqrangecontrol.h
+++ b/qtinterface/tqrangecontrol.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3rangecontrol.h>
-#define QRangeControl Q3RangeControl
-
#endif // USE_QT4
#endif /* TQRANGECONTROL_H */ \ No newline at end of file
diff --git a/qtinterface/tqscrollview.h b/qtinterface/tqscrollview.h
index d7a81c1..14c4ff6 100644
--- a/qtinterface/tqscrollview.h
+++ b/qtinterface/tqscrollview.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3scrollview.h>
-#define QScrollView Q3ScrollView
-
#endif // USE_QT4
#endif /* TQSCROLLVIEW_H */ \ No newline at end of file
diff --git a/qtinterface/tqserversocket.h b/qtinterface/tqserversocket.h
index e3cd078..ac7fa28 100644
--- a/qtinterface/tqserversocket.h
+++ b/qtinterface/tqserversocket.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3serversocket.h>
-#define QServerSocket Q3ServerSocket
-
#endif // USE_QT4
#endif /* TQSERVERSOCKET_H */ \ No newline at end of file
diff --git a/qtinterface/tqshared.h b/qtinterface/tqshared.h
index 139fd3f..f9d631f 100644
--- a/qtinterface/tqshared.h
+++ b/qtinterface/tqshared.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3shared.h>
-#define QShared Q3Shared
-
#endif // USE_QT4
#endif /* TQSHARED_H */ \ No newline at end of file
diff --git a/qtinterface/tqsimplerichtext.h b/qtinterface/tqsimplerichtext.h
index 5f940d6..f2aa8ec 100644
--- a/qtinterface/tqsimplerichtext.h
+++ b/qtinterface/tqsimplerichtext.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3simplerichtext.h>
-#define QSimpleRichText Q3SimpleRichText
-
#endif // USE_QT4
#endif /* TQSIMPLERICHTEXT_H */ \ No newline at end of file
diff --git a/qtinterface/tqsocket.h b/qtinterface/tqsocket.h
index a7c8f51..232cb28 100644
--- a/qtinterface/tqsocket.h
+++ b/qtinterface/tqsocket.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3socket.h>
-#define QSocket Q3Socket
-
#endif // USE_QT4
#endif /* TQSOCKET_H */ \ No newline at end of file
diff --git a/qtinterface/tqsocketdevice.h b/qtinterface/tqsocketdevice.h
index 08315e7..16d6918 100644
--- a/qtinterface/tqsocketdevice.h
+++ b/qtinterface/tqsocketdevice.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3socketdevice.h>
-#define QSocketDevice Q3SocketDevice
-
#endif // USE_QT4
#endif /* TQSOCKETDEVICE_H */ \ No newline at end of file
diff --git a/qtinterface/tqsortedlist.h b/qtinterface/tqsortedlist.h
index db8eb22..fb52d80 100644
--- a/qtinterface/tqsortedlist.h
+++ b/qtinterface/tqsortedlist.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3sortedlist.h>
-#define QSortedList Q3SortedList
-
#endif // USE_QT4
#endif /* TQSORTEDLIST_H */ \ No newline at end of file
diff --git a/qtinterface/tqsqlcursor.h b/qtinterface/tqsqlcursor.h
index 6c1d09c..eb48513 100644
--- a/qtinterface/tqsqlcursor.h
+++ b/qtinterface/tqsqlcursor.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3sqlcursor.h>
-#define QSqlCursor Q3SqlCursor
-
#endif // USE_QT4
#endif /* TQSQLCURSOR_H */ \ No newline at end of file
diff --git a/qtinterface/tqsqlfield.h b/qtinterface/tqsqlfield.h
index 5933964..2f1848f 100644
--- a/qtinterface/tqsqlfield.h
+++ b/qtinterface/tqsqlfield.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3sqlfieldinfo.h>
-#define QSqlFieldInfo Q3SqlFieldInfo
-
#endif // USE_QT4
#endif /* TQSQLFIELD_H */ \ No newline at end of file
diff --git a/qtinterface/tqsqlform.h b/qtinterface/tqsqlform.h
index 43e11dd..3fe4aa7 100644
--- a/qtinterface/tqsqlform.h
+++ b/qtinterface/tqsqlform.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3sqlform.h>
-#define QSqlForm Q3SqlForm
-
#endif // USE_QT4
#endif /* TQSQLFORM_H */ \ No newline at end of file
diff --git a/qtinterface/tqsqlpropertymap.h b/qtinterface/tqsqlpropertymap.h
index 3d9d392..eb6be94 100644
--- a/qtinterface/tqsqlpropertymap.h
+++ b/qtinterface/tqsqlpropertymap.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QSqlPropertyMap class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3sqlpropertymap.h>
-#define QSqlPropertyMap Q3SqlPropertyMap
-
#endif // USE_QT4
#endif /* TQSQLPROPERTYMAP_H */ \ No newline at end of file
diff --git a/qtinterface/tqsqlselectcursor.h b/qtinterface/tqsqlselectcursor.h
index 6bd51ff..1547301 100644
--- a/qtinterface/tqsqlselectcursor.h
+++ b/qtinterface/tqsqlselectcursor.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3sqlselectcursor.h>
-#define QSqlSelectCursor Q3SqlSelectCursor
-
#endif // USE_QT4
#endif /* TQSQLSELECTCURSOR_H */ \ No newline at end of file
diff --git a/qtinterface/tqstrlist.h b/qtinterface/tqstrlist.h
index c2ae35d..a4f9a32 100644
--- a/qtinterface/tqstrlist.h
+++ b/qtinterface/tqstrlist.h
@@ -40,10 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3strlist.h>
-#define QStrList Q3StrList
-#define QStrIList Q3StrIList
-#define QStrListIterator Q3StrListIterator
-
#endif // USE_QT4
#endif /* TQSTRLIST_H */ \ No newline at end of file
diff --git a/qtinterface/tqstylesheet.h b/qtinterface/tqstylesheet.h
index 94722bd..7cb1f47 100644
--- a/qtinterface/tqstylesheet.h
+++ b/qtinterface/tqstylesheet.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3stylesheet.h>
-#define QStyleSheet Q3StyleSheet
-
#endif // USE_QT4
#endif /* TQSTYLESHEET_H */ \ No newline at end of file
diff --git a/qtinterface/tqsyntaxhighlighter.h b/qtinterface/tqsyntaxhighlighter.h
index cfb764f..b5557d9 100644
--- a/qtinterface/tqsyntaxhighlighter.h
+++ b/qtinterface/tqsyntaxhighlighter.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3syntaxhighlighter.h>
-#define QSyntaxHighlighter Q3SyntaxHighlighter
-
#endif // USE_QT4
#endif /* TQSYNTAXHIGHLIGHTER_H */ \ No newline at end of file
diff --git a/qtinterface/tqt-replace b/qtinterface/tqt-replace
new file mode 100755
index 0000000..d11e243
--- /dev/null
+++ b/qtinterface/tqt-replace
@@ -0,0 +1,17 @@
+#!/bin/bash
+QT_VER=3
+
+if [[ $1 == "" ]]; then
+ echo "Usage: tqt-replace <input_file>"
+else
+ if [[ $QT_VER == 3 ]]; then
+ sed -i 's/TQ\([^T]\)/Q\1/g' "$1"
+ sed -i 's/TQT\([^_]\)/QT\1/g' "$1"
+ exit 0
+ fi
+
+ if [[ $QT_VER == 4 ]]; then
+ echo "ERROR: Not Yet Implemented"
+ exit 1
+ fi
+fi
diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h
index 4b88f32..f274112 100644
--- a/qtinterface/tqt.h
+++ b/qtinterface/tqt.h
@@ -22,13 +22,993 @@ 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
#endif
+#ifdef __cplusplus
+#define TQT_METHOD(a) METHOD(a)
+#define TQT_SLOT(a) SLOT(a)
+#define TQT_SIGNAL(a) SIGNAL(a)
+#endif // __cplusplus
+
+#ifdef USE_QT3
+#define TQAccel QAccel
+#define TQAccessible QAccessible
+#define TQAccessibleObject QAccessibleObject
+#define TQAction QAction
+#define TQActionGroup QActionGroup
+#define TQApplication QApplication
+#define TQAsciiCache QAsciiCache
+#define TQAsciiCacheIterator QAsciiCacheIterator
+#define TQAsciiDict QAsciiDict
+#define TQAsciiDictIterator QAsciiDictIterator
+#define TQImageConsumer QImageConsumer
+#define TQImageFormat QImageFormat
+#define TQImageFormatType QImageFormatType
+#define TQImageDecoder QImageDecoder
+#define TQAsyncIO QAsyncIO
+#define TQByteArray QByteArray
+#define TQDataSink QDataSink
+#define TQDataSource QDataSource
+#define TQIODeviceSource QIODeviceSource
+#define TQDataPump QDataPump
+#define TQBig5Codec QBig5Codec
+#define TQBig5hkscsCodec QBig5hkscsCodec
+#define TQBitVal QBitVal
+#define TQBitArray QBitArray
+#define TQBitmap QBitmap
+#define TQBrush QBrush
+#define TQBuffer QBuffer
+#define TQButtonGroup QButtonGroup
+#define TQButton QButton
+#define TQCache QCache
+#define TQCacheIterator QCacheIterator
+#define TQCanvasChunk QCanvasChunk
+#define TQCanvasItemList QCanvasItemList
+#define TQCanvasItemExtra QCanvasItemExtra
+#define TQCanvasItem QCanvasItem
+#define TQCanvasData QCanvasData
+#define TQCanvas QCanvas
+#define TQCanvasViewData QCanvasViewData
+#define TQCanvasView QCanvasView
+#define TQCanvasPixmap QCanvasPixmap
+#define TQCanvasPixmapArray QCanvasPixmapArray
+#define TQCanvasSprite QCanvasSprite
+#define TQPolygonalProcessor QPolygonalProcessor
+#define TQCanvasPolygonalItem QCanvasPolygonalItem
+#define TQCanvasRectangle QCanvasRectangle
+#define TQCanvasPolygon QCanvasPolygon
+#define TQCanvasSpline QCanvasSpline
+#define TQCanvasLine QCanvasLine
+#define TQCanvasEllipse QCanvasEllipse
+#define TQCanvasTextExtra QCanvasTextExtra
+#define TQCanvasText QCanvasText
+#define TQCDEStyle QCDEStyle
+#define TQCheckBox QCheckBox
+#define TQCleanupHandler QCleanupHandler
+#define TQSingleCleanupHandler QSingleCleanupHandler
+#define TQSharedCleanupHandler QSharedCleanupHandler
+#define TQShared QShared
+#define TQColor QColor
+#define TQStrList QStrList
+#define TQStringList QStringList
+#define TQStringPairList QStringPairList
+#define TQLineEdit QLineEdit
+#define TQValidator QValidator
+#define TQListBox QListBox
+#define TQComboBoxData QComboBoxData
+#define TQComboTableItem QComboTableItem
+#define TQWheelEvent QWheelEvent
+#define TQComboBox QComboBox
+#define TQCommonStyle QCommonStyle
+#define TQCompactStyle QCompactStyle
+#define TQConnection QConnection
+#define TQCString QCString
+#define TQCursor QCursor
+#define TQSqlForm QSqlForm
+#define TQDataBrowserPrivate QDataBrowserPrivate
+#define TQDataBrowser QDataBrowser
+#define TQDataStream QDataStream
+#define TQPainter QPainter
+#define TQSqlField QSqlField
+#define TQSqlPropertyMap QSqlPropertyMap
+#define TQDataTablePrivate QDataTablePrivate
+#define TQDataTable QDataTable
+#define TQDataView QDataView
+#define TQDateEdit QDateEdit
+#define TQTimeEdit QTimeEdit
+#define TQDateTimeEdit QDateTimeEdit
+#define TQDateTimeEditBase QDateTimeEditBase
+#define TQDate QDate
+#define TQTime QTime
+#define TQDateTime QDateTime
+#define TQDeepCopy QDeepCopy
+#define TQDesktopWidget QDesktopWidget
+#define TQDial QDial
+#define TQDialog QDialog
+#define TQDict QDict
+#define TQDictIterator QDictIterator
+#define TQDir QDir
+#define TQDirLineEdit QDirLineEdit
+#define TQDirMultiLineEdit QDirMultiLineEdit
+#define TQDns QDns
+#define TQDnsSocket QDnsSocket
+#define TQDockArea QDockArea
+#define TQDockAreaLayout QDockAreaLayout
+#define TQDockWindow QDockWindow
+#define TQDomImplementation QDomImplementation
+#define TQDomNodeList QDomNodeList
+#define TQDomDocumentType QDomDocumentType
+#define TQDomDocument QDomDocument
+#define TQDomNamedNodeMap QDomNamedNodeMap
+#define TQDomDocumentFragment QDomDocumentFragment
+#define TQDomCharacterData QDomCharacterData
+#define TQDomAttr QDomAttr
+#define TQDomElement QDomElement
+#define TQDomText QDomText
+#define TQDomComment QDomComment
+#define TQDomCDATASection QDomCDATASection
+#define TQDomNotation QDomNotation
+#define TQDomEntity QDomEntity
+#define TQDomEntityReference QDomEntityReference
+#define TQDomProcessingInstruction QDomProcessingInstruction
+#define TQDomNode QDomNode
+#define TQDragObject QDragObject
+#define TQStoredDrag QStoredDrag
+#define TQTextDrag QTextDrag
+#define TQImageDrag QImageDrag
+#define TQUriDrag QUriDrag
+#define TQColorDrag QColorDrag
+#define TQDropSite QDropSite
+#define TQEditorFactory QEditorFactory
+#define TQErrorMessage QErrorMessage
+#define TQEucJpCodec QEucJpCodec
+#define TQEucKrCodec QEucKrCodec
+#define TQEvent QEvent
+#define TQTimerEvent QTimerEvent
+#define TQMouseEvent QMouseEvent
+#define TQWheelEvent QWheelEvent
+#define TQTabletEvent QTabletEvent
+#define TQKeyEvent QKeyEvent
+#define TQFocusEvent QFocusEvent
+#define TQPaintEvent QPaintEvent
+#define TQMoveEvent QMoveEvent
+#define TQResizeEvent QResizeEvent
+#define TQCloseEvent QCloseEvent
+#define TQIconDragEvent QIconDragEvent
+#define TQShowEvent QShowEvent
+#define TQHideEvent QHideEvent
+#define TQContextMenuEvent QContextMenuEvent
+#define TQIMEvent QIMEvent
+#define TQIMComposeEvent QIMComposeEvent
+#define TQDropEvent QDropEvent
+#define TQDragMoveEvent QDragMoveEvent
+#define TQDragEnterEvent QDragEnterEvent
+#define TQDragResponseEvent QDragResponseEvent
+#define TQDragLeaveEvent QDragLeaveEvent
+#define TQChildEvent QChildEvent
+#define TQCustomEvent QCustomEvent
+#define TQEventLoop QEventLoop
+#define TQFileIconProvider QFileIconProvider
+#define TQFilePreview QFilePreview
+#define TQFileDialog QFileDialog
+#define TQFile QFile
+#define TQFileInfo QFileInfo
+#define TQFileInfoList QFileInfoList
+#define TQFileInfoListIterator QFileInfoListIterator
+#define TQFocusData QFocusData
+#define TQFontDatabase QFontDatabase
+#define TQFont QFont
+#define TQFontInfo QFontInfo
+#define TQFontMetrics QFontMetrics
+#define TQFrame QFrame
+#define TQFtp QFtp
+#define TQGArray QGArray
+#define TQGb18030Codec QGb18030Codec
+#define TQGbkCodec QGbkCodec
+#define TQGb2312Codec QGb2312Codec
+#define TQGCache QGCache
+#define TQGCacheIterator QGCacheIterator
+#define TQBaseBucket QBaseBucket
+#define TQStringBucket QStringBucket
+#define TQAsciiBucket QAsciiBucket
+#define TQIntBucket QIntBucket
+#define TQPtrBucket QPtrBucket
+#define TQGDict QGDict
+#define TQGDictIterator QGDictIterator
+#define TQGLColormap QGLColormap
+#define TQGL QGL
+#define TQGLFormat QGLFormat
+#define TQGLContext QGLContext
+#define TQGLWidget QGLWidget
+#define TQLNode QLNode
+#define TQGList QGList
+#define TQGListIterator QGListIterator
+#define TQGListStdIterator QGListStdIterator
+#define TQGPlugin QGPlugin
+#define TQGrid QGrid
+#define TQGridView QGridView
+#define TQGroupBox QGroupBox
+#define TQGuardedPtr QGuardedPtr
+#define TQGuardedPtrPrivate QGuardedPtrPrivate
+#define TQGVector QGVector
+#define TQHBox QHBox
+#define TQHButtonGroup QHButtonGroup
+#define TQHeader QHeader
+#define TQHGroupBox QHGroupBox
+#define TQHostAddress QHostAddress
+#define TQHttpHeader QHttpHeader
+#define TQHttpResponseHeader QHttpResponseHeader
+#define TQHttpRequestHeader QHttpRequestHeader
+#define TQHttp QHttp
+#define TQIconSet QIconSet
+#define TQIconFactory QIconFactory
+#define TQIconDragItem QIconDragItem
+#define TQIconDrag QIconDrag
+#define TQIconViewItem QIconViewItem
+#define TQIconView QIconView
+#define TQImageFormatPlugin QImageFormatPlugin
+#define TQImageTextKeyLang QImageTextKeyLang
+#define TQImage QImage
+#define TQImageIO QImageIO
+#define TQInputContextFactory QInputContextFactory
+#define TQInputContext QInputContext
+#define TQIntCache QIntCache
+#define TQIntCacheIterator QIntCacheIterator
+#define TQIntDict QIntDict
+#define TQIntDictIterator QIntDictIterator
+#define TQIODevice QIODevice
+#define TQJisCodec QJisCodec
+#define TQJpUnicodeConv QJpUnicodeConv
+#define TQKeySequence QKeySequence
+#define TQLabel QLabel
+#define TQGLayoutIterator QGLayoutIterator
+#define TQLayoutIterator QLayoutIterator
+#define TQLayoutItem QLayoutItem
+#define TQSpacerItem QSpacerItem
+#define TQWidgetItem QWidgetItem
+#define TQLayout QLayout
+#define TQGridLayout QGridLayout
+#define TQBoxLayout QBoxLayout
+#define TQHBoxLayout QHBoxLayout
+#define TQVBoxLayout QVBoxLayout
+#define TQLCDNumber QLCDNumber
+#define TQLibrary QLibrary
+#define TQLineEdit QLineEdit
+#define TQListBox QListBox
+#define TQListBoxItem QListBoxItem
+#define TQListBoxText QListBoxText
+#define TQListBoxPixmap QListBoxPixmap
+#define TQListViewItem QListViewItem
+#define TQListView QListView
+#define TQCheckListItem QCheckListItem
+#define TQListViewItemIterator QListViewItemIterator
+#define TQLocale QLocale
+#define TQLocalFs QLocalFs
+#define TQMainWindow QMainWindow
+#define TQMapIterator QMapIterator
+#define TQMapConstIterator QMapConstIterator
+#define TQMapPrivateBase QMapPrivateBase
+#define TQMapPrivate QMapPrivate
+#define TQMap QMap
+#define TQMemArray QMemArray
+#define TQMenuBar QMenuBar
+#define TQMenuItem QMenuItem
+#define TQCustomMenuItem QCustomMenuItem
+#define TQMenuData QMenuData
+#define TQMessageBox QMessageBox
+#define TQMetaProperty QMetaProperty
+#define TQMetaObject QMetaObject
+#define TQMetaObjectCleanUp QMetaObjectCleanUp
+#define TQMimeSource QMimeSource
+#define TQMimeSourceFactory QMimeSourceFactory
+#define TQWindowsMime QWindowsMime
+#define TQMacMime QMacMime
+#define TQMotifPlusStyle QMotifPlusStyle
+#define TQMotifStyle QMotifStyle
+#define TQMovie QMovie
+#define TQMultiLineEdit QMultiLineEdit
+#define TQMutex QMutex
+#define TQMutexLocker QMutexLocker
+#define TQt Qt
+#define TQInternal QInternal
+#define TQNetworkProtocolFactoryBase QNetworkProtocolFactoryBase
+#define TQNetworkProtocolFactory QNetworkProtocolFactory
+#define TQNetworkProtocol QNetworkProtocol
+#define TQNetworkOperation QNetworkOperation
+#define TQObjectCleanupHandler QObjectCleanupHandler
+#define TQObjectDictionary QObjectDictionary
+#define TQObject QObject
+#define TQObjectUserData QObjectUserData
+#define TQObject QObject
+#define TQObjectList QObjectList
+#define TQObjectListIterator QObjectListIterator
+#define TQObjectListIt QObjectListIt
+#define TQPaintDevice QPaintDevice
+#define TQPaintDeviceMetrics QPaintDeviceMetrics
+#define TQPainter QPainter
+#define TQColorGroup QColorGroup
+#define TQPalette QPalette
+#define TQPen QPen
+#define TQPicture QPicture
+#define TQPixmapCache QPixmapCache
+#define TQPixmap QPixmap
+#define TQPlatinumStyle QPlatinumStyle
+#define TQPNGImageWriter QPNGImageWriter
+#define TQPNGImagePacker QPNGImagePacker
+#define TQPointArray QPointArray
+#define TQPoint QPoint
+#define TQPolygonScanner QPolygonScanner
+#define TQPopupMenu QPopupMenu
+#define TQPrintDialog QPrintDialog
+#define TQPrinter QPrinter
+#define TQProcess QProcess
+#define TQProgressBar QProgressBar
+#define TQProgressDialog QProgressDialog
+#define TQPtrCollection QPtrCollection
+#define TQPtrDict QPtrDict
+#define TQPtrDictIterator QPtrDictIterator
+#define TQPtrListStdIterator QPtrListStdIterator
+#define TQPtrList QPtrList
+#define TQPtrListIterator QPtrListIterator
+#define TQPtrQueue QPtrQueue
+#define TQPtrStack QPtrStack
+#define TQPtrVector QPtrVector
+#define TQPushButton QPushButton
+#define TQRadioButton QRadioButton
+#define TQRangeControl QRangeControl
+#define TQSpinWidget QSpinWidget
+#define TQRect QRect
+#define TQRegExp QRegExp
+#define TQRegion QRegion
+#define TQHebrewCodec QHebrewCodec
+#define TQScrollBar QScrollBar
+#define TQScrollView QScrollView
+#define TQSemaphore QSemaphore
+#define TQSemiModal QSemiModal
+#define TQServerSocket QServerSocket
+#define TQSettings QSettings
+#define TQSGIStyle QSGIStyle
+#define TQSignal QSignal
+#define TQSignalMapper QSignalMapper
+#define TQConnectionList QConnectionList
+#define TQConnectionListIt QConnectionListIt
+#define TQSignalVec QSignalVec
+#define TQSimpleRichText QSimpleRichText
+#define TQSizeGrip QSizeGrip
+#define TQSize QSize
+#define TQSizePolicy QSizePolicy
+#define TQSjisCodec QSjisCodec
+#define TQSlider QSlider
+#define TQSocketDevice QSocketDevice
+#define TQSocket QSocket
+#define TQSocketNotifier QSocketNotifier
+#define TQSortedList QSortedList
+#define TQSound QSound
+#define TQSpinBox QSpinBox
+#define TQSplashScreen QSplashScreen
+#define TQSplitter QSplitter
+#define TQSqlCursor QSqlCursor
+#define TQSqlDatabase QSqlDatabase
+#define TQSqlDriver QSqlDriver
+#define TQSqlDriverPlugin QSqlDriverPlugin
+#define TQSqlEditorFactory QSqlEditorFactory
+#define TQSqlError QSqlError
+#define TQSqlFieldPrivate QSqlFieldPrivate
+#define TQSqlField QSqlField
+#define TQSqlFieldInfo QSqlFieldInfo
+#define TQSqlForm QSqlForm
+#define TQSql QSql
+#define TQSqlIndex QSqlIndex
+#define TQSqlPropertyMap QSqlPropertyMap
+#define TQSqlQuery QSqlQuery
+#define TQSqlResultShared QSqlResultShared
+#define TQSqlRecordShared QSqlRecordShared
+#define TQSqlRecord QSqlRecord
+#define TQSqlRecordInfo QSqlRecordInfo
+#define TQSqlResult QSqlResult
+#define TQSqlSelectCursorPrivate QSqlSelectCursorPrivate
+#define TQSqlSelectCursor QSqlSelectCursor
+#define TQStatusBar QStatusBar
+#define TQChar QChar
+#define TQString QString
+#define TQCharRef QCharRef
+#define TQConstString QConstString
+#define TQStringList QStringList
+#define TQStrListIterator QStrListIterator
+#define TQStrIList QStrIList
+#define TQStrList QStrList
+#define TQStrVec QStrVec
+#define TQStrIVec QStrIVec
+#define TQStyleFactory QStyleFactory
+#define TQStyleOption QStyleOption
+#define TQStyle QStyle
+#define TQStyleHintReturn QStyleHintReturn
+#define TQStylePlugin QStylePlugin
+#define TQStyleSheetItem QStyleSheetItem
+#define TQStyleSheet QStyleSheet
+#define TQSyntaxHighlighter QSyntaxHighlighter
+#define TQTab QTab
+#define TQTabBar QTabBar
+#define TQTabDialog QTabDialog
+#define TQTableSelection QTableSelection
+#define TQTableItem QTableItem
+#define TQComboTableItem QComboTableItem
+#define TQCheckTableItem QCheckTableItem
+#define TQTable QTable
+#define TQTabWidget QTabWidget
+#define TQTextBrowser QTextBrowser
+#define TQTextCodecFactory QTextCodecFactory
+#define TQTextEncoder QTextEncoder
+#define TQTextDecoder QTextDecoder
+#define TQTextCodec QTextCodec
+#define TQTextCodecPlugin QTextCodecPlugin
+#define TQTextEdit QTextEdit
+#define TQTextStream QTextStream
+#define TQTextIStream QTextIStream
+#define TQTextOStream QTextOStream
+#define TQTSManip QTSManip
+#define TQTextView QTextView
+#define TQThread QThread
+#define TQThreadStorageData QThreadStorageData
+#define TQThreadStorage QThreadStorage
+#define TQTimer QTimer
+#define TQTextOStreamIterator QTextOStreamIterator
+#define TQBackInsertIterator QBackInsertIterator
+#define TQtMsgType QtMsgType
+#define TQtMsgHandler QtMsgHandler
+#define TQToolBar QToolBar
+#define TQToolBox QToolBox
+#define TQToolButton QToolButton
+#define TQToolTipGroup QToolTipGroup
+#define TQToolTip QToolTip
+#define TQTsciiCodec QTsciiCodec
+#define TQUrl QUrl
+#define TQUrlInfo QUrlInfo
+#define TQUrlOperator QUrlOperator
+#define TQUtf8Codec QUtf8Codec
+#define TQUtf16Codec QUtf16Codec
+#define TQValidator QValidator
+#define TQIntValidator QIntValidator
+#define TQDoubleValidator QDoubleValidator
+#define TQRegExpValidator QRegExpValidator
+#define TQValueListNode QValueListNode
+#define TQValueListIterator QValueListIterator
+#define TQValueListConstIterator QValueListConstIterator
+#define TQValueListPrivate QValueListPrivate
+#define TQValueList QValueList
+#define TQValueStack QValueStack
+#define TQValueVectorPrivate QValueVectorPrivate
+#define TQValueVector QValueVector
+#define TQVariant QVariant
+#define TQVBox QVBox
+#define TQVButtonGroup QVButtonGroup
+#define TQVGroupBox QVGroupBox
+#define TQWaitCondition QWaitCondition
+#define TQWhatsThis QWhatsThis
+#define TQWidgetFactory QWidgetFactory
+#define TQWidget QWidget
+#define TQWidgetIntDict QWidgetIntDict
+#define TQWidgetIntDictIt QWidgetIntDictIt
+#define TQWidgetList QWidgetList
+#define TQWidgetListIt QWidgetListIt
+#define TQWidgetPlugin QWidgetPlugin
+#define TQWidgetContainerPlugin QWidgetContainerPlugin
+#define TQWidgetStack QWidgetStack
+#define TQWidgetStackAccelManager QWidgetStackAccelManager
+#define TQWindowsStyle QWindowsStyle
+#define TQWizard QWizard
+#define TQWMatrix QWMatrix
+#define TQWorkspace QWorkspace
+#define TQXmlNamespaceSupport QXmlNamespaceSupport
+#define TQXmlAttributes QXmlAttributes
+#define TQXmlInputSource QXmlInputSource
+#define TQXmlParseException QXmlParseException
+#define TQXmlReader QXmlReader
+#define TQXmlSimpleReader QXmlSimpleReader
+#define TQXmlLocator QXmlLocator
+#define TQXmlContentHandler QXmlContentHandler
+#define TQXmlErrorHandler QXmlErrorHandler
+#define TQXmlDTDHandler QXmlDTDHandler
+#define TQXmlEntityResolver QXmlEntityResolver
+#define TQXmlLexicalHandler QXmlLexicalHandler
+#define TQXmlDeclHandler QXmlDeclHandler
+#define TQXmlDefaultHandler QXmlDefaultHandler
+#endif
+
+#ifdef USE_QT4
+#define TQAccel Q3Accel
+#define TQAccessible QAccessible
+#define TQAccessibleObject QAccessibleObject
+#define TQAction Q3Action
+#define TQActionGroup Q3ActionGroup
+#define TQApplication QApplication
+#define TQAsciiCache Q3AsciiCache
+#define TQAsciiCacheIterator Q3AsciiCacheIterator
+#define TQAsciiDict Q3AsciiDict
+#define TQAsciiDictIterator Q3AsciiDictIterator
+#define TQImageConsumer QImageConsumer
+#define TQImageFormat QImageFormat
+#define TQImageFormatType QImageFormatType
+#define TQImageDecoder QImageDecoder
+#define TQAsyncIO QAsyncIO
+#define TQByteArray QByteArray
+#define TQDataSink QDataSink
+#define TQDataSource QDataSource
+#define TQIODeviceSource QIODeviceSource
+#define TQDataPump QDataPump
+#define TQBig5Codec QBig5Codec
+#define TQBig5hkscsCodec QBig5hkscsCodec
+#define TQBitVal QBitVal
+#define TQBitArray QBitArray
+#define TQBitmap QBitmap
+#define TQBrush QBrush
+#define TQBuffer QBuffer
+#define TQButtonGroup Q3ButtonGroup
+#define TQButton Q3Button
+#define TQCache Q3Cache
+#define TQCacheIterator Q3CacheIterator
+#define TQCanvasChunk Q3CanvasChunk
+#define TQCanvasItemList Q3CanvasItemList
+#define TQCanvasItemExtra Q3CanvasItemExtra
+#define TQCanvasItem Q3CanvasItem
+#define TQCanvasData Q3CanvasData
+#define TQCanvas Q3Canvas
+#define TQCanvasViewData Q3CanvasViewData
+#define TQCanvasView Q3CanvasView
+#define TQCanvasPixmap Q3CanvasPixmap
+#define TQCanvasPixmapArray Q3CanvasPixmapArray
+#define TQCanvasSprite Q3CanvasSprite
+#define TQPolygonalProcessor QPolygonalProcessor
+#define TQCanvasPolygonalItem Q3CanvasPolygonalItem
+#define TQCanvasRectangle Q3CanvasRectangle
+#define TQCanvasPolygon Q3CanvasPolygon
+#define TQCanvasSpline Q3CanvasSpline
+#define TQCanvasLine Q3CanvasLine
+#define TQCanvasEllipse Q3CanvasEllipse
+#define TQCanvasTextExtra Q3CanvasTextExtra
+#define TQCanvasText Q3CanvasText
+#define TQCDEStyle QCDEStyle
+#define TQCheckBox QCheckBox
+#define TQCleanupHandler QCleanupHandler
+#define TQSingleCleanupHandler QSingleCleanupHandler
+#define TQSharedCleanupHandler QSharedCleanupHandler
+#define TQShared Q3Shared
+#define TQColor QColor
+#define TQStrList QStrList
+#define TQStringList QStringList
+#define TQStringPairList Q3StringPairList
+#define TQLineEdit QLineEdit
+#define TQValidator QValidator
+#define TQListBox QListBox
+#define TQComboBoxData Q3ComboBoxData
+#define TQComboTableItem Q3ComboTableItem
+#define TQWheelEvent QWheelEvent
+#define TQComboBox Q3ComboBox
+#define TQCommonStyle QCommonStyle
+#define TQCompactStyle QCompactStyle
+#define TQConnection QConnection
+#define TQCString Q3CString
+#define TQCursor QCursor
+#define TQSqlForm QSqlForm
+#define TQDataBrowserPrivate Q3DataBrowserPrivate
+#define TQDataBrowser Q3DataBrowser
+#define TQDataStream QDataStream
+#define TQPainter QPainter
+#define TQSqlField QSqlField
+#define TQSqlPropertyMap QSqlPropertyMap
+#define TQDataTablePrivate QDataTablePrivate
+#define TQDataTable Q3DataTable
+#define TQDataView Q3DataView
+#define TQDateEdit Q3DateEdit
+#define TQTimeEdit Q3TimeEdit
+#define TQDateTimeEdit Q3DateTimeEdit
+#define TQDateTimeEditBase Q3DateTimeEditBase
+#define TQDate QDate
+#define TQTime QTime
+#define TQDateTime Q3DateTime
+#define TQDeepCopy Q3DeepCopy
+#define TQDesktopWidget QDesktopWidget
+#define TQDial QDial
+#define TQDialog QDialog
+#define TQDict Q3Dict
+#define TQDictIterator Q3DictIterator
+#define TQDir QDir
+#define TQDirLineEdit QDirLineEdit
+#define TQDirMultiLineEdit QDirMultiLineEdit
+#define TQDns Q3Dns
+#define TQDnsSocket QDnsSocket
+#define TQDockArea Q3DockArea
+#define TQDockAreaLayout QDockAreaLayout
+#define TQDockWindow Q3DockWindow
+#define TQDomImplementation QDomImplementation
+#define TQDomNodeList QDomNodeList
+#define TQDomDocumentType QDomDocumentType
+#define TQDomDocument QDomDocument
+#define TQDomNamedNodeMap QDomNamedNodeMap
+#define TQDomDocumentFragment QDomDocumentFragment
+#define TQDomCharacterData QDomCharacterData
+#define TQDomAttr QDomAttr
+#define TQDomElement QDomElement
+#define TQDomText QDomText
+#define TQDomComment QDomComment
+#define TQDomCDATASection QDomCDATASection
+#define TQDomNotation QDomNotation
+#define TQDomEntity QDomEntity
+#define TQDomEntityReference QDomEntityReference
+#define TQDomProcessingInstruction QDomProcessingInstruction
+#define TQDomNode QDomNode
+#define TQDragObject Q3DragObject
+#define TQStoredDrag Q3StoredDrag
+#define TQTextDrag Q3TextDrag
+#define TQImageDrag Q3ImageDrag
+#define TQUriDrag Q3UriDrag
+#define TQColorDrag Q3ColorDrag
+#define TQDropSite Q3DropSite
+#define TQEditorFactory Q3EditorFactory
+#define TQErrorMessage QErrorMessage
+#define TQEucJpCodec QEucJpCodec
+#define TQEucKrCodec QEucKrCodec
+#define TQEvent QEvent
+#define TQTimerEvent QTimerEvent
+#define TQMouseEvent QMouseEvent
+#define TQWheelEvent QWheelEvent
+#define TQTabletEvent QTabletEvent
+#define TQKeyEvent QKeyEvent
+#define TQFocusEvent QFocusEvent
+#define TQPaintEvent QPaintEvent
+#define TQMoveEvent QMoveEvent
+#define TQResizeEvent QResizeEvent
+#define TQCloseEvent QCloseEvent
+#define TQIconDragEvent QIconDragEvent
+#define TQShowEvent QShowEvent
+#define TQHideEvent QHideEvent
+#define TQContextMenuEvent QContextMenuEvent
+#define TQIMEvent QIMEvent
+#define TQIMComposeEvent QIMComposeEvent
+#define TQDropEvent QDropEvent
+#define TQDragMoveEvent QDragMoveEvent
+#define TQDragEnterEvent QDragEnterEvent
+#define TQDragResponseEvent QDragResponseEvent
+#define TQDragLeaveEvent QDragLeaveEvent
+#define TQChildEvent QChildEvent
+#define TQCustomEvent QCustomEvent
+#define TQEventLoop QEventLoop
+#define TQFileIconProvider Q3FileIconProvider
+#define TQFilePreview Q3FilePreview
+#define TQFileDialog Q3FileDialog
+#define TQFile QFile
+#define TQFileInfo QFileInfo
+#define TQFileInfoList QFileInfoList
+#define TQFileInfoListIterator QFileInfoListIterator
+#define TQFocusData QFocusData
+#define TQFontDatabase QFontDatabase
+#define TQFont QFont
+#define TQFontInfo QFontInfo
+#define TQFontMetrics QFontMetrics
+#define TQFrame Q3Frame
+#define TQFtp Q3Ftp
+#define TQGArray QGArray
+#define TQGb18030Codec QGb18030Codec
+#define TQGbkCodec QGbkCodec
+#define TQGb2312Codec QGb2312Codec
+#define TQGCache QGCache
+#define TQGCacheIterator QGCacheIterator
+#define TQBaseBucket QBaseBucket
+#define TQStringBucket QStringBucket
+#define TQAsciiBucket QAsciiBucket
+#define TQIntBucket QIntBucket
+#define TQPtrBucket QPtrBucket
+#define TQGDict QGDict
+#define TQGDictIterator QGDictIterator
+#define TQGLColormap QGLColormap
+#define TQGL QGL
+#define TQGLFormat QGLFormat
+#define TQGLContext QGLContext
+#define TQGLWidget QGLWidget
+#define TQLNode QLNode
+#define TQGList QGList
+#define TQGListIterator QGListIterator
+#define TQGListStdIterator QGListStdIterator
+#define TQGPlugin QGPlugin
+#define TQGrid Q3Grid
+#define TQGridView Q3GridView
+#define TQGroupBox Q3GroupBox
+#define TQGuardedPtr QGuardedPtr
+#define TQGuardedPtrPrivate QGuardedPtrPrivate
+#define TQGVector QGVector
+#define TQHBox Q3HBox
+#define TQHButtonGroup Q3HButtonGroup
+#define TQHeader Q3Header
+#define TQHGroupBox Q3HGroupBox
+#define TQHostAddress QHostAddress
+#define TQHttpHeader Q3HttpHeader
+#define TQHttpResponseHeader Q3HttpResponseHeader
+#define TQHttpRequestHeader Q3HttpRequestHeader
+#define TQHttp Q3Http
+#define TQIconSet QIconSet
+#define TQIconFactory QIconFactory
+#define TQIconDragItem Q3IconDragItem
+#define TQIconDrag Q3IconDrag
+#define TQIconViewItem Q3IconViewItem
+#define TQIconView Q3IconView
+#define TQImageFormatPlugin QImageFormatPlugin
+#define TQImageTextKeyLang QImageTextKeyLang
+#define TQImage QImage
+#define TQImageIO QImageIO
+#define TQInputContextFactory QInputContextFactory
+#define TQInputContext QInputContext
+#define TQIntCache Q3IntCache
+#define TQIntCacheIterator Q3IntCacheIterator
+#define TQIntDict Q3IntDict
+#define TQIntDictIterator Q3IntDictIterator
+#define TQIODevice QIODevice
+#define TQJisCodec QJisCodec
+#define TQJpUnicodeConv QJpUnicodeConv
+#define TQKeySequence QKeySequence
+#define TQLabel QLabel
+#define TQGLayoutIterator QGLayoutIterator
+#define TQLayoutIterator QLayoutIterator
+#define TQLayoutItem QLayoutItem
+#define TQSpacerItem QSpacerItem
+#define TQWidgetItem QWidgetItem
+#define TQLayout QLayout
+#define TQGridLayout QGridLayout
+#define TQBoxLayout QBoxLayout
+#define TQHBoxLayout QHBoxLayout
+#define TQVBoxLayout QVBoxLayout
+#define TQLCDNumber QLCDNumber
+#define TQLibrary QLibrary
+#define TQLineEdit QLineEdit
+#define TQListBox Q3ListBox
+#define TQListBoxItem Q3ListBoxItem
+#define TQListBoxText Q3ListBoxText
+#define TQListBoxPixmap Q3ListBoxPixmap
+#define TQListViewItem Q3ListViewItem
+#define TQListView Q3ListView
+#define TQCheckListItem Q3CheckListItem
+#define TQListViewItemIterator Q3ListViewItemIterator
+#define TQLocale QLocale
+#define TQLocalFs Q3LocalFs
+#define TQMainWindow Q3MainWindow
+#define TQMapIterator QMapIterator
+#define TQMapConstIterator QMapConstIterator
+#define TQMapPrivateBase QMapPrivateBase
+#define TQMapPrivate QMapPrivate
+#define TQMap QMap
+#define TQMemArray Q3MemArray
+#define TQMenuBar QMenuBar
+#define TQMenuItem QMenuItem
+#define TQCustomMenuItem QCustomMenuItem
+#define TQMenuData QMenuData
+#define TQMessageBox QMessageBox
+#define TQMetaProperty QMetaProperty
+#define TQMetaObject QMetaObject
+#define TQMetaObjectCleanUp QMetaObjectCleanUp
+#define TQMimeSource QMimeSource
+#define TQMimeSourceFactory Q3MimeSourceFactory
+#define TQWindowsMime QWindowsMime
+#define TQMacMime QMacMime
+#define TQMotifPlusStyle QMotifPlusStyle
+#define TQMotifStyle QMotifStyle
+#define TQMovie QMovie
+#define TQMultiLineEdit Q3MultiLineEdit
+#define TQMutex QMutex
+#define TQMutexLocker QMutexLocker
+#define TQt Qt
+#define TQInternal QInternal
+#define TQNetworkProtocolFactoryBase QNetworkProtocolFactoryBase
+#define TQNetworkProtocolFactory QNetworkProtocolFactory
+#define TQNetworkProtocol Q3NetworkProtocol
+#define TQNetworkOperation Q3NetworkOperation
+#define TQObjectCleanupHandler QObjectCleanupHandler
+#define TQObjectDictionary QObjectDictionary
+#define TQObject QObject
+#define TQObjectUserData QObjectUserData
+#define TQObject QObject
+#define TQObjectList QObjectList
+#define TQObjectListIterator QObjectListIterator
+#define TQObjectListIt QObjectListIt
+#define TQPaintDevice QPaintDevice
+#define TQPaintDeviceMetrics Q3PaintDeviceMetrics
+#define TQPainter Q3Painter
+#define TQColorGroup QColorGroup
+#define TQPalette QPalette
+#define TQPen QPen
+#define TQPicture Q3Picture
+#define TQPixmapCache QPixmapCache
+#define TQPixmap QPixmap
+#define TQPlatinumStyle QPlatinumStyle
+#define TQPNGImageWriter QPNGImageWriter
+#define TQPNGImagePacker QPNGImagePacker
+#define TQPointArray Q3PointArray
+#define TQPoint QPoint
+#define TQPolygonScanner QPolygonScanner
+#define TQPopupMenu Q3PopupMenu
+#define TQPrintDialog QPrintDialog
+#define TQPrinter QPrinter
+#define TQProcess Q3Process
+#define TQProgressBar QP3rogressBar
+#define TQProgressDialog Q3ProgressDialog
+#define TQPtrCollection Q3PtrCollection
+#define TQPtrDict Q3PtrDict
+#define TQPtrDictIterator Q3PtrDictIterator
+#define TQPtrListStdIterator Q3PtrListStdIterator
+#define TQPtrList Q3PtrList
+#define TQPtrListIterator Q3PtrListIterator
+#define TQPtrQueue Q3PtrQueue
+#define TQPtrStack Q3PtrStack
+#define TQPtrVector Q3PtrVector
+#define TQPushButton QPushButton
+#define TQRadioButton QRadioButton
+#define TQRangeControl Q3RangeControl
+#define TQSpinWidget QSpinWidget
+#define TQRect QRect
+#define TQRegExp QRegExp
+#define TQRegion QRegion
+#define TQHebrewCodec QHebrewCodec
+#define TQScrollBar QScrollBar
+#define TQScrollView Q3ScrollView
+#define TQSemaphore Q3Semaphore
+#define TQSemiModal QSemiModal
+#define TQServerSocket Q3ServerSocket
+#define TQSettings QSettings
+#define TQSGIStyle QSGIStyle
+#define TQSignal Q3Signal
+#define TQSignalMapper QSignalMapper
+#define TQConnectionList QConnectionList
+#define TQConnectionListIt QConnectionListIt
+#define TQSignalVec QSignalVec
+#define TQSimpleRichText Q3SimpleRichText
+#define TQSizeGrip QSizeGrip
+#define TQSize QSize
+#define TQSizePolicy QSizePolicy
+#define TQSjisCodec QSjisCodec
+#define TQSlider QSlider
+#define TQSocketDevice Q3SocketDevice
+#define TQSocket Q3Socket
+#define TQSocketNotifier QSocketNotifier
+#define TQSortedList QSortedList
+#define TQSound QSound
+#define TQSpinBox QSpinBox
+#define TQSplashScreen QSplashScreen
+#define TQSplitter QSplitter
+#define TQSqlCursor Q3SqlCursor
+#define TQSqlDatabase QSqlDatabase
+#define TQSqlDriver QSqlDriver
+#define TQSqlDriverPlugin QSqlDriverPlugin
+#define TQSqlEditorFactory Q3SqlEditorFactory
+#define TQSqlError QSqlError
+#define TQSqlFieldPrivate QSqlFieldPrivate
+#define TQSqlField QSqlField
+#define TQSqlFieldInfo Q3SqlFieldInfo
+#define TQSqlForm Q3SqlForm
+#define TQSql QSql
+#define TQSqlIndex QSqlIndex
+#define TQSqlPropertyMap Q3SqlPropertyMap
+#define TQSqlQuery QSqlQuery
+#define TQSqlResultShared QSqlResultShared
+#define TQSqlRecordShared QSqlRecordShared
+#define TQSqlRecord QSqlRecord
+#define TQSqlRecordInfo Q3SqlRecordInfo
+#define TQSqlResult QSqlResult
+#define TQSqlSelectCursorPrivate QSqlSelectCursorPrivate
+#define TQSqlSelectCursor Q3SqlSelectCursor
+#define TQStatusBar QStatusBar
+#define TQChar QChar
+#define TQString QString
+#define TQCharRef QCharRef
+#define TQConstString QConstString
+#define TQStringList QStringList
+#define TQStrListIterator Q3StrListIterator
+#define TQStrIList Q3StrIList
+#define TQStrList Q3StrList
+#define TQStrVec QStrVec
+#define TQStrIVec QStrIVec
+#define TQStyleFactory QStyleFactory
+#define TQStyleOption QStyleOption
+#define TQStyle QStyle
+#define TQStyleHintReturn QStyleHintReturn
+#define TQStylePlugin QStylePlugin
+#define TQStyleSheetItem Q3StyleSheetItem
+#define TQStyleSheet Q3StyleSheet
+#define TQSyntaxHighlighter Q3SyntaxHighlighter
+#define TQTab QTab
+#define TQTabBar QTabBar
+#define TQTabDialog Q3TabDialog
+#define TQTableSelection Q3TableSelection
+#define TQTableItem Q3TableItem
+#define TQComboTableItem QComboTableItem
+#define TQCheckTableItem Q3CheckTableItem
+#define TQTable Q3Table
+#define TQTabWidget QTabWidget
+#define TQTextBrowser Q3TextBrowser
+#define TQTextCodecFactory QTextCodecFactory
+#define TQTextEncoder QTextEncoder
+#define TQTextDecoder QTextDecoder
+#define TQTextCodec QTextCodec
+#define TQTextCodecPlugin QTextCodecPlugin
+#define TQTextEdit Q3TextEdit
+#define TQTextStream Q3TextStream
+#define TQTextIStream QTextIStream
+#define TQTextOStream QTextOStream
+#define TQTSManip QTSManip
+#define TQTextView Q3TextView
+#define TQThread QThread
+#define TQThreadStorageData QThreadStorageData
+#define TQThreadStorage QThreadStorage
+#define TQTimer QTimer
+#define TQTextOStreamIterator QTextOStreamIterator
+#define TQBackInsertIterator QBackInsertIterator
+#define TQtMsgType QtMsgType
+#define TQtMsgHandler QtMsgHandler
+#define TQToolBar Q3ToolBar
+#define TQToolBox QToolBox
+#define TQToolButton QToolButton
+#define TQToolTipGroup QToolTipGroup
+#define TQToolTip QToolTip
+#define TQTsciiCodec QTsciiCodec
+#define TQUrl Q3Url
+#define TQUrlInfo QUrlInfo
+#define TQUrlOperator Q3UrlOperator
+#define TQUtf8Codec QUtf8Codec
+#define TQUtf16Codec QUtf16Codec
+#define TQValidator QValidator
+#define TQIntValidator QIntValidator
+#define TQDoubleValidator QDoubleValidator
+#define TQRegExpValidator QRegExpValidator
+#define TQValueListNode QValueListNode
+#define TQValueListIterator Q3ValueListIterator
+#define TQValueListConstIterator Q3ValueListConstIterator
+#define TQValueListPrivate QValueListPrivate
+#define TQValueList Q3ValueList
+#define TQValueStack Q3ValueStack
+#define TQValueVectorPrivate QValueVectorPrivate
+#define TQValueVector Q3ValueVector
+#define TQVariant QVariant
+#define TQVBox Q3VBox
+#define TQVButtonGroup Q3VButtonGroup
+#define TQVGroupBox Q3VGroupBox
+#define TQWaitCondition QWaitCondition
+#define TQWhatsThis Q3WhatsThis
+#define TQWidgetFactory QWidgetFactory
+#define TQWidget QWidget
+#define TQWidgetIntDict QWidgetIntDict
+#define TQWidgetIntDictIt QWidgetIntDictIt
+#define TQWidgetList QWidgetList
+#define TQWidgetListIt QWidgetListIt
+#define TQWidgetPlugin QWidgetPlugin
+#define TQWidgetContainerPlugin QWidgetContainerPlugin
+#define TQWidgetStack Q3WidgetStack
+#define TQWidgetStackAccelManager Q3WidgetStackAccelManager
+#define TQWindowsStyle QWindowsStyle
+#define TQWizard Q3Wizard
+#define TQWMatrix QWMatrix
+#define TQWorkspace QWorkspace
+#define TQXmlNamespaceSupport QXmlNamespaceSupport
+#define TQXmlAttributes QXmlAttributes
+#define TQXmlInputSource QXmlInputSource
+#define TQXmlParseException QXmlParseException
+#define TQXmlReader QXmlReader
+#define TQXmlSimpleReader QXmlSimpleReader
+#define TQXmlLocator QXmlLocator
+#define TQXmlContentHandler QXmlContentHandler
+#define TQXmlErrorHandler QXmlErrorHandler
+#define TQXmlDTDHandler QXmlDTDHandler
+#define TQXmlEntityResolver QXmlEntityResolver
+#define TQXmlLexicalHandler QXmlLexicalHandler
+#define TQXmlDeclHandler QXmlDeclHandler
+#define TQXmlDefaultHandler QXmlDefaultHandler
+#endif
+
+// Undo any damage caused by the tqt-replace utility
+//#define QCStringList TQCStringList
+//#define QtWIN TQtWIN
+
//#include "kdemacros.h.in"
//#define TQT_EXPORT KDE_EXPORT
diff --git a/qtinterface/tqtabdialog.h b/qtinterface/tqtabdialog.h
index 445ff3c..c64cbce 100644
--- a/qtinterface/tqtabdialog.h
+++ b/qtinterface/tqtabdialog.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3tabdialog.h>
-#define QTabDialog Q3TabDialog
-
#endif // USE_QT4
#endif /* TQTABDIALOG_H */ \ No newline at end of file
diff --git a/qtinterface/tqtable.h b/qtinterface/tqtable.h
index c7413fc..4d52094 100644
--- a/qtinterface/tqtable.h
+++ b/qtinterface/tqtable.h
@@ -40,12 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3table.h>
-#define QTable Q3Table
-#define QTableItem Q3TableItem
-#define QComboTableItem Q3ComboTableItem
-#define QCheckTableItem Q3CheckTableItem
-#define QTableSelection Q3TableSelection
-
#endif // USE_QT4
#endif /* TQTABLE_H */ \ No newline at end of file
diff --git a/qtinterface/tqtextedit.h b/qtinterface/tqtextedit.h
index c475df0..e4be715 100644
--- a/qtinterface/tqtextedit.h
+++ b/qtinterface/tqtextedit.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QTextEdit class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3textedit.h>
-#define QTextEdit Q3TextEdit
-
#endif // USE_QT4
#endif /* TQTEXTEDIT_H */ \ No newline at end of file
diff --git a/qtinterface/tqtextview.h b/qtinterface/tqtextview.h
index 103d82c..74293ef 100644
--- a/qtinterface/tqtextview.h
+++ b/qtinterface/tqtextview.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3textview.h>
-#define QTextView Q3TextView
-
#endif // USE_QT4
#endif /* TQTEXTVIEW_H */ \ No newline at end of file
diff --git a/qtinterface/tqtimer.h b/qtinterface/tqtimer.h
index f1c1390..d1960f1 100644
--- a/qtinterface/tqtimer.h
+++ b/qtinterface/tqtimer.h
@@ -38,82 +38,8 @@ Boston, MA 02110-1301, USA.
// Reimplement the QTimer class
// For Qt4, some changes are needed
-// Linker tricks required to override a class without changing its name
-#define QTimer IQTimer
#include <QtCore/qtimer.h>
-#undef QTimer
-
-class QTimer : public IQTimer {
-// This is taken straight from the Qt header file, with all Q_OBJECT, slot, and similar keywords stripped out.
-// Also, all inline functions must be converted to simple declarations.
-// This is the last and most obnoxious part of the linker tricks mentioned above
-// Essentially, the compiler needs to know that these Q functions exist so that the above I functions
-// are not attempted to link. Instead, these empty declarations allow the linker to pull in the complete Q function
-// from the Qt toolkit in use. Convoluted, yes, but it should make maintinance MUCH easier as the Qt API changes.
-public:
- explicit QTimer(QObject *parent = 0);
- ~QTimer();
-
- inline bool isActive() const;
- int timerId() const;
-
- void setInterval(int msec);
- int interval() const;
-
- inline void setSingleShot(bool singleShot);
- inline bool isSingleShot() const;
-
- static void singleShot(int msec, QObject *receiver, const char *member);
-
- void start(int msec);
-
- void start();
- void stop();
-
- void timeout();
-// End Qt header file copy
-
-// This is where the new member functions should be placed
-// Unlike the above copied block, these members must be defined in the associated .cpp file,
-// and they should usually do something. Feel free to include as many Qt files as needed
-// in the cpp source file, but DO NOT include them in this header file.
- int myNewFunction(int parameter_one);
-
-// Begin Qt header file copy
-protected:
- void timerEvent(QTimerEvent *);
-
-private:
- inline int startTimer(int);
- inline void killTimer(int);
-};
-
-//inline void QTimer::setSingleShot(bool asingleShot) { single = asingleShot; }
-// End Qt header file copy
#endif // USE_QT4
-// #ifdef USE_QT4
-//
-// // Reimplement the QTimer class
-// // For Qt4, a few overrides are required
-// // Specifically, these functions were altered:
-// // OLD: NEW:
-// //
-//
-// #include <qtimer.h>
-//
-// class Q_EXPORT TQTimer : public QTimer
-// {
-// Q_OBJECT
-// public:
-// TQTimer( QObject *parent=0, const char *name=0 );
-// ~TQTimer();
-//
-// // FIXME: Example ONLY
-// virtual void oldFunction ();
-// };
-//
-// #endif // USE_QT4
-
#endif /* TQTIMER_H */ \ No newline at end of file
diff --git a/qtinterface/tqtoolbar.h b/qtinterface/tqtoolbar.h
index ba01a93..dc148d4 100644
--- a/qtinterface/tqtoolbar.h
+++ b/qtinterface/tqtoolbar.h
@@ -41,8 +41,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3toolbar.h>
-#define QToolBar Q3ToolBar
-
#endif // USE_QT4
#endif /* TQTOOLBAR_H */ \ No newline at end of file
diff --git a/qtinterface/tqurloperator.h b/qtinterface/tqurloperator.h
index 9f0d5b2..38b08ab 100644
--- a/qtinterface/tqurloperator.h
+++ b/qtinterface/tqurloperator.h
@@ -29,18 +29,16 @@ Boston, MA 02110-1301, USA.
// Reimplement the QUrlOperator class
// For Qt3, no changes are needed
-#include <q3urloperator.h>
-
-#define QUrlOperator Q3UrlOperator
+#include <qurloperator.h>
#endif // USE_QT3
#ifdef USE_QT4
// Reimplement the QUrlOperator class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
-#include <qurloperator.h>
+#include <Qt/q3urloperator.h>
#endif // USE_QT4
diff --git a/qtinterface/tqvaluelist.h b/qtinterface/tqvaluelist.h
index 38a54af..3224e5f 100644
--- a/qtinterface/tqvaluelist.h
+++ b/qtinterface/tqvaluelist.h
@@ -41,8 +41,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3valuelist.h>
-#define QValueList Q3ValueList
-
#endif // USE_QT4
#endif /* TQVALUELIST_H */ \ No newline at end of file
diff --git a/qtinterface/tqvaluestack.h b/qtinterface/tqvaluestack.h
index 3817de0..4acc0a2 100644
--- a/qtinterface/tqvaluestack.h
+++ b/qtinterface/tqvaluestack.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3valuestack.h>
-#define QValueStack Q3ValueStack
-
#endif // USE_QT4
#endif /* TQVALUESTACK_H */ \ No newline at end of file
diff --git a/qtinterface/tqvaluevector.h b/qtinterface/tqvaluevector.h
index aaf02f7..fd0c374 100644
--- a/qtinterface/tqvaluevector.h
+++ b/qtinterface/tqvaluevector.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QValueVector class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3valuevector.h>
-#define QValueVector Q3ValueVector
-
#endif // USE_QT4
#endif /* TQVALUEVECTOR_H */ \ No newline at end of file
diff --git a/qtinterface/tqvbox.h b/qtinterface/tqvbox.h
index 46c4284..92e1d94 100644
--- a/qtinterface/tqvbox.h
+++ b/qtinterface/tqvbox.h
@@ -36,12 +36,10 @@ Boston, MA 02110-1301, USA.
#ifdef USE_QT4
// Reimplement the QVBox class
-// For Qt4, no changes are needed
+// For Qt4, some changes are needed
#include <Qt/q3vbox.h>
-#define QVBox Q3VBox
-
#endif // USE_QT4
#endif /* TQVBOX_H */ \ No newline at end of file
diff --git a/qtinterface/tqvbuttongroup.h b/qtinterface/tqvbuttongroup.h
index 7857e66..800c5d1 100644
--- a/qtinterface/tqvbuttongroup.h
+++ b/qtinterface/tqvbuttongroup.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3buttongroup.h>
-#define QVButtonGroup Q3VButtonGroup
-
#endif // USE_QT4
#endif /* TQVBUTTONGROUP_H */ \ No newline at end of file
diff --git a/qtinterface/tqvgroupbox.h b/qtinterface/tqvgroupbox.h
index f0d2857..95a5b87 100644
--- a/qtinterface/tqvgroupbox.h
+++ b/qtinterface/tqvgroupbox.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3vgroupbox.h>
-#define QVGroupBox Q3VGroupBox
-
#endif // USE_QT4
#endif /* TQVGROUPBOX_H */ \ No newline at end of file
diff --git a/qtinterface/tqwhatsthis.h b/qtinterface/tqwhatsthis.h
index cf3b2ba..7d6c21f 100644
--- a/qtinterface/tqwhatsthis.h
+++ b/qtinterface/tqwhatsthis.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3whatsthis.h>
-#define QWhatsThis Q3WhatsThis
-
#endif // USE_QT4
#endif /* TQWHATSTHIS_H */ \ No newline at end of file
diff --git a/qtinterface/tqwidgetfactory.h b/qtinterface/tqwidgetfactory.h
index 040872a..91fec01 100644
--- a/qtinterface/tqwidgetfactory.h
+++ b/qtinterface/tqwidgetfactory.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <QtDesigner/formbuilder.h>
-#define QWidgetFactory QFormBuilder
-
#endif // USE_QT4
#endif /* TQWIDGETFACTORY_H */ \ No newline at end of file
diff --git a/qtinterface/tqwidgetstack.h b/qtinterface/tqwidgetstack.h
index 19b9402..660d01b 100644
--- a/qtinterface/tqwidgetstack.h
+++ b/qtinterface/tqwidgetstack.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/q3widgetstack.h>
-#define QWidgetStack Q3WidgetStack
-
#endif // USE_QT4
#endif /* TQWIDGETSTACK_H */ \ No newline at end of file
diff --git a/qtinterface/tqwmatrix.h b/qtinterface/tqwmatrix.h
index f143ba7..e8d41fe 100644
--- a/qtinterface/tqwmatrix.h
+++ b/qtinterface/tqwmatrix.h
@@ -40,8 +40,6 @@ Boston, MA 02110-1301, USA.
#include <Qt/qmatrix.h>
-#define QWMatrix QMatrix
-
#endif // USE_QT4
#endif /* TQWMATRIX_H */ \ No newline at end of file