3 files changed, 12 insertions, 9 deletions
diff --git a/tools/designer/shared/domtool.cpp b/tools/designer/shared/domtool.cpp
index dce35751d..62d0b70df 100644
--- a/tools/designer/shared/domtool.cpp
+++ b/tools/designer/shared/domtool.cpp
@@ -33,12 +33,12 @@
 
 #include "domtool.h"
 
-#include <ntqsizepolicy.h>
+#include <tqsizepolicy.h>
 #include <ntqcolor.h>
 #include <ntqcursor.h>
 #include <tqdatetime.h>
 #include <ntqrect.h>
-#include <ntqsize.h>
+#include <tqsize.h>
 #include <ntqfont.h>
 #include <tqdom.h>
 
diff --git a/tools/designer/shared/ui2uib.cpp b/tools/designer/shared/ui2uib.cpp
index 6d20635d3..e310576f0 100644
--- a/tools/designer/shared/ui2uib.cpp
+++ b/tools/designer/shared/ui2uib.cpp
@@ -44,7 +44,7 @@
 #include <ntqfont.h>
 #include <tqobject.h>
 #include <ntqrect.h>
-#include <ntqsizepolicy.h>
+#include <tqsizepolicy.h>
 
 /*
     The .uib file format is the binary counterpart of the .ui file
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index fce3e83de..5648f5631 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -65,9 +65,12 @@ static bool was_in_setup = FALSE;
 static TQString converted_widgets[] =
 {
     "TQDateTimeEdit",
-    "TQIconView", 
-    "TQTextBrowser", "TQTextEdit", "TQTextView",
-    "TQWidget", "TQWidgetStack",
+    "TQIconView",
+    "TQMainWindow", "TQMenuBar",
+    "TQPopupMenu",
+    "TQStatusBar", "TQSizeGrip",
+    "TQTextBrowser", "TQTextEdit", "TQTextView", "TQToolBar", "TQToolBox", "TQToolButton", "TQToolTip",
+    "TQWidget", "TQWidgetStack", "TQWorkspace"
 };
 size_t converted_widgets_size = sizeof(converted_widgets) / sizeof(TQString);
 
@@ -526,7 +529,7 @@ void WidgetDatabase::setupDataBase( int id )
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
     r->name = "TQMainWindow";
-    r->includeFile = "ntqmainwindow.h";
+    r->includeFile = "tqmainwindow.h";
     r->group = widgetGroup( "Temp" );
     r->isContainer = TRUE;
 
@@ -535,7 +538,7 @@ void WidgetDatabase::setupDataBase( int id )
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
     r->name = "TQDesignerAction";
-    r->includeFile = "ntqaction.h";
+    r->includeFile = "tqaction.h";
     r->group = widgetGroup( "Temp" );
     r->isContainer = FALSE;
 
@@ -544,7 +547,7 @@ void WidgetDatabase::setupDataBase( int id )
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
     r->name = "TQDesignerActionGroup";
-    r->includeFile = "ntqaction.h";
+    r->includeFile = "tqaction.h";
     r->group = widgetGroup( "Temp" );
     r->isContainer = FALSE;