From 0b0232447ba4fb88e579a2300d19d1aaf4d44752 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 16 Jan 2011 02:39:21 +0000 Subject: Enhanced compatibility with TQt for Qt4 3.4.0 TP2 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1214735 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- qtinterface/Makefile.am | 5 +++-- qtinterface/private/tqinternal_p.h | 40 ++++++++++++++++++++++++++++++++++++++ qtinterface/tqt.h | 14 +++++++++++++ 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 qtinterface/private/tqinternal_p.h (limited to 'qtinterface') diff --git a/qtinterface/Makefile.am b/qtinterface/Makefile.am index 174ba57..153137e 100644 --- a/qtinterface/Makefile.am +++ b/qtinterface/Makefile.am @@ -129,8 +129,9 @@ tqvaluelist.h tqvaluestack.h tqvaluevector.h tqvariant.h tqvfbhdr.h \ tqwaitcondition.h tqwhatsthis.h tqwidgetfactory.h tqwidgetintdict.h tqwidgetlist.h tqwmatrix.h \ tqxml.h \ \ -private/tqucomextra_p.h -private/tqlayoutengine_p.h +private/tqucomextra_p.h \ +private/tqlayoutengine_p.h \ +private/tqinternal_p.h \ \ tqlistiterator.h noinst_HEADERS = diff --git a/qtinterface/private/tqinternal_p.h b/qtinterface/private/tqinternal_p.h new file mode 100644 index 0000000..83b8668 --- /dev/null +++ b/qtinterface/private/tqinternal_p.h @@ -0,0 +1,40 @@ +/* + +Copyright (C) 2010 Timothy Pearson + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public License +along with this library; see the file COPYING.LIB. If not, write to +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. + +*/ + +#ifndef TQINTERNAL_P_H +#define TQINTERNAL_P_H + +#include + +#ifdef USE_QT3 + +// Reimplement the QSharedDoubleBuffer class +// For Qt3, no changes are needed + +#include + +#endif // USE_QT3 + +#ifdef USE_QT4 + +#endif // USE_QT4 + +#endif /* TQINTERNAL_P_H */ diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h index ce816ed..43e3b7f 100644 --- a/qtinterface/tqt.h +++ b/qtinterface/tqt.h @@ -154,6 +154,7 @@ Boston, MA 02110-1301, USA. #define TQCanvasPixmapArray QCanvasPixmapArray #define TQCanvasSprite QCanvasSprite #define TQPolygonalProcessor QPolygonalProcessor +#define TQPDevCmdParam QPDevCmdParam #define TQCanvasPolygonalItem QCanvasPolygonalItem #define TQCanvasRectangle QCanvasRectangle #define TQCanvasPolygon QCanvasPolygon @@ -169,6 +170,7 @@ Boston, MA 02110-1301, USA. #define TQSessionManager QSessionManager #define TQSingleCleanupHandler QSingleCleanupHandler #define TQSharedCleanupHandler QSharedCleanupHandler +#define TQSharedDoubleBuffer QSharedDoubleBuffer #define TQShared QShared #define TQColor QColor #define TQColorDialog QColorDialog @@ -734,6 +736,14 @@ Boston, MA 02110-1301, USA. #define tqtext text #define tqdrawPolyline drawPolyline #define tqbrush brush +#define tqat at +#define tqresizeMode resizeMode +#define connectqStatus connectStatus +#define disconnectqStatus disconnectStatus +#define tqendsWith endsWith +#define tqdrawConvexPolygon drawConvexPolygon +#define tqallWidgets allWidgets +#define tqcapturedTexts capturedTexts #define tqdrawPrimitive drawPrimitive #define tqdrawControlMask drawControlMask @@ -746,6 +756,7 @@ Boston, MA 02110-1301, USA. #define TQ_PROPERTY Q_PROPERTY #define TQMIN QMIN #define TQMAX QMAX +#define TQABS QABS #define tqqt_cast qt_cast #define tqMakePair qMakePair #define qt_tqfind_obj_child qt_find_obj_child @@ -786,11 +797,14 @@ Boston, MA 02110-1301, USA. #define TQT_TQVARIANT(x) (static_cast(static_cast(x))) #define TQT_TQMETAOBJECT(x) (static_cast(static_cast(x))) #define TQT_TQSTYLEOPTION(x) (static_cast(static_cast(x))) +#define TQT_TQEVENT(x) (static_cast(static_cast(x))) #define TQT_TQKEYEVENT(x) (static_cast(static_cast(static_cast(x)))) #define TQT_TQSHOWEVENT(x) (static_cast(static_cast(static_cast(x)))) #define TQT_TQMOUSEEVENT(x) (static_cast(static_cast(static_cast(x)))) +#define TQT_TQWHEELEVENT(x) (static_cast(static_cast(static_cast(x)))) #define TQT_TQFOCUSEVENT(x) (static_cast(static_cast(static_cast(x)))) #define TQT_TQPAINTEVENT(x) (static_cast(static_cast(static_cast(x)))) +#define TQT_TQCHILDEVENT(x) (static_cast(static_cast(static_cast(x)))) #define TQT_TQRESIZEEVENT(x) (static_cast(static_cast(static_cast(x)))) #define TQT_TQOBJECT_OBJECT(x) x -- cgit v1.2.1