More TQt3 fixes

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

4 files changed, 53 insertions, 1 deletions

diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt
index b9f9e1d..f4497af 100644
--- a/qtinterface/CMakeLists.txt
+++ b/qtinterface/CMakeLists.txt
@@ -87,7 +87,7 @@ install( FILES
     tqwidgetintdict.h tqwidgetlist.h tqwmatrix.h tqxml.h private/tqucomextra_p.h
     private/tqlayoutengine_p.h private/tqinternal_p.h private/tqeffects_p.h
     private/tqrichtext_p.h private/tqpluginmanager_p.h private/tqcom_p.h
-    private/tqwidgetinterface_p.h
+    private/tqucom_p.h private/tqwidgetinterface_p.h
     tqlistiterator.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
diff --git a/qtinterface/Makefile.am b/qtinterface/Makefile.am
index 723c827..9cc2cd1 100644
--- a/qtinterface/Makefile.am
+++ b/qtinterface/Makefile.am
@@ -134,6 +134,7 @@ private/tqlayoutengine_p.h \
 private/tqpluginmanager_p.h \
 private/tqwidgetinterface_p.h \
 private/tqcom_p.h \
+private/tqucom_p.h \
 private/tqinternal_p.h \
 private/tqeffects_p.h \
 private/tqrichtext_p.h \
diff --git a/qtinterface/private/tqucom_p.h b/qtinterface/private/tqucom_p.h
new file mode 100644
index 0000000..f189bbf
--- /dev/null
+++ b/qtinterface/private/tqucom_p.h
@@ -0,0 +1,35 @@
+/*
+
+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 TQUCOM_P_H
+#define TQUCOM_P_H
+
+#include <tqt.h>
+
+#ifdef USE_QT3
+
+// For Qt3, no changes are needed
+
+#include <private/qucom_p.h>
+
+#endif // USE_QT3
+
+#endif /* TQUCOM_P_H */
diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake
index 8f97966..e59fecd 100644
--- a/qtinterface/tqt.h.cmake
+++ b/qtinterface/tqt.h.cmake
@@ -64,6 +64,14 @@ Boston, MA 02110-1301, USA.
 #define TQSIGNAL_CODE			QSIGNAL_CODE
 #define TQSLOT_CODE			QSLOT_CODE
 #define TQ_OVERRIDE			Q_OVERRIDE
+#define TQRESULT			QRESULT
+#define TQ_REFCOUNT			Q_REFCOUNT
+#define TQE_NOINTERFACE			QE_NOINTERFACE
+#define TQS_OK				QS_OK
+
+#define TQT_VERSION			QT_VERSION
+#define TQT_VERSION_STR			QT_VERSION_STR
+#define TQT_PRODUCT_LICENSEE		QT_PRODUCT_LICENSEE
 
 #define qint64			long
 #define quint64			unsigned long
@@ -220,6 +228,8 @@ Boston, MA 02110-1301, USA.
 #define tqcolor0 color0
 #define tqcolor1 color1
 
+#define IID_TQUnknown IID_QUnknown
+#define IID_TQComponentInformation IID_QComponentInformation
 #define IID_TQWidgetFactory IID_QWidgetFactory
 
 #define TQAccel QAccel
@@ -232,6 +242,7 @@ Boston, MA 02110-1301, USA.
 #define TQAsciiCacheIterator QAsciiCacheIterator
 #define TQAsciiDict QAsciiDict
 #define TQAsciiDictIterator QAsciiDictIterator
+#define TQAssistantClient QAssistantClient
 #define TQImageConsumer QImageConsumer
 #define TQImageFormat QImageFormat
 #define TQImageFormatType QImageFormatType
@@ -297,6 +308,7 @@ Boston, MA 02110-1301, USA.
 #define TQComboBox QComboBox
 #define TQCommonStyle QCommonStyle
 #define TQCompactStyle QCompactStyle
+#define TQComponentInformationInterface QComponentInformationInterface
 #define TQConnection QConnection
 #define TQCString QCString
 #define TQCursor QCursor
@@ -355,7 +367,9 @@ Boston, MA 02110-1301, USA.
 #define TQTextDrag QTextDrag
 #define TQTextCursor QTextCursor
 #define TQTextFormat QTextFormat
+#define TQTextFormatterBreakInWords QTextFormatterBreakInWords
 #define TQTextParagraph QTextParagraph
+#define TQTextPreProcessor QTextPreProcessor
 #define TQImageDrag QImageDrag
 #define TQUriDrag QUriDrag
 #define TQUuid QUuid
@@ -372,6 +386,7 @@ Boston, MA 02110-1301, USA.
 #define TQWheelEvent QWheelEvent
 #define TQTabletEvent QTabletEvent
 #define TQKeyEvent QKeyEvent
+#define TQFeatureListInterface QFeatureListInterface
 #define TQFocusEvent QFocusEvent
 #define TQPaintEvent QPaintEvent
 #define TQMoveEvent QMoveEvent
@@ -462,6 +477,7 @@ Boston, MA 02110-1301, USA.
 #define TQIntCacheIterator QIntCacheIterator
 #define TQIntDict QIntDict
 #define TQIntDictIterator QIntDictIterator
+#define TQInterfacePtr QInterfacePtr
 #define TQIODevice QIODevice
 #define TQJisCodec QJisCodec
 #define TQJpUnicodeConv QJpUnicodeConv