Fix native TQt3 detection

Fix header file #ifdef collisions
author: Timothy Pearson <[email protected]> 2011-11-08 16:31:23 -0600
committer: Timothy Pearson <[email protected]> 2011-11-08 16:31:23 -0600
commit: 6351ace5b1923516f683adcc27488af6b23f3785 (patch)
tree: b768e4aacaf3c9fb21d384d1e9e7b06890b7c725
parent: d27878829fed305ba79ad65a748bc9a7e0b1843b (diff)
download: tqtinterface-6351ace5b1923516f683adcc27488af6b23f3785.tar.gz
tqtinterface-6351ace5b1923516f683adcc27488af6b23f3785.zip
341 files changed, 1045 insertions, 1020 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 514020d..1ce5c9b 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -160,6 +160,18 @@ if( QT_VERSION STREQUAL "3" )
     #include <qapplication.h>
     int main(int argc, char **argv) { QApplication app(argc, argv); return 0; } "
     HAVE_USABLE_QT${QT_VERSION} )
+    if( NOT HAVE_USABLE_QT${QT_VERSION} )
+      # Unset the Qt detection variable
+      unset( HAVE_USABLE_QT${QT_VERSION} CACHE )
+      # Reset libraries
+      set( QT_LIBRARIES tqt-mt )
+      set( CMAKE_REQUIRED_LIBRARIES -L${QT_LIBRARY_DIR} ${QT_LIBRARIES} )
+      qt_message( "Looking for native TQt3..." )
+      check_cxx_source_compiles("
+        #include <qapplication.h>
+        int main(int argc, char **argv) { TQApplication app(argc, argv); return 0; } "
+        HAVE_USABLE_QT${QT_VERSION} )
+    endif( )
 # check if Qt4 is usable
 elseif( QT_VERSION STREQUAL "4" )
   check_cxx_source_compiles("
@@ -178,6 +190,19 @@ if( QT_VERSION STREQUAL "3" )
     #include <qobject.h>
     int main(int, char**) { QObject::objectTreesListObject(); return 0; } "
     HAVE_PATCHED_QT3 )
+    if( NOT HAVE_PATCHED_QT3 )
+      # Unset the Qt detection variable
+      unset( HAVE_PATCHED_QT3 CACHE )
+      # Reset libraries
+      set( QT_LIBRARIES tqt-mt )
+      set( CMAKE_REQUIRED_LIBRARIES -L${QT_LIBRARY_DIR} ${QT_LIBRARIES} )
+      qt_message( "Looking for patched native TQt3..." )
+      check_cxx_source_compiles("
+        #include <qobjectlist.h>
+        #include <qobject.h>
+        int main(int, char**) { TQObject::objectTreesListObject(); return 0; } "
+        HAVE_PATCHED_QT3 )
+    endif( )
   if( NOT HAVE_PATCHED_QT3 )
     tde_message_fatal( "Your Qt3 is not patched for compatibility with tqtinterface." )
   endif( )
diff --git a/qtinterface/private/tqcom_p.h b/qtinterface/private/tqcom_p.h
index a6a2fb7..8611847 100644
--- a/qtinterface/private/tqcom_p.h
+++ b/qtinterface/private/tqcom_p.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCOM_P_H
-#define TQCOM_P_H
+#ifndef TQT_TQCOM_P_H
+#define TQT_TQCOM_P_H
 
 #include <tqt.h>
 
@@ -32,4 +32,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT3
 
-#endif /* TQCOM_P_H */
+#endif /* TQT_TQCOM_P_H */
diff --git a/qtinterface/private/tqeffects_p.h b/qtinterface/private/tqeffects_p.h
index e0ddff1..7e15c03 100644
--- a/qtinterface/private/tqeffects_p.h
+++ b/qtinterface/private/tqeffects_p.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQEFFECTS_P_H
-#define TQEFFECTS_P_H
+#ifndef TQT_TQEFFECTS_P_H
+#define TQT_TQEFFECTS_P_H
 
 #include <tqt.h>
 
@@ -37,4 +37,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQEFFECTS_P_H */
+#endif /* TQT_TQEFFECTS_P_H */
diff --git a/qtinterface/private/tqinternal_p.h b/qtinterface/private/tqinternal_p.h
index 83b8668..069d11e 100644
--- a/qtinterface/private/tqinternal_p.h
+++ b/qtinterface/private/tqinternal_p.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQINTERNAL_P_H
-#define TQINTERNAL_P_H
+#ifndef TQT_TQINTERNAL_P_H
+#define TQT_TQINTERNAL_P_H
 
 #include <tqt.h>
 
@@ -37,4 +37,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQINTERNAL_P_H */
+#endif /* TQT_TQINTERNAL_P_H */
diff --git a/qtinterface/private/tqlayoutengine_p.h b/qtinterface/private/tqlayoutengine_p.h
index cd72144..1bb9581 100644
--- a/qtinterface/private/tqlayoutengine_p.h
+++ b/qtinterface/private/tqlayoutengine_p.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLAYOUTENGINE_P_H
-#define TQLAYOUTENGINE_P_H
+#ifndef TQT_TQLAYOUTENGINE_P_H
+#define TQT_TQLAYOUTENGINE_P_H
 
 #include <tqt.h>
 
@@ -33,4 +33,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT3
 
-#endif /* TQLAYOUTENGINE_P_H */
+#endif /* TQT_TQLAYOUTENGINE_P_H */
diff --git a/qtinterface/private/tqpluginmanager_p.h b/qtinterface/private/tqpluginmanager_p.h
index d155c1d..d476598 100644
--- a/qtinterface/private/tqpluginmanager_p.h
+++ b/qtinterface/private/tqpluginmanager_p.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPLUGINMANAGER_P_H
-#define TQPLUGINMANAGER_P_H
+#ifndef TQT_TQPLUGINMANAGER_P_H
+#define TQT_TQPLUGINMANAGER_P_H
 
 #include <tqt.h>
 
@@ -32,4 +32,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT3
 
-#endif /* TQPLUGINMANAGER_P_H */
+#endif /* TQT_TQPLUGINMANAGER_P_H */
diff --git a/qtinterface/private/tqrichtext_p.h b/qtinterface/private/tqrichtext_p.h
index fac91fc..47dfed1 100644
--- a/qtinterface/private/tqrichtext_p.h
+++ b/qtinterface/private/tqrichtext_p.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQRICHTEXT_P_H
-#define TQRICHTEXT_P_H
+#ifndef TQT_TQRICHTEXT_P_H
+#define TQT_TQRICHTEXT_P_H
 
 #include <tqt.h>
 
@@ -37,4 +37,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQRICHTEXT_P_H */
+#endif /* TQT_TQRICHTEXT_P_H */
diff --git a/qtinterface/private/tqtextengine_p.h b/qtinterface/private/tqtextengine_p.h
index f557a17..1a6c6cc 100644
--- a/qtinterface/private/tqtextengine_p.h
+++ b/qtinterface/private/tqtextengine_p.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTEXTENGINE_P_H
-#define TQTEXTENGINE_P_H
+#ifndef TQT_TQTEXTENGINE_P_H
+#define TQT_TQTEXTENGINE_P_H
 
 #include <tqt.h>
 
@@ -37,4 +37,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTEXTENGINE_P_H */
+#endif /* TQT_TQTEXTENGINE_P_H */
diff --git a/qtinterface/private/tqucom_p.h b/qtinterface/private/tqucom_p.h
index f189bbf..be46f52 100644
--- a/qtinterface/private/tqucom_p.h
+++ b/qtinterface/private/tqucom_p.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQUCOM_P_H
-#define TQUCOM_P_H
+#ifndef TQT_TQUCOM_P_H
+#define TQT_TQUCOM_P_H
 
 #include <tqt.h>
 
@@ -32,4 +32,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT3
 
-#endif /* TQUCOM_P_H */
+#endif /* TQT_TQUCOM_P_H */
diff --git a/qtinterface/private/tqucomextra_p.h b/qtinterface/private/tqucomextra_p.h
index b062baf..4817321 100644
--- a/qtinterface/private/tqucomextra_p.h
+++ b/qtinterface/private/tqucomextra_p.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQUCOMEXTRA_P_H
-#define TQUCOMEXTRA_P_H
+#ifndef TQT_TQUCOMEXTRA_P_H
+#define TQT_TQUCOMEXTRA_P_H
 
 #include <tqt.h>
 
@@ -45,4 +45,4 @@ public:
 
 #endif // USE_QT4
 
-#endif /* TQUCOMEXTRA_P_H */
+#endif /* TQT_TQUCOMEXTRA_P_H */
diff --git a/qtinterface/private/tqwidgetinterface_p.h b/qtinterface/private/tqwidgetinterface_p.h
index 914242d..5c72d32 100644
--- a/qtinterface/private/tqwidgetinterface_p.h
+++ b/qtinterface/private/tqwidgetinterface_p.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWIDGETINTERFACE_P_H
-#define TQWIDGETINTERFACE_P_H
+#ifndef TQT_TQWIDGETINTERFACE_P_H
+#define TQT_TQWIDGETINTERFACE_P_H
 
 #include <tqt.h>
 
@@ -32,4 +32,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT3
 
-#endif /* TQWIDGETINTERFACE_P_H */
+#endif /* TQT_TQWIDGETINTERFACE_P_H */
diff --git a/qtinterface/tq1xcompatibility.h b/qtinterface/tq1xcompatibility.h
index 18a6a1a..b9c1d6c 100644
--- a/qtinterface/tq1xcompatibility.h
+++ b/qtinterface/tq1xcompatibility.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQ1XCOMPATIBILITY_H
-#define TQ1XCOMPATIBILITY_H
+#ifndef TQT_TQ1XCOMPATIBILITY_H
+#define TQT_TQ1XCOMPATIBILITY_H
 
 #include <tqt.h>
 
@@ -36,4 +36,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQ1XCOMPATIBILITY_H */
-\ No newline at end of file
+#endif /* TQT_TQ1XCOMPATIBILITY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqabstractlayout.h b/qtinterface/tqabstractlayout.h
index 026f4cf..ddb8c5c 100644
--- a/qtinterface/tqabstractlayout.h
+++ b/qtinterface/tqabstractlayout.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQABSTRACTLAYOUT_H
-#define TQABSTRACTLAYOUT_H
+#ifndef TQT_TQABSTRACTLAYOUT_H
+#define TQT_TQABSTRACTLAYOUT_H
 
 #include <tqt.h>
 
@@ -36,4 +36,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQABSTRACTLAYOUT_H */
-\ No newline at end of file
+#endif /* TQT_TQABSTRACTLAYOUT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqaccel.h b/qtinterface/tqaccel.h
index 002a49f..a0ccae9 100644
--- a/qtinterface/tqaccel.h
+++ b/qtinterface/tqaccel.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQACCEL_H
-#define TQACCEL_H
+#ifndef TQT_TQACCEL_H
+#define TQT_TQACCEL_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQACCEL_H */
-\ No newline at end of file
+#endif /* TQT_TQACCEL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqaccessible.h b/qtinterface/tqaccessible.h
index 2df7270..33d6ce8 100644
--- a/qtinterface/tqaccessible.h
+++ b/qtinterface/tqaccessible.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQACCESSIBLE_H
-#define TQACCESSIBLE_H
+#ifndef TQT_TQACCESSIBLE_H
+#define TQT_TQACCESSIBLE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQACCESSIBLE_H */
-\ No newline at end of file
+#endif /* TQT_TQACCESSIBLE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqaction.h b/qtinterface/tqaction.h
index ce1ddd5..7cc9e7d 100644
--- a/qtinterface/tqaction.h
+++ b/qtinterface/tqaction.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQACTION_H
-#define TQACTION_H
+#ifndef TQT_TQACTION_H
+#define TQT_TQACTION_H
 
 #include <tqt.h>
 #include <tqobject.h>
@@ -43,4 +43,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQACTION_H */
-\ No newline at end of file
+#endif /* TQT_TQACTION_H */
+\ No newline at end of file
diff --git a/qtinterface/tqapp.h b/qtinterface/tqapp.h
index 0025c77..f759fac 100644
--- a/qtinterface/tqapp.h
+++ b/qtinterface/tqapp.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQAPP_H
-#define TQAPP_H
+#ifndef TQT_TQAPP_H
+#define TQT_TQAPP_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqapplication.h>
 
-#endif /* TQAPP_H */
-\ No newline at end of file
+#endif /* TQT_TQAPP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqapplication.h b/qtinterface/tqapplication.h
index 8ecec4d..6b44a43 100644
--- a/qtinterface/tqapplication.h
+++ b/qtinterface/tqapplication.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQAPPLICATION_H
-#define TQAPPLICATION_H
+#ifndef TQT_TQAPPLICATION_H
+#define TQT_TQAPPLICATION_H
 
 #include <tqt.h>
 #include <tqasciidict.h>
@@ -49,4 +49,4 @@ unsigned long get_tqt_x_user_time(void);
 
 #endif // USE_QT4
 
-#endif /* TQAPPLICATION_H */
+#endif /* TQT_TQAPPLICATION_H */
diff --git a/qtinterface/tqarray.h b/qtinterface/tqarray.h
index 12a7f2e..5d7843c 100644
--- a/qtinterface/tqarray.h
+++ b/qtinterface/tqarray.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQARRAY_H
-#define TQARRAY_H
+#ifndef TQT_TQARRAY_H
+#define TQT_TQARRAY_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqmemarray.h>
 
-#endif /* TQARRAY_H */
-\ No newline at end of file
+#endif /* TQT_TQARRAY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqasciicache.h b/qtinterface/tqasciicache.h
index dfbcc76..a78ea18 100644
--- a/qtinterface/tqasciicache.h
+++ b/qtinterface/tqasciicache.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQASCIICACHE_H
-#define TQASCIICACHE_H
+#ifndef TQT_TQASCIICACHE_H
+#define TQT_TQASCIICACHE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQASCIICACHE_H */
-\ No newline at end of file
+#endif /* TQT_TQASCIICACHE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqasciidict.h b/qtinterface/tqasciidict.h
index 5cfe505..a6b5320 100644
--- a/qtinterface/tqasciidict.h
+++ b/qtinterface/tqasciidict.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQASCIIDICT_H
-#define TQASCIIDICT_H
+#ifndef TQT_TQASCIIDICT_H
+#define TQT_TQASCIIDICT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQASCIIDICT_H */
-\ No newline at end of file
+#endif /* TQT_TQASCIIDICT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqassistantclient.h b/qtinterface/tqassistantclient.h
index a494fcf..f72b7c7 100644
--- a/qtinterface/tqassistantclient.h
+++ b/qtinterface/tqassistantclient.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQASSISTANTCLIENT_H
-#define TQASSISTANTCLIENT_H
+#ifndef TQT_TQASSISTANTCLIENT_H
+#define TQT_TQASSISTANTCLIENT_H
 
 #include <tqt.h>
 
@@ -30,4 +30,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT3
 
-#endif /* TQASSISTANTCLIENT_H */
+#endif /* TQT_TQASSISTANTCLIENT_H */
diff --git a/qtinterface/tqasyncimageio.h b/qtinterface/tqasyncimageio.h
index fd71590..eb885c6 100644
--- a/qtinterface/tqasyncimageio.h
+++ b/qtinterface/tqasyncimageio.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQASYNCIMAGEIO_H
-#define TQASYNCIMAGEIO_H
+#ifndef TQT_TQASYNCIMAGEIO_H
+#define TQT_TQASYNCIMAGEIO_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQASYNCIMAGEIO_H */
-\ No newline at end of file
+#endif /* TQT_TQASYNCIMAGEIO_H */
+\ No newline at end of file
diff --git a/qtinterface/tqasyncio.h b/qtinterface/tqasyncio.h
index 7b5f8c7..d934096 100644
--- a/qtinterface/tqasyncio.h
+++ b/qtinterface/tqasyncio.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQASYNCIO_H
-#define TQASYNCIO_H
+#ifndef TQT_TQASYNCIO_H
+#define TQT_TQASYNCIO_H
 
 #include <tqt.h>
 #include <tqtimer.h>
@@ -41,4 +41,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQASYNCIO_H */
-\ No newline at end of file
+#endif /* TQT_TQASYNCIO_H */
+\ No newline at end of file
diff --git a/qtinterface/tqbig5codec.h b/qtinterface/tqbig5codec.h
index 7a9fbb0..72a39b4 100644
--- a/qtinterface/tqbig5codec.h
+++ b/qtinterface/tqbig5codec.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQQBIG5CODEC_H
-#define TQQBIG5CODEC_H
+#ifndef TQT_TQQBIG5CODEC_H
+#define TQT_TQQBIG5CODEC_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQQBIG5CODEC_H */
-\ No newline at end of file
+#endif /* TQT_TQQBIG5CODEC_H */
+\ No newline at end of file
diff --git a/qtinterface/tqbitarray.h b/qtinterface/tqbitarray.h
index 659ad89..6dcd918 100644
--- a/qtinterface/tqbitarray.h
+++ b/qtinterface/tqbitarray.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQBITARRAY_H
-#define TQBITARRAY_H
+#ifndef TQT_TQBITARRAY_H
+#define TQT_TQBITARRAY_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQBITARRAY_H */
-\ No newline at end of file
+#endif /* TQT_TQBITARRAY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqbitarry.h b/qtinterface/tqbitarry.h
index 7b1bc06..34fdd51 100644
--- a/qtinterface/tqbitarry.h
+++ b/qtinterface/tqbitarry.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQBITARRY_H
-#define TQBITARRY_H
+#ifndef TQT_TQBITARRY_H
+#define TQT_TQBITARRY_H
 
 #include <tqt.h>
 #include <tqdatastream.h>
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 // Pull in tqbitarry defines
 #include <tqbitarry.h>
 
-#endif /* TQBITARRY_H */
-\ No newline at end of file
+#endif /* TQT_TQBITARRY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqbitmap.h b/qtinterface/tqbitmap.h
index 0963e4c..951d477 100644
--- a/qtinterface/tqbitmap.h
+++ b/qtinterface/tqbitmap.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQBITMAP_H
-#define TQBITMAP_H
+#ifndef TQT_TQBITMAP_H
+#define TQT_TQBITMAP_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQBITMAP_H */
-\ No newline at end of file
+#endif /* TQT_TQBITMAP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqbrush.h b/qtinterface/tqbrush.h
index aef3baf..7da8793 100644
--- a/qtinterface/tqbrush.h
+++ b/qtinterface/tqbrush.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQBRUSH_H
-#define TQBRUSH_H
+#ifndef TQT_TQBRUSH_H
+#define TQT_TQBRUSH_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQBRUSH_H */
-\ No newline at end of file
+#endif /* TQT_TQBRUSH_H */
+\ No newline at end of file
diff --git a/qtinterface/tqbttngrp.h b/qtinterface/tqbttngrp.h
index d888e20..6de934a 100644
--- a/qtinterface/tqbttngrp.h
+++ b/qtinterface/tqbttngrp.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQBTTNGRP_H
-#define TQBTTNGRP_H
+#ifndef TQT_TQBTTNGRP_H
+#define TQT_TQBTTNGRP_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqbuttongroup.h>
 
-#endif /* TQBTTNGRP_H */
-\ No newline at end of file
+#endif /* TQT_TQBTTNGRP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqbuffer.h b/qtinterface/tqbuffer.h
index f65f0b8..13723ec 100644
--- a/qtinterface/tqbuffer.h
+++ b/qtinterface/tqbuffer.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQBUFFER_H
-#define TQBUFFER_H
+#ifndef TQT_TQBUFFER_H
+#define TQT_TQBUFFER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQBUFFER_H */
-\ No newline at end of file
+#endif /* TQT_TQBUFFER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqbutton.h b/qtinterface/tqbutton.h
index 5451e29..44dde3d 100644
--- a/qtinterface/tqbutton.h
+++ b/qtinterface/tqbutton.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQBUTTON_H
-#define TQBUTTON_H
+#ifndef TQT_TQBUTTON_H
+#define TQT_TQBUTTON_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQBUTTON_H */
-\ No newline at end of file
+#endif /* TQT_TQBUTTON_H */
+\ No newline at end of file
diff --git a/qtinterface/tqbuttongroup.h b/qtinterface/tqbuttongroup.h
index 38f924c..b84ab80 100644
--- a/qtinterface/tqbuttongroup.h
+++ b/qtinterface/tqbuttongroup.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQBUTTONGROUP_H
-#define TQBUTTONGROUP_H
+#ifndef TQT_TQBUTTONGROUP_H
+#define TQT_TQBUTTONGROUP_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQBUTTONGROUP_H */
-\ No newline at end of file
+#endif /* TQT_TQBUTTONGROUP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcache.h b/qtinterface/tqcache.h
index 49f698b..287f5fc 100644
--- a/qtinterface/tqcache.h
+++ b/qtinterface/tqcache.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCACHE_H
-#define TQCACHE_H
+#ifndef TQT_TQCACHE_H
+#define TQT_TQCACHE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCACHE_H */
-\ No newline at end of file
+#endif /* TQT_TQCACHE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcanvas.h b/qtinterface/tqcanvas.h
index 3dc4c09..8024b08 100644
--- a/qtinterface/tqcanvas.h
+++ b/qtinterface/tqcanvas.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCANVAS_H
-#define TQCANVAS_H
+#ifndef TQT_TQCANVAS_H
+#define TQT_TQCANVAS_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCANVAS_H */
-\ No newline at end of file
+#endif /* TQT_TQCANVAS_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcdestyle.h b/qtinterface/tqcdestyle.h
index 72c84cb..3c8e2a2 100644
--- a/qtinterface/tqcdestyle.h
+++ b/qtinterface/tqcdestyle.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCDESTYLE_H
-#define TQCDESTYLE_H
+#ifndef TQT_TQCDESTYLE_H
+#define TQT_TQCDESTYLE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCDESTYLE_H */
-\ No newline at end of file
+#endif /* TQT_TQCDESTYLE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcheckbox.h b/qtinterface/tqcheckbox.h
index 6f7425a..55c148d 100644
--- a/qtinterface/tqcheckbox.h
+++ b/qtinterface/tqcheckbox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCHECKBOX_H
-#define TQCHECKBOX_H
+#ifndef TQT_TQCHECKBOX_H
+#define TQT_TQCHECKBOX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCHECKBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQCHECKBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqchkbox.h b/qtinterface/tqchkbox.h
index d25806c..4e3129b 100644
--- a/qtinterface/tqchkbox.h
+++ b/qtinterface/tqchkbox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCHKBOX_H
-#define TQCHKBOX_H
+#ifndef TQT_TQCHKBOX_H
+#define TQT_TQCHKBOX_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqcheckbox.h>
 
-#endif /* TQCHKBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQCHKBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcleanuphandler.h b/qtinterface/tqcleanuphandler.h
index faabf35..5b1140f 100644
--- a/qtinterface/tqcleanuphandler.h
+++ b/qtinterface/tqcleanuphandler.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCLEANUPHANDLER_H
-#define TQCLEANUPHANDLER_H
+#ifndef TQT_TQCLEANUPHANDLER_H
+#define TQT_TQCLEANUPHANDLER_H
 
 #include <tqt.h>
 
@@ -128,4 +128,4 @@ private:
 
 #endif // USE_QT4
 
-#endif /* TQCLEANUPHANDLER_H */
-\ No newline at end of file
+#endif /* TQT_TQCLEANUPHANDLER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqclipboard.h b/qtinterface/tqclipboard.h
index e1e3a67..8616c33 100644
--- a/qtinterface/tqclipboard.h
+++ b/qtinterface/tqclipboard.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCLIPBOARD_H
-#define TQCLIPBOARD_H
+#ifndef TQT_TQCLIPBOARD_H
+#define TQT_TQCLIPBOARD_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCLIPBOARD_H */
-\ No newline at end of file
+#endif /* TQT_TQCLIPBOARD_H */
+\ No newline at end of file
diff --git a/qtinterface/tqclipbrd.h b/qtinterface/tqclipbrd.h
index cba31bc..37d7a5f 100644
--- a/qtinterface/tqclipbrd.h
+++ b/qtinterface/tqclipbrd.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCLIPBRD_H
-#define TQCLIPBRD_H
+#ifndef TQT_TQCLIPBRD_H
+#define TQT_TQCLIPBRD_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqclipboard.h>
 
-#endif /* TQCLIPBRD_H */
-\ No newline at end of file
+#endif /* TQT_TQCLIPBRD_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcollect.h b/qtinterface/tqcollect.h
index 8c91510..a5b0e7a 100644
--- a/qtinterface/tqcollect.h
+++ b/qtinterface/tqcollect.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCOLLECT_H
-#define TQCOLLECT_H
+#ifndef TQT_TQCOLLECT_H
+#define TQT_TQCOLLECT_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqptrcollection.h>
 
-#endif /* TQCOLLECT_H */
-\ No newline at end of file
+#endif /* TQT_TQCOLLECT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcollection.h b/qtinterface/tqcollection.h
index 8318def..c27cc91 100644
--- a/qtinterface/tqcollection.h
+++ b/qtinterface/tqcollection.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCOLLECTION_H
-#define TQCOLLECTION_H
+#ifndef TQT_TQCOLLECTION_H
+#define TQT_TQCOLLECTION_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqptrcollection.h>
 
-#endif /* TQCOLLECTION_H */
-\ No newline at end of file
+#endif /* TQT_TQCOLLECTION_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcolor.h b/qtinterface/tqcolor.h
index 9dd8601..1e3bd45 100644
--- a/qtinterface/tqcolor.h
+++ b/qtinterface/tqcolor.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCOLOR_H
-#define TQCOLOR_H
+#ifndef TQT_TQCOLOR_H
+#define TQT_TQCOLOR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCOLOR_H */
-\ No newline at end of file
+#endif /* TQT_TQCOLOR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcolordialog.h b/qtinterface/tqcolordialog.h
index 328a09b..1bb1d2a 100644
--- a/qtinterface/tqcolordialog.h
+++ b/qtinterface/tqcolordialog.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCOLORDIALOG_H
-#define TQCOLORDIALOG_H
+#ifndef TQT_TQCOLORDIALOG_H
+#define TQT_TQCOLORDIALOG_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCOLORDIALOG_H */
-\ No newline at end of file
+#endif /* TQT_TQCOLORDIALOG_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcombo.h b/qtinterface/tqcombo.h
index 2f69e7f..84f9996 100644
--- a/qtinterface/tqcombo.h
+++ b/qtinterface/tqcombo.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCOMBO_H
-#define TQCOMBO_H
+#ifndef TQT_TQCOMBO_H
+#define TQT_TQCOMBO_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqcombobox.h>
 
-#endif /* TQCOMBO_H */
-\ No newline at end of file
+#endif /* TQT_TQCOMBO_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcombobox.h b/qtinterface/tqcombobox.h
index bb3aa85..bacd944 100644
--- a/qtinterface/tqcombobox.h
+++ b/qtinterface/tqcombobox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCOMBOBOX_H
-#define TQCOMBOBOX_H
+#ifndef TQT_TQCOMBOBOX_H
+#define TQT_TQCOMBOBOX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCOMBOBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQCOMBOBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcommonstyle.h b/qtinterface/tqcommonstyle.h
index f7ed598..66ef08f 100644
--- a/qtinterface/tqcommonstyle.h
+++ b/qtinterface/tqcommonstyle.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCOMMONSTYLE_H
-#define TQCOMMONSTYLE_H
+#ifndef TQT_TQCOMMONSTYLE_H
+#define TQT_TQCOMMONSTYLE_H
 
 #include <tqt.h>
 
@@ -44,4 +44,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCOMMONSTYLE_H */
-\ No newline at end of file
+#endif /* TQT_TQCOMMONSTYLE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcompactstyle.h b/qtinterface/tqcompactstyle.h
index b44f412..8be3bd4 100644
--- a/qtinterface/tqcompactstyle.h
+++ b/qtinterface/tqcompactstyle.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCOMPACTSTYLE_H
-#define TQCOMPACTSTYLE_H
+#ifndef TQT_TQCOMPACTSTYLE_H
+#define TQT_TQCOMPACTSTYLE_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCOMPACTSTYLE_H */
-\ No newline at end of file
+#endif /* TQT_TQCOMPACTSTYLE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqconfig.h b/qtinterface/tqconfig.h
index 9f0b9e3..4bdb7b0 100644
--- a/qtinterface/tqconfig.h
+++ b/qtinterface/tqconfig.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCONFIG_H
-#define TQCONFIG_H
+#ifndef TQT_TQCONFIG_H
+#define TQT_TQCONFIG_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCONFIG_H */
-\ No newline at end of file
+#endif /* TQT_TQCONFIG_H */
+\ No newline at end of file
diff --git a/qtinterface/tqconnect.h b/qtinterface/tqconnect.h
index 67b4664..6aa2451 100644
--- a/qtinterface/tqconnect.h
+++ b/qtinterface/tqconnect.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCONNECT_H
-#define TQCONNECT_H
+#ifndef TQT_TQCONNECT_H
+#define TQT_TQCONNECT_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqconnection.h>
 
-#endif /* TQCONNECT_H */
-\ No newline at end of file
+#endif /* TQT_TQCONNECT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqconnection.h b/qtinterface/tqconnection.h
index 4850bb4..39fcf5d 100644
--- a/qtinterface/tqconnection.h
+++ b/qtinterface/tqconnection.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCONNECTION_H
-#define TQCONNECTION_H
+#ifndef TQT_TQCONNECTION_H
+#define TQT_TQCONNECTION_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCONNECTION_H */
-\ No newline at end of file
+#endif /* TQT_TQCONNECTION_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcstring.h b/qtinterface/tqcstring.h
index 3b07b45..07daf58 100644
--- a/qtinterface/tqcstring.h
+++ b/qtinterface/tqcstring.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCSTRING_H
-#define TQCSTRING_H
+#ifndef TQT_TQCSTRING_H
+#define TQT_TQCSTRING_H
 
 #include <tqt.h>
 #include <tqmemarray.h>
@@ -50,4 +50,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCSTRING_H */
-\ No newline at end of file
+#endif /* TQT_TQCSTRING_H */
+\ No newline at end of file
diff --git a/qtinterface/tqcursor.h b/qtinterface/tqcursor.h
index ada101c..65f47ec 100644
--- a/qtinterface/tqcursor.h
+++ b/qtinterface/tqcursor.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQCURSOR_H
-#define TQCURSOR_H
+#ifndef TQT_TQCURSOR_H
+#define TQT_TQCURSOR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQCURSOR_H */
-\ No newline at end of file
+#endif /* TQT_TQCURSOR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdatabrowser.h b/qtinterface/tqdatabrowser.h
index 261317c..3fb8ba7 100644
--- a/qtinterface/tqdatabrowser.h
+++ b/qtinterface/tqdatabrowser.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDATABROWSER_H
-#define TQDATABROSWER_H
+#ifndef TQT_TQDATABROWSER_H
+#define TQT_TQDATABROSWER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDATABROWSER_H */
-\ No newline at end of file
+#endif /* TQT_TQDATABROWSER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdatastream.h b/qtinterface/tqdatastream.h
index 4638f7e..fdc54bf 100644
--- a/qtinterface/tqdatastream.h
+++ b/qtinterface/tqdatastream.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDATASTREAM_H
-#define TQDATASTREAM_H
+#ifndef TQT_TQDATASTREAM_H
+#define TQT_TQDATASTREAM_H
 
 #include <tqt.h>
 #include <tqiodevice.h>
@@ -43,4 +43,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDATASTREAM_H */
-\ No newline at end of file
+#endif /* TQT_TQDATASTREAM_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdatatable.h b/qtinterface/tqdatatable.h
index ae16ac8..c8376ec 100644
--- a/qtinterface/tqdatatable.h
+++ b/qtinterface/tqdatatable.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDATATABLE_H
-#define TQDATATABLE_H
+#ifndef TQT_TQDATATABLE_H
+#define TQT_TQDATATABLE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDATATABLE_H */
-\ No newline at end of file
+#endif /* TQT_TQDATATABLE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdataview.h b/qtinterface/tqdataview.h
index 7500971..8007dbf 100644
--- a/qtinterface/tqdataview.h
+++ b/qtinterface/tqdataview.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDATAVIEW_H
-#define TQDATAVIEW_H
+#ifndef TQT_TQDATAVIEW_H
+#define TQT_TQDATAVIEW_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDATAVIEW_H */
-\ No newline at end of file
+#endif /* TQT_TQDATAVIEW_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdatetime.h b/qtinterface/tqdatetime.h
index 7078e4a..1753b56 100644
--- a/qtinterface/tqdatetime.h
+++ b/qtinterface/tqdatetime.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDATETIME_H
-#define TQDATETIME_H
+#ifndef TQT_TQDATETIME_H
+#define TQT_TQDATETIME_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDATETIME_H */
-\ No newline at end of file
+#endif /* TQT_TQDATETIME_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdatetimeedit.h b/qtinterface/tqdatetimeedit.h
index 92609ec..6ba4ac4 100644
--- a/qtinterface/tqdatetimeedit.h
+++ b/qtinterface/tqdatetimeedit.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDATETIMEEDIT_H
-#define TQDATETIMEEDIT_H
+#ifndef TQT_TQDATETIMEEDIT_H
+#define TQT_TQDATETIMEEDIT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDATETIMEEDIT_H */
-\ No newline at end of file
+#endif /* TQT_TQDATETIMEEDIT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdatetm.h b/qtinterface/tqdatetm.h
index ba98c2e..b44f57a 100644
--- a/qtinterface/tqdatetm.h
+++ b/qtinterface/tqdatetm.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDATETM_H
-#define TQDATETM_H
+#ifndef TQT_TQDATETM_H
+#define TQT_TQDATETM_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqdatetime.h>
 
-#endif /* TQDATETM_H */
-\ No newline at end of file
+#endif /* TQT_TQDATETM_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdeepcopy.h b/qtinterface/tqdeepcopy.h
index e6a7836..63bc788 100644
--- a/qtinterface/tqdeepcopy.h
+++ b/qtinterface/tqdeepcopy.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDEEPCOPY_H
-#define TQDEEPCOPY_H
+#ifndef TQT_TQDEEPCOPY_H
+#define TQT_TQDEEPCOPY_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDEEPCOPY_H */
-\ No newline at end of file
+#endif /* TQT_TQDEEPCOPY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdesktopwidget.h b/qtinterface/tqdesktopwidget.h
index 6c67f73..e83d0ad 100644
--- a/qtinterface/tqdesktopwidget.h
+++ b/qtinterface/tqdesktopwidget.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDESKTOPWIDGET_H
-#define TQDESKTOPWIDGET_H
+#ifndef TQT_TQDESKTOPWIDGET_H
+#define TQT_TQDESKTOPWIDGET_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDESKTOPWIDGET_H */
-\ No newline at end of file
+#endif /* TQT_TQDESKTOPWIDGET_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdial.h b/qtinterface/tqdial.h
index c075f54..b77ae83 100644
--- a/qtinterface/tqdial.h
+++ b/qtinterface/tqdial.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDIAL_H
-#define TQDIAL_H
+#ifndef TQT_TQDIAL_H
+#define TQT_TQDIAL_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDIAL_H */
-\ No newline at end of file
+#endif /* TQT_TQDIAL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdialog.h b/qtinterface/tqdialog.h
index c88f32f..08381f2 100644
--- a/qtinterface/tqdialog.h
+++ b/qtinterface/tqdialog.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDIALOG_H
-#define TQDIALOG_H
+#ifndef TQT_TQDIALOG_H
+#define TQT_TQDIALOG_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDIALOG_H */
-\ No newline at end of file
+#endif /* TQT_TQDIALOG_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdict.h b/qtinterface/tqdict.h
index d4e5c6c..890a496 100644
--- a/qtinterface/tqdict.h
+++ b/qtinterface/tqdict.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDICT_H
-#define TQDICT_H
+#ifndef TQT_TQDICT_H
+#define TQT_TQDICT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDICT_H */
-\ No newline at end of file
+#endif /* TQT_TQDICT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdir.h b/qtinterface/tqdir.h
index 98e4b41..5b331e1 100644
--- a/qtinterface/tqdir.h
+++ b/qtinterface/tqdir.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDIR_H
-#define TQDIR_H
+#ifndef TQT_TQDIR_H
+#define TQT_TQDIR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDIR_H */
-\ No newline at end of file
+#endif /* TQT_TQDIR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdns.h b/qtinterface/tqdns.h
index 2c74600..b8d57f3 100644
--- a/qtinterface/tqdns.h
+++ b/qtinterface/tqdns.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDNS_H
-#define TQDNS_H
+#ifndef TQT_TQDNS_H
+#define TQT_TQDNS_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDNS_H */
-\ No newline at end of file
+#endif /* TQT_TQDNS_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdockarea.h b/qtinterface/tqdockarea.h
index 9005e04..2001f1b 100644
--- a/qtinterface/tqdockarea.h
+++ b/qtinterface/tqdockarea.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDOCKAREA_H
-#define TQDOCKAREA_H
+#ifndef TQT_TQDOCKAREA_H
+#define TQT_TQDOCKAREA_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDOCKAREA_H */
-\ No newline at end of file
+#endif /* TQT_TQDOCKAREA_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdockwindow.h b/qtinterface/tqdockwindow.h
index 569d3bd..0b4a3e0 100644
--- a/qtinterface/tqdockwindow.h
+++ b/qtinterface/tqdockwindow.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDOCKWINDOW_H
-#define TQDOCKWINDOW_H
+#ifndef TQT_TQDOCKWINDOW_H
+#define TQT_TQDOCKWINDOW_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDOCKWINDOW_H */
-\ No newline at end of file
+#endif /* TQT_TQDOCKWINDOW_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdom.h b/qtinterface/tqdom.h
index 1bdff56..1e9b360 100644
--- a/qtinterface/tqdom.h
+++ b/qtinterface/tqdom.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDOM_H
-#define TQDOM_H
+#ifndef TQT_TQDOM_H
+#define TQT_TQDOM_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQACCEL_H */
-\ No newline at end of file
+#endif /* TQT_TQACCEL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdragobject.h b/qtinterface/tqdragobject.h
index 30cb9a1..f6a96fa 100644
--- a/qtinterface/tqdragobject.h
+++ b/qtinterface/tqdragobject.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDRAGOBJECT_H
-#define TQDRAGOBJECT_H
+#ifndef TQT_TQDRAGOBJECT_H
+#define TQT_TQDRAGOBJECT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDRAGOBJECT_H */
-\ No newline at end of file
+#endif /* TQT_TQDRAGOBJECT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdrawutil.h b/qtinterface/tqdrawutil.h
index 511a428..17f944f 100644
--- a/qtinterface/tqdrawutil.h
+++ b/qtinterface/tqdrawutil.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDRAWUTIL_H
-#define TQDRAWUTIL_H
+#ifndef TQT_TQDRAWUTIL_H
+#define TQT_TQDRAWUTIL_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDRAWUTIL_H */
-\ No newline at end of file
+#endif /* TQT_TQDRAWUTIL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdrawutl.h b/qtinterface/tqdrawutl.h
index 71ceb1b..3418bfb 100644
--- a/qtinterface/tqdrawutl.h
+++ b/qtinterface/tqdrawutl.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDRAWUTIL_H
-#define TQDRAWUTIL_H
+#ifndef TQT_TQDRAWUTIL_H
+#define TQT_TQDRAWUTIL_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqdrawutil.h>
 
-#endif /* TQDRAWUTIL_H */
-\ No newline at end of file
+#endif /* TQT_TQDRAWUTIL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdropsite.h b/qtinterface/tqdropsite.h
index b27f0fc..860b62d 100644
--- a/qtinterface/tqdropsite.h
+++ b/qtinterface/tqdropsite.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDROPSITE_H
-#define TQDROPSITE_H
+#ifndef TQT_TQDROPSITE_H
+#define TQT_TQDROPSITE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQDROPSITE_H */
-\ No newline at end of file
+#endif /* TQT_TQDROPSITE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqdstream.h b/qtinterface/tqdstream.h
index 1b330d4..43e5bc3 100644
--- a/qtinterface/tqdstream.h
+++ b/qtinterface/tqdstream.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQDSTREAM_H
-#define TQDSTREAM_H
+#ifndef TQT_TQDSTREAM_H
+#define TQT_TQDSTREAM_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqdatastream.h>
 
-#endif /* TQDSTREAM_H */
-\ No newline at end of file
+#endif /* TQT_TQDSTREAM_H */
+\ No newline at end of file
diff --git a/qtinterface/tqeditorfactory.h b/qtinterface/tqeditorfactory.h
index 2bea765..2fc2b7b 100644
--- a/qtinterface/tqeditorfactory.h
+++ b/qtinterface/tqeditorfactory.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQEDITORFACTORY_H
-#define TQEDITORFACTORY_H
+#ifndef TQT_TQEDITORFACTORY_H
+#define TQT_TQEDITORFACTORY_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQEDITORFACTORY_H */
-\ No newline at end of file
+#endif /* TQT_TQEDITORFACTORY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqerrormessage.h b/qtinterface/tqerrormessage.h
index 501cd26..4c65338 100644
--- a/qtinterface/tqerrormessage.h
+++ b/qtinterface/tqerrormessage.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQERRORMESSAGE_H
-#define TQERRORMESSAGE_H
+#ifndef TQT_TQERRORMESSAGE_H
+#define TQT_TQERRORMESSAGE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQERRORMESSAGE_H */
-\ No newline at end of file
+#endif /* TQT_TQERRORMESSAGE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqeucjpcodec.h b/qtinterface/tqeucjpcodec.h
index cf53e9a..d77f939 100644
--- a/qtinterface/tqeucjpcodec.h
+++ b/qtinterface/tqeucjpcodec.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQEUCJPCODEC_H
-#define TQEUCJPCODEC_H
+#ifndef TQT_TQEUCJPCODEC_H
+#define TQT_TQEUCJPCODEC_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQEUCJPCODEC_H */
-\ No newline at end of file
+#endif /* TQT_TQEUCJPCODEC_H */
+\ No newline at end of file
diff --git a/qtinterface/tqeuckrcodec.h b/qtinterface/tqeuckrcodec.h
index 3cf3953..ba0685b 100644
--- a/qtinterface/tqeuckrcodec.h
+++ b/qtinterface/tqeuckrcodec.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQEUCKRCODEC_H
-#define TQEUCKRCODEC_H
+#ifndef TQT_TQEUCKRCODEC_H
+#define TQT_TQEUCKRCODEC_H
 
 #include <tqt.h>
 
@@ -39,4 +39,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQEUCKRCODEC_H */
-\ No newline at end of file
+#endif /* TQT_TQEUCKRCODEC_H */
+\ No newline at end of file
diff --git a/qtinterface/tqevent.h b/qtinterface/tqevent.h
index ab5840c..023a05b 100644
--- a/qtinterface/tqevent.h
+++ b/qtinterface/tqevent.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQEVENT_H
-#define TQEVENT_H
+#ifndef TQT_TQEVENT_H
+#define TQT_TQEVENT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQEVENT_H */
-\ No newline at end of file
+#endif /* TQT_TQEVENT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqeventloop.h b/qtinterface/tqeventloop.h
index c84284f..3c7310e 100644
--- a/qtinterface/tqeventloop.h
+++ b/qtinterface/tqeventloop.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQEVENTLOOP_H
-#define TQEVENTLOOP_H
+#ifndef TQT_TQEVENTLOOP_H
+#define TQT_TQEVENTLOOP_H
 
 #include <tqt.h>
 
@@ -60,4 +60,4 @@ public:
 
 #endif // USE_QT4
 
-#endif /* TQEVENTLOOP_H */
-\ No newline at end of file
+#endif /* TQT_TQEVENTLOOP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfeatures.h b/qtinterface/tqfeatures.h
index e2008ff..e9bb751 100644
--- a/qtinterface/tqfeatures.h
+++ b/qtinterface/tqfeatures.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFEATURES_H
-#define TQFEATURES_H
+#ifndef TQT_TQFEATURES_H
+#define TQT_TQFEATURES_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQFEATURES_H */
-\ No newline at end of file
+#endif /* TQT_TQFEATURES_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfile.h b/qtinterface/tqfile.h
index deef8ca..4bec476 100644
--- a/qtinterface/tqfile.h
+++ b/qtinterface/tqfile.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFILE_H
-#define TQFILE_H
+#ifndef TQT_TQFILE_H
+#define TQT_TQFILE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQFILE_H */
-\ No newline at end of file
+#endif /* TQT_TQFILE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfiledef.h b/qtinterface/tqfiledef.h
index da48a55..d5e54c1 100644
--- a/qtinterface/tqfiledef.h
+++ b/qtinterface/tqfiledef.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFILEDEF_H
-#define TQFILEDEF_H
+#ifndef TQT_TQFILEDEF_H
+#define TQT_TQFILEDEF_H
 
 #include <tqt.h>
 
@@ -38,4 +38,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQFILEDEF_H */
-\ No newline at end of file
+#endif /* TQT_TQFILEDEF_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfiledialog.h b/qtinterface/tqfiledialog.h
index a800d40..cebbf8d 100644
--- a/qtinterface/tqfiledialog.h
+++ b/qtinterface/tqfiledialog.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFILEDIALOG_H
-#define TQFILEDIALOG_H
+#ifndef TQT_TQFILEDIALOG_H
+#define TQT_TQFILEDIALOG_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQFILEDIALOG_H */
-\ No newline at end of file
+#endif /* TQT_TQFILEDIALOG_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfiledlg.h b/qtinterface/tqfiledlg.h
index 7cc0126..003ef4a 100644
--- a/qtinterface/tqfiledlg.h
+++ b/qtinterface/tqfiledlg.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFILEDLG_H
-#define TQFILEDLG_H
+#ifndef TQT_TQFILEDLG_H
+#define TQT_TQFILEDLG_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqfiledialog.h>
 
-#endif /* TQFILEDLG_H */
-\ No newline at end of file
+#endif /* TQT_TQFILEDLG_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfileinf.h b/qtinterface/tqfileinf.h
index 15d6f4b..7697602 100644
--- a/qtinterface/tqfileinf.h
+++ b/qtinterface/tqfileinf.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFILEINF_H
-#define TQFILEINF_H
+#ifndef TQT_TQFILEINF_H
+#define TQT_TQFILEINF_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqfileinfo.h>
 
-#endif /* TQFILEINF_H */
-\ No newline at end of file
+#endif /* TQT_TQFILEINF_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfileinfo.h b/qtinterface/tqfileinfo.h
index 65e76c2..d30d58b 100644
--- a/qtinterface/tqfileinfo.h
+++ b/qtinterface/tqfileinfo.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFILEINFO_H
-#define TQFILEINFO_H
+#ifndef TQT_TQFILEINFO_H
+#define TQT_TQFILEINFO_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQFILEINFO_H */
-\ No newline at end of file
+#endif /* TQT_TQFILEINFO_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfocusdata.h b/qtinterface/tqfocusdata.h
index 7d56fe7..81ea02a 100644
--- a/qtinterface/tqfocusdata.h
+++ b/qtinterface/tqfocusdata.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFOCUSDATA_H
-#define TQFOCUSDATA_H
+#ifndef TQT_TQFOCUSDATA_H
+#define TQT_TQFOCUSDATA_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQFOCUSDATA_H */
-\ No newline at end of file
+#endif /* TQT_TQFOCUSDATA_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfont.h b/qtinterface/tqfont.h
index 3061fb4..d267060 100644
--- a/qtinterface/tqfont.h
+++ b/qtinterface/tqfont.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFONT_H
-#define TQFONT_H
+#ifndef TQT_TQFONT_H
+#define TQT_TQFONT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQFONT_H */
-\ No newline at end of file
+#endif /* TQT_TQFONT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfontdatabase.h b/qtinterface/tqfontdatabase.h
index 027803b..922feb0 100644
--- a/qtinterface/tqfontdatabase.h
+++ b/qtinterface/tqfontdatabase.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFONTDATABASE_H
-#define TQFONTDATABASE_H
+#ifndef TQT_TQFONTDATABASE_H
+#define TQT_TQFONTDATABASE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQFONTDATABASE_H */
-\ No newline at end of file
+#endif /* TQT_TQFONTDATABASE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfontdialog.h b/qtinterface/tqfontdialog.h
index a5e7f86..cfcaed3 100644
--- a/qtinterface/tqfontdialog.h
+++ b/qtinterface/tqfontdialog.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFONTDIALOG_H
-#define TQFONTDIALOG_H
+#ifndef TQT_TQFONTDIALOG_H
+#define TQT_TQFONTDIALOG_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQFONTDIALOG_H */
-\ No newline at end of file
+#endif /* TQT_TQFONTDIALOG_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfontinf.h b/qtinterface/tqfontinf.h
index 98b8fb4..393c2e6 100644
--- a/qtinterface/tqfontinf.h
+++ b/qtinterface/tqfontinf.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFONTINF_H
-#define TQFONTINF_H
+#ifndef TQT_TQFONTINF_H
+#define TQT_TQFONTINF_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqfontinfo.h>
 
-#endif /* TQFONTINF_H */
-\ No newline at end of file
+#endif /* TQT_TQFONTINF_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfontinfo.h b/qtinterface/tqfontinfo.h
index 9f893b3..3a85285 100644
--- a/qtinterface/tqfontinfo.h
+++ b/qtinterface/tqfontinfo.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFONTINFO_H
-#define TQFONTINFO_H
+#ifndef TQT_TQFONTINFO_H
+#define TQT_TQFONTINFO_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQFONTINFO_H */
-\ No newline at end of file
+#endif /* TQT_TQFONTINFO_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfontmet.h b/qtinterface/tqfontmet.h
index a6efe22..cc7b88e 100644
--- a/qtinterface/tqfontmet.h
+++ b/qtinterface/tqfontmet.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFONTMET_H
-#define TQFONTMET_H
+#ifndef TQT_TQFONTMET_H
+#define TQT_TQFONTMET_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqfontmetrics.h>
 
-#endif /* TQFONTMET_H */
-\ No newline at end of file
+#endif /* TQT_TQFONTMET_H */
+\ No newline at end of file
diff --git a/qtinterface/tqfontmetrics.h b/qtinterface/tqfontmetrics.h
index 72fc079..b7a79be 100644
--- a/qtinterface/tqfontmetrics.h
+++ b/qtinterface/tqfontmetrics.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFONTMETRICS_H
-#define TQFONTMETRICS_H
+#ifndef TQT_TQFONTMETRICS_H
+#define TQT_TQFONTMETRICS_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQFONTMETRICS_H */
-\ No newline at end of file
+#endif /* TQT_TQFONTMETRICS_H */
+\ No newline at end of file
diff --git a/qtinterface/tqframe.h b/qtinterface/tqframe.h
index 9ba1ded..3c196a0 100644
--- a/qtinterface/tqframe.h
+++ b/qtinterface/tqframe.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFRAME_H
-#define TQFRAME_H
+#ifndef TQT_TQFRAME_H
+#define TQT_TQFRAME_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQFRAME_H */
-\ No newline at end of file
+#endif /* TQT_TQFRAME_H */
+\ No newline at end of file
diff --git a/qtinterface/tqftp.h b/qtinterface/tqftp.h
index 0f1df8f..fc98b40 100644
--- a/qtinterface/tqftp.h
+++ b/qtinterface/tqftp.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQFTP_H
-#define TQFTP_H
+#ifndef TQT_TQFTP_H
+#define TQT_TQFTP_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQFTP_H */
-\ No newline at end of file
+#endif /* TQT_TQFTP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgarray.h b/qtinterface/tqgarray.h
index 813dc8a..f3feac6 100644
--- a/qtinterface/tqgarray.h
+++ b/qtinterface/tqgarray.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGARRAY_H
-#define TQGARRAY_H
+#ifndef TQT_TQGARRAY_H
+#define TQT_TQGARRAY_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGARRAY_H */
-\ No newline at end of file
+#endif /* TQT_TQGARRAY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgb18030codec.h b/qtinterface/tqgb18030codec.h
index 13e1281..326fd28 100644
--- a/qtinterface/tqgb18030codec.h
+++ b/qtinterface/tqgb18030codec.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGB18030CODEC_H
-#define TQGB18030CODEC_H
+#ifndef TQT_TQGB18030CODEC_H
+#define TQT_TQGB18030CODEC_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGB18030CODEC_H */
-\ No newline at end of file
+#endif /* TQT_TQGB18030CODEC_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgbkcodec.h b/qtinterface/tqgbkcodec.h
index 19afc8a..b08d9cb 100644
--- a/qtinterface/tqgbkcodec.h
+++ b/qtinterface/tqgbkcodec.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGBKCODEC_H
-#define TQGBKCODEC_H
+#ifndef TQT_TQGBKCODEC_H
+#define TQT_TQGBKCODEC_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqgb18030codec.h>
 
-#endif /* TQGBKCODEC_H */
-\ No newline at end of file
+#endif /* TQT_TQGBKCODEC_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgcache.h b/qtinterface/tqgcache.h
index 659005c..a10441b 100644
--- a/qtinterface/tqgcache.h
+++ b/qtinterface/tqgcache.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGCACHE_H
-#define TQGCACHE_H
+#ifndef TQT_TQGCACHE_H
+#define TQT_TQGCACHE_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGCACHE_H */
-\ No newline at end of file
+#endif /* TQT_TQGCACHE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgdict.h b/qtinterface/tqgdict.h
index a37fd8d..289b1bf 100644
--- a/qtinterface/tqgdict.h
+++ b/qtinterface/tqgdict.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGDICT_H
-#define TQGDICT_H
+#ifndef TQT_TQGDICT_H
+#define TQT_TQGDICT_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGDICT_H */
-\ No newline at end of file
+#endif /* TQT_TQGDICT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgeneric.h b/qtinterface/tqgeneric.h
index 8f2d3d0..eaf3762 100644
--- a/qtinterface/tqgeneric.h
+++ b/qtinterface/tqgeneric.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGENERIC_H
-#define TQGENERIC_H
+#ifndef TQT_TQGENERIC_H
+#define TQT_TQGENERIC_H
 
 #include <tqt.h>
 
@@ -34,4 +34,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGENERIC_H */
-\ No newline at end of file
+#endif /* TQT_TQGENERIC_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgif.h b/qtinterface/tqgif.h
index ae21d0c..a839524 100644
--- a/qtinterface/tqgif.h
+++ b/qtinterface/tqgif.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGIF_H
-#define TQGIF_H
+#ifndef TQT_TQGIF_H
+#define TQT_TQGIF_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGIF_H */
-\ No newline at end of file
+#endif /* TQT_TQGIF_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgl.h b/qtinterface/tqgl.h
index 22e9d48..7039a1c 100644
--- a/qtinterface/tqgl.h
+++ b/qtinterface/tqgl.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGL_H
-#define TQGL_H
+#ifndef TQT_TQGL_H
+#define TQT_TQGL_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGL_H */
-\ No newline at end of file
+#endif /* TQT_TQGL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqglcolormap.h b/qtinterface/tqglcolormap.h
index fa9f621..24ddaf9 100644
--- a/qtinterface/tqglcolormap.h
+++ b/qtinterface/tqglcolormap.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGLCOLORMAP_H
-#define TQGLCOLORMAP_H
+#ifndef TQT_TQGLCOLORMAP_H
+#define TQT_TQGLCOLORMAP_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGLCOLORMAP_H */
-\ No newline at end of file
+#endif /* TQT_TQGLCOLORMAP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqglist.h b/qtinterface/tqglist.h
index 6187874..378fd4e 100644
--- a/qtinterface/tqglist.h
+++ b/qtinterface/tqglist.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGLIST_H
-#define TQGLIST_H
+#ifndef TQT_TQGLIST_H
+#define TQT_TQGLIST_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGLIST_H */
-\ No newline at end of file
+#endif /* TQT_TQGLIST_H */
+\ No newline at end of file
diff --git a/qtinterface/tqglobal.h b/qtinterface/tqglobal.h
index 1e336ac..5094d00 100644
--- a/qtinterface/tqglobal.h
+++ b/qtinterface/tqglobal.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGLOBAL_H
-#define TQGLOBAL_H
+#ifndef TQT_TQGLOBAL_H
+#define TQT_TQGLOBAL_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGLOBAL_H */
-\ No newline at end of file
+#endif /* TQT_TQGLOBAL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgplugin.h b/qtinterface/tqgplugin.h
index ca95d3c..1b66267 100644
--- a/qtinterface/tqgplugin.h
+++ b/qtinterface/tqgplugin.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGPLUGIN_H
-#define TQGPLUGIN_H
+#ifndef TQT_TQGPLUGIN_H
+#define TQT_TQGPLUGIN_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGPLUGIN_H */
-\ No newline at end of file
+#endif /* TQT_TQGPLUGIN_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgrid.h b/qtinterface/tqgrid.h
index 3097917..d2dd05f 100644
--- a/qtinterface/tqgrid.h
+++ b/qtinterface/tqgrid.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGRID_H
-#define TQGRID_H
+#ifndef TQT_TQGRID_H
+#define TQT_TQGRID_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGRID_H */
-\ No newline at end of file
+#endif /* TQT_TQGRID_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgridview.h b/qtinterface/tqgridview.h
index 49b572c..1b48d71 100644
--- a/qtinterface/tqgridview.h
+++ b/qtinterface/tqgridview.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGRIDVIEW_H
-#define TQGRIDVIEW_H
+#ifndef TQT_TQGRIDVIEW_H
+#define TQT_TQGRIDVIEW_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGRIDVIEW_H */
-\ No newline at end of file
+#endif /* TQT_TQGRIDVIEW_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgroupbox.h b/qtinterface/tqgroupbox.h
index d70d5f3..b83a77e 100644
--- a/qtinterface/tqgroupbox.h
+++ b/qtinterface/tqgroupbox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGROUPBOX_H
-#define TQGROUPBOX_H
+#ifndef TQT_TQGROUPBOX_H
+#define TQT_TQGROUPBOX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGROUPBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQGROUPBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgrpbox.h b/qtinterface/tqgrpbox.h
index e83205c..e6e5aff 100644
--- a/qtinterface/tqgrpbox.h
+++ b/qtinterface/tqgrpbox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGRPBOX_H
-#define TQGRPBOX_H
+#ifndef TQT_TQGRPBOX_H
+#define TQT_TQGRPBOX_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqgroupbox.h>
 
-#endif /* TQGRPBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQGRPBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqguardedptr.h b/qtinterface/tqguardedptr.h
index a8b82c8..4626aaa 100644
--- a/qtinterface/tqguardedptr.h
+++ b/qtinterface/tqguardedptr.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGUARDEDPTR_H
-#define TQGUARDEDPTR_H
+#ifndef TQT_TQGUARDEDPTR_H
+#define TQT_TQGUARDEDPTR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGUARDEDPTR_H */
-\ No newline at end of file
+#endif /* TQT_TQGUARDEDPTR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqgvector.h b/qtinterface/tqgvector.h
index 20e11fe..42f407d 100644
--- a/qtinterface/tqgvector.h
+++ b/qtinterface/tqgvector.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQGVECTOR_H
-#define TQGVECTOR_H
+#ifndef TQT_TQGVECTOR_H
+#define TQT_TQGVECTOR_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQGVECTOR_H */
-\ No newline at end of file
+#endif /* TQT_TQGVECTOR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqhbox.h b/qtinterface/tqhbox.h
index eeda409..a23a09f 100644
--- a/qtinterface/tqhbox.h
+++ b/qtinterface/tqhbox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQHBOX_H
-#define TQHBOX_H
+#ifndef TQT_TQHBOX_H
+#define TQT_TQHBOX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQHBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQHBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqhbuttongroup.h b/qtinterface/tqhbuttongroup.h
index 04c50dd..6a06b3e 100644
--- a/qtinterface/tqhbuttongroup.h
+++ b/qtinterface/tqhbuttongroup.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQHBUTTONGROUP_H
-#define TQHBUTTONGROUP_H
+#ifndef TQT_TQHBUTTONGROUP_H
+#define TQT_TQHBUTTONGROUP_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQHBUTTONGROUP_H */
-\ No newline at end of file
+#endif /* TQT_TQHBUTTONGROUP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqheader.h b/qtinterface/tqheader.h
index f33af50..5e97694 100644
--- a/qtinterface/tqheader.h
+++ b/qtinterface/tqheader.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQHEADER_H
-#define TQHEADER_H
+#ifndef TQT_TQHEADER_H
+#define TQT_TQHEADER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQHEADER_H */
-\ No newline at end of file
+#endif /* TQT_TQHEADER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqhgroupbox.h b/qtinterface/tqhgroupbox.h
index 14085e5..53b6049 100644
--- a/qtinterface/tqhgroupbox.h
+++ b/qtinterface/tqhgroupbox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQHGROUPBOX_H
-#define TQHGROUPBOX_H
+#ifndef TQT_TQHGROUPBOX_H
+#define TQT_TQHGROUPBOX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQHGROUPBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQHGROUPBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqhostaddress.h b/qtinterface/tqhostaddress.h
index 59073c6..a4d2783 100644
--- a/qtinterface/tqhostaddress.h
+++ b/qtinterface/tqhostaddress.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQHOSTADDRESS_H
-#define TQHOSTADDRESS_H
+#ifndef TQT_TQHOSTADDRESS_H
+#define TQT_TQHOSTADDRESS_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQHOSTADDRESS_H */
-\ No newline at end of file
+#endif /* TQT_TQHOSTADDRESS_H */
+\ No newline at end of file
diff --git a/qtinterface/tqhttp.h b/qtinterface/tqhttp.h
index 12b46f0..c033ee8 100644
--- a/qtinterface/tqhttp.h
+++ b/qtinterface/tqhttp.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQHTTP_H
-#define TQHTTP_H
+#ifndef TQT_TQHTTP_H
+#define TQT_TQHTTP_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQHTTP_H */
-\ No newline at end of file
+#endif /* TQT_TQHTTP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqiconset.h b/qtinterface/tqiconset.h
index ac6035d..92851fe 100644
--- a/qtinterface/tqiconset.h
+++ b/qtinterface/tqiconset.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQICONSET_H
-#define TQICONSET_H
+#ifndef TQT_TQICONSET_H
+#define TQT_TQICONSET_H
 
 #include <tqt.h>
 
@@ -67,4 +67,4 @@ private:
 
 #endif // USE_QT4
 
-#endif /* TQICONSET_H */
-\ No newline at end of file
+#endif /* TQT_TQICONSET_H */
+\ No newline at end of file
diff --git a/qtinterface/tqiconview.h b/qtinterface/tqiconview.h
index fceebd1..e9c71f3 100644
--- a/qtinterface/tqiconview.h
+++ b/qtinterface/tqiconview.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQICONVIEW_H
-#define TQICONVIEW_H
+#ifndef TQT_TQICONVIEW_H
+#define TQT_TQICONVIEW_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQICONVIEW_H */
-\ No newline at end of file
+#endif /* TQT_TQICONVIEW_H */
+\ No newline at end of file
diff --git a/qtinterface/tqimage.h b/qtinterface/tqimage.h
index 0e93bb1..ddf1ec1 100644
--- a/qtinterface/tqimage.h
+++ b/qtinterface/tqimage.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQIMAGE_H
-#define TQIMAGE_H
+#ifndef TQT_TQIMAGE_H
+#define TQT_TQIMAGE_H
 
 #include <tqt.h>
 
@@ -64,4 +64,4 @@ protected:
 
 #endif // USE_QT4
 
-#endif /* TQIMAGE_H */
-\ No newline at end of file
+#endif /* TQT_TQIMAGE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqimageformatplugin.h b/qtinterface/tqimageformatplugin.h
index 2b25221..124891b 100644
--- a/qtinterface/tqimageformatplugin.h
+++ b/qtinterface/tqimageformatplugin.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQIMAGEFORMATPLUGIN_H
-#define TQIMAGEFORMATPLUGIN_H
+#ifndef TQT_TQIMAGEFORMATPLUGIN_H
+#define TQT_TQIMAGEFORMATPLUGIN_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQIMAGEFORMATPLUGIN_H */
-\ No newline at end of file
+#endif /* TQT_TQIMAGEFORMATPLUGIN_H */
+\ No newline at end of file
diff --git a/qtinterface/tqinputcontext.h b/qtinterface/tqinputcontext.h
index a73636f..5a9f569 100644
--- a/qtinterface/tqinputcontext.h
+++ b/qtinterface/tqinputcontext.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQINPUTCONTEXT_H
-#define TQINPUTCONTEXT_H
+#ifndef TQT_TQINPUTCONTEXT_H
+#define TQT_TQINPUTCONTEXT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQINPUTCONTEXT_H */
-\ No newline at end of file
+#endif /* TQT_TQINPUTCONTEXT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqinputcontextfactory.h b/qtinterface/tqinputcontextfactory.h
index 85aae01..3ca7863 100644
--- a/qtinterface/tqinputcontextfactory.h
+++ b/qtinterface/tqinputcontextfactory.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQINPUTCONTEXTFACTORY_H
-#define TQINPUTCONTEXTFACTORY_H
+#ifndef TQT_TQINPUTCONTEXTFACTORY_H
+#define TQT_TQINPUTCONTEXTFACTORY_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQINPUTCONTEXTFACTORY_H */
-\ No newline at end of file
+#endif /* TQT_TQINPUTCONTEXTFACTORY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqinputdialog.h b/qtinterface/tqinputdialog.h
index f0edbc2..b4c3ad3 100644
--- a/qtinterface/tqinputdialog.h
+++ b/qtinterface/tqinputdialog.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQINPUTDIALOG_H
-#define TQINPUTDIALOG_H
+#ifndef TQT_TQINPUTDIALOG_H
+#define TQT_TQINPUTDIALOG_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQINPUTDIALOG_H */
-\ No newline at end of file
+#endif /* TQT_TQINPUTDIALOG_H */
+\ No newline at end of file
diff --git a/qtinterface/tqintcach.h b/qtinterface/tqintcach.h
index d91f457..aae7245 100644
--- a/qtinterface/tqintcach.h
+++ b/qtinterface/tqintcach.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQINTCACH_H
-#define TQINTCACH_H
+#ifndef TQT_TQINTCACH_H
+#define TQT_TQINTCACH_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqintcache.h>
 
-#endif /* TQINTCACH_H */
-\ No newline at end of file
+#endif /* TQT_TQINTCACH_H */
+\ No newline at end of file
diff --git a/qtinterface/tqintcache.h b/qtinterface/tqintcache.h
index da63504..042fe50 100644
--- a/qtinterface/tqintcache.h
+++ b/qtinterface/tqintcache.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQINTCACHE_H
-#define TQINTCACHE_H
+#ifndef TQT_TQINTCACHE_H
+#define TQT_TQINTCACHE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQINTCACHE_H */
-\ No newline at end of file
+#endif /* TQT_TQINTCACHE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqintdict.h b/qtinterface/tqintdict.h
index 5e7fd1b..bb76f3d 100644
--- a/qtinterface/tqintdict.h
+++ b/qtinterface/tqintdict.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQINTDICT_H
-#define TQINTDICT_H
+#ifndef TQT_TQINTDICT_H
+#define TQT_TQINTDICT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQINTDICT_H */
-\ No newline at end of file
+#endif /* TQT_TQINTDICT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqinterlacestyle.h b/qtinterface/tqinterlacestyle.h
index 90540e3..0a834af 100644
--- a/qtinterface/tqinterlacestyle.h
+++ b/qtinterface/tqinterlacestyle.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQINTERLACESTYLE_H
-#define TQINTERLACESTYLE_H
+#ifndef TQT_TQINTERLACESTYLE_H
+#define TQT_TQINTERLACESTYLE_H
 
 #include <tqt.h>
 
@@ -46,4 +46,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQINTERLACESTYLE_H */
-\ No newline at end of file
+#endif /* TQT_TQINTERLACESTYLE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqiodev.h b/qtinterface/tqiodev.h
index e81b74f..7bfebc0 100644
--- a/qtinterface/tqiodev.h
+++ b/qtinterface/tqiodev.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQIODEV_H
-#define TQIODEV_H
+#ifndef TQT_TQIODEV_H
+#define TQT_TQIODEV_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqiodevice.h>
 
-#endif /* TQIODEV_H */
-\ No newline at end of file
+#endif /* TQT_TQIODEV_H */
+\ No newline at end of file
diff --git a/qtinterface/tqiodevice.h b/qtinterface/tqiodevice.h
index b4bb9c5..4728996 100644
--- a/qtinterface/tqiodevice.h
+++ b/qtinterface/tqiodevice.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQIODEVICE_H
-#define TQIODEVICE_H
+#ifndef TQT_TQIODEVICE_H
+#define TQT_TQIODEVICE_H
 
 #include <tqt.h>
 #include <tqobject.h>
@@ -57,4 +57,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQIODEVICE_H */
-\ No newline at end of file
+#endif /* TQT_TQIODEVICE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqjiscodec.h b/qtinterface/tqjiscodec.h
index 0d187e7..f3840b1 100644
--- a/qtinterface/tqjiscodec.h
+++ b/qtinterface/tqjiscodec.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQJISCODEC_H
-#define TQJISCODEC_H
+#ifndef TQT_TQJISCODEC_H
+#define TQT_TQJISCODEC_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQJISCODEC_H */
-\ No newline at end of file
+#endif /* TQT_TQJISCODEC_H */
+\ No newline at end of file
diff --git a/qtinterface/tqjpegio.h b/qtinterface/tqjpegio.h
index 01c0dc8..27691bc 100644
--- a/qtinterface/tqjpegio.h
+++ b/qtinterface/tqjpegio.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQJPEGIO_H
-#define TQJPEGIO_H
+#ifndef TQT_TQJPEGIO_H
+#define TQT_TQJPEGIO_H
 #include <tqt.h>
 
 #ifdef USE_QT3
@@ -39,4 +39,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQJPEGIO_H */
-\ No newline at end of file
+#endif /* TQT_TQJPEGIO_H */
+\ No newline at end of file
diff --git a/qtinterface/tqjpunicode.h b/qtinterface/tqjpunicode.h
index 63a7363..d34376e 100644
--- a/qtinterface/tqjpunicode.h
+++ b/qtinterface/tqjpunicode.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQJPUNICODE_H
-#define TQJPUNICODE_H
+#ifndef TQT_TQJPUNICODE_H
+#define TQT_TQJPUNICODE_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQJPUNICODE_H */
-\ No newline at end of file
+#endif /* TQT_TQJPUNICODE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqkeycode.h b/qtinterface/tqkeycode.h
index 8b6fd34..8206f12 100644
--- a/qtinterface/tqkeycode.h
+++ b/qtinterface/tqkeycode.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQKEYCODE_H
-#define TQKEYCODE_H
+#ifndef TQT_TQKEYCODE_H
+#define TQT_TQKEYCODE_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqkeycode.h>
 
-#endif /* TQKEYCODE_H */
-\ No newline at end of file
+#endif /* TQT_TQKEYCODE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqkeysequence.h b/qtinterface/tqkeysequence.h
index 29f2496..e6e77c1 100644
--- a/qtinterface/tqkeysequence.h
+++ b/qtinterface/tqkeysequence.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQKEYSEQUENCE_H
-#define TQKEYSEQUENCE_H
+#ifndef TQT_TQKEYSEQUENCE_H
+#define TQT_TQKEYSEQUENCE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQKEYSEQUENCE_H */
-\ No newline at end of file
+#endif /* TQT_TQKEYSEQUENCE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqlabel.h b/qtinterface/tqlabel.h
index 1eca0c8..2af056a 100644
--- a/qtinterface/tqlabel.h
+++ b/qtinterface/tqlabel.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLABEL_H
-#define TQLABEL_H
+#ifndef TQT_TQLABEL_H
+#define TQT_TQLABEL_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQLABEL_H */
-\ No newline at end of file
+#endif /* TQT_TQLABEL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqlayout.h b/qtinterface/tqlayout.h
index 53c4392..ae4f860 100644
--- a/qtinterface/tqlayout.h
+++ b/qtinterface/tqlayout.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLAYOUT_H
-#define TQLAYOUT_H
+#ifndef TQT_TQLAYOUT_H
+#define TQT_TQLAYOUT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQLAYOUT_H */
-\ No newline at end of file
+#endif /* TQT_TQLAYOUT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqlcdnum.h b/qtinterface/tqlcdnum.h
index cd3fadf..236739e 100644
--- a/qtinterface/tqlcdnum.h
+++ b/qtinterface/tqlcdnum.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLCDNUMBER_H
-#define TQLCDNUMBER_H
+#ifndef TQT_TQLCDNUMBER_H
+#define TQT_TQLCDNUMBER_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqlcdnumber.h>
 
-#endif /* TQLCDNUMBER_H */
-\ No newline at end of file
+#endif /* TQT_TQLCDNUMBER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqlcdnumber.h b/qtinterface/tqlcdnumber.h
index d965df9..cbe4abc 100644
--- a/qtinterface/tqlcdnumber.h
+++ b/qtinterface/tqlcdnumber.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLCDNUMBER_H
-#define TQLCDNUMBER_H
+#ifndef TQT_TQLCDNUMBER_H
+#define TQT_TQLCDNUMBER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQLCDNUMBER_H */
-\ No newline at end of file
+#endif /* TQT_TQLCDNUMBER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqlibrary.h b/qtinterface/tqlibrary.h
index db8b5e4..e4ca5ed 100644
--- a/qtinterface/tqlibrary.h
+++ b/qtinterface/tqlibrary.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLIBRARY_H
-#define TQLIBRARY_H
+#ifndef TQT_TQLIBRARY_H
+#define TQT_TQLIBRARY_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQLIBRARY_H */
-\ No newline at end of file
+#endif /* TQT_TQLIBRARY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqlined.h b/qtinterface/tqlined.h
index d579a99..1ce55a6 100644
--- a/qtinterface/tqlined.h
+++ b/qtinterface/tqlined.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLINED_H
-#define TQLINED_H
+#ifndef TQT_TQLINED_H
+#define TQT_TQLINED_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqlineedit.h>
 
-#endif /* TQLINED_H */
-\ No newline at end of file
+#endif /* TQT_TQLINED_H */
+\ No newline at end of file
diff --git a/qtinterface/tqlineedit.h b/qtinterface/tqlineedit.h
index 47ccd9f..577642e 100644
--- a/qtinterface/tqlineedit.h
+++ b/qtinterface/tqlineedit.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLINEEDIT_H
-#define TQLINEEDIT_H
+#ifndef TQT_TQLINEEDIT_H
+#define TQT_TQLINEEDIT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQLINEEDIT_H */
-\ No newline at end of file
+#endif /* TQT_TQLINEEDIT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqlist.h b/qtinterface/tqlist.h
index e497685..40873f9 100644
--- a/qtinterface/tqlist.h
+++ b/qtinterface/tqlist.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLIST_H
-#define TQLIST_H
+#ifndef TQT_TQLIST_H
+#define TQT_TQLIST_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqptrlist.h>
 
-#endif /* TQLIST_H */
-\ No newline at end of file
+#endif /* TQT_TQLIST_H */
+\ No newline at end of file
diff --git a/qtinterface/tqlistbox.h b/qtinterface/tqlistbox.h
index 6045977..1e5ab13 100644
--- a/qtinterface/tqlistbox.h
+++ b/qtinterface/tqlistbox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLISTBOX_H
-#define TQLISTBOX_H
+#ifndef TQT_TQLISTBOX_H
+#define TQT_TQLISTBOX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQLISTBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQLISTBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqlistiterator.h b/qtinterface/tqlistiterator.h
index 47bd897..4cd1991 100644
--- a/qtinterface/tqlistiterator.h
+++ b/qtinterface/tqlistiterator.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLISTITERATOR_H
-#define TQLISTITERATOR_H
+#ifndef TQT_TQLISTITERATOR_H
+#define TQT_TQLISTITERATOR_H
 
 #include <tqt.h>
 
@@ -83,4 +83,4 @@ private:
 
 #endif // USE_QT4
 
-#endif /* TQLISTITERATOR_H */
-\ No newline at end of file
+#endif /* TQT_TQLISTITERATOR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqlistview.h b/qtinterface/tqlistview.h
index c6a0430..cd2cb47 100644
--- a/qtinterface/tqlistview.h
+++ b/qtinterface/tqlistview.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLISTVIEW_H
-#define TQLISTVIEW_H
+#ifndef TQT_TQLISTVIEW_H
+#define TQT_TQLISTVIEW_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQLISTVIEW_H */
-\ No newline at end of file
+#endif /* TQT_TQLISTVIEW_H */
+\ No newline at end of file
diff --git a/qtinterface/tqlocale.h b/qtinterface/tqlocale.h
index 4ed038a..14751ae 100644
--- a/qtinterface/tqlocale.h
+++ b/qtinterface/tqlocale.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLOCALE_H
-#define TQLOCALE_H
+#ifndef TQT_TQLOCALE_H
+#define TQT_TQLOCALE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQLOCALE_H */
-\ No newline at end of file
+#endif /* TQT_TQLOCALE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqlocalfs.h b/qtinterface/tqlocalfs.h
index d811b74..18ca0b8 100644
--- a/qtinterface/tqlocalfs.h
+++ b/qtinterface/tqlocalfs.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQLOCALFS_H
-#define TQLOCALFS_H
+#ifndef TQT_TQLOCALFS_H
+#define TQT_TQLOCALFS_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQLOCALFS_H */
-\ No newline at end of file
+#endif /* TQT_TQLOCALFS_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmainwindow.h b/qtinterface/tqmainwindow.h
index edb0530..a4f5f94 100644
--- a/qtinterface/tqmainwindow.h
+++ b/qtinterface/tqmainwindow.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMAINWINDOW_H
-#define TQMAINWINDOW_H
+#ifndef TQT_TQMAINWINDOW_H
+#define TQT_TQMAINWINDOW_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQMAINWINDOW_H */
-\ No newline at end of file
+#endif /* TQT_TQMAINWINDOW_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmap.h b/qtinterface/tqmap.h
index 92f170d..58ccd40 100644
--- a/qtinterface/tqmap.h
+++ b/qtinterface/tqmap.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMAP_H
-#define TQMAP_H
+#ifndef TQT_TQMAP_H
+#define TQT_TQMAP_H
 
 #include <tqt.h>
 
@@ -932,4 +932,4 @@ QDataStream& operator<<( QDataStream& s, const TQMap<Key,T>& m ) {
 
 #endif // USE_QT4
 
-#endif /* TQMAP_H */
-\ No newline at end of file
+#endif /* TQT_TQMAP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmemarray.h b/qtinterface/tqmemarray.h
index 5fc1be7..30f2ce6 100644
--- a/qtinterface/tqmemarray.h
+++ b/qtinterface/tqmemarray.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMEMARRAY_H
-#define TQMEMARRAY_H
+#ifndef TQT_TQMEMARRAY_H
+#define TQT_TQMEMARRAY_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQMEMARRAY_H */
-\ No newline at end of file
+#endif /* TQT_TQMEMARRAY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmenubar.h b/qtinterface/tqmenubar.h
index 64fd780..91872b6 100644
--- a/qtinterface/tqmenubar.h
+++ b/qtinterface/tqmenubar.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMENUBAR_H
-#define TQMENUBAR_H
+#ifndef TQT_TQMENUBAR_H
+#define TQT_TQMENUBAR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQMENUBAR_H */
-\ No newline at end of file
+#endif /* TQT_TQMENUBAR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmenudata.h b/qtinterface/tqmenudata.h
index f1b74b9..3dd4dae 100644
--- a/qtinterface/tqmenudata.h
+++ b/qtinterface/tqmenudata.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMENUDATA_H
-#define TQMENUDATA_H
+#ifndef TQT_TQMENUDATA_H
+#define TQT_TQMENUDATA_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQMENUDATA_H */
-\ No newline at end of file
+#endif /* TQT_TQMENUDATA_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmenudta.h b/qtinterface/tqmenudta.h
index 5251b7f..8232887 100644
--- a/qtinterface/tqmenudta.h
+++ b/qtinterface/tqmenudta.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMENUDTA_H
-#define TQMENUDTA_H
+#ifndef TQT_TQMENUDTA_H
+#define TQT_TQMENUDTA_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqmenudata.h>
 
-#endif /* TQMENUDTA_H */
-\ No newline at end of file
+#endif /* TQT_TQMENUDTA_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmessagebox.h b/qtinterface/tqmessagebox.h
index 49bb050..4bc2ea4 100644
--- a/qtinterface/tqmessagebox.h
+++ b/qtinterface/tqmessagebox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMESSAGEBOX_H
-#define TQMESSAGEBOX_H
+#ifndef TQT_TQMESSAGEBOX_H
+#define TQT_TQMESSAGEBOX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQMESSAGEBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQMESSAGEBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmetaobj.h b/qtinterface/tqmetaobj.h
index fed7246..e52c5be 100644
--- a/qtinterface/tqmetaobj.h
+++ b/qtinterface/tqmetaobj.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMETAOBJ_H
-#define TQMETAOBJ_H
+#ifndef TQT_TQMETAOBJ_H
+#define TQT_TQMETAOBJ_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqmetaobject.h>
 
-#endif /* TQMETAOBJ_H */
-\ No newline at end of file
+#endif /* TQT_TQMETAOBJ_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmetaobject.h b/qtinterface/tqmetaobject.h
index 9f6ac91..9af7abd 100644
--- a/qtinterface/tqmetaobject.h
+++ b/qtinterface/tqmetaobject.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMETAOBJECT_H
-#define TQMETAOBJECT_H
+#ifndef TQT_TQMETAOBJECT_H
+#define TQT_TQMETAOBJECT_H
 
 #include <tqt.h>
 #include <tqconnection.h>
@@ -45,4 +45,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQMETAOBJECT_H */
-\ No newline at end of file
+#endif /* TQT_TQMETAOBJECT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmime.h b/qtinterface/tqmime.h
index e5409cb..ce0f42e 100644
--- a/qtinterface/tqmime.h
+++ b/qtinterface/tqmime.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMIME_H
-#define TQMIME_H
+#ifndef TQT_TQMIME_H
+#define TQT_TQMIME_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQMIME_H */
-\ No newline at end of file
+#endif /* TQT_TQMIME_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmlined.h b/qtinterface/tqmlined.h
index a35d81e..4499e41 100644
--- a/qtinterface/tqmlined.h
+++ b/qtinterface/tqmlined.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMLINED_H
-#define TQMLINED_H
+#ifndef TQT_TQMLINED_H
+#define TQT_TQMLINED_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqmultilineedit.h>
 
-#endif /* TQMLINED_H */
-\ No newline at end of file
+#endif /* TQT_TQMLINED_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmngio.h b/qtinterface/tqmngio.h
index fe55e28..24bcfa0 100644
--- a/qtinterface/tqmngio.h
+++ b/qtinterface/tqmngio.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMNGIO_H
-#define TQMNGIO_H
+#ifndef TQT_TQMNGIO_H
+#define TQT_TQMNGIO_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQMNGIO_H */
-\ No newline at end of file
+#endif /* TQT_TQMNGIO_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmodules.h b/qtinterface/tqmodules.h
index 57b6da7..3154246 100644
--- a/qtinterface/tqmodules.h
+++ b/qtinterface/tqmodules.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMODULES_H
-#define TQMODULES_H
+#ifndef TQT_TQMODULES_H
+#define TQT_TQMODULES_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQMODULES_H */
-\ No newline at end of file
+#endif /* TQT_TQMODULES_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmotifplusstyle.h b/qtinterface/tqmotifplusstyle.h
index 4de6aed..8cf3a53 100644
--- a/qtinterface/tqmotifplusstyle.h
+++ b/qtinterface/tqmotifplusstyle.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMOTIFPLUSSTYLE_H
-#define TQMOTIFPLUSSTYLE_H
+#ifndef TQT_TQMOTIFPLUSSTYLE_H
+#define TQT_TQMOTIFPLUSSTYLE_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQMOTIFPLUSSTYLE_H */
-\ No newline at end of file
+#endif /* TQT_TQMOTIFPLUSSTYLE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmotifstyle.h b/qtinterface/tqmotifstyle.h
index 6f908fa..9ae35c2 100644
--- a/qtinterface/tqmotifstyle.h
+++ b/qtinterface/tqmotifstyle.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMOTIFSTYLE_H
-#define TQMOTIFSTYLE_H
+#ifndef TQT_TQMOTIFSTYLE_H
+#define TQT_TQMOTIFSTYLE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQACCEL_H */
-\ No newline at end of file
+#endif /* TQT_TQACCEL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmovie.h b/qtinterface/tqmovie.h
index b4b21fd..8d8ba32 100644
--- a/qtinterface/tqmovie.h
+++ b/qtinterface/tqmovie.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMOVIE_H
-#define TQMOVIE_H
+#ifndef TQT_TQMOVIE_H
+#define TQT_TQMOVIE_H
 
 #include <tqt.h>
 
@@ -57,4 +57,4 @@ private:
 
 #endif // USE_QT4
 
-#endif /* TQMOVIE_H */
-\ No newline at end of file
+#endif /* TQT_TQMOVIE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmsgbox.h b/qtinterface/tqmsgbox.h
index 30f2fc0..53c27a9 100644
--- a/qtinterface/tqmsgbox.h
+++ b/qtinterface/tqmsgbox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMSGBOX_H
-#define TQMSGBOX_H
+#ifndef TQT_TQMSGBOX_H
+#define TQT_TQMSGBOX_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqmessagebox.h>
 
-#endif /* TQMSGBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQMSGBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmultilinedit.h b/qtinterface/tqmultilinedit.h
index 6a7707c..882b4b4 100644
--- a/qtinterface/tqmultilinedit.h
+++ b/qtinterface/tqmultilinedit.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMULTILINEDIT_H
-#define TQMULTILINEDIT_H
+#ifndef TQT_TQMULTILINEDIT_H
+#define TQT_TQMULTILINEDIT_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqmultilineedit.h>
 
-#endif /* TQMULTILINEDIT_H */
-\ No newline at end of file
+#endif /* TQT_TQMULTILINEDIT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmultilineedit.h b/qtinterface/tqmultilineedit.h
index 1c20bf1..b8543a2 100644
--- a/qtinterface/tqmultilineedit.h
+++ b/qtinterface/tqmultilineedit.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMULTILINEEDIT_H
-#define TQMULTILINEEDIT_H
+#ifndef TQT_TQMULTILINEEDIT_H
+#define TQT_TQMULTILINEEDIT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQMULTILINEEDIT_H */
-\ No newline at end of file
+#endif /* TQT_TQMULTILINEEDIT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqmutex.h b/qtinterface/tqmutex.h
index 07f927f..20c04f3 100644
--- a/qtinterface/tqmutex.h
+++ b/qtinterface/tqmutex.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQMUTEX_H
-#define TQMUTEX_H
+#ifndef TQT_TQMUTEX_H
+#define TQT_TQMUTEX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQMUTEX_H */
-\ No newline at end of file
+#endif /* TQT_TQMUTEX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqnamespace.h b/qtinterface/tqnamespace.h
index 4ffe2d7..f89087e 100644
--- a/qtinterface/tqnamespace.h
+++ b/qtinterface/tqnamespace.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQNAMESPACE_H
-#define TQNAMESPACE_H
+#ifndef TQT_TQNAMESPACE_H
+#define TQT_TQNAMESPACE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQNAMESPACE_H */
-\ No newline at end of file
+#endif /* TQT_TQNAMESPACE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqnetwork.h b/qtinterface/tqnetwork.h
index 5043413..35a18ea 100644
--- a/qtinterface/tqnetwork.h
+++ b/qtinterface/tqnetwork.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQNETWORK_H
-#define TQNETWORK_H
+#ifndef TQT_TQNETWORK_H
+#define TQT_TQNETWORK_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQNETWORK_H */
-\ No newline at end of file
+#endif /* TQT_TQNETWORK_H */
+\ No newline at end of file
diff --git a/qtinterface/tqnetworkprotocol.h b/qtinterface/tqnetworkprotocol.h
index cddc99a..a6ac734 100644
--- a/qtinterface/tqnetworkprotocol.h
+++ b/qtinterface/tqnetworkprotocol.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQNETWORKPROTOCOL_H
-#define TQNETWORKPROTOCOL_H
+#ifndef TQT_TQNETWORKPROTOCOL_H
+#define TQT_TQNETWORKPROTOCOL_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQNETWORKPROTOCOL_H */
-\ No newline at end of file
+#endif /* TQT_TQNETWORKPROTOCOL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqnp.h b/qtinterface/tqnp.h
index 0a1eff0..1f87e56 100644
--- a/qtinterface/tqnp.h
+++ b/qtinterface/tqnp.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQNP_H
-#define TQNP_H
+#ifndef TQT_TQNP_H
+#define TQT_TQNP_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQNP_H */
-\ No newline at end of file
+#endif /* TQT_TQNP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqobjcoll.h b/qtinterface/tqobjcoll.h
index 2a1b40f..8ac1a88 100644
--- a/qtinterface/tqobjcoll.h
+++ b/qtinterface/tqobjcoll.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQOBJCALL_H
-#define TQOBJCALL_H
+#ifndef TQT_TQOBJCALL_H
+#define TQT_TQOBJCALL_H
 
 #include <tqt.h>
 
@@ -29,4 +29,4 @@ Boston, MA 02110-1301, USA.
 #include <tqobjectlist.h>
 #include <tqobjectdict.h>
 
-#endif /* TQOBJCALL_H */
-\ No newline at end of file
+#endif /* TQT_TQOBJCALL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqobjdefs.h b/qtinterface/tqobjdefs.h
index e000053..035cc3f 100644
--- a/qtinterface/tqobjdefs.h
+++ b/qtinterface/tqobjdefs.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQOBJDEFS_H
-#define TQOBJDEFS_H
+#ifndef TQT_TQOBJDEFS_H
+#define TQT_TQOBJDEFS_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqobjectdefs.h>
 
-#endif /* TQOBJDEFS_H */
-\ No newline at end of file
+#endif /* TQT_TQOBJDEFS_H */
+\ No newline at end of file
diff --git a/qtinterface/tqobject.h b/qtinterface/tqobject.h
index f19e493..3246224 100644
--- a/qtinterface/tqobject.h
+++ b/qtinterface/tqobject.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQOBJECT_H
-#define TQOBJECT_H
+#ifndef TQT_TQOBJECT_H
+#define TQT_TQOBJECT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQOBJECT_H */
-\ No newline at end of file
+#endif /* TQT_TQOBJECT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqobjectcleanuphandler.h b/qtinterface/tqobjectcleanuphandler.h
index ddfa5be..70fd9d7 100644
--- a/qtinterface/tqobjectcleanuphandler.h
+++ b/qtinterface/tqobjectcleanuphandler.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQOBJECTCLEANUPHANDLER_H
-#define TQOBJECTCLEANUPHANDLER_H
+#ifndef TQT_TQOBJECTCLEANUPHANDLER_H
+#define TQT_TQOBJECTCLEANUPHANDLER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQOBJECTCLEANUPHANDLER_H */
-\ No newline at end of file
+#endif /* TQT_TQOBJECTCLEANUPHANDLER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqobjectdict.h b/qtinterface/tqobjectdict.h
index 37431f2..aa83877 100644
--- a/qtinterface/tqobjectdict.h
+++ b/qtinterface/tqobjectdict.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQOBJECTDICT_H
-#define TQOBJECTDICT_H
+#ifndef TQT_TQOBJECTDICT_H
+#define TQT_TQOBJECTDICT_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQOBJECTDICT_H */
-\ No newline at end of file
+#endif /* TQT_TQOBJECTDICT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqobjectlist.h b/qtinterface/tqobjectlist.h
index 1286100..a65cba0 100644
--- a/qtinterface/tqobjectlist.h
+++ b/qtinterface/tqobjectlist.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQOBJECTLIST_H
-#define TQOBJECTLIST_H
+#ifndef TQT_TQOBJECTLIST_H
+#define TQT_TQOBJECTLIST_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQOBJECTLIST_H */
-\ No newline at end of file
+#endif /* TQT_TQOBJECTLIST_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpaintd.h b/qtinterface/tqpaintd.h
index d21bdd7..ad53002 100644
--- a/qtinterface/tqpaintd.h
+++ b/qtinterface/tqpaintd.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPAINTD_H
-#define TQPAINTD_H
+#ifndef TQT_TQPAINTD_H
+#define TQT_TQPAINTD_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqpaintdevice.h>
 
-#endif /* TQPAINTD_H */
-\ No newline at end of file
+#endif /* TQT_TQPAINTD_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpaintdc.h b/qtinterface/tqpaintdc.h
index 33071ce..838fd81 100644
--- a/qtinterface/tqpaintdc.h
+++ b/qtinterface/tqpaintdc.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPAINTDC_H
-#define TQPAINTDC_H
+#ifndef TQT_TQPAINTDC_H
+#define TQT_TQPAINTDC_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqpaintdevicedefs.h>
 
-#endif /* TQPAINTDC_H */
-\ No newline at end of file
+#endif /* TQT_TQPAINTDC_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpaintdevice.h b/qtinterface/tqpaintdevice.h
index 6e94932..8a90bc9 100644
--- a/qtinterface/tqpaintdevice.h
+++ b/qtinterface/tqpaintdevice.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPAINTDEVICE_H
-#define TQPAINTDEVICE_H
+#ifndef TQT_TQPAINTDEVICE_H
+#define TQT_TQPAINTDEVICE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPAINTDEVICE_H */
-\ No newline at end of file
+#endif /* TQT_TQPAINTDEVICE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpaintdevicemetrics.h b/qtinterface/tqpaintdevicemetrics.h
index 40629f5..2802c2c 100644
--- a/qtinterface/tqpaintdevicemetrics.h
+++ b/qtinterface/tqpaintdevicemetrics.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPAINTDEVICEMETRICS_H
-#define TQPAINTDEVICEMETRICS_H
+#ifndef TQT_TQPAINTDEVICEMETRICS_H
+#define TQT_TQPAINTDEVICEMETRICS_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPAINTDEVICEMETRICS_H */
-\ No newline at end of file
+#endif /* TQT_TQPAINTDEVICEMETRICS_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpainter.h b/qtinterface/tqpainter.h
index 375a59b..0acb479 100644
--- a/qtinterface/tqpainter.h
+++ b/qtinterface/tqpainter.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPAINTER_H
-#define TQPAINTER_H
+#ifndef TQT_TQPAINTER_H
+#define TQT_TQPAINTER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPAINTER_H */
-\ No newline at end of file
+#endif /* TQT_TQPAINTER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpair.h b/qtinterface/tqpair.h
index db3ec73..1a4dc79 100644
--- a/qtinterface/tqpair.h
+++ b/qtinterface/tqpair.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPAIR_H
-#define TQPAIR_H
+#ifndef TQT_TQPAIR_H
+#define TQT_TQPAIR_H
 
 #include <tqt.h>
 
@@ -140,4 +140,4 @@ inline QDataStream& operator<<( QDataStream& s, const TQPair<T1, T2>& p )
 
 #endif // USE_QT4
 
-#endif /* TQPAIR_H */
-\ No newline at end of file
+#endif /* TQT_TQPAIR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpalette.h b/qtinterface/tqpalette.h
index 9f6d34c..5193617 100644
--- a/qtinterface/tqpalette.h
+++ b/qtinterface/tqpalette.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPALETTE_H
-#define TQPALETTE_H
+#ifndef TQT_TQPALETTE_H
+#define TQT_TQPALETTE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPALETTE_H */
-\ No newline at end of file
+#endif /* TQT_TQPALETTE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpdevmet.h b/qtinterface/tqpdevmet.h
index 2a2e91e..78fe93e 100644
--- a/qtinterface/tqpdevmet.h
+++ b/qtinterface/tqpdevmet.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPDEVMET_H
-#define TQPDEVMET_H
+#ifndef TQT_TQPDEVMET_H
+#define TQT_TQPDEVMET_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqpaintdevicemetrics.h>
 
-#endif /* TQPDEVMET_H */
-\ No newline at end of file
+#endif /* TQT_TQPDEVMET_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpen.h b/qtinterface/tqpen.h
index d9929b5..43be7ac 100644
--- a/qtinterface/tqpen.h
+++ b/qtinterface/tqpen.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPEN_H
-#define TQPEN_H
+#ifndef TQT_TQPEN_H
+#define TQT_TQPEN_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPEN_H */
-\ No newline at end of file
+#endif /* TQT_TQPEN_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpicture.h b/qtinterface/tqpicture.h
index 6d86929..7ae962f 100644
--- a/qtinterface/tqpicture.h
+++ b/qtinterface/tqpicture.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPICTURE_H
-#define TQPICTURE_H
+#ifndef TQT_TQPICTURE_H
+#define TQT_TQPICTURE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPICTURE_H */
-\ No newline at end of file
+#endif /* TQT_TQPICTURE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpixmap.h b/qtinterface/tqpixmap.h
index e5dab4c..7f8016e 100644
--- a/qtinterface/tqpixmap.h
+++ b/qtinterface/tqpixmap.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPIXMAP_H
-#define TQPIXMAP_H
+#ifndef TQT_TQPIXMAP_H
+#define TQT_TQPIXMAP_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPIXMAP_H */
-\ No newline at end of file
+#endif /* TQT_TQPIXMAP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpixmapcache.h b/qtinterface/tqpixmapcache.h
index c39670f..db68e4f 100644
--- a/qtinterface/tqpixmapcache.h
+++ b/qtinterface/tqpixmapcache.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPIXMAPCACHE_H
-#define TQPIXMAPCACHE_H
+#ifndef TQT_TQPIXMAPCACHE_H
+#define TQT_TQPIXMAPCACHE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPIXMAPCACHE_H */
-\ No newline at end of file
+#endif /* TQT_TQPIXMAPCACHE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqplatinumstyle.h b/qtinterface/tqplatinumstyle.h
index 6a065c1..2901978 100644
--- a/qtinterface/tqplatinumstyle.h
+++ b/qtinterface/tqplatinumstyle.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPLATINUMSTYLE_H
-#define TQPLATINUMSTYLE_H
+#ifndef TQT_TQPLATINUMSTYLE_H
+#define TQT_TQPLATINUMSTYLE_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPLATINUMSTYLE_H */
-\ No newline at end of file
+#endif /* TQT_TQPLATINUMSTYLE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpmcache.h b/qtinterface/tqpmcache.h
index e2d7f8d..7ee3825 100644
--- a/qtinterface/tqpmcache.h
+++ b/qtinterface/tqpmcache.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPMCACHE_H
-#define TQPMCACHE_H
+#ifndef TQT_TQPMCACHE_H
+#define TQT_TQPMCACHE_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqpixmapcache.h>
 
-#endif /* TQPMCACHE_H */
-\ No newline at end of file
+#endif /* TQT_TQPMCACHE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpngio.h b/qtinterface/tqpngio.h
index 18a4d8f..5afe79c 100644
--- a/qtinterface/tqpngio.h
+++ b/qtinterface/tqpngio.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPNGIO_H
-#define TQPNGIO_H
+#ifndef TQT_TQPNGIO_H
+#define TQT_TQPNGIO_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPNGIO_H */
-\ No newline at end of file
+#endif /* TQT_TQPNGIO_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpntarry.h b/qtinterface/tqpntarry.h
index 0844498..d15173c 100644
--- a/qtinterface/tqpntarry.h
+++ b/qtinterface/tqpntarry.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPNTARRY_H
-#define TQPNTARRY_H
+#ifndef TQT_TQPNTARRY_H
+#define TQT_TQPNTARRY_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqpointarray.h>
 
-#endif /* TQPNTARRY_H */
-\ No newline at end of file
+#endif /* TQT_TQPNTARRY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpoint.h b/qtinterface/tqpoint.h
index 09e720e..452cfa4 100644
--- a/qtinterface/tqpoint.h
+++ b/qtinterface/tqpoint.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPOINT_H
-#define TQPOINT_H
+#ifndef TQT_TQPOINT_H
+#define TQT_TQPOINT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPOINT_H */
-\ No newline at end of file
+#endif /* TQT_TQPOINT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpointarray.h b/qtinterface/tqpointarray.h
index 3bd335f..4858512 100644
--- a/qtinterface/tqpointarray.h
+++ b/qtinterface/tqpointarray.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPOINTARRAY_H
-#define TQPOINTARRAY_H
+#ifndef TQT_TQPOINTARRAY_H
+#define TQT_TQPOINTARRAY_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPOINTARRAY_H */
-\ No newline at end of file
+#endif /* TQT_TQPOINTARRAY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpolygonscanner.h b/qtinterface/tqpolygonscanner.h
index 4a5499f..7f69f4d 100644
--- a/qtinterface/tqpolygonscanner.h
+++ b/qtinterface/tqpolygonscanner.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPOLYGONSCANNER_H
-#define TQPOLYGONSCANNER_H
+#ifndef TQT_TQPOLYGONSCANNER_H
+#define TQT_TQPOLYGONSCANNER_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPOLYGONSCANNER_H */
-\ No newline at end of file
+#endif /* TQT_TQPOLYGONSCANNER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpopmenu.h b/qtinterface/tqpopmenu.h
index 34b0c91..dd0b9e4 100644
--- a/qtinterface/tqpopmenu.h
+++ b/qtinterface/tqpopmenu.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPOPMENU_H
-#define TQPOPMENU_H
+#ifndef TQT_TQPOPMENU_H
+#define TQT_TQPOPMENU_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqpopupmenu.h>
 
-#endif /* TQPOPMENU_H */
-\ No newline at end of file
+#endif /* TQT_TQPOPMENU_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpopupmenu.h b/qtinterface/tqpopupmenu.h
index 606897a..c81f7c8 100644
--- a/qtinterface/tqpopupmenu.h
+++ b/qtinterface/tqpopupmenu.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPOPUPMENU_H
-#define TQPOPUPMENU_H
+#ifndef TQT_TQPOPUPMENU_H
+#define TQT_TQPOPUPMENU_H
 
 #include <tqt.h>
 
@@ -43,4 +43,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPOPUPMENU_H */
-\ No newline at end of file
+#endif /* TQT_TQPOPUPMENU_H */
+\ No newline at end of file
diff --git a/qtinterface/tqprintdialog.h b/qtinterface/tqprintdialog.h
index 777c4a4..0df321b 100644
--- a/qtinterface/tqprintdialog.h
+++ b/qtinterface/tqprintdialog.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPRINTDIALOG_H
-#define TQPRINTDIALOG_H
+#ifndef TQT_TQPRINTDIALOG_H
+#define TQT_TQPRINTDIALOG_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPRINTDIALOG_H */
-\ No newline at end of file
+#endif /* TQT_TQPRINTDIALOG_H */
+\ No newline at end of file
diff --git a/qtinterface/tqprinter.h b/qtinterface/tqprinter.h
index ed5abfd..231f0cf 100644
--- a/qtinterface/tqprinter.h
+++ b/qtinterface/tqprinter.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPRINTER_H
-#define TQPRINTER_H
+#ifndef TQT_TQPRINTER_H
+#define TQT_TQPRINTER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPRINTER_H */
-\ No newline at end of file
+#endif /* TQT_TQPRINTER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqprndlg.h b/qtinterface/tqprndlg.h
index 1f0b43b..f820ec1 100644
--- a/qtinterface/tqprndlg.h
+++ b/qtinterface/tqprndlg.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPRNDLG_H
-#define TQPRNDLG_H
+#ifndef TQT_TQPRNDLG_H
+#define TQT_TQPRNDLG_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqprintdialog.h>
 
-#endif /* TQPRNDLG_H */
-\ No newline at end of file
+#endif /* TQT_TQPRNDLG_H */
+\ No newline at end of file
diff --git a/qtinterface/tqprocess.h b/qtinterface/tqprocess.h
index 3fdd0e7..33d66fa 100644
--- a/qtinterface/tqprocess.h
+++ b/qtinterface/tqprocess.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPROCESS_H
-#define TQPROCESS_H
+#ifndef TQT_TQPROCESS_H
+#define TQT_TQPROCESS_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPROCESS_H */
-\ No newline at end of file
+#endif /* TQT_TQPROCESS_H */
+\ No newline at end of file
diff --git a/qtinterface/tqprogbar.h b/qtinterface/tqprogbar.h
index 44a36b0..6ed73d6 100644
--- a/qtinterface/tqprogbar.h
+++ b/qtinterface/tqprogbar.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPROGBAR_H
-#define TQPROGBAR_H
+#ifndef TQT_TQPROGBAR_H
+#define TQT_TQPROGBAR_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqprogressbar.h>
 
-#endif /* TQPROGBAR_H */
-\ No newline at end of file
+#endif /* TQT_TQPROGBAR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqprogdlg.h b/qtinterface/tqprogdlg.h
index 64de922..77819e8 100644
--- a/qtinterface/tqprogdlg.h
+++ b/qtinterface/tqprogdlg.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPROGDLG_H
-#define TQPROGDLG_H
+#ifndef TQT_TQPROGDLG_H
+#define TQT_TQPROGDLG_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqprogressdialog.h>
 
-#endif /* TQPROGDLG_H */
-\ No newline at end of file
+#endif /* TQT_TQPROGDLG_H */
+\ No newline at end of file
diff --git a/qtinterface/tqprogressbar.h b/qtinterface/tqprogressbar.h
index 9de64b9..515a68c 100644
--- a/qtinterface/tqprogressbar.h
+++ b/qtinterface/tqprogressbar.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPROGRESSBAR_H
-#define TQPROGRESSBAR_H
+#ifndef TQT_TQPROGRESSBAR_H
+#define TQT_TQPROGRESSBAR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPROGRESSBAR_H */
-\ No newline at end of file
+#endif /* TQT_TQPROGRESSBAR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqprogressdialog.h b/qtinterface/tqprogressdialog.h
index 2297cb3..2cbebd3 100644
--- a/qtinterface/tqprogressdialog.h
+++ b/qtinterface/tqprogressdialog.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPROGRESSDIALOG_H
-#define TQPROGRESSDIALOG_H
+#ifndef TQT_TQPROGRESSDIALOG_H
+#define TQT_TQPROGRESSDIALOG_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPROGRESSDIALOG_H */
-\ No newline at end of file
+#endif /* TQT_TQPROGRESSDIALOG_H */
+\ No newline at end of file
diff --git a/qtinterface/tqptrcollection.h b/qtinterface/tqptrcollection.h
index 7309de8..3d5fff7 100644
--- a/qtinterface/tqptrcollection.h
+++ b/qtinterface/tqptrcollection.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPTRCOLLECTION_H
-#define TQPTRCOLLECTION_H
+#ifndef TQT_TQPTRCOLLECTION_H
+#define TQT_TQPTRCOLLECTION_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPTRCOLLECTION_H */
-\ No newline at end of file
+#endif /* TQT_TQPTRCOLLECTION_H */
+\ No newline at end of file
diff --git a/qtinterface/tqptrdict.h b/qtinterface/tqptrdict.h
index 07a47e8..f124c77 100644
--- a/qtinterface/tqptrdict.h
+++ b/qtinterface/tqptrdict.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPTRDICT_H
-#define TQPTRDICT_H
+#ifndef TQT_TQPTRDICT_H
+#define TQT_TQPTRDICT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPTRDICT_H */
-\ No newline at end of file
+#endif /* TQT_TQPTRDICT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqptrlist.h b/qtinterface/tqptrlist.h
index 6dc6771..2205341 100644
--- a/qtinterface/tqptrlist.h
+++ b/qtinterface/tqptrlist.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPTRLIST_H
-#define TQPTRLIST_H
+#ifndef TQT_TQPTRLIST_H
+#define TQT_TQPTRLIST_H
 
 #include <tqt.h>
 
@@ -246,12 +246,12 @@ public:
 };
 
 #ifndef QT_NO_COMPAT
-#define TQList TQPtrList
-#define TQListIterator TQPtrListIterator
+#define TQT_TQList TQPtrList
+#define TQT_TQListIterator TQPtrListIterator
 #endif
 
 /**********************************************************************/
 
 #endif // USE_QT4
 
-#endif /* TQPTRLIST_H */
-\ No newline at end of file
+#endif /* TQT_TQPTRLIST_H */
+\ No newline at end of file
diff --git a/qtinterface/tqptrqueue.h b/qtinterface/tqptrqueue.h
index 05cd55f..7e9692d 100644
--- a/qtinterface/tqptrqueue.h
+++ b/qtinterface/tqptrqueue.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPTRQUEUE_H
-#define TQPTRQUEUE_H
+#ifndef TQT_TQPTRQUEUE_H
+#define TQT_TQPTRQUEUE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPTRQUEUE_H */
-\ No newline at end of file
+#endif /* TQT_TQPTRQUEUE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqptrstack.h b/qtinterface/tqptrstack.h
index 349681f..69450ba 100644
--- a/qtinterface/tqptrstack.h
+++ b/qtinterface/tqptrstack.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPTRSTACK_H
-#define TQPTRSTACK_H
+#ifndef TQT_TQPTRSTACK_H
+#define TQT_TQPTRSTACK_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPTRSTACK_H */
-\ No newline at end of file
+#endif /* TQT_TQPTRSTACK_H */
+\ No newline at end of file
diff --git a/qtinterface/tqptrvector.h b/qtinterface/tqptrvector.h
index 70e76b1..ed7486c 100644
--- a/qtinterface/tqptrvector.h
+++ b/qtinterface/tqptrvector.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPTRVECTOR_H
-#define TQPTRVECTOR_H
+#ifndef TQT_TQPTRVECTOR_H
+#define TQT_TQPTRVECTOR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPTRVECTOR_H */
-\ No newline at end of file
+#endif /* TQT_TQPTRVECTOR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpushbt.h b/qtinterface/tqpushbt.h
index 96594bf..6538363 100644
--- a/qtinterface/tqpushbt.h
+++ b/qtinterface/tqpushbt.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPUSHBT_H
-#define TQPUSHBT_H
+#ifndef TQT_TQPUSHBT_H
+#define TQT_TQPUSHBT_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqpushbutton.h>
 
-#endif /* TQPUSHBT_H */
-\ No newline at end of file
+#endif /* TQT_TQPUSHBT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqpushbutton.h b/qtinterface/tqpushbutton.h
index 203ccf2..0b6670d 100644
--- a/qtinterface/tqpushbutton.h
+++ b/qtinterface/tqpushbutton.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQPUSHBUTTON_H
-#define TQPUSHBUTTON_H
+#ifndef TQT_TQPUSHBUTTON_H
+#define TQT_TQPUSHBUTTON_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQPUSHBUTTON_H */
-\ No newline at end of file
+#endif /* TQT_TQPUSHBUTTON_H */
+\ No newline at end of file
diff --git a/qtinterface/tqqueue.h b/qtinterface/tqqueue.h
index 6118ebb..1330188 100644
--- a/qtinterface/tqqueue.h
+++ b/qtinterface/tqqueue.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQQUEUE_H
-#define TQQUEUE_H
+#ifndef TQT_TQQUEUE_H
+#define TQT_TQQUEUE_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqptrqueue.h>
 
-#endif /* TQQUEUE_H */
-\ No newline at end of file
+#endif /* TQT_TQQUEUE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqradiobt.h b/qtinterface/tqradiobt.h
index c0092e5..50f432c 100644
--- a/qtinterface/tqradiobt.h
+++ b/qtinterface/tqradiobt.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQRADIOBT_H
-#define TQRADIOBT_H
+#ifndef TQT_TQRADIOBT_H
+#define TQT_TQRADIOBT_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqradiobutton.h>
 
-#endif /* TQRADIOBT_H */
-\ No newline at end of file
+#endif /* TQT_TQRADIOBT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqradiobutton.h b/qtinterface/tqradiobutton.h
index d7754f6..4590cad 100644
--- a/qtinterface/tqradiobutton.h
+++ b/qtinterface/tqradiobutton.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQRADIOBUTTON_H
-#define TQRADIOBUTTON_H
+#ifndef TQT_TQRADIOBUTTON_H
+#define TQT_TQRADIOBUTTON_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQRADIOBUTTON_H */
-\ No newline at end of file
+#endif /* TQT_TQRADIOBUTTON_H */
+\ No newline at end of file
diff --git a/qtinterface/tqrangecontrol.h b/qtinterface/tqrangecontrol.h
index 2433df0..45c2dc6 100644
--- a/qtinterface/tqrangecontrol.h
+++ b/qtinterface/tqrangecontrol.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQRANGECONTROL_H
-#define TQRANGECONTROL_H
+#ifndef TQT_TQRANGECONTROL_H
+#define TQT_TQRANGECONTROL_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQRANGECONTROL_H */
-\ No newline at end of file
+#endif /* TQT_TQRANGECONTROL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqrangect.h b/qtinterface/tqrangect.h
index c3fb1f7..e8ae593 100644
--- a/qtinterface/tqrangect.h
+++ b/qtinterface/tqrangect.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQRANGECT_H
-#define TQRANGECT_H
+#ifndef TQT_TQRANGECT_H
+#define TQT_TQRANGECT_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqrangecontrol.h>
 
-#endif /* TQRANGECT_H */
-\ No newline at end of file
+#endif /* TQT_TQRANGECT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqrect.h b/qtinterface/tqrect.h
index 5160c57..9b9dcef 100644
--- a/qtinterface/tqrect.h
+++ b/qtinterface/tqrect.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQRECT_H
-#define TQRECT_H
+#ifndef TQT_TQRECT_H
+#define TQT_TQRECT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQRECT_H */
-\ No newline at end of file
+#endif /* TQT_TQRECT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqregexp.h b/qtinterface/tqregexp.h
index 7798253..a7c386b 100644
--- a/qtinterface/tqregexp.h
+++ b/qtinterface/tqregexp.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQREGEXP_H
-#define TQREGEXP_H
+#ifndef TQT_TQREGEXP_H
+#define TQT_TQREGEXP_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQREGEXP_H */
-\ No newline at end of file
+#endif /* TQT_TQREGEXP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqregion.h b/qtinterface/tqregion.h
index 8abec90..285e165 100644
--- a/qtinterface/tqregion.h
+++ b/qtinterface/tqregion.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQREGION_H
-#define TQREGION_H
+#ifndef TQT_TQREGION_H
+#define TQT_TQREGION_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQREGION_H */
-\ No newline at end of file
+#endif /* TQT_TQREGION_H */
+\ No newline at end of file
diff --git a/qtinterface/tqrtlcodec.h b/qtinterface/tqrtlcodec.h
index c769792..7b50d91 100644
--- a/qtinterface/tqrtlcodec.h
+++ b/qtinterface/tqrtlcodec.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQRTLCODEC_H
-#define TQRTLCODEC_H
+#ifndef TQT_TQRTLCODEC_H
+#define TQT_TQRTLCODEC_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQRTLCODEC_H */
-\ No newline at end of file
+#endif /* TQT_TQRTLCODEC_H */
+\ No newline at end of file
diff --git a/qtinterface/tqscrbar.h b/qtinterface/tqscrbar.h
index ad028a4..ea60875 100644
--- a/qtinterface/tqscrbar.h
+++ b/qtinterface/tqscrbar.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSCRBAR_H
-#define TQSCRBAR_H
+#ifndef TQT_TQSCRBAR_H
+#define TQT_TQSCRBAR_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqscrollbar.h>
 
-#endif /* TQSCRBAR_H */
-\ No newline at end of file
+#endif /* TQT_TQSCRBAR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqscrollbar.h b/qtinterface/tqscrollbar.h
index 5263b84..7241ccd 100644
--- a/qtinterface/tqscrollbar.h
+++ b/qtinterface/tqscrollbar.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSCROLLBAR_H
-#define TQSCROLLBAR_H
+#ifndef TQT_TQSCROLLBAR_H
+#define TQT_TQSCROLLBAR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSCROLLBAR_H */
-\ No newline at end of file
+#endif /* TQT_TQSCROLLBAR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqscrollview.h b/qtinterface/tqscrollview.h
index 14c4ff6..8c75203 100644
--- a/qtinterface/tqscrollview.h
+++ b/qtinterface/tqscrollview.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSCROLLVIEW_H
-#define TQSCROLLVIEW_H
+#ifndef TQT_TQSCROLLVIEW_H
+#define TQT_TQSCROLLVIEW_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSCROLLVIEW_H */
-\ No newline at end of file
+#endif /* TQT_TQSCROLLVIEW_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsemaphore.h b/qtinterface/tqsemaphore.h
index d1431ab..80c27ce 100644
--- a/qtinterface/tqsemaphore.h
+++ b/qtinterface/tqsemaphore.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSEMAPHORE_H
-#define TQSEMAPHORE_H
+#ifndef TQT_TQSEMAPHORE_H
+#define TQT_TQSEMAPHORE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSEMAPHORE_H */
-\ No newline at end of file
+#endif /* TQT_TQSEMAPHORE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsemimodal.h b/qtinterface/tqsemimodal.h
index 2f2ddb1..8aeb7f4 100644
--- a/qtinterface/tqsemimodal.h
+++ b/qtinterface/tqsemimodal.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSEMIMODAL_H
-#define TQSEMIMODAL_H
+#ifndef TQT_TQSEMIMODAL_H
+#define TQT_TQSEMIMODAL_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSEMIMODAL_H */
-\ No newline at end of file
+#endif /* TQT_TQSEMIMODAL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqserversocket.h b/qtinterface/tqserversocket.h
index ac7fa28..fefade2 100644
--- a/qtinterface/tqserversocket.h
+++ b/qtinterface/tqserversocket.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSERVERSOCKET_H
-#define TQSERVERSOCKET_H
+#ifndef TQT_TQSERVERSOCKET_H
+#define TQT_TQSERVERSOCKET_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSERVERSOCKET_H */
-\ No newline at end of file
+#endif /* TQT_TQSERVERSOCKET_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsession.h b/qtinterface/tqsession.h
index 1485f20..d6c04b8 100644
--- a/qtinterface/tqsession.h
+++ b/qtinterface/tqsession.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSESSION_H
-#define TQSESSION_H
+#ifndef TQT_TQSESSION_H
+#define TQT_TQSESSION_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSESSION_H */
-\ No newline at end of file
+#endif /* TQT_TQSESSION_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsessionmanager.h b/qtinterface/tqsessionmanager.h
index cd7d9a4..9bca583 100644
--- a/qtinterface/tqsessionmanager.h
+++ b/qtinterface/tqsessionmanager.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSESSIONMANAGER_H
-#define TQSESSIONMANAGER_H
+#ifndef TQT_TQSESSIONMANAGER_H
+#define TQT_TQSESSIONMANAGER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSESSIONMANAGER_H */
-\ No newline at end of file
+#endif /* TQT_TQSESSIONMANAGER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsettings.h b/qtinterface/tqsettings.h
index 7fd0181..d7daf64 100644
--- a/qtinterface/tqsettings.h
+++ b/qtinterface/tqsettings.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSETTINGS_H
-#define TQSETTINGS_H
+#ifndef TQT_TQSETTINGS_H
+#define TQT_TQSETTINGS_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSETTINGS_H */
-\ No newline at end of file
+#endif /* TQT_TQSETTINGS_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsgistyle.h b/qtinterface/tqsgistyle.h
index 06eae67..72143ff 100644
--- a/qtinterface/tqsgistyle.h
+++ b/qtinterface/tqsgistyle.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSGISTYLE_H
-#define TQSGISTYLE_H
+#ifndef TQT_TQSGISTYLE_H
+#define TQT_TQSGISTYLE_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSGISTYLE_H */
-\ No newline at end of file
+#endif /* TQT_TQSGISTYLE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqshared.h b/qtinterface/tqshared.h
index f9d631f..8629721 100644
--- a/qtinterface/tqshared.h
+++ b/qtinterface/tqshared.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSHARED_H
-#define TQSHARED_H
+#ifndef TQT_TQSHARED_H
+#define TQT_TQSHARED_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSHARED_H */
-\ No newline at end of file
+#endif /* TQT_TQSHARED_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsignal.h b/qtinterface/tqsignal.h
index 85e899a..f863cd0 100644
--- a/qtinterface/tqsignal.h
+++ b/qtinterface/tqsignal.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSIGNAL_H
-#define TQSIGNAL_H
+#ifndef TQT_TQSIGNAL_H
+#define TQT_TQSIGNAL_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSIGNAL_H */
-\ No newline at end of file
+#endif /* TQT_TQSIGNAL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsignalmapper.h b/qtinterface/tqsignalmapper.h
index 207bd1b..9a4b9e9 100644
--- a/qtinterface/tqsignalmapper.h
+++ b/qtinterface/tqsignalmapper.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSIGNALMAPPER_H
-#define TQSIGNALMAPPER_H
+#ifndef TQT_TQSIGNALMAPPER_H
+#define TQT_TQSIGNALMAPPER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSIGNALMAPPER_H */
-\ No newline at end of file
+#endif /* TQT_TQSIGNALMAPPER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsignalslotimp.h b/qtinterface/tqsignalslotimp.h
index b1db14a..35e9380 100644
--- a/qtinterface/tqsignalslotimp.h
+++ b/qtinterface/tqsignalslotimp.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSIGNALSLOTIMP_H
-#define TQSIGNALSLOTIMP_H
+#ifndef TQT_TQSIGNALSLOTIMP_H
+#define TQT_TQSIGNALSLOTIMP_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSIGNALSLOTIMP_H */
-\ No newline at end of file
+#endif /* TQT_TQSIGNALSLOTIMP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsimplerichtext.h b/qtinterface/tqsimplerichtext.h
index f2aa8ec..3516546 100644
--- a/qtinterface/tqsimplerichtext.h
+++ b/qtinterface/tqsimplerichtext.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSIMPLERICHTEXT_H
-#define TQSIMPLERICHTEXT_H
+#ifndef TQT_TQSIMPLERICHTEXT_H
+#define TQT_TQSIMPLERICHTEXT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSIMPLERICHTEXT_H */
-\ No newline at end of file
+#endif /* TQT_TQSIMPLERICHTEXT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsize.h b/qtinterface/tqsize.h
index e0fe0f3..107639e 100644
--- a/qtinterface/tqsize.h
+++ b/qtinterface/tqsize.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSIZE_H
-#define TQSIZE_H
+#ifndef TQT_TQSIZE_H
+#define TQT_TQSIZE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSIZE_H */
-\ No newline at end of file
+#endif /* TQT_TQSIZE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsizegrip.h b/qtinterface/tqsizegrip.h
index 2e22649..7f7a7c9 100644
--- a/qtinterface/tqsizegrip.h
+++ b/qtinterface/tqsizegrip.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSIZEGRIP_H
-#define TQSIZEGRIP_H
+#ifndef TQT_TQSIZEGRIP_H
+#define TQT_TQSIZEGRIP_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSIZEGRIP_H */
-\ No newline at end of file
+#endif /* TQT_TQSIZEGRIP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsizepolicy.h b/qtinterface/tqsizepolicy.h
index 1f04758..90d7a67 100644
--- a/qtinterface/tqsizepolicy.h
+++ b/qtinterface/tqsizepolicy.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSIZEPOLICY_H
-#define TQSIZEPOLICY_H
+#ifndef TQT_TQSIZEPOLICY_H
+#define TQT_TQSIZEPOLICY_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSIZEPOLICY_H */
-\ No newline at end of file
+#endif /* TQT_TQSIZEPOLICY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsjiscodec.h b/qtinterface/tqsjiscodec.h
index 51561e8..1363833 100644
--- a/qtinterface/tqsjiscodec.h
+++ b/qtinterface/tqsjiscodec.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSJISCODEC_H
-#define TQSJISCODEC_H
+#ifndef TQT_TQSJISCODEC_H
+#define TQT_TQSJISCODEC_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSJISCODEC_H */
-\ No newline at end of file
+#endif /* TQT_TQSJISCODEC_H */
+\ No newline at end of file
diff --git a/qtinterface/tqslider.h b/qtinterface/tqslider.h
index 463f414..0864c73 100644
--- a/qtinterface/tqslider.h
+++ b/qtinterface/tqslider.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSLIDER_H
-#define TQSLIDER_H
+#ifndef TQT_TQSLIDER_H
+#define TQT_TQSLIDER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSLIDER_H */
+#endif /* TQT_TQSLIDER_H */
diff --git a/qtinterface/tqsocket.h b/qtinterface/tqsocket.h
index 232cb28..433fdbd 100644
--- a/qtinterface/tqsocket.h
+++ b/qtinterface/tqsocket.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSOCKET_H
-#define TQSOCKET_H
+#ifndef TQT_TQSOCKET_H
+#define TQT_TQSOCKET_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSOCKET_H */
-\ No newline at end of file
+#endif /* TQT_TQSOCKET_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsocketdevice.h b/qtinterface/tqsocketdevice.h
index 16d6918..909c531 100644
--- a/qtinterface/tqsocketdevice.h
+++ b/qtinterface/tqsocketdevice.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSOCKETDEVICE_H
-#define TQSOCKETDEVICE_H
+#ifndef TQT_TQSOCKETDEVICE_H
+#define TQT_TQSOCKETDEVICE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSOCKETDEVICE_H */
-\ No newline at end of file
+#endif /* TQT_TQSOCKETDEVICE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsocketnotifier.h b/qtinterface/tqsocketnotifier.h
index e2921bf..703df43 100644
--- a/qtinterface/tqsocketnotifier.h
+++ b/qtinterface/tqsocketnotifier.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSOCKETNOTIFIER_H
-#define TQSOCKETNOTIFIER_H
+#ifndef TQT_TQSOCKETNOTIFIER_H
+#define TQT_TQSOCKETNOTIFIER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSOCKETNOTIFIER_H */
-\ No newline at end of file
+#endif /* TQT_TQSOCKETNOTIFIER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsocknot.h b/qtinterface/tqsocknot.h
index ed6861b..b63eefe 100644
--- a/qtinterface/tqsocknot.h
+++ b/qtinterface/tqsocknot.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSOCKNOT_H
-#define TQSOCKNOT_H
+#ifndef TQT_TQSOCKNOT_H
+#define TQT_TQSOCKNOT_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqsocketnotifier.h>
 
-#endif /* TQSOCKNOT_H */
-\ No newline at end of file
+#endif /* TQT_TQSOCKNOT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsortedlist.h b/qtinterface/tqsortedlist.h
index fb52d80..4b6cea7 100644
--- a/qtinterface/tqsortedlist.h
+++ b/qtinterface/tqsortedlist.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSORTEDLIST_H
-#define TQSORTEDLIST_H
+#ifndef TQT_TQSORTEDLIST_H
+#define TQT_TQSORTEDLIST_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSORTEDLIST_H */
-\ No newline at end of file
+#endif /* TQT_TQSORTEDLIST_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsound.h b/qtinterface/tqsound.h
index ca42cbb..5f2b292 100644
--- a/qtinterface/tqsound.h
+++ b/qtinterface/tqsound.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSOUND_H
-#define TQSOUND_H
+#ifndef TQT_TQSOUND_H
+#define TQT_TQSOUND_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSOUND_H */
-\ No newline at end of file
+#endif /* TQT_TQSOUND_H */
+\ No newline at end of file
diff --git a/qtinterface/tqspinbox.h b/qtinterface/tqspinbox.h
index faf7321..0c9caac 100644
--- a/qtinterface/tqspinbox.h
+++ b/qtinterface/tqspinbox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSPINBOX_H
-#define TQSPINBOX_H
+#ifndef TQT_TQSPINBOX_H
+#define TQT_TQSPINBOX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSPINBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQSPINBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsplashscreen.h b/qtinterface/tqsplashscreen.h
index b488d08..3dce7d8 100644
--- a/qtinterface/tqsplashscreen.h
+++ b/qtinterface/tqsplashscreen.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSPLASHSCREEN_H
-#define TQSPLASHSCREEN_H
+#ifndef TQT_TQSPLASHSCREEN_H
+#define TQT_TQSPLASHSCREEN_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSPLASHSCREEN_H */
-\ No newline at end of file
+#endif /* TQT_TQSPLASHSCREEN_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsplitter.h b/qtinterface/tqsplitter.h
index 922d1bc..f5c832f 100644
--- a/qtinterface/tqsplitter.h
+++ b/qtinterface/tqsplitter.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSPLITTER_H
-#define TQSPLITTER_H
+#ifndef TQT_TQSPLITTER_H
+#define TQT_TQSPLITTER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSPLITTER_H */
-\ No newline at end of file
+#endif /* TQT_TQSPLITTER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsql.h b/qtinterface/tqsql.h
index fd73445..6c87cd7 100644
--- a/qtinterface/tqsql.h
+++ b/qtinterface/tqsql.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQL_H
-#define TQSQL_H
+#ifndef TQT_TQSQL_H
+#define TQT_TQSQL_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQL_H */
-\ No newline at end of file
+#endif /* TQT_TQSQL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqlcursor.h b/qtinterface/tqsqlcursor.h
index eb48513..fa2ee9e 100644
--- a/qtinterface/tqsqlcursor.h
+++ b/qtinterface/tqsqlcursor.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLCURSOR_H
-#define TQSQLCURSOR_H
+#ifndef TQT_TQSQLCURSOR_H
+#define TQT_TQSQLCURSOR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLCURSOR_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLCURSOR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqldatabase.h b/qtinterface/tqsqldatabase.h
index 8b1c44c..906b2a7 100644
--- a/qtinterface/tqsqldatabase.h
+++ b/qtinterface/tqsqldatabase.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLDATABASE_H
-#define TQSQLDATABASE_H
+#ifndef TQT_TQSQLDATABASE_H
+#define TQT_TQSQLDATABASE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLDATABASE_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLDATABASE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqldriver.h b/qtinterface/tqsqldriver.h
index fa56b8a..67daf36 100644
--- a/qtinterface/tqsqldriver.h
+++ b/qtinterface/tqsqldriver.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLDRIVER_H
-#define TQSQLDRIVER_H
+#ifndef TQT_TQSQLDRIVER_H
+#define TQT_TQSQLDRIVER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLDRIVER_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLDRIVER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqldriverplugin.h b/qtinterface/tqsqldriverplugin.h
index a82ba6e..443c328 100644
--- a/qtinterface/tqsqldriverplugin.h
+++ b/qtinterface/tqsqldriverplugin.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLDRIVERPLUGIN_H
-#define TQSQLDRIVERPLUGIN_H
+#ifndef TQT_TQSQLDRIVERPLUGIN_H
+#define TQT_TQSQLDRIVERPLUGIN_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLDRIVERPLUGIN_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLDRIVERPLUGIN_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqleditorfactory.h b/qtinterface/tqsqleditorfactory.h
index d25e93f..c06482e 100644
--- a/qtinterface/tqsqleditorfactory.h
+++ b/qtinterface/tqsqleditorfactory.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLEDITORFACTORY_H
-#define TQSQLEDITORFACTORY_H
+#ifndef TQT_TQSQLEDITORFACTORY_H
+#define TQT_TQSQLEDITORFACTORY_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLEDITORFACTORY_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLEDITORFACTORY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqlerror.h b/qtinterface/tqsqlerror.h
index 1897f36..de0e230 100644
--- a/qtinterface/tqsqlerror.h
+++ b/qtinterface/tqsqlerror.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLERROR_H
-#define TQSQLERROR_H
+#ifndef TQT_TQSQLERROR_H
+#define TQT_TQSQLERROR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLERROR_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLERROR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqlfield.h b/qtinterface/tqsqlfield.h
index 2f1848f..c25d0f1 100644
--- a/qtinterface/tqsqlfield.h
+++ b/qtinterface/tqsqlfield.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLFIELD_H
-#define TQSQLFIELD_H
+#ifndef TQT_TQSQLFIELD_H
+#define TQT_TQSQLFIELD_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLFIELD_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLFIELD_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqlform.h b/qtinterface/tqsqlform.h
index 3fe4aa7..8f38294 100644
--- a/qtinterface/tqsqlform.h
+++ b/qtinterface/tqsqlform.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLFORM_H
-#define TQSQLFORM_H
+#ifndef TQT_TQSQLFORM_H
+#define TQT_TQSQLFORM_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLFORM_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLFORM_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqlindex.h b/qtinterface/tqsqlindex.h
index b403021..ba05c11 100644
--- a/qtinterface/tqsqlindex.h
+++ b/qtinterface/tqsqlindex.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLINDEX_H
-#define TQSQLINDEX_H
+#ifndef TQT_TQSQLINDEX_H
+#define TQT_TQSQLINDEX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLINDEX_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLINDEX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqlpropertymap.h b/qtinterface/tqsqlpropertymap.h
index eb6be94..cc584de 100644
--- a/qtinterface/tqsqlpropertymap.h
+++ b/qtinterface/tqsqlpropertymap.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLPROPERTYMAP_H
-#define TQSQLPROPERTYMAP_H
+#ifndef TQT_TQSQLPROPERTYMAP_H
+#define TQT_TQSQLPROPERTYMAP_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLPROPERTYMAP_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLPROPERTYMAP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqlquery.h b/qtinterface/tqsqlquery.h
index 4d1d3bf..31c9a65 100644
--- a/qtinterface/tqsqlquery.h
+++ b/qtinterface/tqsqlquery.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLQUERY_H
-#define TQSQLQUERY_H
+#ifndef TQT_TQSQLQUERY_H
+#define TQT_TQSQLQUERY_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLQUERY_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLQUERY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqlrecord.h b/qtinterface/tqsqlrecord.h
index 6ba228f..116db77 100644
--- a/qtinterface/tqsqlrecord.h
+++ b/qtinterface/tqsqlrecord.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLRECORD_H
-#define TQSQLRECORD_H
+#ifndef TQT_TQSQLRECORD_H
+#define TQT_TQSQLRECORD_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLRECORD_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLRECORD_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqlresult.h b/qtinterface/tqsqlresult.h
index 2cdc75a..03bd3b6 100644
--- a/qtinterface/tqsqlresult.h
+++ b/qtinterface/tqsqlresult.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLRESULT_H
-#define TQSQLRESULT_H
+#ifndef TQT_TQSQLRESULT_H
+#define TQT_TQSQLRESULT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLRESULT_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLRESULT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsqlselectcursor.h b/qtinterface/tqsqlselectcursor.h
index 1547301..ba9dd8d 100644
--- a/qtinterface/tqsqlselectcursor.h
+++ b/qtinterface/tqsqlselectcursor.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSQLSELECTCURSOR_H
-#define TQSQLSELECTCURSOR_H
+#ifndef TQT_TQSQLSELECTCURSOR_H
+#define TQT_TQSQLSELECTCURSOR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSQLSELECTCURSOR_H */
-\ No newline at end of file
+#endif /* TQT_TQSQLSELECTCURSOR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqstack.h b/qtinterface/tqstack.h
index 03f9491..bc684c9 100644
--- a/qtinterface/tqstack.h
+++ b/qtinterface/tqstack.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSTACK_H
-#define TQSTACK_H
+#ifndef TQT_TQSTACK_H
+#define TQT_TQSTACK_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSTACK_H */
-\ No newline at end of file
+#endif /* TQT_TQSTACK_H */
+\ No newline at end of file
diff --git a/qtinterface/tqstatusbar.h b/qtinterface/tqstatusbar.h
index 847a2a9..b475057 100644
--- a/qtinterface/tqstatusbar.h
+++ b/qtinterface/tqstatusbar.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSTATUSBAR_H
-#define TQSTATUSBAR_H
+#ifndef TQT_TQSTATUSBAR_H
+#define TQT_TQSTATUSBAR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSTATUSBAR_H */
-\ No newline at end of file
+#endif /* TQT_TQSTATUSBAR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqstring.cpp b/qtinterface/tqstring.cpp
index 5062dc1..7efebe3 100644
--- a/qtinterface/tqstring.cpp
+++ b/qtinterface/tqstring.cpp
@@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#define TQ_EXCLUDE_QCSTRING
+#define TQT_TQ_EXCLUDE_QCSTRING
 
 #include <tqt.h>
 #include <tqstring.h>
diff --git a/qtinterface/tqstring.h b/qtinterface/tqstring.h
index b773b84..ab9354f 100644
--- a/qtinterface/tqstring.h
+++ b/qtinterface/tqstring.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSTRING_H
-#define TQSTRING_H
+#ifndef TQT_TQSTRING_H
+#define TQT_TQSTRING_H
 
 #include <tqt.h>
 #include <tqcstring.h>
@@ -45,4 +45,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSTRING_H */
-\ No newline at end of file
+#endif /* TQT_TQSTRING_H */
+\ No newline at end of file
diff --git a/qtinterface/tqstringlist.h b/qtinterface/tqstringlist.h
index a2b7750..4e0b34b 100644
--- a/qtinterface/tqstringlist.h
+++ b/qtinterface/tqstringlist.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSTRINGLIST_H
-#define TQSTRINGLIST_H
+#ifndef TQT_TQSTRINGLIST_H
+#define TQT_TQSTRINGLIST_H
 
 #include <tqt.h>
 
@@ -165,4 +165,4 @@ extern QDataStream &operator<<( QDataStream &, const TQStringList& );
 
 #endif // USE_QT4
 
-#endif /* TQSTRINGLIST_H */
-\ No newline at end of file
+#endif /* TQT_TQSTRINGLIST_H */
+\ No newline at end of file
diff --git a/qtinterface/tqstrlist.h b/qtinterface/tqstrlist.h
index f0efaf3..9967457 100644
--- a/qtinterface/tqstrlist.h
+++ b/qtinterface/tqstrlist.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSTRLIST_H
-#define TQSTRLIST_H
+#ifndef TQT_TQSTRLIST_H
+#define TQT_TQSTRLIST_H
 
 #include <tqt.h>
 
@@ -195,4 +195,4 @@ inline TQStrList::TQStrList( const TQStrList &strList )
 
 #endif // USE_QT4
 
-#endif /* TQSTRLIST_H */
-\ No newline at end of file
+#endif /* TQT_TQSTRLIST_H */
+\ No newline at end of file
diff --git a/qtinterface/tqstrvec.h b/qtinterface/tqstrvec.h
index 5bc587f..335a155 100644
--- a/qtinterface/tqstrvec.h
+++ b/qtinterface/tqstrvec.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSTRVEC_H
-#define TQSTRVEC_H
+#ifndef TQT_TQSTRVEC_H
+#define TQT_TQSTRVEC_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSTRVEC_H */
-\ No newline at end of file
+#endif /* TQT_TQSTRVEC_H */
+\ No newline at end of file
diff --git a/qtinterface/tqstyle.h b/qtinterface/tqstyle.h
index a881835..8122207 100644
--- a/qtinterface/tqstyle.h
+++ b/qtinterface/tqstyle.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSTYLE_H
-#define TQSTYLE_H
+#ifndef TQT_TQSTYLE_H
+#define TQT_TQSTYLE_H
 
 #include <tqt.h>
 
@@ -56,4 +56,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSTYLE_H */
-\ No newline at end of file
+#endif /* TQT_TQSTYLE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqstylefactory.h b/qtinterface/tqstylefactory.h
index da50720..b3e16dd 100644
--- a/qtinterface/tqstylefactory.h
+++ b/qtinterface/tqstylefactory.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSTYLEFACTORY_H
-#define TQSTYLEFACTORY_H
+#ifndef TQT_TQSTYLEFACTORY_H
+#define TQT_TQSTYLEFACTORY_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSTYLEFACTORY_H */
-\ No newline at end of file
+#endif /* TQT_TQSTYLEFACTORY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqstyleplugin.h b/qtinterface/tqstyleplugin.h
index 6e6593e..52474ed 100644
--- a/qtinterface/tqstyleplugin.h
+++ b/qtinterface/tqstyleplugin.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSTYLEPLUGIN_H
-#define TQSTYLEPLUGIN_H
+#ifndef TQT_TQSTYLEPLUGIN_H
+#define TQT_TQSTYLEPLUGIN_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSTYLEPLUGIN_H */
-\ No newline at end of file
+#endif /* TQT_TQSTYLEPLUGIN_H */
+\ No newline at end of file
diff --git a/qtinterface/tqstylesheet.h b/qtinterface/tqstylesheet.h
index 7cb1f47..b1d5676 100644
--- a/qtinterface/tqstylesheet.h
+++ b/qtinterface/tqstylesheet.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSTYLESHEET_H
-#define TQSTYLESHEET_H
+#ifndef TQT_TQSTYLESHEET_H
+#define TQT_TQSTYLESHEET_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSTYLESHEET_H */
-\ No newline at end of file
+#endif /* TQT_TQSTYLESHEET_H */
+\ No newline at end of file
diff --git a/qtinterface/tqsyntaxhighlighter.h b/qtinterface/tqsyntaxhighlighter.h
index b5557d9..a12f76e 100644
--- a/qtinterface/tqsyntaxhighlighter.h
+++ b/qtinterface/tqsyntaxhighlighter.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQSYNTAXHIGHLIGHTER_H
-#define TQSYNTAXHIGHLIGHTER_H
+#ifndef TQT_TQSYNTAXHIGHLIGHTER_H
+#define TQT_TQSYNTAXHIGHLIGHTER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQSYNTAXHIGHLIGHTER_H */
-\ No newline at end of file
+#endif /* TQT_TQSYNTAXHIGHLIGHTER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtabbar.h b/qtinterface/tqtabbar.h
index 2edefff..a2a8fba 100644
--- a/qtinterface/tqtabbar.h
+++ b/qtinterface/tqtabbar.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTABBAR_H
-#define TQTABBAR_H
+#ifndef TQT_TQTABBAR_H
+#define TQT_TQTABBAR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTABBAR_H */
-\ No newline at end of file
+#endif /* TQT_TQTABBAR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtabdialog.h b/qtinterface/tqtabdialog.h
index c64cbce..234be38 100644
--- a/qtinterface/tqtabdialog.h
+++ b/qtinterface/tqtabdialog.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTABDIALOG_H
-#define TQTABDIALOG_H
+#ifndef TQT_TQTABDIALOG_H
+#define TQT_TQTABDIALOG_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTABDIALOG_H */
-\ No newline at end of file
+#endif /* TQT_TQTABDIALOG_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtabdlg.h b/qtinterface/tqtabdlg.h
index dd4ef83..064a76e 100644
--- a/qtinterface/tqtabdlg.h
+++ b/qtinterface/tqtabdlg.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTABDLG_H
-#define TQTABDLG_H
+#ifndef TQT_TQTABDLG_H
+#define TQT_TQTABDLG_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqtabdialog.h>
 
-#endif /* TQTABDLG_H */
-\ No newline at end of file
+#endif /* TQT_TQTABDLG_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtable.h b/qtinterface/tqtable.h
index 4d52094..99e81b8 100644
--- a/qtinterface/tqtable.h
+++ b/qtinterface/tqtable.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTABLE_H
-#define TQTABLE_H
+#ifndef TQT_TQTABLE_H
+#define TQT_TQTABLE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTABLE_H */
-\ No newline at end of file
+#endif /* TQT_TQTABLE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtabwidget.h b/qtinterface/tqtabwidget.h
index 533b674..2283013 100644
--- a/qtinterface/tqtabwidget.h
+++ b/qtinterface/tqtabwidget.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTABWIDGET_H
-#define TQTABWIDGET_H
+#ifndef TQT_TQTABWIDGET_H
+#define TQT_TQTABWIDGET_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTABWIDGET_H */
-\ No newline at end of file
+#endif /* TQT_TQTABWIDGET_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtextbrowser.h b/qtinterface/tqtextbrowser.h
index 7a2f448..9810102 100644
--- a/qtinterface/tqtextbrowser.h
+++ b/qtinterface/tqtextbrowser.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTEXTBROWSER_H
-#define TQTEXTBROWSER_H
+#ifndef TQT_TQTEXTBROWSER_H
+#define TQT_TQTEXTBROWSER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTEXTBROWSER_H */
-\ No newline at end of file
+#endif /* TQT_TQTEXTBROWSER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtextcodec.h b/qtinterface/tqtextcodec.h
index fac0a89..90d09df 100644
--- a/qtinterface/tqtextcodec.h
+++ b/qtinterface/tqtextcodec.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTEXTCODEC_H
-#define TQTEXTCODEC_H
+#ifndef TQT_TQTEXTCODEC_H
+#define TQT_TQTEXTCODEC_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTEXTCODEC_H */
-\ No newline at end of file
+#endif /* TQT_TQTEXTCODEC_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtextcodecfactory.h b/qtinterface/tqtextcodecfactory.h
index e772da2..46d74e1 100644
--- a/qtinterface/tqtextcodecfactory.h
+++ b/qtinterface/tqtextcodecfactory.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTEXTCODECFACTORY_H
-#define TQTEXTCODECFACTORY_H
+#ifndef TQT_TQTEXTCODECFACTORY_H
+#define TQT_TQTEXTCODECFACTORY_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTEXTCODECFACTORY_H */
-\ No newline at end of file
+#endif /* TQT_TQTEXTCODECFACTORY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtextcodecplugin.h b/qtinterface/tqtextcodecplugin.h
index 99ea648..fc4a1b6 100644
--- a/qtinterface/tqtextcodecplugin.h
+++ b/qtinterface/tqtextcodecplugin.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTEXTCODECPLUGIN_H
-#define TQTEXTCODECPLUGIN_H
+#ifndef TQT_TQTEXTCODECPLUGIN_H
+#define TQT_TQTEXTCODECPLUGIN_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTEXTCODECPLUGIN_H */
-\ No newline at end of file
+#endif /* TQT_TQTEXTCODECPLUGIN_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtextedit.h b/qtinterface/tqtextedit.h
index e4be715..9f3b8d2 100644
--- a/qtinterface/tqtextedit.h
+++ b/qtinterface/tqtextedit.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTEXTEDIT_H
-#define TQTEXTEDIT_H
+#ifndef TQT_TQTEXTEDIT_H
+#define TQT_TQTEXTEDIT_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTEXTEDIT_H */
-\ No newline at end of file
+#endif /* TQT_TQTEXTEDIT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtextstream.h b/qtinterface/tqtextstream.h
index fc840af..03372cc 100644
--- a/qtinterface/tqtextstream.h
+++ b/qtinterface/tqtextstream.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTEXTSTREAM_H
-#define TQTEXTSTREAM_H
+#ifndef TQT_TQTEXTSTREAM_H
+#define TQT_TQTEXTSTREAM_H
 
 #include <tqt.h>
 #include <tqstring.h>
@@ -44,4 +44,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTEXTSTREAM_H */
-\ No newline at end of file
+#endif /* TQT_TQTEXTSTREAM_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtextview.h b/qtinterface/tqtextview.h
index 74293ef..81919ef 100644
--- a/qtinterface/tqtextview.h
+++ b/qtinterface/tqtextview.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTEXTVIEW_H
-#define TQTEXTVIEW_H
+#ifndef TQT_TQTEXTVIEW_H
+#define TQT_TQTEXTVIEW_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTEXTVIEW_H */
-\ No newline at end of file
+#endif /* TQT_TQTEXTVIEW_H */
+\ No newline at end of file
diff --git a/qtinterface/tqthread.h b/qtinterface/tqthread.h
index 9cc2a50..f58cf08 100644
--- a/qtinterface/tqthread.h
+++ b/qtinterface/tqthread.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTHREAD_H
-#define TQTHREAD_H
+#ifndef TQT_TQTHREAD_H
+#define TQT_TQTHREAD_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTHREAD_H */
-\ No newline at end of file
+#endif /* TQT_TQTHREAD_H */
+\ No newline at end of file
diff --git a/qtinterface/tqthreadstorage.h b/qtinterface/tqthreadstorage.h
index b841af6..1299491 100644
--- a/qtinterface/tqthreadstorage.h
+++ b/qtinterface/tqthreadstorage.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTHREADSTORAGE_H
-#define TQTHREADSTORAGE_H
+#ifndef TQT_TQTHREADSTORAGE_H
+#define TQT_TQTHREADSTORAGE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTHREADSTORAGE_H */
-\ No newline at end of file
+#endif /* TQT_TQTHREADSTORAGE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtimer.h b/qtinterface/tqtimer.h
index d1960f1..2f9d5da 100644
--- a/qtinterface/tqtimer.h
+++ b/qtinterface/tqtimer.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTIMER_H
-#define TQTIMER_H
+#ifndef TQT_TQTIMER_H
+#define TQT_TQTIMER_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTIMER_H */
-\ No newline at end of file
+#endif /* TQT_TQTIMER_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtl.h b/qtinterface/tqtl.h
index 40efda6..57547bd 100644
--- a/qtinterface/tqtl.h
+++ b/qtinterface/tqtl.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTL_H
-#define TQTL_H
+#ifndef TQT_TQTL_H
+#define TQT_TQTL_H
 
 #include <tqt.h>
 
@@ -359,4 +359,4 @@ inline TQBackInsertIterator<Container> qBackInserter( Container &c )
 
 #endif // USE_QT4
 
-#endif /* TQTL_H */
-\ No newline at end of file
+#endif /* TQT_TQTL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtoolbar.h b/qtinterface/tqtoolbar.h
index dc148d4..97ac747 100644
--- a/qtinterface/tqtoolbar.h
+++ b/qtinterface/tqtoolbar.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTOOLBAR_H
-#define TQTOOLBAR_H
+#ifndef TQT_TQTOOLBAR_H
+#define TQT_TQTOOLBAR_H
 
 #include <tqt.h>
 
@@ -43,4 +43,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTOOLBAR_H */
-\ No newline at end of file
+#endif /* TQT_TQTOOLBAR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtoolbox.h b/qtinterface/tqtoolbox.h
index cd3ee04..b5b9bf6 100644
--- a/qtinterface/tqtoolbox.h
+++ b/qtinterface/tqtoolbox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTOOLBOX_H
-#define TQTOOLBOX_H
+#ifndef TQT_TQTOOLBOX_H
+#define TQT_TQTOOLBOX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTOOLBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQTOOLBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtoolbutton.h b/qtinterface/tqtoolbutton.h
index 186a1b0..5f733e1 100644
--- a/qtinterface/tqtoolbutton.h
+++ b/qtinterface/tqtoolbutton.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTOOLBUTTON_H
-#define TQTOOLBUTTON_H
+#ifndef TQT_TQTOOLBUTTON_H
+#define TQT_TQTOOLBUTTON_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTOOLBUTTON_H */
-\ No newline at end of file
+#endif /* TQT_TQTOOLBUTTON_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtooltip.h b/qtinterface/tqtooltip.h
index 0525d44..42daa06 100644
--- a/qtinterface/tqtooltip.h
+++ b/qtinterface/tqtooltip.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTOOLTIP_H
-#define TQTOOLTIP_H
+#ifndef TQT_TQTOOLTIP_H
+#define TQT_TQTOOLTIP_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTOOLTIP_H */
-\ No newline at end of file
+#endif /* TQT_TQTOOLTIP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtranslator.h b/qtinterface/tqtranslator.h
index d6593b9..4afc7db 100644
--- a/qtinterface/tqtranslator.h
+++ b/qtinterface/tqtranslator.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTRANSLATOR_H
-#define TQTRANSLATOR_H
+#ifndef TQT_TQTRANSLATOR_H
+#define TQT_TQTRANSLATOR_H
 
 #include <tqt.h>
 
@@ -93,4 +93,4 @@ private:
 
 #endif // USE_QT4
 
-#endif /* TQTRANSLATOR_H */
-\ No newline at end of file
+#endif /* TQT_TQTRANSLATOR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtsciicodec.h b/qtinterface/tqtsciicodec.h
index e60c707..c3967ce 100644
--- a/qtinterface/tqtsciicodec.h
+++ b/qtinterface/tqtsciicodec.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTSCIICODEC_H
-#define TQTSCIICODEC_H
+#ifndef TQT_TQTSCIICODEC_H
+#define TQT_TQTSCIICODEC_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQTSCIICODEC_H */
-\ No newline at end of file
+#endif /* TQT_TQTSCIICODEC_H */
+\ No newline at end of file
diff --git a/qtinterface/tqtstream.h b/qtinterface/tqtstream.h
index 7815be3..a91eb2f 100644
--- a/qtinterface/tqtstream.h
+++ b/qtinterface/tqtstream.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQTSTREAM_H
-#define TQTSTREAM_H
+#ifndef TQT_TQTSTREAM_H
+#define TQT_TQTSTREAM_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqtextstream.h>
 
-#endif /* TQTSTREAM_H */
-\ No newline at end of file
+#endif /* TQT_TQTSTREAM_H */
+\ No newline at end of file
diff --git a/qtinterface/tqurl.h b/qtinterface/tqurl.h
index 90cefbc..6ed52be 100644
--- a/qtinterface/tqurl.h
+++ b/qtinterface/tqurl.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQURL_H
-#define TQURL_H
+#ifndef TQT_TQURL_H
+#define TQT_TQURL_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQURL_H */
-\ No newline at end of file
+#endif /* TQT_TQURL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqurlinfo.h b/qtinterface/tqurlinfo.h
index f61c37b..1ebb4d6 100644
--- a/qtinterface/tqurlinfo.h
+++ b/qtinterface/tqurlinfo.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQURLINFO_H
-#define TQURLINFO_H
+#ifndef TQT_TQURLINFO_H
+#define TQT_TQURLINFO_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQURL_H */
-\ No newline at end of file
+#endif /* TQT_TQURL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqurloperator.h b/qtinterface/tqurloperator.h
index 38b08ab..37fb584 100644
--- a/qtinterface/tqurloperator.h
+++ b/qtinterface/tqurloperator.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQURLOPERATOR_H
-#define TQURLOPERATOR_H
+#ifndef TQT_TQURLOPERATOR_H
+#define TQT_TQURLOPERATOR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQURLOPERATOR_H */
-\ No newline at end of file
+#endif /* TQT_TQURLOPERATOR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqutfcodec.h b/qtinterface/tqutfcodec.h
index 270b4b9..e788130 100644
--- a/qtinterface/tqutfcodec.h
+++ b/qtinterface/tqutfcodec.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQUTFCODEC_H
-#define TQUTFCODEC_H
+#ifndef TQT_TQUTFCODEC_H
+#define TQT_TQUTFCODEC_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQUTFCODEC_H */
-\ No newline at end of file
+#endif /* TQT_TQUTFCODEC_H */
+\ No newline at end of file
diff --git a/qtinterface/tquuid.h b/qtinterface/tquuid.h
index 3eb3722..d12a7eb 100644
--- a/qtinterface/tquuid.h
+++ b/qtinterface/tquuid.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQUUID_H
-#define TQUUID_H
+#ifndef TQT_TQUUID_H
+#define TQT_TQUUID_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQUUID_H */
-\ No newline at end of file
+#endif /* TQT_TQUUID_H */
+\ No newline at end of file
diff --git a/qtinterface/tqvalidator.h b/qtinterface/tqvalidator.h
index 10ba23b..9ceea73 100644
--- a/qtinterface/tqvalidator.h
+++ b/qtinterface/tqvalidator.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQVALIDATOR_H
-#define TQVALIDATOR_H
+#ifndef TQT_TQVALIDATOR_H
+#define TQT_TQVALIDATOR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQVALIDATOR_H */
-\ No newline at end of file
+#endif /* TQT_TQVALIDATOR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqvaluelist.h b/qtinterface/tqvaluelist.h
index 916a55f..f8d73b9 100644
--- a/qtinterface/tqvaluelist.h
+++ b/qtinterface/tqvaluelist.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQVALUELIST_H
-#define TQVALUELIST_H
+#ifndef TQT_TQVALUELIST_H
+#define TQT_TQVALUELIST_H
 
 #include <tqt.h>
 #include <tqdatastream.h>
@@ -717,4 +717,4 @@ QDataStream& operator<<( QDataStream& s, const TQValueList<T>& l )
 
 #endif // USE_QT4
 
-#endif /* TQVALUELIST_H */
-\ No newline at end of file
+#endif /* TQT_TQVALUELIST_H */
+\ No newline at end of file
diff --git a/qtinterface/tqvaluestack.h b/qtinterface/tqvaluestack.h
index 4acc0a2..ed987f5 100644
--- a/qtinterface/tqvaluestack.h
+++ b/qtinterface/tqvaluestack.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQVALUESTACK_H
-#define TQVALUESTACK_H
+#ifndef TQT_TQVALUESTACK_H
+#define TQT_TQVALUESTACK_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQVALUESTACK_H */
-\ No newline at end of file
+#endif /* TQT_TQVALUESTACK_H */
+\ No newline at end of file
diff --git a/qtinterface/tqvaluevector.h b/qtinterface/tqvaluevector.h
index fd0c374..021f8b3 100644
--- a/qtinterface/tqvaluevector.h
+++ b/qtinterface/tqvaluevector.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQVALUEVECTOR_H
-#define TQVALUEVECTOR_H
+#ifndef TQT_TQVALUEVECTOR_H
+#define TQT_TQVALUEVECTOR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQVALUEVECTOR_H */
-\ No newline at end of file
+#endif /* TQT_TQVALUEVECTOR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqvariant.h b/qtinterface/tqvariant.h
index 0f5559b..b489af7 100644
--- a/qtinterface/tqvariant.h
+++ b/qtinterface/tqvariant.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQVARIANT_H
-#define TQVARIANT_H
+#ifndef TQT_TQVARIANT_H
+#define TQT_TQVARIANT_H
 
 #include <tqt.h>
 #include <tqdatastream.h>
@@ -43,4 +43,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQVARIANT_H */
-\ No newline at end of file
+#endif /* TQT_TQVARIANT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqvbox.h b/qtinterface/tqvbox.h
index 92e1d94..f04d1f6 100644
--- a/qtinterface/tqvbox.h
+++ b/qtinterface/tqvbox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQVBOX_H
-#define TQVBOX_H
+#ifndef TQT_TQVBOX_H
+#define TQT_TQVBOX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQVBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQVBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqvbuttongroup.h b/qtinterface/tqvbuttongroup.h
index 800c5d1..ff59cf3 100644
--- a/qtinterface/tqvbuttongroup.h
+++ b/qtinterface/tqvbuttongroup.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQVBUTTONGROUP_H
-#define TQVBUTTONGROUP_H
+#ifndef TQT_TQVBUTTONGROUP_H
+#define TQT_TQVBUTTONGROUP_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQVBUTTONGROUP_H */
-\ No newline at end of file
+#endif /* TQT_TQVBUTTONGROUP_H */
+\ No newline at end of file
diff --git a/qtinterface/tqvector.h b/qtinterface/tqvector.h
index 14a005a..73325cc 100644
--- a/qtinterface/tqvector.h
+++ b/qtinterface/tqvector.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQVECTOR_H
-#define TQVECTOR_H
+#ifndef TQT_TQVECTOR_H
+#define TQT_TQVECTOR_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqptrvector.h>
 
-#endif /* TQVECTOR_H */
-\ No newline at end of file
+#endif /* TQT_TQVECTOR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqvfbhdr.h b/qtinterface/tqvfbhdr.h
index f5073f8..bf10af4 100644
--- a/qtinterface/tqvfbhdr.h
+++ b/qtinterface/tqvfbhdr.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQVFBHDR_H
-#define TQVFBHDR_H
+#ifndef TQT_TQVFBHDR_H
+#define TQT_TQVFBHDR_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQVFBHDR_H */
-\ No newline at end of file
+#endif /* TQT_TQVFBHDR_H */
+\ No newline at end of file
diff --git a/qtinterface/tqvgroupbox.h b/qtinterface/tqvgroupbox.h
index 95a5b87..652685a 100644
--- a/qtinterface/tqvgroupbox.h
+++ b/qtinterface/tqvgroupbox.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQVGROUPBOX_H
-#define TQVGROUPBOX_H
+#ifndef TQT_TQVGROUPBOX_H
+#define TQT_TQVGROUPBOX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQVGROUPBOX_H */
-\ No newline at end of file
+#endif /* TQT_TQVGROUPBOX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwaitcondition.h b/qtinterface/tqwaitcondition.h
index 994c888..93d46ef 100644
--- a/qtinterface/tqwaitcondition.h
+++ b/qtinterface/tqwaitcondition.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWAITCONDITION_H
-#define TQWAITCONDITION_H
+#ifndef TQT_TQWAITCONDITION_H
+#define TQT_TQWAITCONDITION_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQWAITCONDITION_H */
-\ No newline at end of file
+#endif /* TQT_TQWAITCONDITION_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwhatsthis.h b/qtinterface/tqwhatsthis.h
index 8bb1367..088ecf6 100644
--- a/qtinterface/tqwhatsthis.h
+++ b/qtinterface/tqwhatsthis.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWHATSTHIS_H
-#define TQWHATSTHIS_H
+#ifndef TQT_TQWHATSTHIS_H
+#define TQT_TQWHATSTHIS_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQWHATSTHIS_H */
-\ No newline at end of file
+#endif /* TQT_TQWHATSTHIS_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwidcoll.h b/qtinterface/tqwidcoll.h
index c323cb0..836d88a 100644
--- a/qtinterface/tqwidcoll.h
+++ b/qtinterface/tqwidcoll.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWIDCOLL_H
-#define TQWIDCOLL_H
+#ifndef TQT_TQWIDCOLL_H
+#define TQT_TQWIDCOLL_H
 
 #include <tqt.h>
 
@@ -29,4 +29,4 @@ Boston, MA 02110-1301, USA.
 #include <tqwidgetlist.h>
 #include <tqwidgetintdict.h>
 
-#endif /* TQWIDCOLL_H */
-\ No newline at end of file
+#endif /* TQT_TQWIDCOLL_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwidget.h b/qtinterface/tqwidget.h
index c3b361b..d9342ee 100644
--- a/qtinterface/tqwidget.h
+++ b/qtinterface/tqwidget.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWIDGET_H
-#define TQWIDGET_H
+#ifndef TQT_TQWIDGET_H
+#define TQT_TQWIDGET_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQWIDGET_H */
-\ No newline at end of file
+#endif /* TQT_TQWIDGET_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwidgetfactory.h b/qtinterface/tqwidgetfactory.h
index 91fec01..80e0d8d 100644
--- a/qtinterface/tqwidgetfactory.h
+++ b/qtinterface/tqwidgetfactory.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWIDGETFACTORY_H
-#define TQWIDGETFACTORY_H
+#ifndef TQT_TQWIDGETFACTORY_H
+#define TQT_TQWIDGETFACTORY_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQWIDGETFACTORY_H */
-\ No newline at end of file
+#endif /* TQT_TQWIDGETFACTORY_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwidgetintdict.h b/qtinterface/tqwidgetintdict.h
index 80dd020..d6b1107 100644
--- a/qtinterface/tqwidgetintdict.h
+++ b/qtinterface/tqwidgetintdict.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWIDGETINTDICT_H
-#define TQWIDGETINTDICT_H
+#ifndef TQT_TQWIDGETINTDICT_H
+#define TQT_TQWIDGETINTDICT_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQWIDGETINTDICT_H */
-\ No newline at end of file
+#endif /* TQT_TQWIDGETINTDICT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwidgetlist.h b/qtinterface/tqwidgetlist.h
index a88c018..21cd7ac 100644
--- a/qtinterface/tqwidgetlist.h
+++ b/qtinterface/tqwidgetlist.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWIDGETLIST_H
-#define TQWIDGETLIST_H
+#ifndef TQT_TQWIDGETLIST_H
+#define TQT_TQWIDGETLIST_H
 
 #include <tqt.h>
 
@@ -88,4 +88,4 @@ public:
 
 #endif // USE_QT4
 
-#endif /* TQWIDGETLIST_H */
-\ No newline at end of file
+#endif /* TQT_TQWIDGETLIST_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwidgetplugin.h b/qtinterface/tqwidgetplugin.h
index a9c9cb0..0dd505f 100644
--- a/qtinterface/tqwidgetplugin.h
+++ b/qtinterface/tqwidgetplugin.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWIDGETPLUGIN_H
-#define TQWIDGETPLUGIN_H
+#ifndef TQT_TQWIDGETPLUGIN_H
+#define TQT_TQWIDGETPLUGIN_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQWIDGETPLUGIN_H */
-\ No newline at end of file
+#endif /* TQT_TQWIDGETPLUGIN_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwidgetstack.h b/qtinterface/tqwidgetstack.h
index 660d01b..f96359b 100644
--- a/qtinterface/tqwidgetstack.h
+++ b/qtinterface/tqwidgetstack.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWIDGETSTACK_H
-#define TQWIDGETSTACK_H
+#ifndef TQT_TQWIDGETSTACK_H
+#define TQT_TQWIDGETSTACK_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQWIDGETSTACK_H */
-\ No newline at end of file
+#endif /* TQT_TQWIDGETSTACK_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwindefs.h b/qtinterface/tqwindefs.h
index fd292bd..66bfe71 100644
--- a/qtinterface/tqwindefs.h
+++ b/qtinterface/tqwindefs.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWINDEFS_H
-#define TQWINDEFS_H
+#ifndef TQT_TQWINDEFS_H
+#define TQT_TQWINDEFS_H
 
 #include <tqt.h>
 
@@ -28,4 +28,4 @@ Boston, MA 02110-1301, USA.
 
 #include <tqwindowdefs.h>
 
-#endif /* TQWINDEFS_H */
-\ No newline at end of file
+#endif /* TQT_TQWINDEFS_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwindowdefs.h b/qtinterface/tqwindowdefs.h
index 010ae74..7e98e47 100644
--- a/qtinterface/tqwindowdefs.h
+++ b/qtinterface/tqwindowdefs.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWINDOWDEFS_H
-#define TQWINDOWDEFS_H
+#ifndef TQT_TQWINDOWDEFS_H
+#define TQT_TQWINDOWDEFS_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQWINDOWDEFS_H */
-\ No newline at end of file
+#endif /* TQT_TQWINDOWDEFS_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwindowsstyle.h b/qtinterface/tqwindowsstyle.h
index 9d710be..a6dd0eb 100644
--- a/qtinterface/tqwindowsstyle.h
+++ b/qtinterface/tqwindowsstyle.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWINDOWSSTYLE_H
-#define TQWINDOWSSTYLE_H
+#ifndef TQT_TQWINDOWSSTYLE_H
+#define TQT_TQWINDOWSSTYLE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQWINDOWSSTYLE_H */
-\ No newline at end of file
+#endif /* TQT_TQWINDOWSSTYLE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwinexport.h b/qtinterface/tqwinexport.h
index 8542b94..43c380d 100644
--- a/qtinterface/tqwinexport.h
+++ b/qtinterface/tqwinexport.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWINEXPORT_H
-#define TQWINEXPORT_H
+#ifndef TQT_TQWINEXPORT_H
+#define TQT_TQWINEXPORT_H
 
 #include <tqt.h>
 
@@ -40,4 +40,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQWINEXPORT_H */
-\ No newline at end of file
+#endif /* TQT_TQWINEXPORT_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwizard.h b/qtinterface/tqwizard.h
index f126da6..2defd89 100644
--- a/qtinterface/tqwizard.h
+++ b/qtinterface/tqwizard.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWIZARD_H
-#define TQWIZARD_H
+#ifndef TQT_TQWIZARD_H
+#define TQT_TQWIZARD_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQWIZARD_H */
-\ No newline at end of file
+#endif /* TQT_TQWIZARD_H */
+\ No newline at end of file
diff --git a/qtinterface/tqwmatrix.h b/qtinterface/tqwmatrix.h
index e8d41fe..08d8fa1 100644
--- a/qtinterface/tqwmatrix.h
+++ b/qtinterface/tqwmatrix.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWMATRIX_H
-#define TQWMATRIX_H
+#ifndef TQT_TQWMATRIX_H
+#define TQT_TQWMATRIX_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQWMATRIX_H */
-\ No newline at end of file
+#endif /* TQT_TQWMATRIX_H */
+\ No newline at end of file
diff --git a/qtinterface/tqworkspace.h b/qtinterface/tqworkspace.h
index e46974e..1f242ae 100644
--- a/qtinterface/tqworkspace.h
+++ b/qtinterface/tqworkspace.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQWORKSPACE_H
-#define TQWORKSPACE_H
+#ifndef TQT_TQWORKSPACE_H
+#define TQT_TQWORKSPACE_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQWORKSPACE_H */
-\ No newline at end of file
+#endif /* TQT_TQWORKSPACE_H */
+\ No newline at end of file
diff --git a/qtinterface/tqxml.h b/qtinterface/tqxml.h
index 668d672..81b1580 100644
--- a/qtinterface/tqxml.h
+++ b/qtinterface/tqxml.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef TQXML_H
-#define TQXML_H
+#ifndef TQT_TQXML_H
+#define TQT_TQXML_H
 
 #include <tqt.h>
 
@@ -42,4 +42,4 @@ Boston, MA 02110-1301, USA.
 
 #endif // USE_QT4
 
-#endif /* TQXML_H */
-\ No newline at end of file
+#endif /* TQT_TQXML_H */
+\ No newline at end of file
author	Timothy Pearson <[email protected]>	2011-11-08 16:31:23 -0600
committer	Timothy Pearson <[email protected]>	2011-11-08 16:31:23 -0600
commit	6351ace5b1923516f683adcc27488af6b23f3785 (patch)
tree	b768e4aacaf3c9fb21d384d1e9e7b06890b7c725
parent	d27878829fed305ba79ad65a748bc9a7e0b1843b (diff)
download	tqtinterface-6351ace5b1923516f683adcc27488af6b23f3785.tar.gz tqtinterface-6351ace5b1923516f683adcc27488af6b23f3785.zip