Adjust to current tqt3 versionHEADmaster

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 12 insertions, 18 deletions

diff --git a/configure.py b/configure.py
index 2f1fa80..0c9a22d 100644
--- a/configure.py
+++ b/configure.py
@@ -228,10 +228,7 @@ class ConfigurePyTQt3(ConfigureBase):
         if check_class("tqassistantclient.h", "TQAssistantClient(\"foo\")", lib="tqassistantclient"):
             tqtmod_lib = "tqassistantclient"
         else:
-            if check_class("ntqassistantclient.h", "TQAssistantClient(\"foo\")", lib="tqassistantclient"):
-                tqtmod_lib = "tqassistantclient"
-            else:
-                disabled_classes.append("TQAssistantClient")
+            disabled_classes.append("TQAssistantClient")
 
         return tqtmod_lib
 
@@ -1094,10 +1091,7 @@ def check_tqt_installation(macros):
     tqglobal = os.path.join(tqt_incdir, "tqglobal.h")
 
     if not os.access(tqglobal, os.F_OK):
-        tqglobal = os.path.join(tqt_incdir, "ntqglobal.h")
-
-        if not os.access(tqglobal, os.F_OK):
-            sip_tqt_config.error("tqglobal.h or ntqglobal.h could not be found in %s." % tqt_incdir)
+        sip_tqt_config.error("tqglobal.h could not be found in %s." % tqt_incdir)
 
     # Get the TQt version number.
     global tqt_version
diff --git a/pytquic3/widgetdatabase.h b/pytquic3/widgetdatabase.h
index 18b63af..97e2999 100644
--- a/pytquic3/widgetdatabase.h
+++ b/pytquic3/widgetdatabase.h
@@ -30,7 +30,7 @@
 #include <tqiconset.h>
 #include <tqstring.h>
 #include "widgetinterface.h" // up here for GCC 2.7.* compatibility
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 
 
 extern TQPluginManager<WidgetInterface> *widgetManager();
diff --git a/pytquic3/widgetinterface.h b/pytquic3/widgetinterface.h
index 50f8e6d..7d32414 100644
--- a/pytquic3/widgetinterface.h
+++ b/pytquic3/widgetinterface.h
@@ -21,7 +21,7 @@
 #ifndef WIDGETINTERFACE_H
 #define WIDGETINTERFACE_H
 
-#include <private/qwidgetinterface_p.h>
+#include <private/tqwidgetinterface_p.h>
 
 #define WidgetInterface TQWidgetFactoryInterface
 #define IID_Widget IID_QWidgetFactory
diff --git a/sip/tqt/tqlayout.sip b/sip/tqt/tqlayout.sip
index 82b86f2..841e3b0 100644
--- a/sip/tqt/tqlayout.sip
+++ b/sip/tqt/tqlayout.sip
@@ -101,7 +101,7 @@ This is a wrapper around the <Literal>TQLayoutIterator</Literal>
 class TQGLayoutIterator
 {
 %TypeHeaderCode
-#include <tqabstractlayout.h>
+#include <tqlayout.h>
 %End
 
 public:
@@ -114,7 +114,7 @@ public:
 class TQLayoutIterator
 {
 %TypeHeaderCode
-#include <tqabstractlayout.h>
+#include <tqlayout.h>
 %End
 
 public:
@@ -137,7 +137,7 @@ public:
 class TQLayoutItem
 {
 %TypeHeaderCode
-#include <tqabstractlayout.h>
+#include <tqlayout.h>
 %End
 
 public:
@@ -178,7 +178,7 @@ public:
 class TQSpacerItem : TQLayoutItem
 {
 %TypeHeaderCode
-#include <tqabstractlayout.h>
+#include <tqlayout.h>
 %End
 
 public:
@@ -201,7 +201,7 @@ public:
 class TQWidgetItem : TQLayoutItem
 {
 %TypeHeaderCode
-#include <tqabstractlayout.h>
+#include <tqlayout.h>
 %End
 
 public:
@@ -224,7 +224,7 @@ public:
 class TQLayout : TQObject, TQLayoutItem
 {
 %TypeHeaderCode
-#include <tqabstractlayout.h>
+#include <tqlayout.h>
 %End
 
 public:
diff --git a/sip/tqt/tqobject.sip b/sip/tqt/tqobject.sip
index ef2ddc5..af994aa 100644
--- a/sip/tqt/tqobject.sip
+++ b/sip/tqt/tqobject.sip
@@ -697,8 +697,8 @@ PyObject *pytqt3GetSender();
 #include <tqobject.h>
 #include <tqvariant.h>
 #include <tqmetaobject.h>
-#include <private/qucom_p.h>
-#include <private/qucomextra_p.h>
+#include <private/tqucom_p.h>
+#include <private/tqucomextra_p.h>
 
 
 // These optional parts of the legacy TQt support API for SIP are implemented.