Update to latest tqt3 automated conversion

6 files changed, 28 insertions, 28 deletions

diff --git a/src/opengl/qgl.h b/src/opengl/ntqgl.h
index e58b18d4d..0476dfeff 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/ntqgl.h
@@ -42,8 +42,8 @@
 #define TQGL_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qglcolormap.h"
+#include "ntqwidget.h"
+#include "ntqglcolormap.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/opengl/qglcolormap.h b/src/opengl/ntqglcolormap.h
index 9aaaf22d1..23e334109 100644
--- a/src/opengl/qglcolormap.h
+++ b/src/opengl/ntqglcolormap.h
@@ -42,9 +42,9 @@
 #define TQGLCOLORMAP_H
 
 #ifndef QT_H
-#include "qcolor.h"
-#include "qmemarray.h"
-#include "qshared.h"
+#include "ntqcolor.h"
+#include "ntqmemarray.h"
+#include "ntqshared.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index eed5d37b5..612448d59 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qgl.h"
-#include "qpixmap.h"
-#include "qpaintdevicemetrics.h"
-#include "qimage.h"
-#include "qcleanuphandler.h"
-#include "qptrdict.h"
+#include "ntqgl.h"
+#include "ntqpixmap.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqimage.h"
+#include "ntqcleanuphandler.h"
+#include "ntqptrdict.h"
 
 static TQGLFormat* qgl_default_format = 0;
 static TQGLFormat* qgl_default_overlay_format = 0;
@@ -62,7 +62,7 @@ static TQCleanupHandler<TQGLFormat> qgl_cleanup_format;
 
 
 /*!
-    \class TQGL qgl.h
+    \class TQGL ntqgl.h
     \brief The TQGL class is a namespace for miscellaneous identifiers
     in the TQt OpenGL module.
 \if defined(commercial)
@@ -96,7 +96,7 @@ static TQCleanupHandler<TQGLFormat> qgl_cleanup_format;
 
 
 /*!
-    \class TQGLFormat qgl.h
+    \class TQGLFormat ntqgl.h
     \brief The TQGLFormat class specifies the display format of an OpenGL
     rendering context.
 \if defined(commercial)
@@ -734,7 +734,7 @@ bool operator!=( const TQGLFormat& a, const TQGLFormat& b )
 TQGLContext* TQGLContext::currentCtx = 0;
 
 /*!
-    \class TQGLContext qgl.h
+    \class TQGLContext ntqgl.h
     \brief The TQGLContext class encapsulates an OpenGL rendering context.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -1127,7 +1127,7 @@ bool TQGLContext::create( const TQGLContext* shareContext )
 
 
 /*!
-    \class TQGLWidget qgl.h
+    \class TQGLWidget ntqgl.h
     \brief The TQGLWidget class is a widget for rendering OpenGL graphics.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index 939653661..a8f317a4f 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qgl.h"
+#include "ntqgl.h"
 
 #if defined(Q_WS_X11)
 
-#include "qmap.h"
-#include "qpixmap.h"
-#include "qapplication.h"
+#include "ntqmap.h"
+#include "ntqpixmap.h"
+#include "ntqapplication.h"
 
-#include "qintdict.h"
+#include "ntqintdict.h"
 #include "private/qfontengine_p.h"
 
 #define INT8  dummy_INT8
@@ -74,7 +74,7 @@ extern "C" {
 
 #include "qgl_x11_p.h"
 #ifdef QT_DLOPEN_OPENGL
-#include "qlibrary.h"
+#include "ntqlibrary.h"
 
 extern "C" {
 _glCallLists qt_glCallLists;
diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp
index 22b819f39..048b7dc29 100644
--- a/src/opengl/qglcolormap.cpp
+++ b/src/opengl/qglcolormap.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 /*!
-    \class TQGLColormap qglcolormap.h
+    \class TQGLColormap ntqglcolormap.h
     \brief The TQGLColormap class is used for installing custom colormaps into
     TQGLWidgets.
 \if defined(commercial)
@@ -73,8 +73,8 @@
 
     Example of use:
     \code
-    #include <qapplication.h>
-    #include <qglcolormap.h>
+    #include <ntqapplication.h>
+    #include <ntqglcolormap.h>
 
     int main()
     {
@@ -97,8 +97,8 @@
     \sa TQGLWidget::setColormap(), TQGLWidget::colormap()
 */
 
-#include "qglcolormap.h"
-#include "qmemarray.h"
+#include "ntqglcolormap.h"
+#include "ntqmemarray.h"
 
 
 /*!
diff --git a/src/opengl/qt_opengl.pri b/src/opengl/qt_opengl.pri
index bb0a5d869..b89ea8c27 100644
--- a/src/opengl/qt_opengl.pri
+++ b/src/opengl/qt_opengl.pri
@@ -1,8 +1,8 @@
 # Qt opengl module
 
 opengl {
-	HEADERS += $$OPENGL_H/qgl.h \
-		   $$OPENGL_H/qglcolormap.h
+	HEADERS += $$OPENGL_H/ntqgl.h \
+		   $$OPENGL_H/ntqglcolormap.h
 	SOURCES	+= $$OPENGL_CPP/qgl.cpp \
 		   $$OPENGL_CPP/qglcolormap.cpp
 	x11 {