Bring API more in line with TQt for Qt4 3.4.0 TP2

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1215550 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 55 insertions, 1 deletions

diff --git a/qtinterface/Makefile.am b/qtinterface/Makefile.am
index 153137e..5f6d7a2 100644
--- a/qtinterface/Makefile.am
+++ b/qtinterface/Makefile.am
@@ -132,6 +132,7 @@ tqxml.h \
 private/tqucomextra_p.h \
 private/tqlayoutengine_p.h \
 private/tqinternal_p.h \
+private/tqeffects_p.h \
 \
 tqlistiterator.h
 noinst_HEADERS =
diff --git a/qtinterface/private/tqeffects_p.h b/qtinterface/private/tqeffects_p.h
new file mode 100644
index 0000000..e0ddff1
--- /dev/null
+++ b/qtinterface/private/tqeffects_p.h
@@ -0,0 +1,40 @@
+/*
+
+Copyright (C) 2010 Timothy Pearson <[email protected]>
+
+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 TQEFFECTS_P_H
+#define TQEFFECTS_P_H
+
+#include <tqt.h>
+
+#ifdef USE_QT3
+
+// Reimplement the QUComExtra_P class
+// For Qt3, no changes are needed
+
+#include <private/qeffects_p.h>
+
+#endif // USE_QT3
+
+#ifdef USE_QT4
+
+#endif // USE_QT4
+
+#endif /* TQEFFECTS_P_H */
diff --git a/qtinterface/tqt-replace b/qtinterface/tqt-replace
index 78c2ae7..bae6332 100755
--- a/qtinterface/tqt-replace
+++ b/qtinterface/tqt-replace
@@ -8,6 +8,7 @@ else
 		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"
+		sed -i 's/Q_SIGNALS>/signals>/g' "$1"
 		exit 0
 	fi
 
diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h
index 15faadb..43a8b25 100644
--- a/qtinterface/tqt.h
+++ b/qtinterface/tqt.h
@@ -55,7 +55,8 @@ Boston, MA 02110-1301, USA.
 #define TQSO_Default		Default
 #define SO_Default		Default
 #define TQ_PrimitiveElement	PrimitiveElement
-#define tqqt_cast		::qt_cast
+//#define tqqt_cast		::qt_cast
+#define tqqt_cast		qt_cast
 #define TQ_StrongFocus		QWidget::StrongFocus
 #define TQ_NoFocus		QWidget::NoFocus
 #define TQ_WheelFocus		QWidget::WheelFocus
@@ -243,6 +244,7 @@ Boston, MA 02110-1301, USA.
 #define TQColorDrag QColorDrag
 #define TQDropSite QDropSite
 #define TQEditorFactory QEditorFactory
+#define TQEffects QEffects
 #define TQErrorMessage QErrorMessage
 #define TQEucJpCodec QEucJpCodec
 #define TQEucKrCodec QEucKrCodec
@@ -744,6 +746,13 @@ Boston, MA 02110-1301, USA.
 #define tqdrawConvexPolygon	drawConvexPolygon
 #define tqallWidgets	allWidgets
 #define tqcapturedTexts	capturedTexts
+#define tqarg	arg
+#define tqbegin	begin
+#define tqdrawPixmap	drawPixmap
+#define tqscale	scale
+#define exitqStatus	exitStatus
+#define tqsetNum	setNum
+#define tqprocessEvents	processEvents
 
 #define tqdrawPrimitive			drawPrimitive
 #define tqdrawControlMask		drawControlMask
@@ -769,6 +778,7 @@ Boston, MA 02110-1301, USA.
 
 #define TQ_EXTERN_C		Q_EXTERN_C
 #define TQ_EXPORT_PLUGIN	Q_EXPORT_PLUGIN
+#define TQ_EXPORT		Q_EXPORT
 
 #define tqt_mo_access access
 
@@ -780,6 +790,7 @@ Boston, MA 02110-1301, USA.
 #define TQT_TQWIDGET(x) (static_cast<TQWidget*>(static_cast<QWidget*>(x)))
 #define TQT_TQSIZEPOLICY(x) (static_cast<TQSizePolicy*>(static_cast<QSizePolicy*>(x)))
 #define TQT_TQLAYOUT(x) (static_cast<TQLayout*>(static_cast<QLayout*>(x)))
+#define TQT_TQGRIDLAYOUT(x) (static_cast<TQGridLayout*>(static_cast<QGridLayout*>(x)))
 #define TQT_TQPAINTER(x) (static_cast<TQPainter*>(static_cast<QPainter*>(x)))
 #define TQT_TQPAINTDEVICE(x) (static_cast<TQPaintDevice*>(static_cast<QPaintDevice*>(x)))
 #define TQT_TQLAYOUTITEM(x) (static_cast<TQLayoutItem*>(static_cast<QLayoutItem*>(x)))
@@ -808,6 +819,7 @@ Boston, MA 02110-1301, USA.
 #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_TQCONTEXTMENUEVENT(x) (static_cast<TQContextMenuEvent*>(static_cast<QContextMenuEvent*>(static_cast<QEvent*>(x))))
 
 #define TQT_TQOBJECT_OBJECT(x) x
 #define TQT_TQSIZEPOLICY_OBJECT(x) x