summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/tabbedbrowser.ui.h2
-rw-r--r--tools/designer/designer/command.cpp2
-rw-r--r--tools/designer/designer/command.h2
-rw-r--r--tools/designer/designer/iconvieweditorimpl.cpp2
-rw-r--r--tools/designer/designer/newformimpl.cpp2
-rw-r--r--tools/designer/designer/newformimpl.h2
-rw-r--r--tools/designer/designer/pixmapchooser.cpp2
-rw-r--r--tools/designer/designer/resource.cpp2
-rw-r--r--tools/designer/designer/startdialogimpl.cpp2
-rw-r--r--tools/designer/designer/startdialogimpl.h2
-rw-r--r--tools/designer/designer/widgetfactory.cpp2
-rw-r--r--tools/designer/designer/widgetfactory.h2
-rw-r--r--tools/designer/plugins/wizards/mainwindowwizard.ui2
-rw-r--r--tools/designer/shared/widgetdatabase.cpp1
-rw-r--r--tools/designer/shared/widgetdatabase.h2
-rw-r--r--tools/designer/uilib/tqwidgetfactory.cpp2
16 files changed, 16 insertions, 15 deletions
diff --git a/tools/assistant/tabbedbrowser.ui.h b/tools/assistant/tabbedbrowser.ui.h
index 2d0a04393..b5c5bd5e6 100644
--- a/tools/assistant/tabbedbrowser.ui.h
+++ b/tools/assistant/tabbedbrowser.ui.h
@@ -10,7 +10,7 @@
#include <ntqfileinfo.h>
#include <ntqtoolbutton.h>
#include <ntqpixmap.h>
-#include <ntqiconset.h>
+#include <tqiconset.h>
#include <ntqstyle.h>
#include <ntqtimer.h>
diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp
index fd33209b1..8708ccb9f 100644
--- a/tools/designer/designer/command.cpp
+++ b/tools/designer/designer/command.cpp
@@ -53,7 +53,7 @@
#include <ntqlayout.h>
#include <ntqmessagebox.h>
#include <ntqlistbox.h>
-#include <ntqiconview.h>
+#include <tqiconview.h>
#include <tqtextedit.h>
#include <tqptrstack.h>
#include <ntqheader.h>
diff --git a/tools/designer/designer/command.h b/tools/designer/designer/command.h
index 88a25956c..354ed7669 100644
--- a/tools/designer/designer/command.h
+++ b/tools/designer/designer/command.h
@@ -45,7 +45,7 @@
#include <ntqlistview.h>
#include <tqptrlist.h>
#include <tqmap.h>
-#include <ntqiconset.h>
+#include <tqiconset.h>
class TQWizard;
class TQTabWidget;
diff --git a/tools/designer/designer/iconvieweditorimpl.cpp b/tools/designer/designer/iconvieweditorimpl.cpp
index a98f7dd80..7f45cda5e 100644
--- a/tools/designer/designer/iconvieweditorimpl.cpp
+++ b/tools/designer/designer/iconvieweditorimpl.cpp
@@ -38,7 +38,7 @@
#include <ntqlineedit.h>
#include <ntqlabel.h>
-#include <ntqiconview.h>
+#include <tqiconview.h>
#include <ntqpushbutton.h>
#include <ntqcheckbox.h>
diff --git a/tools/designer/designer/newformimpl.cpp b/tools/designer/designer/newformimpl.cpp
index 378fcabfe..f2c9eacf1 100644
--- a/tools/designer/designer/newformimpl.cpp
+++ b/tools/designer/designer/newformimpl.cpp
@@ -44,7 +44,7 @@
#include "projectsettingsimpl.h"
#include "sourcefile.h"
-#include <ntqiconview.h>
+#include <tqiconview.h>
#include <ntqlabel.h>
#include <ntqfileinfo.h>
#include <ntqdir.h>
diff --git a/tools/designer/designer/newformimpl.h b/tools/designer/designer/newformimpl.h
index 3b9413387..7b981be0a 100644
--- a/tools/designer/designer/newformimpl.h
+++ b/tools/designer/designer/newformimpl.h
@@ -35,7 +35,7 @@
#define NEWFORMIMPL_H
#include "newform.h"
-#include <ntqiconview.h>
+#include <tqiconview.h>
class Project;
diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp
index ce63c4d2e..2883678a2 100644
--- a/tools/designer/designer/pixmapchooser.cpp
+++ b/tools/designer/designer/pixmapchooser.cpp
@@ -50,7 +50,7 @@
#include <ntqlabel.h>
#include <ntqlineedit.h>
#include <ntqpushbutton.h>
-#include <ntqiconview.h>
+#include <tqiconview.h>
#if defined(DESIGNER)
static ImageIconProvider *imageIconProvider = 0;
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index 9655ee4eb..315cbe5fc 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -59,7 +59,7 @@
#include <ntqfeatures.h>
#include <ntqfile.h>
#include <ntqheader.h>
-#include <ntqiconview.h>
+#include <tqiconview.h>
#include <ntqlabel.h>
#include <ntqlayout.h>
#include <ntqlistbox.h>
diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp
index cbf15601c..947a9410d 100644
--- a/tools/designer/designer/startdialogimpl.cpp
+++ b/tools/designer/designer/startdialogimpl.cpp
@@ -1,7 +1,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqptrlist.h>
-#include <ntqiconview.h>
+#include <tqiconview.h>
#include <ntqcombobox.h>
#include <ntqlabel.h>
#include <ntqfiledialog.h>
diff --git a/tools/designer/designer/startdialogimpl.h b/tools/designer/designer/startdialogimpl.h
index 3480c5714..2e86e0c6c 100644
--- a/tools/designer/designer/startdialogimpl.h
+++ b/tools/designer/designer/startdialogimpl.h
@@ -34,7 +34,7 @@
#ifndef STARTDIALOGIMPL_H
#define STARTDIALOGIMPL_H
-#include <ntqiconview.h>
+#include <tqiconview.h>
#include <ntqlistview.h>
#include <tqstring.h>
#include <tqstringlist.h>
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index 30f10c096..c52add638 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -56,7 +56,7 @@
#include <ntqpixmap.h>
#include <ntqgroupbox.h>
-#include <ntqiconview.h>
+#include <tqiconview.h>
#ifndef TQT_NO_TABLE
#include <ntqtable.h>
#endif
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index be9a4849d..e4bba6709 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -35,7 +35,7 @@
#define WIDGETFACTORY_H
#include <ntqvariant.h>
-#include <ntqiconset.h>
+#include <tqiconset.h>
#include <tqstring.h>
#include <ntqintdict.h>
#include <ntqtabwidget.h>
diff --git a/tools/designer/plugins/wizards/mainwindowwizard.ui b/tools/designer/plugins/wizards/mainwindowwizard.ui
index 2382b5f1c..f8688e861 100644
--- a/tools/designer/plugins/wizards/mainwindowwizard.ui
+++ b/tools/designer/plugins/wizards/mainwindowwizard.ui
@@ -33,7 +33,7 @@
**
*********************************************************************</comment>
<include location="global" impldecl="in implementation">designerinterface.h</include>
-<include location="global" impldecl="in implementation">ntqiconset.h</include>
+<include location="global" impldecl="in implementation">tqiconset.h</include>
<include location="global" impldecl="in implementation">ntqaction.h</include>
<include location="global" impldecl="in implementation">ntqpixmap.h</include>
<include location="global" impldecl="in implementation">ntqdict.h</include>
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index a7585d895..3481491ae 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[] =
{
+ "TQIconView",
"TQTextBrowser", "TQTextEdit", "TQTextView",
"TQWidget", "TQWidgetStack",
};
diff --git a/tools/designer/shared/widgetdatabase.h b/tools/designer/shared/widgetdatabase.h
index 15892ded0..234c7c974 100644
--- a/tools/designer/shared/widgetdatabase.h
+++ b/tools/designer/shared/widgetdatabase.h
@@ -34,7 +34,7 @@
#ifndef WIDGETDATABASE_H
#define WIDGETDATABASE_H
-#include <ntqiconset.h>
+#include <tqiconset.h>
#include <tqstring.h>
#include "../interfaces/widgetinterface.h" // up here for GCC 2.7.* compatibility
#include <private/qpluginmanager_p.h>
diff --git a/tools/designer/uilib/tqwidgetfactory.cpp b/tools/designer/uilib/tqwidgetfactory.cpp
index 420bdc8c5..ead498175 100644
--- a/tools/designer/uilib/tqwidgetfactory.cpp
+++ b/tools/designer/uilib/tqwidgetfactory.cpp
@@ -65,7 +65,7 @@
#include <ntqradiobutton.h>
#include <ntqgroupbox.h>
#include <ntqbuttongroup.h>
-#include <ntqiconview.h>
+#include <tqiconview.h>
#include <ntqheader.h>
#ifndef TQT_NO_TABLE
#include <ntqtable.h>