summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
Diffstat (limited to 'tools/assistant')
-rw-r--r--tools/assistant/config.cpp12
-rw-r--r--tools/assistant/config.h8
-rw-r--r--tools/assistant/docuparser.cpp12
-rw-r--r--tools/assistant/docuparser.h6
-rw-r--r--tools/assistant/finddialog.ui4
-rw-r--r--tools/assistant/finddialog.ui.h2
-rw-r--r--tools/assistant/helpdialogimpl.cpp50
-rw-r--r--tools/assistant/helpdialogimpl.h16
-rw-r--r--tools/assistant/helpwindow.cpp26
-rw-r--r--tools/assistant/helpwindow.h2
-rw-r--r--tools/assistant/index.cpp10
-rw-r--r--tools/assistant/index.h8
-rw-r--r--tools/assistant/lib/lib.pro2
-rw-r--r--tools/assistant/lib/ntqassistantclient.h (renamed from tools/assistant/lib/qassistantclient.h)2
-rw-r--r--tools/assistant/lib/qassistantclient.cpp12
-rw-r--r--tools/assistant/main.cpp20
-rw-r--r--tools/assistant/mainwindow.ui50
-rw-r--r--tools/assistant/mainwindow.ui.h20
-rw-r--r--tools/assistant/profile.cpp10
-rw-r--r--tools/assistant/profile.h8
-rw-r--r--tools/assistant/settingsdialogimpl.cpp34
-rw-r--r--tools/assistant/settingsdialogimpl.h6
-rw-r--r--tools/assistant/tabbedbrowser.ui6
-rw-r--r--tools/assistant/tabbedbrowser.ui.h12
-rw-r--r--tools/assistant/topicchooserimpl.cpp6
-rw-r--r--tools/assistant/topicchooserimpl.h2
26 files changed, 173 insertions, 173 deletions
diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp
index 931985bd..9a829589 100644
--- a/tools/assistant/config.cpp
+++ b/tools/assistant/config.cpp
@@ -35,12 +35,12 @@
#include "profile.h"
#include "docuparser.h"
-#include <qapplication.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qsettings.h>
-#include <qxml.h>
+#include <ntqapplication.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqsettings.h>
+#include <ntqxml.h>
static Config *static_configuration = 0;
diff --git a/tools/assistant/config.h b/tools/assistant/config.h
index 9a38fb8a..3bf6c6ad 100644
--- a/tools/assistant/config.h
+++ b/tools/assistant/config.h
@@ -36,10 +36,10 @@
#include "profile.h"
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qpixmap.h>
-#include <qmap.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqpixmap.h>
+#include <ntqmap.h>
class Profile;
diff --git a/tools/assistant/docuparser.cpp b/tools/assistant/docuparser.cpp
index 3d21d286..158d10d9 100644
--- a/tools/assistant/docuparser.cpp
+++ b/tools/assistant/docuparser.cpp
@@ -34,12 +34,12 @@
#include "docuparser.h"
#include "profile.h"
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qxml.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqregexp.h>
+#include <ntqstring.h>
+#include <ntqxml.h>
TQDataStream &operator>>( TQDataStream &s, ContentItem &ci )
{
diff --git a/tools/assistant/docuparser.h b/tools/assistant/docuparser.h
index 820766c3..919c3145 100644
--- a/tools/assistant/docuparser.h
+++ b/tools/assistant/docuparser.h
@@ -34,9 +34,9 @@
#ifndef DOCUPARSER_H
#define DOCUPARSER_H
-#include <qxml.h>
-#include <qptrlist.h>
-#include <qmap.h>
+#include <ntqxml.h>
+#include <ntqptrlist.h>
+#include <ntqmap.h>
class Profile;
diff --git a/tools/assistant/finddialog.ui b/tools/assistant/finddialog.ui
index 6e7e8253..7b09fe96 100644
--- a/tools/assistant/finddialog.ui
+++ b/tools/assistant/finddialog.ui
@@ -254,8 +254,8 @@
<tabstop>PushButton2</tabstop>
</tabstops>
<includes>
- <include location="global" impldecl="in implementation">qstatusbar.h</include>
- <include location="global" impldecl="in implementation">qtextbrowser.h</include>
+ <include location="global" impldecl="in implementation">ntqstatusbar.h</include>
+ <include location="global" impldecl="in implementation">ntqtextbrowser.h</include>
<include location="local" impldecl="in implementation">mainwindow.h</include>
<include location="local" impldecl="in implementation">tabbedbrowser.h</include>
<include location="local" impldecl="in implementation">finddialog.ui.h</include>
diff --git a/tools/assistant/finddialog.ui.h b/tools/assistant/finddialog.ui.h
index 7e07a4f9..f356dd4c 100644
--- a/tools/assistant/finddialog.ui.h
+++ b/tools/assistant/finddialog.ui.h
@@ -31,7 +31,7 @@
**
**********************************************************************/
-#include <qapplication.h>
+#include <ntqapplication.h>
void FindDialog::init()
{
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index 81d216f8..f299ee8e 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -39,31 +39,31 @@
#include "config.h"
#include "tabbedbrowser.h"
-#include <qaccel.h>
-#include <qapplication.h>
-#include <qcursor.h>
-#include <qdir.h>
-#include <qeventloop.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qheader.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qmessagebox.h>
-#include <qpixmap.h>
-#include <qprogressbar.h>
-#include <qptrlist.h>
-#include <qptrstack.h>
-#include <qpushbutton.h>
-#include <qregexp.h>
-#include <qsettings.h>
-#include <qstatusbar.h>
-#include <qtabwidget.h>
-#include <qtextbrowser.h>
-#include <qtextstream.h>
-#include <qtimer.h>
-#include <qurl.h>
-#include <qvalidator.h>
+#include <ntqaccel.h>
+#include <ntqapplication.h>
+#include <ntqcursor.h>
+#include <ntqdir.h>
+#include <ntqeventloop.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqheader.h>
+#include <ntqlabel.h>
+#include <ntqlineedit.h>
+#include <ntqmessagebox.h>
+#include <ntqpixmap.h>
+#include <ntqprogressbar.h>
+#include <ntqptrlist.h>
+#include <ntqptrstack.h>
+#include <ntqpushbutton.h>
+#include <ntqregexp.h>
+#include <ntqsettings.h>
+#include <ntqstatusbar.h>
+#include <ntqtabwidget.h>
+#include <ntqtextbrowser.h>
+#include <ntqtextstream.h>
+#include <ntqtimer.h>
+#include <ntqurl.h>
+#include <ntqvalidator.h>
#include <stdlib.h>
#include <limits.h>
diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h
index a12317b8..04faa1f5 100644
--- a/tools/assistant/helpdialogimpl.h
+++ b/tools/assistant/helpdialogimpl.h
@@ -39,14 +39,14 @@
#include "helpwindow.h"
#include "docuparser.h"
-#include <qlistbox.h>
-#include <qlistview.h>
-#include <qmap.h>
-#include <qstringlist.h>
-#include <qvalidator.h>
-#include <qpopupmenu.h>
-#include <qdict.h>
-#include <qpopupmenu.h>
+#include <ntqlistbox.h>
+#include <ntqlistview.h>
+#include <ntqmap.h>
+#include <ntqstringlist.h>
+#include <ntqvalidator.h>
+#include <ntqpopupmenu.h>
+#include <ntqdict.h>
+#include <ntqpopupmenu.h>
class TQProgressBar;
class MainWindow;
diff --git a/tools/assistant/helpwindow.cpp b/tools/assistant/helpwindow.cpp
index 3230afce..266fa972 100644
--- a/tools/assistant/helpwindow.cpp
+++ b/tools/assistant/helpwindow.cpp
@@ -37,19 +37,19 @@
#include "helpdialogimpl.h"
#include "config.h"
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qurl.h>
-#include <qmessagebox.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qprocess.h>
-#include <qpopupmenu.h>
-#include <qaction.h>
-#include <qfileinfo.h>
-#include <qevent.h>
-#include <qtextstream.h>
-#include <qtextcodec.h>
+#include <ntqapplication.h>
+#include <ntqclipboard.h>
+#include <ntqurl.h>
+#include <ntqmessagebox.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqprocess.h>
+#include <ntqpopupmenu.h>
+#include <ntqaction.h>
+#include <ntqfileinfo.h>
+#include <ntqevent.h>
+#include <ntqtextstream.h>
+#include <ntqtextcodec.h>
#if defined(Q_OS_WIN32)
#include <windows.h>
diff --git a/tools/assistant/helpwindow.h b/tools/assistant/helpwindow.h
index d12ece1f..db89947d 100644
--- a/tools/assistant/helpwindow.h
+++ b/tools/assistant/helpwindow.h
@@ -34,7 +34,7 @@
#ifndef HELPWINDOW_H
#define HELPWINDOW_H
-#include <qtextbrowser.h>
+#include <ntqtextbrowser.h>
class MainWindow;
class TQKeyEvent;
diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp
index 4f04f595..4ce081de 100644
--- a/tools/assistant/index.cpp
+++ b/tools/assistant/index.cpp
@@ -33,11 +33,11 @@
#include "index.h"
-#include <qfile.h>
-#include <qdir.h>
-#include <qstringlist.h>
-#include <qdict.h>
-#include <qapplication.h>
+#include <ntqfile.h>
+#include <ntqdir.h>
+#include <ntqstringlist.h>
+#include <ntqdict.h>
+#include <ntqapplication.h>
#include <ctype.h>
diff --git a/tools/assistant/index.h b/tools/assistant/index.h
index 236b03db..333e41b7 100644
--- a/tools/assistant/index.h
+++ b/tools/assistant/index.h
@@ -34,10 +34,10 @@
#ifndef INDEX_H
#define INDEX_H
-#include <qstringlist.h>
-#include <qdict.h>
-#include <qdatastream.h>
-#include <qobject.h>
+#include <ntqstringlist.h>
+#include <ntqdict.h>
+#include <ntqdatastream.h>
+#include <ntqobject.h>
struct Document {
Document( int d, int f ) : docNumber( d ), frequency( f ) {}
diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro
index 09beced5..af1b1c6c 100644
--- a/tools/assistant/lib/lib.pro
+++ b/tools/assistant/lib/lib.pro
@@ -7,7 +7,7 @@ CONFIG += staticlib
CONFIG -= dll
SOURCES = qassistantclient.cpp
-HEADERS += $$QT_SOURCE_TREE/include/qassistantclient.h
+HEADERS += $$QT_SOURCE_TREE/include/ntqassistantclient.h
DEFINES += QT_INTERNAL_NETWORK
diff --git a/tools/assistant/lib/qassistantclient.h b/tools/assistant/lib/ntqassistantclient.h
index 891dc1ba..28fd6693 100644
--- a/tools/assistant/lib/qassistantclient.h
+++ b/tools/assistant/lib/ntqassistantclient.h
@@ -34,7 +34,7 @@
#ifndef TQASSISTANTCLIENT_H
#define TQASSISTANTCLIENT_H
-#include <qobject.h>
+#include <ntqobject.h>
class TQSocket;
class TQProcess;
diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp
index d6acac3c..b0fc0df3 100644
--- a/tools/assistant/lib/qassistantclient.cpp
+++ b/tools/assistant/lib/qassistantclient.cpp
@@ -31,13 +31,13 @@
**
**********************************************************************/
-#include "qassistantclient.h"
+#include "ntqassistantclient.h"
-#include <qsocket.h>
-#include <qtextstream.h>
-#include <qprocess.h>
-#include <qtimer.h>
-#include <qfileinfo.h>
+#include <ntqsocket.h>
+#include <ntqtextstream.h>
+#include <ntqprocess.h>
+#include <ntqtimer.h>
+#include <ntqfileinfo.h>
class TQAssistantClientPrivate
{
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index b0c0082a..dc99b7a1 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -35,18 +35,18 @@
#include "helpdialogimpl.h"
#include "config.h"
-#include <qapplication.h>
-#include <qserversocket.h>
-#include <qsocket.h>
-#include <qpixmap.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
-#include <qdir.h>
-#include <qmessagebox.h>
-#include <qguardedptr.h>
+#include <ntqapplication.h>
+#include <ntqserversocket.h>
+#include <ntqsocket.h>
+#include <ntqpixmap.h>
+#include <ntqptrlist.h>
+#include <ntqstringlist.h>
+#include <ntqdir.h>
+#include <ntqmessagebox.h>
+#include <ntqguardedptr.h>
#include <stdlib.h>
#include <stdio.h>
-#include <qtextcodec.h>
+#include <ntqtextcodec.h>
#ifdef Q_WS_WIN
#define INDEX_CHECK( text ) if( i+1 >= argc ) { TQMessageBox::information( 0, "TQt Assistant", text ); return 1; }
diff --git a/tools/assistant/mainwindow.ui b/tools/assistant/mainwindow.ui
index a5d87237..7087e2f3 100644
--- a/tools/assistant/mainwindow.ui
+++ b/tools/assistant/mainwindow.ui
@@ -570,37 +570,37 @@
</connection>
</connections>
<includes>
- <include location="global" impldecl="in implementation">qtoolbutton.h</include>
+ <include location="global" impldecl="in implementation">ntqtoolbutton.h</include>
<include location="local" impldecl="in implementation">settingsdialogimpl.h</include>
- <include location="global" impldecl="in implementation">qmessagebox.h</include>
- <include location="global" impldecl="in implementation">qfontdatabase.h</include>
- <include location="global" impldecl="in implementation">qaccel.h</include>
- <include location="global" impldecl="in implementation">qcombobox.h</include>
- <include location="global" impldecl="in implementation">qpaintdevicemetrics.h</include>
- <include location="global" impldecl="in implementation">qsimplerichtext.h</include>
- <include location="global" impldecl="in implementation">qfileinfo.h</include>
- <include location="global" impldecl="in implementation">qtextstream.h</include>
- <include location="global" impldecl="in implementation">qdockwindow.h</include>
+ <include location="global" impldecl="in implementation">ntqmessagebox.h</include>
+ <include location="global" impldecl="in implementation">ntqfontdatabase.h</include>
+ <include location="global" impldecl="in implementation">ntqaccel.h</include>
+ <include location="global" impldecl="in implementation">ntqcombobox.h</include>
+ <include location="global" impldecl="in implementation">ntqpaintdevicemetrics.h</include>
+ <include location="global" impldecl="in implementation">ntqsimplerichtext.h</include>
+ <include location="global" impldecl="in implementation">ntqfileinfo.h</include>
+ <include location="global" impldecl="in implementation">ntqtextstream.h</include>
+ <include location="global" impldecl="in implementation">ntqdockwindow.h</include>
<include location="global" impldecl="in implementation">stdlib.h</include>
- <include location="global" impldecl="in implementation">qmime.h</include>
+ <include location="global" impldecl="in implementation">ntqmime.h</include>
<include location="local" impldecl="in implementation">helpwindow.h</include>
- <include location="global" impldecl="in implementation">qstylesheet.h</include>
- <include location="global" impldecl="in implementation">qapplication.h</include>
+ <include location="global" impldecl="in implementation">ntqstylesheet.h</include>
+ <include location="global" impldecl="in implementation">ntqapplication.h</include>
<include location="local" impldecl="in implementation">helpdialogimpl.h</include>
- <include location="global" impldecl="in implementation">qdir.h</include>
- <include location="global" impldecl="in implementation">qprinter.h</include>
- <include location="global" impldecl="in implementation">qpainter.h</include>
- <include location="global" impldecl="in implementation">qurl.h</include>
- <include location="global" impldecl="in implementation">qstatusbar.h</include>
- <include location="global" impldecl="in implementation">qlineedit.h</include>
- <include location="global" impldecl="in implementation">qsettings.h</include>
- <include location="global" impldecl="in implementation">qcheckbox.h</include>
+ <include location="global" impldecl="in implementation">ntqdir.h</include>
+ <include location="global" impldecl="in implementation">ntqprinter.h</include>
+ <include location="global" impldecl="in implementation">ntqpainter.h</include>
+ <include location="global" impldecl="in implementation">ntqurl.h</include>
+ <include location="global" impldecl="in implementation">ntqstatusbar.h</include>
+ <include location="global" impldecl="in implementation">ntqlineedit.h</include>
+ <include location="global" impldecl="in implementation">ntqsettings.h</include>
+ <include location="global" impldecl="in implementation">ntqcheckbox.h</include>
<include location="local" impldecl="in implementation">tabbedbrowser.h</include>
- <include location="global" impldecl="in declaration">qptrlist.h</include>
- <include location="global" impldecl="in declaration">qguardedptr.h</include>
- <include location="global" impldecl="in declaration">qmap.h</include>
+ <include location="global" impldecl="in declaration">ntqptrlist.h</include>
+ <include location="global" impldecl="in declaration">ntqguardedptr.h</include>
+ <include location="global" impldecl="in declaration">ntqmap.h</include>
<include location="local" impldecl="in declaration">finddialog.h</include>
- <include location="global" impldecl="in declaration">qstringlist.h</include>
+ <include location="global" impldecl="in declaration">ntqstringlist.h</include>
<include location="local" impldecl="in declaration">helpwindow.h</include>
<include location="local" impldecl="in implementation">mainwindow.ui.h</include>
</includes>
diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h
index 9b4c7d97..a0824271 100644
--- a/tools/assistant/mainwindow.ui.h
+++ b/tools/assistant/mainwindow.ui.h
@@ -33,16 +33,16 @@
#include "config.h"
-#include <qtabwidget.h>
-#include <qfileinfo.h>
-#include <qaccel.h>
-#include <qobjectlist.h>
-#include <qtimer.h>
-#include <qdragobject.h>
-#include <qfontinfo.h>
-#include <qaccel.h>
-#include <qmetaobject.h>
-#include <qeventloop.h>
+#include <ntqtabwidget.h>
+#include <ntqfileinfo.h>
+#include <ntqaccel.h>
+#include <ntqobjectlist.h>
+#include <ntqtimer.h>
+#include <ntqdragobject.h>
+#include <ntqfontinfo.h>
+#include <ntqaccel.h>
+#include <ntqmetaobject.h>
+#include <ntqeventloop.h>
TQPtrList<MainWindow> *MainWindow::windows = 0;
diff --git a/tools/assistant/profile.cpp b/tools/assistant/profile.cpp
index 8eb7330d..231520ee 100644
--- a/tools/assistant/profile.cpp
+++ b/tools/assistant/profile.cpp
@@ -31,11 +31,11 @@
**
**********************************************************************/
#include "profile.h"
-#include <qxml.h>
-#include <qtextcodec.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
-#include <qdir.h>
+#include <ntqxml.h>
+#include <ntqtextcodec.h>
+#include <ntqfileinfo.h>
+#include <ntqregexp.h>
+#include <ntqdir.h>
#define QT_TITLE "TQt Reference Documentation"
#define DESIGNER_TITLE "TQt Designer Manual"
diff --git a/tools/assistant/profile.h b/tools/assistant/profile.h
index dbc14036..5d3dd34e 100644
--- a/tools/assistant/profile.h
+++ b/tools/assistant/profile.h
@@ -34,10 +34,10 @@
#ifndef PROFILE_H
#define PROFILE_H
-#include <qfileinfo.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qmap.h>
+#include <ntqfileinfo.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqmap.h>
class DocuParser;
diff --git a/tools/assistant/settingsdialogimpl.cpp b/tools/assistant/settingsdialogimpl.cpp
index f0edcc13..e9111d6d 100644
--- a/tools/assistant/settingsdialogimpl.cpp
+++ b/tools/assistant/settingsdialogimpl.cpp
@@ -35,23 +35,23 @@
#include "docuparser.h"
#include "config.h"
-#include <qapplication.h>
-#include <qpushbutton.h>
-#include <qcheckbox.h>
-#include <qcolordialog.h>
-#include <qdir.h>
-#include <qfiledialog.h>
-#include <qfileinfo.h>
-#include <qlineedit.h>
-#include <qlistbox.h>
-#include <qlistview.h>
-#include <qmessagebox.h>
-#include <qptrstack.h>
-#include <qsettings.h>
-#include <qtimer.h>
-#include <qtoolbutton.h>
-#include <qtabwidget.h>
-#include <qmap.h>
+#include <ntqapplication.h>
+#include <ntqpushbutton.h>
+#include <ntqcheckbox.h>
+#include <ntqcolordialog.h>
+#include <ntqdir.h>
+#include <ntqfiledialog.h>
+#include <ntqfileinfo.h>
+#include <ntqlineedit.h>
+#include <ntqlistbox.h>
+#include <ntqlistview.h>
+#include <ntqmessagebox.h>
+#include <ntqptrstack.h>
+#include <ntqsettings.h>
+#include <ntqtimer.h>
+#include <ntqtoolbutton.h>
+#include <ntqtabwidget.h>
+#include <ntqmap.h>
SettingsDialog::SettingsDialog( TQWidget *parent, const char* name )
diff --git a/tools/assistant/settingsdialogimpl.h b/tools/assistant/settingsdialogimpl.h
index 3fed9068..77273dc8 100644
--- a/tools/assistant/settingsdialogimpl.h
+++ b/tools/assistant/settingsdialogimpl.h
@@ -36,9 +36,9 @@
#include "settingsdialog.h"
-#include <qstringlist.h>
-#include <qptrlist.h>
-#include <qlistview.h>
+#include <ntqstringlist.h>
+#include <ntqptrlist.h>
+#include <ntqlistview.h>
class SettingsDialog : public SettingsDialogBase
{
diff --git a/tools/assistant/tabbedbrowser.ui b/tools/assistant/tabbedbrowser.ui
index 33dd9170..906fcecb 100644
--- a/tools/assistant/tabbedbrowser.ui
+++ b/tools/assistant/tabbedbrowser.ui
@@ -78,11 +78,11 @@
</grid>
</widget>
<includes>
- <include location="global" impldecl="in declaration">qsettings.h</include>
+ <include location="global" impldecl="in declaration">ntqsettings.h</include>
<include location="local" impldecl="in implementation">helpwindow.h</include>
<include location="local" impldecl="in implementation">mainwindow.h</include>
- <include location="global" impldecl="in implementation">qstylesheet.h</include>
- <include location="global" impldecl="in implementation">qmime.h</include>
+ <include location="global" impldecl="in implementation">ntqstylesheet.h</include>
+ <include location="global" impldecl="in implementation">ntqmime.h</include>
<include location="local" impldecl="in implementation">tabbedbrowser.ui.h</include>
</includes>
<forwards>
diff --git a/tools/assistant/tabbedbrowser.ui.h b/tools/assistant/tabbedbrowser.ui.h
index 8f2324e5..6663b53a 100644
--- a/tools/assistant/tabbedbrowser.ui.h
+++ b/tools/assistant/tabbedbrowser.ui.h
@@ -7,12 +7,12 @@
** place of a destructor.
*****************************************************************************/
-#include <qfileinfo.h>
-#include <qtoolbutton.h>
-#include <qpixmap.h>
-#include <qiconset.h>
-#include <qstyle.h>
-#include <qtimer.h>
+#include <ntqfileinfo.h>
+#include <ntqtoolbutton.h>
+#include <ntqpixmap.h>
+#include <ntqiconset.h>
+#include <ntqstyle.h>
+#include <ntqtimer.h>
#include "config.h"
diff --git a/tools/assistant/topicchooserimpl.cpp b/tools/assistant/topicchooserimpl.cpp
index 7e8e685d..736aa484 100644
--- a/tools/assistant/topicchooserimpl.cpp
+++ b/tools/assistant/topicchooserimpl.cpp
@@ -33,9 +33,9 @@
#include "topicchooserimpl.h"
-#include <qlabel.h>
-#include <qlistbox.h>
-#include <qpushbutton.h>
+#include <ntqlabel.h>
+#include <ntqlistbox.h>
+#include <ntqpushbutton.h>
TopicChooser::TopicChooser( TQWidget *parent, const TQStringList &lnkNames,
const TQStringList &lnks, const TQString &title )
diff --git a/tools/assistant/topicchooserimpl.h b/tools/assistant/topicchooserimpl.h
index 34334e6e..bc3fbd41 100644
--- a/tools/assistant/topicchooserimpl.h
+++ b/tools/assistant/topicchooserimpl.h
@@ -36,7 +36,7 @@
#include "topicchooser.h"
-#include <qstringlist.h>
+#include <ntqstringlist.h>
class TopicChooser : public TopicChooserBase
{