Add compatibility with not-yet-released TQt for Qt4 3.4.0 TP2

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1214120 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent d8f7ca2865
commit a764d0100c

@ -81,7 +81,7 @@ tqlistiterator.cpp
libtqt_la_LIBADD = $(LIB_QT)
libtqt_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries)
include_HEADERS = tqt.h tqaccel.h tqaccessible.h tqaction.h tqapplication.h tqasyncio.h \
include_HEADERS = tqt.h tqtglobaldefines.h tqaccel.h tqaccessible.h tqaction.h tqapplication.h tqasyncio.h \
tqbuttongroup.h tqbutton.h \
tqcanvas.h tqcdestyle.h tqcheckbox.h tqclipboard.h tqcolordialog.h tqcombobox.h tqcommonstyle.h \
tqdatabrowser.h tqdatatable.h tqdataview.h tqdatetimeedit.h tqdesktopwidget.h tqdial.h tqdialog.h tqdns.h tqdockarea.h tqdockwindow.h tqdragobject.h \
@ -129,9 +129,6 @@ 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 \
\
tqlistiterator.h
noinst_HEADERS =
@ -155,6 +152,7 @@ install-exec-local:
cp -Rp "$(srcdir)/tqt-replace" "$(DESTDIR)$(bindir)/"
cp -Rp "$(srcdir)/tqt-replace-stream" "$(DESTDIR)$(bindir)/"
cp -Rp "$(srcdir)/moc-tqt" "$(DESTDIR)$(bindir)/"
cp -Rp "$(srcdir)/uic-tqt" "$(DESTDIR)$(bindir)/"
cp -Rp "$(srcdir)/mcopidl-tqt" "$(DESTDIR)$(bindir)/"
cp -Rp "$(srcdir)/dcopidl-tqt" "$(DESTDIR)$(bindir)/"
cp -Rp "$(srcdir)/dcopidlng-tqt" "$(DESTDIR)$(bindir)/"
@ -166,3 +164,5 @@ install-exec-local:
sed -i '$(QT_VER_REPLACE)' "$(DESTDIR)$(bindir)/tqt-replace-stream"
sed -i '$(QT_HVER_REPLACE)' "$(srcdir)/tqt.h"
cp -Rp "$(srcdir)/tqt4/" "$(DESTDIR)$(includedir)/"
mkdir -p "$(DESTDIR)$(includedir)/private/"
cp -Rp "$(srcdir)/private/" "$(DESTDIR)$(includedir)/private/"

@ -7,6 +7,7 @@ else
if [[ $QT_VER == 3 ]]; then
sed -i 's/TQ\([^T]\)/Q\1/g' "$1"
sed -i 's/TQT\([^_]\)/QT\1/g' "$1"
sed -i 's/Q_SLOTS>/slots>/g' "$1"
exit 0
fi

@ -1,6 +1,6 @@
/*
Copyright (C) 2010 Timothy Pearson <kb9vqf@pearsoncomputing.net>
Copyright (C) 2010-2011 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
@ -53,9 +53,18 @@ Boston, MA 02110-1301, USA.
#define tqaccess access
#define tqcolorTable colorTable
#define TQSO_Default Default
#define SO_Default Default
#define TQ_PrimitiveElement PrimitiveElement
#define tqqt_cast ::qt_cast
#define TQ_StrongFocus QWidget::StrongFocus
#define TQ_NoFocus QWidget::NoFocus
#define TQ_WheelFocus QWidget::WheelFocus
#define TQ_ClickFocus QWidget::ClickFocus
#define TQ_TabFocus QWidget::TabFocus
#define TQ_FocusPolicy QWidget::FocusPolicy
#define TQ_Horizontal Horizontal
#define TQ_Vertical Vertical
#define TQ_Alignment Qt::AlignmentFlags
#define TQImage_ScaleFree QImage::ScaleFree
#define TQ_Key_Shift Key_Shift
#define TQ_Key_Control Key_Control
@ -154,6 +163,8 @@ Boston, MA 02110-1301, USA.
#define TQCDEStyle QCDEStyle
#define TQCheckBox QCheckBox
#define TQCleanupHandler QCleanupHandler
#define TQClipboard QClipboard
#define TQSessionManager QSessionManager
#define TQSingleCleanupHandler QSingleCleanupHandler
#define TQSharedCleanupHandler QSharedCleanupHandler
#define TQShared QShared
@ -241,6 +252,7 @@ Boston, MA 02110-1301, USA.
#define TQPaintEvent QPaintEvent
#define TQMoveEvent QMoveEvent
#define TQResizeEvent QResizeEvent
#define TQRgb QRgb
#define TQCloseEvent QCloseEvent
#define TQIconDragEvent QIconDragEvent
#define TQShowEvent QShowEvent
@ -332,6 +344,7 @@ Boston, MA 02110-1301, USA.
#define TQGLayoutIterator QGLayoutIterator
#define TQLayoutIterator QLayoutIterator
#define TQLayoutItem QLayoutItem
#define TQLayoutWidget QLayoutWidget
#define TQSpacerItem QSpacerItem
#define TQWidgetItem QWidgetItem
#define TQLayout QLayout
@ -566,6 +579,7 @@ Boston, MA 02110-1301, USA.
#define TQWizard QWizard
#define TQWMatrix QWMatrix
#define TQWorkspace QWorkspace
#define TQXEmbed QXEmbed
#define TQXmlNamespaceSupport QXmlNamespaceSupport
#define TQXmlAttributes QXmlAttributes
#define TQXmlInputSource QXmlInputSource
@ -580,6 +594,7 @@ Boston, MA 02110-1301, USA.
#define TQXmlLexicalHandler QXmlLexicalHandler
#define TQXmlDeclHandler QXmlDeclHandler
#define TQXmlDefaultHandler QXmlDefaultHandler
#define TQUnknownInterface QUnknownInterface
#define tqRound qRound
#define tqstrlen qstrlen
@ -693,11 +708,52 @@ Boston, MA 02110-1301, USA.
#define tqinvalidateHeight invalidateHeight
#define tqlayoutTabs layoutTabs
#define tqreplacement replacement
#define tqsuperClass superClass
#define tqinvertPixels invertPixels
#define setqStatus setStatus
#define tqparentNode parentNode
#define tqsuperClassName superClassName
#define tqclipboard clipboard
#define tqfamilies families
#define tqstartsWith startsWith
#define tqrects rects
#define tqsetFont setFont
#define tqsetPalette setPalette
#define tqpalette palette
#define tqstyle style
#define tqstyles styles
#define tqsizePolicy sizePolicy
#define tqparentMenu parentMenu
#define tqsmoothSizes smoothSizes
#define tqstandardSizes standardSizes
#define tqresize resize
#define tqstaticMetaObject staticMetaObject
#define tqopen open
#define tqtext text
#define tqdrawPolyline drawPolyline
#define tqbrush brush
#define tqdrawControlMask drawControlMask
#define tqdrawPrimitive drawPrimitive
#define tqdrawControlMask drawControlMask
#define tqsizeFromContents sizeFromContents
#define tqdrawComplexControlMask drawComplexControlMask
#define TQUObject QUObject
#define TQCOORD QCOORD
#define TQCOORD_MAX QCOORD_MAX
#define TQ_SETS Q_SETS
#define TQ_PROPERTY Q_PROPERTY
#define TQMIN QMIN
#define TQMAX QMAX
#define tqqt_cast qt_cast
#define tqMakePair qMakePair
#define qt_tqfind_obj_child qt_find_obj_child
#define tqt_ucm_query_verification_data qt_ucm_query_verification_data
#define TQUObject QUObject
#define static_TQUType_int static_QUType_int
#define static_TQUType_TQString static_QUType_QString
#define static_TQUType_ptr static_QUType_ptr
#define static_TQUType_bool static_QUType_bool
#define tqt_mo_access access
@ -728,6 +784,12 @@ 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_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_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_TQRESIZEEVENT(x) (static_cast<TQResizeEvent*>(static_cast<QResizeEvent*>(static_cast<QEvent*>(x))))
#define TQT_TQOBJECT_OBJECT(x) x
#define TQT_TQSIZEPOLICY_OBJECT(x) x
@ -776,6 +838,24 @@ Boston, MA 02110-1301, USA.
// END BLOCK ONE
#define tqarrowCursor Qt::arrowCursor
#define tqupArrowCursor Qt::upArrowCursor
#define tqcrossCursor Qt::crossCursor
#define tqwaitCursor Qt::waitCursor
#define tqibeamCursor Qt::ibeamCursor
#define tqsizeVerCursor Qt::sizeVerCursor
#define tqsizeHorCursor Qt::sizeHorCursor
#define tqsizeBDiagCursor Qt::sizeBDiagCursor
#define tqsizeFDiagCursor Qt::sizeFDiagCursor
#define tqsizeAllCursor Qt::sizeAllCursor
#define tqblankCursor Qt::blankCursor
#define tqsplitVCursor Qt::splitVCursor
#define tqsplitHCursor Qt::splitHCursor
#define tqpointingHandCursor Qt::pointingHandCursor
#define tqforbiddenCursor Qt::forbiddenCursor
#define tqwhatsThisCursor Qt::whatsThisCursor
#define tqbusyCursor Qt::busyCursor
#endif // USE_QT3
#ifdef USE_QT4

@ -0,0 +1,20 @@
/*
Copyright (C) 2010-2011 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.
*/

@ -0,0 +1,18 @@
#!/bin/bash
if [[ $1 == "" ]]; then
echo "Usage: uic-tqt <uic arguments>"
else
for var in "$@"
do
if [[ ${var##*.} == "ui" ]]; then
uifile=$var
fi
done
cp -Rp $uifile $uifile.bkp
tqt-replace $uifile
uic "$@"
cp -Rp $uifile.bkp $uifile
rm -f $uifile.bkp
fi
Loading…
Cancel
Save