From c9a6fbb8c4c57c325aa0a4255533a2380458f18a Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 16 Jul 2010 06:27:29 +0000 Subject: Remove unneeded arts/kde checks from configure script Committed partial progress git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1150494 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- configure.in.in | 25 ------------------------- qtinterface/tqaccel.h | 6 ++++-- qtinterface/tqaccessible.h | 4 ++-- qtinterface/tqaction.h | 5 +++-- qtinterface/tqapplication.h | 1 + qtinterface/tqasciicache.h | 6 ++++-- qtinterface/tqasciidict.h | 6 ++++-- qtinterface/tqasyncimageio.h | 8 +++----- qtinterface/tqasyncio.h | 4 +--- qtinterface/tqbig5codec.h | 4 +--- qtinterface/tqbitarray.h | 6 ++++-- qtinterface/tqbitmap.h | 4 ++-- qtinterface/tqbrush.h | 4 ++-- qtinterface/tqbuffer.h | 4 ++-- qtinterface/tqbutton.h | 4 ++-- qtinterface/tqbuttongroup.h | 4 ++-- qtinterface/tqcache.h | 6 ++++-- qtinterface/tqcanvas.h | 17 ++++++++++++++++- qtinterface/tqcdestyle.h | 4 ++-- qtinterface/tqcheckbox.h | 4 ++-- qtinterface/tqcleanuphandler.h | 4 ++-- qtinterface/tqclipboard.h | 4 ++-- qtinterface/tqcolor.h | 2 +- qtinterface/tqcolordialog.h | 4 ++-- qtinterface/tqcombobox.h | 4 ++-- qtinterface/tqcommonstyle.h | 4 ++-- qtinterface/tqcompactstyle.h | 8 +++----- qtinterface/tqconnection.h | 4 +--- qtinterface/tqcstring.h | 6 ++++-- qtinterface/tqcursor.h | 4 ++-- qtinterface/tqdatabrowser.h | 6 ++++-- qtinterface/tqdatastream.h | 2 +- qtinterface/tqdatatable.h | 6 ++++-- qtinterface/tqdataview.h | 4 +++- qtinterface/tqdatetime.h | 8 ++++---- qtinterface/tqdatetimeedit.h | 6 ++++-- qtinterface/tqdeepcopy.h | 6 ++++-- qtinterface/tqdesktopwidget.h | 4 ++-- qtinterface/tqdial.h | 4 ++-- qtinterface/tqdialog.h | 4 ++-- qtinterface/tqdict.h | 8 ++++---- qtinterface/tqdir.h | 4 ++-- qtinterface/tqdns.h | 6 ++++-- qtinterface/tqdockarea.h | 6 ++++-- qtinterface/tqdockwindow.h | 6 ++++-- qtinterface/tqdom.h | 4 ++-- qtinterface/tqdragobject.h | 6 ++++-- qtinterface/tqdrawutil.h | 4 ++-- qtinterface/tqdropsite.h | 6 ++++-- qtinterface/tqguardedptr.h | 6 ++++-- qtinterface/tqiconset.h | 6 ++++-- qtinterface/tqiodevice.h | 3 ++- qtinterface/tqmemarray.h | 4 +++- qtinterface/tqshared.h | 6 ++++-- qtinterface/tqsql.h | 4 ++-- qtinterface/tqt.h | 4 ++++ qtinterface/tqtextstream.h | 4 ++-- qtinterface/tqvaluelist.h | 6 ++++-- qtinterface/tqvariant.h | 4 ++-- qtinterface/tqwmatrix.h | 6 ++++-- 60 files changed, 177 insertions(+), 146 deletions(-) diff --git a/configure.in.in b/configure.in.in index 96ebee2..fc7f2f3 100644 --- a/configure.in.in +++ b/configure.in.in @@ -102,31 +102,6 @@ KCONFIG_COMPILER="compiled" MAKEKDEWIDGETS="compiled" dnl Checks for libraries etc -AC_BASE_PATH_KDE([don't test]) dnl kdelibs is a special case -KDE_ENABLE_HIDDEN_VISIBILITY - -AC_CREATE_KFSSTND(default) -AC_SUBST_KFSSTND - -KDE_CREATE_LIBS_ALIASES - -AC_DEFUN([KDE_DO_UIC_AGAIN], -[ -AC_REQUIRE([AC_PATH_QT_MOC_UIC]) -UIC=$UIC_PATH -if test x$ac_uic_supports_nounload = xyes; then - UIC="$UIC -nounload" -fi -AC_SUBST(UIC) -]) -KDE_DO_UIC_AGAIN - -# configure would do this very late. Too late for us! -test "x$prefix" = xNONE && prefix=$ac_default_prefix - -AC_DEFINE_UNQUOTED(KDEDIR, "$prefix", [The prefix to use as fallback]) -KDE_EXPAND_MAKEVAR(ac_kde_sysconfdir, sysconfdir) -AC_DEFINE_UNQUOTED(KDESYSCONFDIR, "$ac_kde_sysconfdir", [The compiled in system configuration prefix]) ac_cpp_safe=$ac_cpp ac_CPPFLAGS_safe=$CPPFLAGS diff --git a/qtinterface/tqaccel.h b/qtinterface/tqaccel.h index 68f0b8c..5a6c38c 100644 --- a/qtinterface/tqaccel.h +++ b/qtinterface/tqaccel.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QAccel class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QAccel Q3Accel #endif // USE_QT4 diff --git a/qtinterface/tqaccessible.h b/qtinterface/tqaccessible.h index 41b20be..2df7270 100644 --- a/qtinterface/tqaccessible.h +++ b/qtinterface/tqaccessible.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QAccessible class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqaction.h b/qtinterface/tqaction.h index 4e22bcc..ce1ddd5 100644 --- a/qtinterface/tqaction.h +++ b/qtinterface/tqaction.h @@ -23,6 +23,7 @@ Boston, MA 02110-1301, USA. #define TQACTION_H #include +#include #ifdef USE_QT3 @@ -36,9 +37,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QAction class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqapplication.h b/qtinterface/tqapplication.h index 7d88b46..6d03b76 100644 --- a/qtinterface/tqapplication.h +++ b/qtinterface/tqapplication.h @@ -265,6 +265,7 @@ protected: // 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 e5f29c6..01e71fd 100644 --- a/qtinterface/tqasciicache.h +++ b/qtinterface/tqasciicache.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QAsciiCache class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QAsciiCache Q3AsciiCache #endif // USE_QT4 diff --git a/qtinterface/tqasciidict.h b/qtinterface/tqasciidict.h index 2085f27..2b03388 100644 --- a/qtinterface/tqasciidict.h +++ b/qtinterface/tqasciidict.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QAsciiDict class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define AsciiDict Q3AsciiDict #endif // USE_QT4 diff --git a/qtinterface/tqasyncimageio.h b/qtinterface/tqasyncimageio.h index 25f157b..fd71590 100644 --- a/qtinterface/tqasyncimageio.h +++ b/qtinterface/tqasyncimageio.h @@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT3 -// Reimplement the QAsciiDict class +// Reimplement the QAsyncImageIO class // For Qt3, no changes are needed #include @@ -35,10 +35,8 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 -// Reimplement the QAsciiDict class -// For Qt4, no changes are needed - -#include +// Reimplement the QAsyncImageIO class +// For Qt4, this class no longer exists! #endif // USE_QT4 diff --git a/qtinterface/tqasyncio.h b/qtinterface/tqasyncio.h index 5708884..7b5f8c7 100644 --- a/qtinterface/tqasyncio.h +++ b/qtinterface/tqasyncio.h @@ -37,9 +37,7 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QAsyncIO class -// For Qt4, some changes are needed - -//#include +// For Qt4, this class no longer exists! #endif // USE_QT4 diff --git a/qtinterface/tqbig5codec.h b/qtinterface/tqbig5codec.h index 84f758f..7a9fbb0 100644 --- a/qtinterface/tqbig5codec.h +++ b/qtinterface/tqbig5codec.h @@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QBig5Codec class -// For Qt4, no changes are needed - -#include +// For Qt4, this class no longer exists! #endif // USE_QT4 diff --git a/qtinterface/tqbitarray.h b/qtinterface/tqbitarray.h index 634c459..3286e0f 100644 --- a/qtinterface/tqbitarray.h +++ b/qtinterface/tqbitarray.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QBitArray class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QBitVal QBitRef #endif // USE_QT4 diff --git a/qtinterface/tqbitmap.h b/qtinterface/tqbitmap.h index 50ceb75..0963e4c 100644 --- a/qtinterface/tqbitmap.h +++ b/qtinterface/tqbitmap.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QBitmap class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqbrush.h b/qtinterface/tqbrush.h index 2a20dcd..aef3baf 100644 --- a/qtinterface/tqbrush.h +++ b/qtinterface/tqbrush.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QBrush class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqbuffer.h b/qtinterface/tqbuffer.h index 0df56af..f65f0b8 100644 --- a/qtinterface/tqbuffer.h +++ b/qtinterface/tqbuffer.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QBuffer class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqbutton.h b/qtinterface/tqbutton.h index 4890a26..5451e29 100644 --- a/qtinterface/tqbutton.h +++ b/qtinterface/tqbutton.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QButton class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqbuttongroup.h b/qtinterface/tqbuttongroup.h index 74eddde..38f924c 100644 --- a/qtinterface/tqbuttongroup.h +++ b/qtinterface/tqbuttongroup.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QButtonGroup class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqcache.h b/qtinterface/tqcache.h index 3f0ac28..6a39380 100644 --- a/qtinterface/tqcache.h +++ b/qtinterface/tqcache.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QCache class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QCache Q3Cache #endif // USE_QT4 diff --git a/qtinterface/tqcanvas.h b/qtinterface/tqcanvas.h index 8c5b744..2d2ff11 100644 --- a/qtinterface/tqcanvas.h +++ b/qtinterface/tqcanvas.h @@ -38,7 +38,22 @@ Boston, MA 02110-1301, USA. // Reimplement the QCanvas class // For Qt4, no changes are needed -#include +#include + +#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 diff --git a/qtinterface/tqcdestyle.h b/qtinterface/tqcdestyle.h index f3c7e26..72c84cb 100644 --- a/qtinterface/tqcdestyle.h +++ b/qtinterface/tqcdestyle.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QCDEStyle class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqcheckbox.h b/qtinterface/tqcheckbox.h index 2eabd1c..6f7425a 100644 --- a/qtinterface/tqcheckbox.h +++ b/qtinterface/tqcheckbox.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the TQCheckBox class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqcleanuphandler.h b/qtinterface/tqcleanuphandler.h index 53cfd69..87f54bf 100644 --- a/qtinterface/tqcleanuphandler.h +++ b/qtinterface/tqcleanuphandler.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT3 // Reimplement the QCleanupHandler class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqclipboard.h b/qtinterface/tqclipboard.h index e0e95f9..e1e3a67 100644 --- a/qtinterface/tqclipboard.h +++ b/qtinterface/tqclipboard.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QClipboard class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqcolor.h b/qtinterface/tqcolor.h index db9702b..4c3dacc 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 +#include #endif // USE_QT3 diff --git a/qtinterface/tqcolordialog.h b/qtinterface/tqcolordialog.h index ba227e3..328a09b 100644 --- a/qtinterface/tqcolordialog.h +++ b/qtinterface/tqcolordialog.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QColorDialog class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqcombobox.h b/qtinterface/tqcombobox.h index 7842c7e..bb3aa85 100644 --- a/qtinterface/tqcombobox.h +++ b/qtinterface/tqcombobox.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QComboBox class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqcommonstyle.h b/qtinterface/tqcommonstyle.h index bb47b29..187a9e3 100644 --- a/qtinterface/tqcommonstyle.h +++ b/qtinterface/tqcommonstyle.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QCommonStyle class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqcompactstyle.h b/qtinterface/tqcompactstyle.h index a3881aa..b44f412 100644 --- a/qtinterface/tqcompactstyle.h +++ b/qtinterface/tqcompactstyle.h @@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT3 -// Reimplement the QAccel class +// Reimplement the QCompactStyle class // For Qt3, no changes are needed #include @@ -35,10 +35,8 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 -// Reimplement the QAccel class -// For Qt4, no changes are needed - -#include +// Reimplement the QCompactStyle class +// For Qt4, this class was removed! #endif // USE_QT4 diff --git a/qtinterface/tqconnection.h b/qtinterface/tqconnection.h index f17085b..4850bb4 100644 --- a/qtinterface/tqconnection.h +++ b/qtinterface/tqconnection.h @@ -36,9 +36,7 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QConnection class -// For Qt4, no changes are needed - -#include +// For Qt4, this internal class no longer exists! #endif // USE_QT4 diff --git a/qtinterface/tqcstring.h b/qtinterface/tqcstring.h index 9a4908e..2c2001a 100644 --- a/qtinterface/tqcstring.h +++ b/qtinterface/tqcstring.h @@ -38,9 +38,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QCString class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QCString Q3CString #endif // USE_QT4 diff --git a/qtinterface/tqcursor.h b/qtinterface/tqcursor.h index 5c0a88c..ada101c 100644 --- a/qtinterface/tqcursor.h +++ b/qtinterface/tqcursor.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QCursor class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqdatabrowser.h b/qtinterface/tqdatabrowser.h index ed4419c..6bc05ed 100644 --- a/qtinterface/tqdatabrowser.h +++ b/qtinterface/tqdatabrowser.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDataBrowser class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QDataBrowser Q3DataBrowser #endif // USE_QT4 diff --git a/qtinterface/tqdatastream.h b/qtinterface/tqdatastream.h index c397e3e..0d35258 100644 --- a/qtinterface/tqdatastream.h +++ b/qtinterface/tqdatastream.h @@ -39,7 +39,7 @@ Boston, MA 02110-1301, USA. // Reimplement the QDataStream class // For Qt4, no changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqdatatable.h b/qtinterface/tqdatatable.h index d44bde5..314e0ad 100644 --- a/qtinterface/tqdatatable.h +++ b/qtinterface/tqdatatable.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDataTable class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QDataTable Q3DataTable #endif // USE_QT4 diff --git a/qtinterface/tqdataview.h b/qtinterface/tqdataview.h index ea2dfcc..eb331f1 100644 --- a/qtinterface/tqdataview.h +++ b/qtinterface/tqdataview.h @@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA. // Reimplement the QDataView class // For Qt4, no changes are needed -#include +#include + +#define QDataView Q3DataView #endif // USE_QT4 diff --git a/qtinterface/tqdatetime.h b/qtinterface/tqdatetime.h index 8223641..7078e4a 100644 --- a/qtinterface/tqdatetime.h +++ b/qtinterface/tqdatetime.h @@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT3 -// Reimplement the QAccel class +// Reimplement the QDateTime class // For Qt3, no changes are needed #include @@ -35,10 +35,10 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 -// Reimplement the QAccel class -// For Qt4, no changes are needed +// Reimplement the QDateTime class +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqdatetimeedit.h b/qtinterface/tqdatetimeedit.h index 9b1a51a..1239645 100644 --- a/qtinterface/tqdatetimeedit.h +++ b/qtinterface/tqdatetimeedit.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDateTimeEditBase class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QDateTimeEdit Q3DateTimeEditBase #endif // USE_QT4 diff --git a/qtinterface/tqdeepcopy.h b/qtinterface/tqdeepcopy.h index 1495934..13aaecf 100644 --- a/qtinterface/tqdeepcopy.h +++ b/qtinterface/tqdeepcopy.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDeepCopy class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QDeepCopy Q3DeepCopy #endif // USE_QT4 diff --git a/qtinterface/tqdesktopwidget.h b/qtinterface/tqdesktopwidget.h index 061f354..6c67f73 100644 --- a/qtinterface/tqdesktopwidget.h +++ b/qtinterface/tqdesktopwidget.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDesktopWidget class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqdial.h b/qtinterface/tqdial.h index 7628ced..c075f54 100644 --- a/qtinterface/tqdial.h +++ b/qtinterface/tqdial.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDial class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqdialog.h b/qtinterface/tqdialog.h index 06d605f..c88f32f 100644 --- a/qtinterface/tqdialog.h +++ b/qtinterface/tqdialog.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDialog class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqdict.h b/qtinterface/tqdict.h index 2ca9e1a..d4e5c6c 100644 --- a/qtinterface/tqdict.h +++ b/qtinterface/tqdict.h @@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT3 -// Reimplement the QAccel class +// Reimplement the QDict class // For Qt3, no changes are needed #include @@ -35,10 +35,10 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 -// Reimplement the QAccel class -// For Qt4, no changes are needed +// Reimplement the QDict class +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqdir.h b/qtinterface/tqdir.h index 6c2bb6d..58825d9 100644 --- a/qtinterface/tqdir.h +++ b/qtinterface/tqdir.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDir class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqdns.h b/qtinterface/tqdns.h index 8c5db78..a54c5d2 100644 --- a/qtinterface/tqdns.h +++ b/qtinterface/tqdns.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDns class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QDns Q3Dns #endif // USE_QT4 diff --git a/qtinterface/tqdockarea.h b/qtinterface/tqdockarea.h index 3b9d14a..660ae58 100644 --- a/qtinterface/tqdockarea.h +++ b/qtinterface/tqdockarea.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDockArea class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QDockArea Q3DockArea #endif // USE_QT4 diff --git a/qtinterface/tqdockwindow.h b/qtinterface/tqdockwindow.h index cf37621..31334b9 100644 --- a/qtinterface/tqdockwindow.h +++ b/qtinterface/tqdockwindow.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDockWindow class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QDockWindow Q3DockWindow #endif // USE_QT4 diff --git a/qtinterface/tqdom.h b/qtinterface/tqdom.h index 7b727f2..1bdff56 100644 --- a/qtinterface/tqdom.h +++ b/qtinterface/tqdom.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDom class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqdragobject.h b/qtinterface/tqdragobject.h index 143c1fc..0c8cd2b 100644 --- a/qtinterface/tqdragobject.h +++ b/qtinterface/tqdragobject.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDragObject class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QDragObject Q3DragObject #endif // USE_QT4 diff --git a/qtinterface/tqdrawutil.h b/qtinterface/tqdrawutil.h index 9bd754e..511a428 100644 --- a/qtinterface/tqdrawutil.h +++ b/qtinterface/tqdrawutil.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDrawUtil class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqdropsite.h b/qtinterface/tqdropsite.h index 73e3f2c..772d3aa 100644 --- a/qtinterface/tqdropsite.h +++ b/qtinterface/tqdropsite.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QDropSite class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QDropSite Q3DropSite #endif // USE_QT4 diff --git a/qtinterface/tqguardedptr.h b/qtinterface/tqguardedptr.h index 1ec3aa0..df5c452 100644 --- a/qtinterface/tqguardedptr.h +++ b/qtinterface/tqguardedptr.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QGuardedPtr class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QGuardedPtr QPointer #endif // USE_QT4 diff --git a/qtinterface/tqiconset.h b/qtinterface/tqiconset.h index 244240b..71a3aef 100644 --- a/qtinterface/tqiconset.h +++ b/qtinterface/tqiconset.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QAccel class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QIconSet QIcon #endif // USE_QT4 diff --git a/qtinterface/tqiodevice.h b/qtinterface/tqiodevice.h index 59d38d2..6e2dfb8 100644 --- a/qtinterface/tqiodevice.h +++ b/qtinterface/tqiodevice.h @@ -23,6 +23,7 @@ Boston, MA 02110-1301, USA. #define TQIODEVICE_H #include +#include #ifdef USE_QT3 @@ -38,7 +39,7 @@ Boston, MA 02110-1301, USA. // Reimplement the QIODevice class // For Qt4, no changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqmemarray.h b/qtinterface/tqmemarray.h index 47accef..d6f126c 100644 --- a/qtinterface/tqmemarray.h +++ b/qtinterface/tqmemarray.h @@ -38,7 +38,9 @@ Boston, MA 02110-1301, USA. // Reimplement the QMemArray class // For Qt4, no changes are needed -#include +#include + +#define QMemArray Q3MemArray #endif // USE_QT4 diff --git a/qtinterface/tqshared.h b/qtinterface/tqshared.h index 19a59db..139fd3f 100644 --- a/qtinterface/tqshared.h +++ b/qtinterface/tqshared.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QShared class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QShared Q3Shared #endif // USE_QT4 diff --git a/qtinterface/tqsql.h b/qtinterface/tqsql.h index 6ff80e6..fd73445 100644 --- a/qtinterface/tqsql.h +++ b/qtinterface/tqsql.h @@ -36,9 +36,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QSql class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h index 62f6021..36d8a58 100644 --- a/qtinterface/tqt.h +++ b/qtinterface/tqt.h @@ -25,6 +25,10 @@ Boston, MA 02110-1301, USA. //#define USE_QT3 #define USE_QT4 +#ifdef USE_QT4 +#define QT3_SUPPORT +#endif + //#include "kdemacros.h.in" //#define TQT_EXPORT KDE_EXPORT diff --git a/qtinterface/tqtextstream.h b/qtinterface/tqtextstream.h index 54b2c1f..fc840af 100644 --- a/qtinterface/tqtextstream.h +++ b/qtinterface/tqtextstream.h @@ -38,9 +38,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QTextStream class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqvaluelist.h b/qtinterface/tqvaluelist.h index af27329..38a54af 100644 --- a/qtinterface/tqvaluelist.h +++ b/qtinterface/tqvaluelist.h @@ -37,9 +37,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QValueList class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QValueList Q3ValueList #endif // USE_QT4 diff --git a/qtinterface/tqvariant.h b/qtinterface/tqvariant.h index 81011f0..2f632aa 100644 --- a/qtinterface/tqvariant.h +++ b/qtinterface/tqvariant.h @@ -37,9 +37,9 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QVariant class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include #endif // USE_QT4 diff --git a/qtinterface/tqwmatrix.h b/qtinterface/tqwmatrix.h index 2546d39..f143ba7 100644 --- a/qtinterface/tqwmatrix.h +++ b/qtinterface/tqwmatrix.h @@ -36,9 +36,11 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 // Reimplement the QWMatrix class -// For Qt4, no changes are needed +// For Qt4, some changes are needed -#include +#include + +#define QWMatrix QMatrix #endif // USE_QT4 -- cgit v1.2.3