From a30f5359f03c3017fa19a6770fab32d25d22cb87 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 15 Jul 2024 19:08:22 +0900
Subject: Rename graphics class nt* related files to equivalent tq* (part 1)

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 tools/designer/designer/actiondnd.cpp                 |  2 +-
 tools/designer/designer/connectionitems.cpp           |  2 +-
 tools/designer/designer/designer_pch.h                |  2 +-
 tools/designer/designer/formwindow.cpp                |  2 +-
 tools/designer/designer/layout.cpp                    |  2 +-
 tools/designer/designer/listboxdnd.cpp                |  2 +-
 tools/designer/designer/listdnd.cpp                   |  2 +-
 tools/designer/designer/listviewdnd.cpp               |  2 +-
 tools/designer/designer/menubareditor.cpp             |  2 +-
 tools/designer/designer/orderindicator.cpp            |  2 +-
 tools/designer/designer/outputwindow.cpp              |  2 +-
 tools/designer/designer/paletteeditoradvancedimpl.cpp |  2 +-
 tools/designer/designer/pixmapchooser.cpp             |  2 +-
 tools/designer/designer/popupmenueditor.cpp           |  2 +-
 tools/designer/designer/previewframe.cpp              |  2 +-
 tools/designer/designer/propertyeditor.cpp            | 10 +++++-----
 tools/designer/designer/richtextfontdialog.ui.h       |  4 ++--
 tools/designer/designer/styledbutton.cpp              |  4 ++--
 tools/designer/designer/widgetfactory.h               |  2 +-
 tools/designer/designer/workspace.cpp                 |  2 +-
 tools/designer/editor/arghintwidget.cpp               |  2 +-
 tools/designer/editor/conf.cpp                        |  4 ++--
 tools/designer/editor/conf.h                          |  4 ++--
 tools/designer/editor/markerwidget.cpp                |  2 +-
 tools/designer/editor/preferences.ui                  |  4 ++--
 tools/designer/examples/colortool/colornameform.ui.h  |  2 +-
 tools/designer/examples/colortool/mainform.ui         |  6 +++---
 tools/designer/examples/richedit/richedit.ui          |  2 +-
 tools/designer/plugins/dlg/dlg2ui.cpp                 | 16 ++++++++--------
 tools/designer/shared/domtool.cpp                     |  4 ++--
 tools/designer/shared/globaldefs.h                    |  2 +-
 tools/designer/shared/ui2uib.cpp                      |  4 ++--
 tools/designer/shared/widgetdatabase.cpp              |  1 +
 33 files changed, 53 insertions(+), 52 deletions(-)

(limited to 'tools/designer')

diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp
index 153dd0e6..1381a9f8 100644
--- a/tools/designer/designer/actiondnd.cpp
+++ b/tools/designer/designer/actiondnd.cpp
@@ -50,7 +50,7 @@
 #include <tqmenudata.h>
 #include <ntqmessagebox.h>
 #include <tqobjectlist.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqstyle.h>
 #include <tqtimer.h>
 
diff --git a/tools/designer/designer/connectionitems.cpp b/tools/designer/designer/connectionitems.cpp
index 558e6fef..65f433a2 100644
--- a/tools/designer/designer/connectionitems.cpp
+++ b/tools/designer/designer/connectionitems.cpp
@@ -37,7 +37,7 @@
 #include "metadatabase.h"
 #include "widgetfactory.h"
 #include "project.h"
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqcombobox.h>
 #include <ntqmetaobject.h>
 #include <ntqcombobox.h>
diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h
index 07edd9b3..62430136 100644
--- a/tools/designer/designer/designer_pch.h
+++ b/tools/designer/designer/designer_pch.h
@@ -24,7 +24,7 @@
 #include <ntqmessagebox.h>
 #include <ntqmetaobject.h>
 #include <tqobjectlist.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqpixmap.h>
 #include <ntqpushbutton.h>
 #include <ntqspinbox.h>
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index 185e9d2e..d80aeb7e 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -52,7 +52,7 @@
 #include <stdlib.h>
 
 #include <ntqevent.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqpen.h>
 #include <ntqlabel.h>
 #include <tqobjectlist.h>
diff --git a/tools/designer/designer/layout.cpp b/tools/designer/designer/layout.cpp
index da501306..f2b8b749 100644
--- a/tools/designer/designer/layout.cpp
+++ b/tools/designer/designer/layout.cpp
@@ -38,7 +38,7 @@
 
 #include <ntqlayout.h>
 #include <ntqevent.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqpen.h>
 #include <tqbitmap.h>
 #include <ntqsplitter.h>
diff --git a/tools/designer/designer/listboxdnd.cpp b/tools/designer/designer/listboxdnd.cpp
index ad0192da..07692755 100644
--- a/tools/designer/designer/listboxdnd.cpp
+++ b/tools/designer/designer/listboxdnd.cpp
@@ -34,7 +34,7 @@
 #include "listboxdnd.h"
 #include <tqwidget.h>
 #include <ntqheader.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqdragobject.h>
 #include <tqvaluelist.h>
 
diff --git a/tools/designer/designer/listdnd.cpp b/tools/designer/designer/listdnd.cpp
index 8a7fb0d4..6e180969 100644
--- a/tools/designer/designer/listdnd.cpp
+++ b/tools/designer/designer/listdnd.cpp
@@ -33,7 +33,7 @@
 
 #include "listdnd.h"
 #include <tqwidget.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 ListDnd::ListDnd( TQScrollView * eventSource, const char * name )
     : TQObject( eventSource, name ),
diff --git a/tools/designer/designer/listviewdnd.cpp b/tools/designer/designer/listviewdnd.cpp
index 7df525b0..72877e44 100644
--- a/tools/designer/designer/listviewdnd.cpp
+++ b/tools/designer/designer/listviewdnd.cpp
@@ -34,7 +34,7 @@
 #include "listviewdnd.h"
 #include <tqwidget.h>
 #include <ntqheader.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqdragobject.h>
 #include <tqvaluelist.h>
 
diff --git a/tools/designer/designer/menubareditor.cpp b/tools/designer/designer/menubareditor.cpp
index b9f70f51..173b18ce 100644
--- a/tools/designer/designer/menubareditor.cpp
+++ b/tools/designer/designer/menubareditor.cpp
@@ -37,7 +37,7 @@
 #include <tqdragobject.h>
 #include <ntqlineedit.h>
 #include <tqmainwindow.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqstyle.h>
 #include "command.h"
 #include "formwindow.h"
diff --git a/tools/designer/designer/orderindicator.cpp b/tools/designer/designer/orderindicator.cpp
index 6baf60a7..9ea5e311 100644
--- a/tools/designer/designer/orderindicator.cpp
+++ b/tools/designer/designer/orderindicator.cpp
@@ -36,7 +36,7 @@
 #include "orderindicator.h"
 #include "formwindow.h"
 
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqbitmap.h>
 #include <ntqapplication.h>
 
diff --git a/tools/designer/designer/outputwindow.cpp b/tools/designer/designer/outputwindow.cpp
index 4dc59ab4..8c556909 100644
--- a/tools/designer/designer/outputwindow.cpp
+++ b/tools/designer/designer/outputwindow.cpp
@@ -42,7 +42,7 @@
 #include <ntqheader.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 static TQTextEdit *debugoutput = 0;
 TQ_EXPORT bool debugToStderr = FALSE;
diff --git a/tools/designer/designer/paletteeditoradvancedimpl.cpp b/tools/designer/designer/paletteeditoradvancedimpl.cpp
index 112a4249..f776e584 100644
--- a/tools/designer/designer/paletteeditoradvancedimpl.cpp
+++ b/tools/designer/designer/paletteeditoradvancedimpl.cpp
@@ -41,7 +41,7 @@
 #include <ntqapplication.h>
 #include <ntqpushbutton.h>
 #include <ntqlistbox.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqgroupbox.h>
 
 /*!
diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp
index 2883678a..169a5c9c 100644
--- a/tools/designer/designer/pixmapchooser.cpp
+++ b/tools/designer/designer/pixmapchooser.cpp
@@ -46,7 +46,7 @@
 
 #include <ntqapplication.h>
 #include <tqimage.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqlabel.h>
 #include <ntqlineedit.h>
 #include <ntqpushbutton.h>
diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp
index ad9957a3..733953b5 100644
--- a/tools/designer/designer/popupmenueditor.cpp
+++ b/tools/designer/designer/popupmenueditor.cpp
@@ -37,7 +37,7 @@
 #include <tqdragobject.h>
 #include <ntqlineedit.h>
 #include <tqobjectlist.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqpopupmenu.h>
 #include <ntqrect.h>
 #include <tqsize.h>
diff --git a/tools/designer/designer/previewframe.cpp b/tools/designer/designer/previewframe.cpp
index 9fe2b4bf..b3da648d 100644
--- a/tools/designer/designer/previewframe.cpp
+++ b/tools/designer/designer/previewframe.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include <ntqvbox.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 #include "previewframe.h"
 
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 50ffd404..778f554b 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -51,7 +51,7 @@
 #include "database.h"
 #include "menubareditor.h"
 
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqpalette.h>
 #include <ntqapplication.h>
 #include <ntqheader.h>
@@ -61,14 +61,14 @@
 #include <ntqcombobox.h>
 #include <ntqpushbutton.h>
 #include <ntqhbox.h>
-#include <ntqfontdialog.h>
+#include <tqfontdialog.h>
 #include <ntqspinbox.h>
 #include <ntqevent.h>
 #include <tqobjectlist.h>
 #include <ntqlistbox.h>
-#include <ntqfontdatabase.h>
-#include <ntqcolor.h>
-#include <ntqcolordialog.h>
+#include <tqfontdatabase.h>
+#include <tqcolor.h>
+#include <tqcolordialog.h>
 #include <ntqlabel.h>
 #include <ntqlayout.h>
 #include <tqsizepolicy.h>
diff --git a/tools/designer/designer/richtextfontdialog.ui.h b/tools/designer/designer/richtextfontdialog.ui.h
index 529c52aa..27a11a21 100644
--- a/tools/designer/designer/richtextfontdialog.ui.h
+++ b/tools/designer/designer/richtextfontdialog.ui.h
@@ -5,8 +5,8 @@
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
-#include <ntqcolordialog.h>
-#include <ntqfontdatabase.h>
+#include <tqcolordialog.h>
+#include <tqfontdatabase.h>
 
 void RichTextFontDialog::init()
 {
diff --git a/tools/designer/designer/styledbutton.cpp b/tools/designer/designer/styledbutton.cpp
index db759a53..e371a99a 100644
--- a/tools/designer/designer/styledbutton.cpp
+++ b/tools/designer/designer/styledbutton.cpp
@@ -35,10 +35,10 @@
 #include "styledbutton.h"
 #include "formwindow.h"
 #include "pixmapchooser.h"
-#include <ntqcolordialog.h>
+#include <tqcolordialog.h>
 #include <ntqpalette.h>
 #include <ntqlabel.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqimage.h>
 #include <ntqpixmap.h>
 #include <ntqapplication.h>
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index 23d409f9..05d55005 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -41,7 +41,7 @@
 #include <ntqtabwidget.h>
 #include <ntqpixmap.h>
 #include <tqsize.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqevent.h>
 #include <tqobjectlist.h>
 #include <ntqlabel.h>
diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp
index f0ba9f5d..d190723c 100644
--- a/tools/designer/designer/workspace.cpp
+++ b/tools/designer/designer/workspace.cpp
@@ -47,7 +47,7 @@
 #include <tqdragobject.h>
 #include <tqfileinfo.h>
 #include <ntqapplication.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqpen.h>
 #include <tqobjectlist.h>
 #include <tqworkspace.h>
diff --git a/tools/designer/editor/arghintwidget.cpp b/tools/designer/editor/arghintwidget.cpp
index 90bf4a8d..ec11a114 100644
--- a/tools/designer/editor/arghintwidget.cpp
+++ b/tools/designer/editor/arghintwidget.cpp
@@ -35,7 +35,7 @@
 #include <ntqbutton.h>
 #include <ntqlabel.h>
 #include <ntqlayout.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqpixmap.h>
 
 static const char * left_xpm[] = {
diff --git a/tools/designer/editor/conf.cpp b/tools/designer/editor/conf.cpp
index b3b7e721..65541ea1 100644
--- a/tools/designer/editor/conf.cpp
+++ b/tools/designer/editor/conf.cpp
@@ -33,8 +33,8 @@
 
 #include "conf.h"
 #include <ntqapplication.h>
-#include <ntqfont.h>
-#include <ntqcolor.h>
+#include <tqfont.h>
+#include <tqcolor.h>
 #include <tqsettings.h>
 
 TQMap<TQString, ConfigStyle> Config::defaultStyles()
diff --git a/tools/designer/editor/conf.h b/tools/designer/editor/conf.h
index 55eb7f46..7869a7f4 100644
--- a/tools/designer/editor/conf.h
+++ b/tools/designer/editor/conf.h
@@ -34,8 +34,8 @@
 #ifndef CONF_H
 #define CONF_H
 
-#include <ntqfont.h>
-#include <ntqcolor.h>
+#include <tqfont.h>
+#include <tqcolor.h>
 #include <tqmap.h>
 
 struct ConfigStyle
diff --git a/tools/designer/editor/markerwidget.cpp b/tools/designer/editor/markerwidget.cpp
index 96244980..c393d9c3 100644
--- a/tools/designer/editor/markerwidget.cpp
+++ b/tools/designer/editor/markerwidget.cpp
@@ -35,7 +35,7 @@
 #include "viewmanager.h"
 #include <private/qrichtext_p.h>
 #include "editor.h"
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqpopupmenu.h>
 #include "paragdata.h"
 
diff --git a/tools/designer/editor/preferences.ui b/tools/designer/editor/preferences.ui
index 19bdea43..a4085df7 100644
--- a/tools/designer/editor/preferences.ui
+++ b/tools/designer/editor/preferences.ui
@@ -476,11 +476,11 @@
     <include location="global" impldecl="in implementation">ntqlineedit.h</include>
     <include location="global" impldecl="in implementation">ntqpixmap.h</include>
     <include location="global" impldecl="in implementation">ntqcombobox.h</include>
-    <include location="global" impldecl="in implementation">ntqfontdatabase.h</include>
+    <include location="global" impldecl="in implementation">tqfontdatabase.h</include>
     <include location="local" impldecl="in implementation">editor.h</include>
     <include location="global" impldecl="in implementation">ntqpushbutton.h</include>
     <include location="global" impldecl="in implementation">ntqcheckbox.h</include>
-    <include location="global" impldecl="in implementation">ntqcolordialog.h</include>
+    <include location="global" impldecl="in implementation">tqcolordialog.h</include>
     <include location="global" impldecl="in implementation">tqsettings.h</include>
     <include location="local" impldecl="in implementation">preferences.ui.h</include>
 </includes>
diff --git a/tools/designer/examples/colortool/colornameform.ui.h b/tools/designer/examples/colortool/colornameform.ui.h
index dc651554..70d7f62f 100644
--- a/tools/designer/examples/colortool/colornameform.ui.h
+++ b/tools/designer/examples/colortool/colornameform.ui.h
@@ -5,7 +5,7 @@
 ** update this file, preserving your code. Create an init() function in place
 ** of a constructor, and a destroy() function in place of a destructor.
 *****************************************************************************/
-#include <ntqcolor.h>
+#include <tqcolor.h>
 #include <tqmap.h>
 #include <tqstring.h>
 
diff --git a/tools/designer/examples/colortool/mainform.ui b/tools/designer/examples/colortool/mainform.ui
index 177ecfe5..199c9bf0 100644
--- a/tools/designer/examples/colortool/mainform.ui
+++ b/tools/designer/examples/colortool/mainform.ui
@@ -516,14 +516,14 @@
     <include location="local" impldecl="in implementation">ntqradiobutton.h</include>
     <include location="local" impldecl="in implementation">ntqcheckbox.h</include>
     <include location="local" impldecl="in implementation">colornameform.h</include>
-    <include location="local" impldecl="in implementation">ntqcolordialog.h</include>
+    <include location="local" impldecl="in implementation">tqcolordialog.h</include>
     <include location="local" impldecl="in implementation">tqregexp.h</include>
     <include location="local" impldecl="in implementation">tqfile.h</include>
     <include location="local" impldecl="in implementation">tqfiledialog.h</include>
     <include location="local" impldecl="in implementation">ntqapplication.h</include>
-    <include location="local" impldecl="in implementation">ntqcolor.h</include>
+    <include location="local" impldecl="in implementation">tqcolor.h</include>
     <include location="local" impldecl="in implementation">tqstring.h</include>
-    <include location="local" impldecl="in implementation">ntqpainter.h</include>
+    <include location="local" impldecl="in implementation">tqpainter.h</include>
     <include location="local" impldecl="in implementation">tqstatusbar.h</include>
     <include location="local" impldecl="in implementation">ntqmessagebox.h</include>
     <include location="local" impldecl="in implementation">tqclipboard.h</include>
diff --git a/tools/designer/examples/richedit/richedit.ui b/tools/designer/examples/richedit/richedit.ui
index c27ba8b4..204ba230 100644
--- a/tools/designer/examples/richedit/richedit.ui
+++ b/tools/designer/examples/richedit/richedit.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>EditorForm</class>
 <include location="global" impldecl="in implementation">tqfile.h</include>
-<include location="global" impldecl="in implementation">ntqfontdatabase.h</include>
+<include location="global" impldecl="in implementation">tqfontdatabase.h</include>
 <include location="global" impldecl="in implementation">ntqmessagebox.h</include>
 <include location="global" impldecl="in implementation">ntqapplication.h</include>
 <include location="global" impldecl="in implementation">tqfiledialog.h</include>
diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp
index 924eef88..3744f750 100644
--- a/tools/designer/plugins/dlg/dlg2ui.cpp
+++ b/tools/designer/plugins/dlg/dlg2ui.cpp
@@ -107,7 +107,7 @@ static const struct {
     { "DlgWidget", "DataVarName", 0, 0 },
     { "DlgWidget", "Enabled", "enabled", "boolean" },
     { "DlgWidget", "FocusPolicy", "focusPolicy", "enum" },
-    { "DlgWidget", "Font", "font", "qfont" },
+    { "DlgWidget", "Font", "font", "tqfont" },
     { "DlgWidget", "FontPropagation", 0, 0 },
     { "DlgWidget", "MaximumSize", "maximumSize", "tqsize" },
     { "DlgWidget", "MinimumSize", "minimumSize", "tqsize" },
@@ -926,16 +926,16 @@ TQVariant Dlg2Ui::getValue( const TQDomElement& e, const TQString& tagName,
 	    return TQPoint( x, y );
 	} else if ( type == TQString("qpalette") ) {
 	    TQColorGroup active = getValue( children, TQString("Active"),
-					   TQString("qcolorgroup") )
+					   TQString("tqcolorgroup") )
 					   .toColorGroup();
 	    TQColorGroup disabled = getValue( children, TQString("Disabled"),
-					   TQString("qcolorgroup") )
+					   TQString("tqcolorgroup") )
 					   .toColorGroup();
 	    TQColorGroup inactive = getValue( children, TQString("Inactive"),
-					   TQString("qcolorgroup") )
+					   TQString("tqcolorgroup") )
 					   .toColorGroup();
 	    return TQPalette( active, disabled, inactive );
-	} else if ( type == TQString("qfont") ) {
+	} else if ( type == TQString("tqfont") ) {
 	    TQString family = getValue( children, TQString("Family"),
 				       TQString("tqstring") ).toString();
 	    int pointSize = getValue( children, TQString("PointSize"),
@@ -964,7 +964,7 @@ TQVariant Dlg2Ui::getValue( const TQDomElement& e, const TQString& tagName,
 	    if ( styleHint != 0 )
 		f.setStyleHint( (TQFont::StyleHint) styleHint );
 	    return f;
-	} else if ( type == TQString("qcolor") ) {
+	} else if ( type == TQString("tqcolor") ) {
 	    // if any component missing, zero is to be assumed
 	    int red = getValue( children, TQString("Red"), TQString("integer") )
 		      .toInt();
@@ -973,7 +973,7 @@ TQVariant Dlg2Ui::getValue( const TQDomElement& e, const TQString& tagName,
 	    int blue = getValue( children, TQString("Blue"), TQString("integer") )
 		       .toInt();
 	    return TQColor( red, green, blue );
-	} else if ( type == TQString("qcolorgroup") ) {
+	} else if ( type == TQString("tqcolorgroup") ) {
 	    static const TQColorGroup::ColorRole roles[NumColorRoles] = {
 		TQColorGroup::Foreground, TQColorGroup::Button,
 		TQColorGroup::Light, TQColorGroup::Midlight, TQColorGroup::Dark,
@@ -992,7 +992,7 @@ TQVariant Dlg2Ui::getValue( const TQDomElement& e, const TQString& tagName,
 	    for ( int i = 0; i < NumColorRoles; i++ )
 		group.setColor( roles[i],
 				getValue(children, TQString(roleNames[i]),
-					 TQString("qcolor")).toColor() );
+					 TQString("tqcolor")).toColor() );
 	    return group;
 	} else {
 	    syntaxError();
diff --git a/tools/designer/shared/domtool.cpp b/tools/designer/shared/domtool.cpp
index 62d0b70d..de7ed556 100644
--- a/tools/designer/shared/domtool.cpp
+++ b/tools/designer/shared/domtool.cpp
@@ -34,12 +34,12 @@
 #include "domtool.h"
 
 #include <tqsizepolicy.h>
-#include <ntqcolor.h>
+#include <tqcolor.h>
 #include <ntqcursor.h>
 #include <tqdatetime.h>
 #include <ntqrect.h>
 #include <tqsize.h>
-#include <ntqfont.h>
+#include <tqfont.h>
 #include <tqdom.h>
 
 /*!
diff --git a/tools/designer/shared/globaldefs.h b/tools/designer/shared/globaldefs.h
index f093e0a3..a92e2a46 100644
--- a/tools/designer/shared/globaldefs.h
+++ b/tools/designer/shared/globaldefs.h
@@ -34,7 +34,7 @@
 #ifndef GLOBALDEFS_H
 #define GLOBALDEFS_H
 
-#include <ntqcolor.h>
+#include <tqcolor.h>
 #include <ntqapplication.h>
 
 #define BOXLAYOUT_DEFAULT_MARGIN 11
diff --git a/tools/designer/shared/ui2uib.cpp b/tools/designer/shared/ui2uib.cpp
index 990f66b3..0dd01e4b 100644
--- a/tools/designer/shared/ui2uib.cpp
+++ b/tools/designer/shared/ui2uib.cpp
@@ -36,12 +36,12 @@
 
 #include <domtool.h>
 
-#include <ntqcolor.h>
+#include <tqcolor.h>
 #include <ntqcursor.h>
 #include <tqdatetime.h>
 #include <tqdom.h>
 #include <tqfile.h>
-#include <ntqfont.h>
+#include <tqfont.h>
 #include <tqobject.h>
 #include <ntqrect.h>
 #include <tqsizepolicy.h>
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index c5430d78..e69f004d 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -64,6 +64,7 @@ static bool was_in_setup = FALSE;
 // It will be removed afterwards
 static TQString converted_widgets[] =
 {
+    "TQColorDialog",
     "TQDateTimeEdit",
     "TQFileDialog",
     "TQIconView",
-- 
cgit v1.2.1