Browse Source

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
tags/v3.5.13
tpearson 9 years ago
parent
commit
0b0232447b
4 changed files with 58 additions and 2 deletions
  1. +1
    -0
      CMakeLists.txt
  2. +3
    -2
      qtinterface/Makefile.am
  3. +40
    -0
      qtinterface/private/tqinternal_p.h
  4. +14
    -0
      qtinterface/tqt.h

+ 1
- 0
CMakeLists.txt View File

@@ -394,6 +394,7 @@ set( tqt_INCS
qtinterface/tqxml.h
qtinterface/private/tqucomextra_p.h
qtinterface/private/tqlayoutengine_p.h
qtinterface/private/tqinternal_p.h
qtinterface/tqlistiterator.h
)



+ 3
- 2
qtinterface/Makefile.am View File

@@ -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 =


+ 40
- 0
qtinterface/private/tqinternal_p.h View File

@@ -0,0 +1,40 @@
/*

Copyright (C) 2010 Timothy Pearson <kb9vqf@pearsoncomputing.net>

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 <tqt.h>

#ifdef USE_QT3

// Reimplement the QSharedDoubleBuffer class
// For Qt3, no changes are needed

#include <private/qinternal_p.h>

#endif // USE_QT3

#ifdef USE_QT4

#endif // USE_QT4

#endif /* TQINTERNAL_P_H */

+ 14
- 0
qtinterface/tqt.h View File

@@ -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<TQVariant*>(static_cast<QVariant*>(x)))
#define TQT_TQMETAOBJECT(x) (static_cast<TQMetaObject*>(static_cast<QMetaObject*>(x)))
#define TQT_TQSTYLEOPTION(x) (static_cast<TQStyleOption*>(static_cast<TQStyleOption*>(x)))
#define TQT_TQEVENT(x) (static_cast<TQEvent*>(static_cast<QEvent*>(x)))
#define TQT_TQKEYEVENT(x) (static_cast<TQKeyEvent*>(static_cast<QKeyEvent*>(static_cast<QEvent*>(x))))
#define TQT_TQSHOWEVENT(x) (static_cast<TQShowEvent*>(static_cast<QShowEvent*>(static_cast<QEvent*>(x))))
#define TQT_TQMOUSEEVENT(x) (static_cast<TQMouseEvent*>(static_cast<QMouseEvent*>(static_cast<QEvent*>(x))))
#define TQT_TQWHEELEVENT(x) (static_cast<TQWheelEvent*>(static_cast<QWheelEvent*>(static_cast<QEvent*>(x))))
#define TQT_TQFOCUSEVENT(x) (static_cast<TQFocusEvent*>(static_cast<QFocusEvent*>(static_cast<QEvent*>(x))))
#define TQT_TQPAINTEVENT(x) (static_cast<TQPaintEvent*>(static_cast<QPaintEvent*>(static_cast<QEvent*>(x))))
#define TQT_TQCHILDEVENT(x) (static_cast<TQChildEvent*>(static_cast<QChildEvent*>(static_cast<QEvent*>(x))))
#define TQT_TQRESIZEEVENT(x) (static_cast<TQResizeEvent*>(static_cast<QResizeEvent*>(static_cast<QEvent*>(x))))

#define TQT_TQOBJECT_OBJECT(x) x


Loading…
Cancel
Save