Rename graphics class nt* related files to equivalent tq* (part 2)

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

47 files changed, 60 insertions, 60 deletions

diff --git a/tools/assistant/config.h b/tools/assistant/config.h
index 7caef30fd..fccc01b53 100644
--- a/tools/assistant/config.h
+++ b/tools/assistant/config.h
@@ -38,7 +38,7 @@
 
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqmap.h>
 
 class Profile;
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index e8ced3b32..bc866eab0 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -50,7 +50,7 @@
 #include <ntqlabel.h>
 #include <ntqlineedit.h>
 #include <ntqmessagebox.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <ntqprogressbar.h>
 #include <tqptrlist.h>
 #include <tqptrstack.h>
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index 25ac3d821..162ab052b 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -38,7 +38,7 @@
 #include <ntqapplication.h>
 #include <tqserversocket.h>
 #include <tqsocket.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqptrlist.h>
 #include <tqstringlist.h>
 #include <tqdir.h>
diff --git a/tools/assistant/mainwindow.ui b/tools/assistant/mainwindow.ui
index 9589f9007..a2e3b4019 100644
--- a/tools/assistant/mainwindow.ui
+++ b/tools/assistant/mainwindow.ui
@@ -588,7 +588,7 @@
     <include location="global" impldecl="in implementation">ntqapplication.h</include>
     <include location="local" impldecl="in implementation">helpdialogimpl.h</include>
     <include location="global" impldecl="in implementation">tqdir.h</include>
-    <include location="global" impldecl="in implementation">ntqprinter.h</include>
+    <include location="global" impldecl="in implementation">tqprinter.h</include>
     <include location="global" impldecl="in implementation">tqpainter.h</include>
     <include location="global" impldecl="in implementation">tqurl.h</include>
     <include location="global" impldecl="in implementation">tqstatusbar.h</include>
diff --git a/tools/assistant/tabbedbrowser.ui.h b/tools/assistant/tabbedbrowser.ui.h
index 5c021a7e2..425840d3b 100644
--- a/tools/assistant/tabbedbrowser.ui.h
+++ b/tools/assistant/tabbedbrowser.ui.h
@@ -9,7 +9,7 @@
 
 #include <tqfileinfo.h>
 #include <tqtoolbutton.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqiconset.h>
 #include <tqstyle.h>
 #include <tqtimer.h>
diff --git a/tools/designer/designer/actiondnd.h b/tools/designer/designer/actiondnd.h
index 3b492af15..9ecce881b 100644
--- a/tools/designer/designer/actiondnd.h
+++ b/tools/designer/designer/actiondnd.h
@@ -38,7 +38,7 @@
 #include <tqdragobject.h>
 #include <tqmap.h>
 #include <tqmenubar.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqpopupmenu.h>
 #include <tqptrlist.h>
 #include <tqtoolbar.h>
diff --git a/tools/designer/designer/command.h b/tools/designer/designer/command.h
index 354ed7669..8948bfcbd 100644
--- a/tools/designer/designer/command.h
+++ b/tools/designer/designer/command.h
@@ -38,7 +38,7 @@
 #include "layout.h"
 
 #include <tqstring.h>
-#include <ntqrect.h>
+#include <tqrect.h>
 #include <tqvaluelist.h>
 #include <ntqvariant.h>
 #include <tqobject.h>
diff --git a/tools/designer/designer/designer_de.ts b/tools/designer/designer/designer_de.ts
index c2bb3db6e..0461b3044 100644
--- a/tools/designer/designer/designer_de.ts
+++ b/tools/designer/designer/designer_de.ts
@@ -3829,7 +3829,7 @@ load these files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message encoding="UTF-8">
-        <source>QPixmap(</source>
+        <source>TQPixmap(</source>
         <translation type="unfinished"></translation>
     </message>
     <message encoding="UTF-8">
diff --git a/tools/designer/designer/designer_fr.ts b/tools/designer/designer/designer_fr.ts
index 805279721..c31eba6b0 100644
--- a/tools/designer/designer/designer_fr.ts
+++ b/tools/designer/designer/designer_fr.ts
@@ -3827,7 +3827,7 @@ load these files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message encoding="UTF-8">
-        <source>QPixmap(</source>
+        <source>TQPixmap(</source>
         <translation type="unfinished"></translation>
     </message>
     <message encoding="UTF-8">
diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h
index 62430136c..e2544b926 100644
--- a/tools/designer/designer/designer_pch.h
+++ b/tools/designer/designer/designer_pch.h
@@ -25,7 +25,7 @@
 #include <ntqmetaobject.h>
 #include <tqobjectlist.h>
 #include <tqpainter.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <ntqpushbutton.h>
 #include <ntqspinbox.h>
 #include <tqstring.h>
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index d80aeb7e2..1e023fda0 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -53,7 +53,7 @@
 
 #include <ntqevent.h>
 #include <tqpainter.h>
-#include <ntqpen.h>
+#include <tqpen.h>
 #include <ntqlabel.h>
 #include <tqobjectlist.h>
 #include <tqtimer.h>
@@ -62,7 +62,7 @@
 #include <ntqspinbox.h>
 #include <tqstatusbar.h>
 #include <ntqapplication.h>
-#include <ntqpalette.h>
+#include <tqpalette.h>
 #include <ntqmessagebox.h>
 #include <tqpopupmenu.h>
 #include <tqsizegrip.h>
@@ -72,7 +72,7 @@
 #include <tqtooltip.h>
 #include <ntqfeatures.h>
 #include <ntqaccel.h>
-#include <ntqpixmapcache.h>
+#include <tqpixmapcache.h>
 #include <tqbitmap.h>
 #include <ntqsplitter.h>
 
diff --git a/tools/designer/designer/formwindow.h b/tools/designer/designer/formwindow.h
index 7fd0e5ff6..3cd3d470d 100644
--- a/tools/designer/designer/formwindow.h
+++ b/tools/designer/designer/formwindow.h
@@ -41,7 +41,7 @@
 
 #include <tqwidget.h>
 #include <tqptrdict.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqwidgetlist.h>
 #include <tqmap.h>
 
diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp
index 00b13f32b..5cb494074 100644
--- a/tools/designer/designer/hierarchyview.cpp
+++ b/tools/designer/designer/hierarchyview.cpp
@@ -49,7 +49,7 @@
 #include "popupmenueditor.h"
 #include "menubareditor.h"
 
-#include <ntqpalette.h>
+#include <tqpalette.h>
 #include <tqobjectlist.h>
 #include <ntqheader.h>
 #include <tqpopupmenu.h>
diff --git a/tools/designer/designer/layout.cpp b/tools/designer/designer/layout.cpp
index f2b8b749e..46d15eefe 100644
--- a/tools/designer/designer/layout.cpp
+++ b/tools/designer/designer/layout.cpp
@@ -39,7 +39,7 @@
 #include <ntqlayout.h>
 #include <ntqevent.h>
 #include <tqpainter.h>
-#include <ntqpen.h>
+#include <tqpen.h>
 #include <tqbitmap.h>
 #include <ntqsplitter.h>
 #include <tqvaluevector.h>
diff --git a/tools/designer/designer/listvieweditorimpl.h b/tools/designer/designer/listvieweditorimpl.h
index bbe15dc0a..cab52d646 100644
--- a/tools/designer/designer/listvieweditorimpl.h
+++ b/tools/designer/designer/listvieweditorimpl.h
@@ -37,7 +37,7 @@
 #include "listvieweditor.h"
 
 #include <tqmap.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqvaluelist.h>
 
 class FormWindow;
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 6c52d2091..a8ff8b6fb 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -92,7 +92,7 @@
 #include <ntqfeatures.h>
 #include <ntqmetaobject.h>
 #include <tqaction.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqworkspace.h>
 #include <tqfiledialog.h>
 #include <tqclipboard.h>
diff --git a/tools/designer/designer/pixmapchooser.h b/tools/designer/designer/pixmapchooser.h
index 0ffd74384..46f754506 100644
--- a/tools/designer/designer/pixmapchooser.h
+++ b/tools/designer/designer/pixmapchooser.h
@@ -36,7 +36,7 @@
 
 #include <tqfiledialog.h>
 #include <ntqscrollview.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqurl.h>
 
 class FormWindow;
diff --git a/tools/designer/designer/pixmapcollection.h b/tools/designer/designer/pixmapcollection.h
index 918f18d4c..60c5dc9cf 100644
--- a/tools/designer/designer/pixmapcollection.h
+++ b/tools/designer/designer/pixmapcollection.h
@@ -35,7 +35,7 @@
 #define PIXMAPCOLLECTION_H
 
 #include <tqstring.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqvaluelist.h>
 #include "designerappiface.h"
 
diff --git a/tools/designer/designer/pixmapcollectioneditor.ui b/tools/designer/designer/pixmapcollectioneditor.ui
index 26a52eca4..90ab7e63e 100644
--- a/tools/designer/designer/pixmapcollectioneditor.ui
+++ b/tools/designer/designer/pixmapcollectioneditor.ui
@@ -199,7 +199,7 @@
     <include location="local" impldecl="in implementation">project.h</include>
     <include location="global" impldecl="in implementation">tqfileinfo.h</include>
     <include location="global" impldecl="in implementation">tqimage.h</include>
-    <include location="global" impldecl="in declaration">ntqpixmap.h</include>
+    <include location="global" impldecl="in declaration">tqpixmap.h</include>
     <include location="local" impldecl="in implementation">pixmapcollectioneditor.ui.h</include>
 </includes>
 <forwards>
diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp
index 733953b57..ba43a3633 100644
--- a/tools/designer/designer/popupmenueditor.cpp
+++ b/tools/designer/designer/popupmenueditor.cpp
@@ -39,7 +39,7 @@
 #include <tqobjectlist.h>
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
-#include <ntqrect.h>
+#include <tqrect.h>
 #include <tqsize.h>
 #include <tqstyle.h>
 #include <tqtimer.h>
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 778f554b6..30525df70 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -52,7 +52,7 @@
 #include "menubareditor.h"
 
 #include <tqpainter.h>
-#include <ntqpalette.h>
+#include <tqpalette.h>
 #include <ntqapplication.h>
 #include <ntqheader.h>
 #include <ntqlineedit.h>
diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp
index fbe7884cd..1d618a3d0 100644
--- a/tools/designer/designer/startdialogimpl.cpp
+++ b/tools/designer/designer/startdialogimpl.cpp
@@ -6,7 +6,7 @@
 #include <ntqlabel.h>
 #include <tqfiledialog.h>
 #include <ntqtabwidget.h>
-#include <ntqpoint.h>
+#include <tqpoint.h>
 #include <tqobjectlist.h>
 #include <ntqpushbutton.h>
 #include <ntqlayout.h>
diff --git a/tools/designer/designer/styledbutton.cpp b/tools/designer/designer/styledbutton.cpp
index e371a99ac..543da3c9a 100644
--- a/tools/designer/designer/styledbutton.cpp
+++ b/tools/designer/designer/styledbutton.cpp
@@ -36,11 +36,11 @@
 #include "formwindow.h"
 #include "pixmapchooser.h"
 #include <tqcolordialog.h>
-#include <ntqpalette.h>
+#include <tqpalette.h>
 #include <ntqlabel.h>
 #include <tqpainter.h>
 #include <tqimage.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <ntqapplication.h>
 #include <tqdragobject.h>
 #include <tqstyle.h>
diff --git a/tools/designer/designer/styledbutton.h b/tools/designer/designer/styledbutton.h
index 3c11cf1fb..5bc1d9782 100644
--- a/tools/designer/designer/styledbutton.h
+++ b/tools/designer/designer/styledbutton.h
@@ -35,7 +35,7 @@
 #define STYLEDBUTTON_H
 
 #include <ntqbutton.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 
 class TQColor;
 class TQBrush;
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index 1caeea8d4..9fb3e33dd 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -54,7 +54,7 @@
 
 #include <ntqfeatures.h>
 
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <ntqgroupbox.h>
 #include <tqiconview.h>
 #ifndef TQT_NO_TABLE
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index 05d550058..6e5b45370 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -39,7 +39,7 @@
 #include <tqstring.h>
 #include <tqintdict.h>
 #include <ntqtabwidget.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqsize.h>
 #include <tqpainter.h>
 #include <ntqevent.h>
diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp
index d190723ca..ffe52975d 100644
--- a/tools/designer/designer/workspace.cpp
+++ b/tools/designer/designer/workspace.cpp
@@ -48,7 +48,7 @@
 #include <tqfileinfo.h>
 #include <ntqapplication.h>
 #include <tqpainter.h>
-#include <ntqpen.h>
+#include <tqpen.h>
 #include <tqobjectlist.h>
 #include <tqworkspace.h>
 #include <tqpopupmenu.h>
diff --git a/tools/designer/editor/arghintwidget.cpp b/tools/designer/editor/arghintwidget.cpp
index ec11a114e..c8f643ba1 100644
--- a/tools/designer/editor/arghintwidget.cpp
+++ b/tools/designer/editor/arghintwidget.cpp
@@ -36,7 +36,7 @@
 #include <ntqlabel.h>
 #include <ntqlayout.h>
 #include <tqpainter.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 
 static const char * left_xpm[] = {
 "16 16 3 1",
diff --git a/tools/designer/editor/markerwidget.h b/tools/designer/editor/markerwidget.h
index b3bfbc233..3f2aaf372 100644
--- a/tools/designer/editor/markerwidget.h
+++ b/tools/designer/editor/markerwidget.h
@@ -35,7 +35,7 @@
 #define MARKERWIDGET_H
 
 #include <tqwidget.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 
 class ViewManager;
 class TQTextParagraph;
diff --git a/tools/designer/editor/preferences.ui b/tools/designer/editor/preferences.ui
index a4085df7a..5627528c8 100644
--- a/tools/designer/editor/preferences.ui
+++ b/tools/designer/editor/preferences.ui
@@ -472,9 +472,9 @@
 <includes>
     <include location="global" impldecl="in declaration">tqmap.h</include>
     <include location="local" impldecl="in declaration">conf.h</include>
-    <include location="global" impldecl="in implementation">ntqpalette.h</include>
+    <include location="global" impldecl="in implementation">tqpalette.h</include>
     <include location="global" impldecl="in implementation">ntqlineedit.h</include>
-    <include location="global" impldecl="in implementation">ntqpixmap.h</include>
+    <include location="global" impldecl="in implementation">tqpixmap.h</include>
     <include location="global" impldecl="in implementation">ntqcombobox.h</include>
     <include location="global" impldecl="in implementation">tqfontdatabase.h</include>
     <include location="local" impldecl="in implementation">editor.h</include>
diff --git a/tools/designer/examples/credit/creditformbase.cpp b/tools/designer/examples/credit/creditformbase.cpp
index db3d7e5c6..788ccf6a4 100644
--- a/tools/designer/examples/credit/creditformbase.cpp
+++ b/tools/designer/examples/credit/creditformbase.cpp
@@ -20,7 +20,7 @@
 #include <ntqwhatsthis.h>
 #include "creditformbase.ui.h"
 #include <tqimage.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 
 static TQPixmap uic_load_pixmap_CreditFormBase( const TQString &name )
 {
diff --git a/tools/designer/examples/opengl/glwidget.h b/tools/designer/examples/opengl/glwidget.h
index 565efb4a5..bd5d5b320 100644
--- a/tools/designer/examples/opengl/glwidget.h
+++ b/tools/designer/examples/opengl/glwidget.h
@@ -35,7 +35,7 @@
 #ifndef GLWIDGET_H
 #define GLWIDGET_H
 
-#include <ntqgl.h>
+#include <tqgl.h>
 
 class GLWidget : public TQGLWidget
 {
diff --git a/tools/designer/examples/opengl/main.cpp b/tools/designer/examples/opengl/main.cpp
index c30e36307..3882cab86 100644
--- a/tools/designer/examples/opengl/main.cpp
+++ b/tools/designer/examples/opengl/main.cpp
@@ -35,7 +35,7 @@
 #include <widgetinterface.h>
 
 #include <tqobjectcleanuphandler.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 
 #include "glwidget.h"
 
diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp
index 3744f750b..8978b88e8 100644
--- a/tools/designer/plugins/dlg/dlg2ui.cpp
+++ b/tools/designer/plugins/dlg/dlg2ui.cpp
@@ -102,7 +102,7 @@ static const struct {
     { "DlgWidget", "AdjustSize", 0, 0 },
     { "DlgWidget", "BackgroundMode", "backgroundMode", "enum" },
     { "DlgWidget", "BackgroundOrigin", "backgroundOrigin", "enum" },
-    { "DlgWidget", "BackgroundPixmap", "backgroundPixmap", "qpixmap" },
+    { "DlgWidget", "BackgroundPixmap", "backgroundPixmap", "tqpixmap" },
     { "DlgWidget", "DataLenName", 0, 0 },
     { "DlgWidget", "DataVarName", 0, 0 },
     { "DlgWidget", "Enabled", "enabled", "boolean" },
@@ -112,7 +112,7 @@ static const struct {
     { "DlgWidget", "MaximumSize", "maximumSize", "tqsize" },
     { "DlgWidget", "MinimumSize", "minimumSize", "tqsize" },
     { "DlgWidget", "Name", 0, 0 },
-    { "DlgWidget", "Palette", "palette", "qpalette" },
+    { "DlgWidget", "Palette", "palette", "tqpalette" },
     { "DlgWidget", "PalettePropagation", 0, 0 },
     { "DlgWidget", "ReadPixmapFromData", 0, 0 },
     { "DlgWidget", "Rect", 0, 0 },
@@ -725,11 +725,11 @@ void Dlg2Ui::emitWidgetBody( const TQDomElement& e, bool layouted )
 			    name = getTextValue( n );
 			} else if ( tagName == TQString("Rect") ) {
 			    TQRect rect = getValue( n.toElement(), tagName,
-						   TQString("qrect") )
+						   TQString("tqrect") )
 					 .toRect();
 			    if ( !layouted )
 				emitProperty( TQString("geometry"), rect,
-					      TQString("qrect") );
+					      TQString("tqrect") );
 			} else if ( tagName == TQString("SignalConnection") ) {
 			    TQDomNode child = n.firstChild();
 			    while ( !child.isNull() ) {
@@ -908,7 +908,7 @@ TQVariant Dlg2Ui::getValue( const TQDomElement& e, const TQString& tagName,
 	    int height = getValue( children, TQString("Height"),
 				   TQString("integer") ).toInt();
 	    return TQSize( width, height );
-	} else if ( type == TQString("qrect") ) {
+	} else if ( type == TQString("tqrect") ) {
 	    int x = getValue( children, TQString("X"), TQString("integer") )
 		    .toInt();
 	    int y = getValue( children, TQString("Y"), TQString("integer") )
@@ -918,13 +918,13 @@ TQVariant Dlg2Ui::getValue( const TQDomElement& e, const TQString& tagName,
 	    int height = getValue( children, TQString("Height"),
 				   TQString("integer") ).toInt();
 	    return TQRect( x, y, width, height );
-	} else if ( type == TQString("qpoint") ) {
+	} else if ( type == TQString("tqpoint") ) {
 	    int x = getValue( children, TQString("X"), TQString("integer") )
 		    .toInt();
 	    int y = getValue( children, TQString("Y"), TQString("integer") )
 		    .toInt();
 	    return TQPoint( x, y );
-	} else if ( type == TQString("qpalette") ) {
+	} else if ( type == TQString("tqpalette") ) {
 	    TQColorGroup active = getValue( children, TQString("Active"),
 					   TQString("tqcolorgroup") )
 					   .toColorGroup();
@@ -1372,7 +1372,7 @@ void Dlg2Ui::matchWidgetLayoutCommon( const TQDomElement& widgetLayoutCommon )
     */
 #if 1
     TQPoint initialPos = getValue( children, TQString("InitialPos"),
-				  TQString("qpoint") ).toPoint();
+				  TQString("tqpoint") ).toPoint();
     TQSize size = getValue( children, TQString("Size"), TQString("tqsize") )
 		 .toSize();
 #endif
diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp
index 460c0bbe6..b9b54b0b0 100644
--- a/tools/designer/plugins/glade/glade2ui.cpp
+++ b/tools/designer/plugins/glade/glade2ui.cpp
@@ -41,7 +41,7 @@
 #include <tqimage.h>
 #include <ntqprogressdialog.h>
 #include <ntqmessagebox.h>
-#include <ntqrect.h>
+#include <tqrect.h>
 #include <tqregexp.h>
 #include <tqsizepolicy.h>
 
diff --git a/tools/designer/plugins/wizards/mainwindowwizard.ui b/tools/designer/plugins/wizards/mainwindowwizard.ui
index 3406b4ca6..0ff86dd99 100644
--- a/tools/designer/plugins/wizards/mainwindowwizard.ui
+++ b/tools/designer/plugins/wizards/mainwindowwizard.ui
@@ -35,7 +35,7 @@
 <include location="global" impldecl="in implementation">designerinterface.h</include>
 <include location="global" impldecl="in implementation">tqiconset.h</include>
 <include location="global" impldecl="in implementation">tqaction.h</include>
-<include location="global" impldecl="in implementation">ntqpixmap.h</include>
+<include location="global" impldecl="in implementation">tqpixmap.h</include>
 <include location="global" impldecl="in implementation">tqdict.h</include>
 <include location="local" implDecl="in declaration">mainwindowwizard.ui.h</include>
 <forward>struct DesignerFormWindow;</forward>
diff --git a/tools/designer/shared/domtool.cpp b/tools/designer/shared/domtool.cpp
index de7ed556c..e2faac345 100644
--- a/tools/designer/shared/domtool.cpp
+++ b/tools/designer/shared/domtool.cpp
@@ -37,7 +37,7 @@
 #include <tqcolor.h>
 #include <ntqcursor.h>
 #include <tqdatetime.h>
-#include <ntqrect.h>
+#include <tqrect.h>
 #include <tqsize.h>
 #include <tqfont.h>
 #include <tqdom.h>
diff --git a/tools/designer/shared/ui2uib.cpp b/tools/designer/shared/ui2uib.cpp
index 0dd01e4bd..98ed8a544 100644
--- a/tools/designer/shared/ui2uib.cpp
+++ b/tools/designer/shared/ui2uib.cpp
@@ -43,7 +43,7 @@
 #include <tqfile.h>
 #include <tqfont.h>
 #include <tqobject.h>
-#include <ntqrect.h>
+#include <tqrect.h>
 #include <tqsizepolicy.h>
 
 /*
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index 00a24784a..fd4755c78 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -199,7 +199,7 @@ void Uic::createFormDecl( const TQDomElement &e )
     out << "#include <ntqvariant.h>" << endl; // for broken HP-UX compilers
 
     if ( !imageMembers.isEmpty() )
-	out << "#include <ntqpixmap.h>" << endl;
+	out << "#include <tqpixmap.h>" << endl;
 
     TQStringList globalIncludes, localIncludes;
     int wid = WidgetDatabase::idFromClassName( objClass );
@@ -852,7 +852,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 
     if ( !requiredImages.isEmpty() || externPixmaps ) {
 	out << "#include <tqimage.h>" << endl;
-	out << "#include <ntqpixmap.h>" << endl << endl;
+	out << "#include <tqpixmap.h>" << endl << endl;
     }
 
     /*
diff --git a/tools/designer/uic/uic.h b/tools/designer/uic/uic.h
index 93fdad2cc..caf566705 100644
--- a/tools/designer/uic/uic.h
+++ b/tools/designer/uic/uic.h
@@ -38,7 +38,7 @@
 #include <tqstringlist.h>
 #include <tqmap.h>
 #include <tqtextstream.h>
-#include <ntqpalette.h>
+#include <tqpalette.h>
 #include <ntqvariant.h>
 
 class Uic : public TQt
diff --git a/tools/designer/uilib/tqwidgetfactory.h b/tools/designer/uilib/tqwidgetfactory.h
index c2fd359e8..4f9ba7456 100644
--- a/tools/designer/uilib/tqwidgetfactory.h
+++ b/tools/designer/uilib/tqwidgetfactory.h
@@ -38,7 +38,7 @@
 #include <tqstring.h>
 #include <tqptrlist.h>
 #include <tqimage.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqvaluelist.h>
 #include <tqmap.h>
 #include <tqaction.h>
diff --git a/tools/linguist/linguist/main.cpp b/tools/linguist/linguist/main.cpp
index a458a8212..cea49d599 100644
--- a/tools/linguist/linguist/main.cpp
+++ b/tools/linguist/linguist/main.cpp
@@ -35,7 +35,7 @@
 
 #include <ntqapplication.h>
 #include <ntqlabel.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqtimer.h>
 #include <tqtextcodec.h>
 #include <ntqtranslator.h>
diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp
index 16a250783..0e422f269 100644
--- a/tools/linguist/linguist/msgedit.cpp
+++ b/tools/linguist/linguist/msgedit.cpp
@@ -48,7 +48,7 @@
 #include <ntqlabel.h>
 #include <ntqlayout.h>
 #include <tqtextedit.h>
-#include <ntqpalette.h>
+#include <tqpalette.h>
 #include <ntqpushbutton.h>
 #include <tqstring.h>
 #include <tqtextview.h>
diff --git a/tools/linguist/linguist/msgedit.h b/tools/linguist/linguist/msgedit.h
index 2bcd99ed3..0ca95bcf7 100644
--- a/tools/linguist/linguist/msgedit.h
+++ b/tools/linguist/linguist/msgedit.h
@@ -44,7 +44,7 @@
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
 #include <ntqscrollview.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqbitmap.h>
 #include <tqtooltip.h>
 
diff --git a/tools/linguist/linguist/printout.cpp b/tools/linguist/linguist/printout.cpp
index 61b592c6e..f41bfd190 100644
--- a/tools/linguist/linguist/printout.cpp
+++ b/tools/linguist/linguist/printout.cpp
@@ -33,7 +33,7 @@
 
 #include "printout.h"
 
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <tqfontmetrics.h>
 
 PrintOut::PrintOut( TQPrinter *printer )
diff --git a/tools/linguist/linguist/printout.h b/tools/linguist/linguist/printout.h
index a77671e24..150cc193b 100644
--- a/tools/linguist/linguist/printout.h
+++ b/tools/linguist/linguist/printout.h
@@ -37,7 +37,7 @@
 #include <tqfont.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqpainter.h>
-#include <ntqrect.h>
+#include <tqrect.h>
 #include <tqvaluelist.h>
 #include <tqdatetime.h>
 
diff --git a/tools/linguist/linguist/trwindow.h b/tools/linguist/linguist/trwindow.h
index 5c0dfaaec..71864c6fb 100644
--- a/tools/linguist/linguist/trwindow.h
+++ b/tools/linguist/linguist/trwindow.h
@@ -41,9 +41,9 @@
 #include <tqmainwindow.h>
 #include <tqptrlist.h>
 #include <tqdict.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <tqstringlist.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <ntqlistview.h>
 
 class TQAction;