summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qtinterface/private/tqlayoutengine_p.h2
-rw-r--r--qtinterface/tqt.h.cmake8
2 files changed, 3 insertions, 7 deletions
diff --git a/qtinterface/private/tqlayoutengine_p.h b/qtinterface/private/tqlayoutengine_p.h
index cd72144..67078e4 100644
--- a/qtinterface/private/tqlayoutengine_p.h
+++ b/qtinterface/private/tqlayoutengine_p.h
@@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA.
// Reimplement the QUComExtra_P class
// For Qt3, no changes are needed
-#include <private/qlayoutengine_p.h>
+#include <private/qtqlayoutengine_p.h>
#endif // USE_QT3
diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake
index 1c7be4a..3eac857 100644
--- a/qtinterface/tqt.h.cmake
+++ b/qtinterface/tqt.h.cmake
@@ -793,7 +793,6 @@ Boston, MA 02110-1301, USA.
#define tqGray qGray
#define tqCompress qCompress
#define tqInstallMsgHandler qInstallMsgHandler
-#define tqparentWidget parentWidget
#define tqchildAt childAt
#define tqchildrenRect childrenRect
#define tqchildrenRegion childrenRegion
@@ -867,13 +866,11 @@ Boston, MA 02110-1301, USA.
#define tqfindNextRef findNextRef
#define connecttqStatus connectStatus
#define disconnecttqStatus disconnectStatus
-#define tqinvalidateHeight invalidateHeight
-#define tqlayoutTabs layoutTabs
+#define layoutTabs 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
@@ -885,7 +882,6 @@ Boston, MA 02110-1301, USA.
#define tqstyle style
#define tqstyles styles
#define tqsizePolicy sizePolicy
-#define tqparentMenu parentMenu
#define tqsmoothSizes smoothSizes
#define tqstandardSizes standardSizes
#define tqresize resize
@@ -910,7 +906,7 @@ Boston, MA 02110-1301, USA.
#define tqsetNum setNum
#define tqprocessEvents processEvents
#define tqsetBufferFromCopy setBuffer
-#define tqlayoutChanged layoutChanged
+#define layoutChanged layoutChanged
#define tqsetVisible setVisible
#define tqsetUpdatesEnabled setUpdatesEnabled
#define tqfindExtension findExtension