Drop TQT_NO_COMPAT coder14.1.1

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 0f7f50ffa0596d88bd40cb1aea429fa04ae30ef6)

8 files changed, 18 insertions, 22 deletions

diff --git a/examples/tqt3reference/stylewindow.cpp b/examples/tqt3reference/stylewindow.cpp
index 0a5ca48..dea797b 100644
--- a/examples/tqt3reference/stylewindow.cpp
+++ b/examples/tqt3reference/stylewindow.cpp
@@ -38,19 +38,19 @@
 **
 ****************************************************************************/
 
-#include <ntqcheckbox.h>
-#include <ntqcombobox.h>
-#include <ntqradiobutton.h>
-#include <ntqpushbutton.h>
-#include <ntqprogressbar.h>
-#include <ntqtextedit.h>
-#include <ntqtabbar.h>
-#include <ntqtoolbar.h>
-#include <ntqtoolbutton.h>
-#include <ntqmainwindow.h>
-#include <ntqlayout.h>
-#include <ntqaction.h>
-#include <ntqgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqradiobutton.h>
+#include <tqpushbutton.h>
+#include <tqprogressbar.h>
+#include <tqtextedit.h>
+#include <tqtabbar.h>
+#include <tqtoolbar.h>
+#include <tqtoolbutton.h>
+#include <tqmainwindow.h>
+#include <tqlayout.h>
+#include <tqaction.h>
+#include <tqgroupbox.h>
 
 #include "stylewindow.h"
 
diff --git a/examples/tqt3reference/stylewindow.h b/examples/tqt3reference/stylewindow.h
index cd35077..badca69 100644
--- a/examples/tqt3reference/stylewindow.h
+++ b/examples/tqt3reference/stylewindow.h
@@ -41,7 +41,7 @@
 #ifndef STYLEWINDOW_H
 #define STYLEWINDOW_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
 class StyleWindow : public TQWidget
 {
diff --git a/generate_xml_information b/generate_xml_information
index c0003f3..3d5db74 100755
--- a/generate_xml_information
+++ b/generate_xml_information
@@ -2,5 +2,5 @@
 
 gccxml --gccxml-cxxflags -I/usr/include/qt4/ /usr/include/qt4/QtGui/QStyle -fxml=test.xml && cat test.xml | grep -E "(Enumeration|EnumValue)" &> qt4enums.xml
 rm -f test.xml
-gccxml --gccxml-cxxflags -I/usr/include/tqt3/ /usr/include/tqt3/ntqstyle.h -fxml=test.xml && cat test.xml | grep -E "(Enumeration|EnumValue)" &> qt3enums.xml
+gccxml --gccxml-cxxflags -I/usr/include/tqt3/ -I/usr/include/tqt/ /usr/include/tqt3/tqstyle.h -fxml=test.xml && cat test.xml | grep -E "(Enumeration|EnumValue)" &> qt3enums.xml
 rm -f test.xml
diff --git a/lib/tdeqt4converter.h b/lib/tdeqt4converter.h
index 6d94c9b..5f7f754 100644
--- a/lib/tdeqt4converter.h
+++ b/lib/tdeqt4converter.h
@@ -19,7 +19,6 @@
 #ifndef TDEQT4CONVERTER_H
 #define TDEQT4CONVERTER_H
 
-#define TQT_NO_COMPAT_NAMES
 #include <tqstyle.h>
 #include <tqpixmap.h>
 #include <tqbitmap.h>
diff --git a/lib/tdeqt4painter.cpp b/lib/tdeqt4painter.cpp
index 0d0410b..ce0c896 100644
--- a/lib/tdeqt4painter.cpp
+++ b/lib/tdeqt4painter.cpp
@@ -20,7 +20,6 @@
 
 #include "tdeqt4painter.h"
 
-#define TQT_NO_COMPAT_NAMES
 #include "tqpainter.h"
 #include "tqpixmap.h"
 #include "tqbitmap.h"
diff --git a/lib/tdeqt4painter.h b/lib/tdeqt4painter.h
index 56254f4..178b80f 100644
--- a/lib/tdeqt4painter.h
+++ b/lib/tdeqt4painter.h
@@ -21,9 +21,8 @@
 #ifndef TDEQT4PAINTER_H
 #define TDEQT4PAINTER_H
 
-#define TQT_NO_COMPAT_NAMES
-#include "ntqpaintdevice.h"
-#include "ntqbuffer.h"
+#include "tqpaintdevice.h"
+#include "tqbuffer.h"
 #undef Qt
 
 #include <QtGui/QPainter>
diff --git a/plugin/simplestyle.cpp b/plugin/simplestyle.cpp
index 0a6ecb0..56c72a6 100644
--- a/plugin/simplestyle.cpp
+++ b/plugin/simplestyle.cpp
@@ -16,7 +16,6 @@
 **
 **********************************************************************/
 
-#define TQT_NO_COMPAT_NAMES
 #include <tqstyle.h>
 #include <tqpixmap.h>
 #include <tqbitmap.h>
diff --git a/plugin/simplestyle.h b/plugin/simplestyle.h
index f4c5ac0..b41e90a 100644
--- a/plugin/simplestyle.h
+++ b/plugin/simplestyle.h
@@ -21,7 +21,7 @@
 
 #include <QtGui/QWindowsStyle>
 #include <QFileDialog>
-#include <ntqintcache.h>
+#include <tqintcache.h>
 
 #include "tdeqt4converter.h"