Update to latest tqt3 automated conversion

40 files changed, 191 insertions, 191 deletions

diff --git a/tools/linguist/linguist/finddialog.cpp b/tools/linguist/linguist/finddialog.cpp
index c4d70ec87..c3eee1f6d 100644
--- a/tools/linguist/linguist/finddialog.cpp
+++ b/tools/linguist/linguist/finddialog.cpp
@@ -39,12 +39,12 @@
 
 #include "finddialog.h"
 
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
+#include <ntqcheckbox.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqlineedit.h>
+#include <ntqpushbutton.h>
+#include <ntqwhatsthis.h>
 
 FindDialog::FindDialog( bool replace, TQWidget *parent, const char *name,
 			bool modal )
diff --git a/tools/linguist/linguist/finddialog.h b/tools/linguist/linguist/finddialog.h
index 31e79ffff..43c7b589b 100644
--- a/tools/linguist/linguist/finddialog.h
+++ b/tools/linguist/linguist/finddialog.h
@@ -34,7 +34,7 @@
 #ifndef FINDDIALOG_H
 #define FINDDIALOG_H
 
-#include <qdialog.h>
+#include <ntqdialog.h>
 
 class TQCheckBox;
 class TQLineEdit;
diff --git a/tools/linguist/linguist/listviews.cpp b/tools/linguist/linguist/listviews.cpp
index 30fc8f0f0..4acfb5051 100644
--- a/tools/linguist/linguist/listviews.cpp
+++ b/tools/linguist/linguist/listviews.cpp
@@ -33,7 +33,7 @@
 
 #include "listviews.h"
 
-#include <qpainter.h>
+#include <ntqpainter.h>
 
 static const int Text0MaxLen = 150;
 static const int Text1MaxLen = 150;
diff --git a/tools/linguist/linguist/listviews.h b/tools/linguist/linguist/listviews.h
index a90b87f5f..62bc42943 100644
--- a/tools/linguist/linguist/listviews.h
+++ b/tools/linguist/linguist/listviews.h
@@ -36,10 +36,10 @@
 
 #include "msgedit.h"
 
-#include <qstring.h>
-#include <qptrlist.h>
-#include <qregexp.h>
-#include <qlistview.h>
+#include <ntqstring.h>
+#include <ntqptrlist.h>
+#include <ntqregexp.h>
+#include <ntqlistview.h>
 
 class LVI : public TQListViewItem
 {
diff --git a/tools/linguist/linguist/main.cpp b/tools/linguist/linguist/main.cpp
index 240b3192f..927047769 100644
--- a/tools/linguist/linguist/main.cpp
+++ b/tools/linguist/linguist/main.cpp
@@ -33,14 +33,14 @@
 
 #include "trwindow.h"
 
-#include <qapplication.h>
-#include <qlabel.h>
-#include <qpixmap.h>
-#include <qtimer.h>
-#include <qtextcodec.h>
-#include <qtranslator.h>
-#include <qsettings.h>
-#include <qsplashscreen.h>
+#include <ntqapplication.h>
+#include <ntqlabel.h>
+#include <ntqpixmap.h>
+#include <ntqtimer.h>
+#include <ntqtextcodec.h>
+#include <ntqtranslator.h>
+#include <ntqsettings.h>
+#include <ntqsplashscreen.h>
 
 int main( int argc, char **argv )
 {
diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp
index c13ccb601..21d54af8f 100644
--- a/tools/linguist/linguist/msgedit.cpp
+++ b/tools/linguist/linguist/msgedit.cpp
@@ -42,26 +42,26 @@
 #include "phraselv.h"
 #include "simtexth.h"
 
-#include <qapplication.h>
-#include <qcheckbox.h>
-#include <qclipboard.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtextedit.h>
-#include <qpalette.h>
-#include <qpushbutton.h>
-#include <qstring.h>
-#include <qtextview.h>
-#include <qwhatsthis.h>
-#include <qvbox.h>
-#include <qmainwindow.h>
-#include <qheader.h>
-#include <qregexp.h>
-#include <qdockarea.h>
-#include <qdockwindow.h>
-#include <qscrollview.h>
-#include <qfont.h>
-#include <qaccel.h>
+#include <ntqapplication.h>
+#include <ntqcheckbox.h>
+#include <ntqclipboard.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqtextedit.h>
+#include <ntqpalette.h>
+#include <ntqpushbutton.h>
+#include <ntqstring.h>
+#include <ntqtextview.h>
+#include <ntqwhatsthis.h>
+#include <ntqvbox.h>
+#include <ntqmainwindow.h>
+#include <ntqheader.h>
+#include <ntqregexp.h>
+#include <ntqdockarea.h>
+#include <ntqdockwindow.h>
+#include <ntqscrollview.h>
+#include <ntqfont.h>
+#include <ntqaccel.h>
 #include <private/qrichtext_p.h>
 
 static const int MaxCandidates = 5;
diff --git a/tools/linguist/linguist/msgedit.h b/tools/linguist/linguist/msgedit.h
index 1eb66b118..a85bc1dd3 100644
--- a/tools/linguist/linguist/msgedit.h
+++ b/tools/linguist/linguist/msgedit.h
@@ -39,14 +39,14 @@
 
 #include <metatranslator.h>
 
-#include <qsplitter.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qscrollview.h>
-#include <qpixmap.h>
-#include <qbitmap.h>
-#include <qtooltip.h>
+#include <ntqsplitter.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqvaluelist.h>
+#include <ntqscrollview.h>
+#include <ntqpixmap.h>
+#include <ntqbitmap.h>
+#include <ntqtooltip.h>
 
 class TQAccel;
 class TQDockArea;
diff --git a/tools/linguist/linguist/phrase.cpp b/tools/linguist/linguist/phrase.cpp
index fd2961286..945d41507 100644
--- a/tools/linguist/linguist/phrase.cpp
+++ b/tools/linguist/linguist/phrase.cpp
@@ -33,13 +33,13 @@
 
 #include "phrase.h"
 
-#include <qapplication.h>
-#include <qcstring.h>
-#include <qfile.h>
-#include <qmessagebox.h>
-#include <qregexp.h>
-#include <qtextstream.h>
-#include <qxml.h>
+#include <ntqapplication.h>
+#include <ntqcstring.h>
+#include <ntqfile.h>
+#include <ntqmessagebox.h>
+#include <ntqregexp.h>
+#include <ntqtextstream.h>
+#include <ntqxml.h>
 
 static TQString protect( const TQString& str )
 {
diff --git a/tools/linguist/linguist/phrase.h b/tools/linguist/linguist/phrase.h
index 26d9663a2..c1dfc4995 100644
--- a/tools/linguist/linguist/phrase.h
+++ b/tools/linguist/linguist/phrase.h
@@ -34,8 +34,8 @@
 #ifndef PHRASE_H
 #define PHRASE_H
 
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <ntqstring.h>
+#include <ntqvaluelist.h>
 
 class Phrase
 {
diff --git a/tools/linguist/linguist/phrasebookbox.cpp b/tools/linguist/linguist/phrasebookbox.cpp
index 169be47b9..382842dc3 100644
--- a/tools/linguist/linguist/phrasebookbox.cpp
+++ b/tools/linguist/linguist/phrasebookbox.cpp
@@ -40,13 +40,13 @@
 #include "phrasebookbox.h"
 #include "phraselv.h"
 
-#include <qapplication.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qmessagebox.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
+#include <ntqapplication.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqlineedit.h>
+#include <ntqmessagebox.h>
+#include <ntqpushbutton.h>
+#include <ntqwhatsthis.h>
 
 PhraseBookBox::PhraseBookBox( const TQString& filename,
 			      const PhraseBook& phraseBook, TQWidget *parent,
diff --git a/tools/linguist/linguist/phrasebookbox.h b/tools/linguist/linguist/phrasebookbox.h
index 873453aa8..a48d40c02 100644
--- a/tools/linguist/linguist/phrasebookbox.h
+++ b/tools/linguist/linguist/phrasebookbox.h
@@ -36,8 +36,8 @@
 
 #include "phrase.h"
 
-#include <qdialog.h>
-#include <qvaluelist.h>
+#include <ntqdialog.h>
+#include <ntqvaluelist.h>
 
 class TQLineEdit;
 class TQPushButton;
diff --git a/tools/linguist/linguist/phraselv.cpp b/tools/linguist/linguist/phraselv.cpp
index ff395ad16..92757cd84 100644
--- a/tools/linguist/linguist/phraselv.cpp
+++ b/tools/linguist/linguist/phraselv.cpp
@@ -39,9 +39,9 @@
 
 #include "phraselv.h"
 
-#include <qregexp.h>
-#include <qwhatsthis.h>
-#include <qheader.h>
+#include <ntqregexp.h>
+#include <ntqwhatsthis.h>
+#include <ntqheader.h>
 
 class WhatPhrase : public TQWhatsThis
 {
diff --git a/tools/linguist/linguist/phraselv.h b/tools/linguist/linguist/phraselv.h
index 945216bae..8135b43e3 100644
--- a/tools/linguist/linguist/phraselv.h
+++ b/tools/linguist/linguist/phraselv.h
@@ -36,7 +36,7 @@
 
 #include "phrase.h"
 
-#include <qlistview.h>
+#include <ntqlistview.h>
 
 class TQWhatsThis;
 
diff --git a/tools/linguist/linguist/printout.cpp b/tools/linguist/linguist/printout.cpp
index d9af33792..321e8de2d 100644
--- a/tools/linguist/linguist/printout.cpp
+++ b/tools/linguist/linguist/printout.cpp
@@ -33,8 +33,8 @@
 
 #include "printout.h"
 
-#include <qprinter.h>
-#include <qfontmetrics.h>
+#include <ntqprinter.h>
+#include <ntqfontmetrics.h>
 
 PrintOut::PrintOut( TQPrinter *printer )
     : pr( printer ), pdmetrics( printer ), nextRule( NoRule ), page( 0 )
diff --git a/tools/linguist/linguist/printout.h b/tools/linguist/linguist/printout.h
index 87e25d065..bba3da6af 100644
--- a/tools/linguist/linguist/printout.h
+++ b/tools/linguist/linguist/printout.h
@@ -34,12 +34,12 @@
 #ifndef PRINTOUT_H
 #define PRINTOUT_H
 
-#include <qfont.h>
-#include <qpaintdevicemetrics.h>
-#include <qpainter.h>
-#include <qrect.h>
-#include <qvaluelist.h>
-#include <qdatetime.h>
+#include <ntqfont.h>
+#include <ntqpaintdevicemetrics.h>
+#include <ntqpainter.h>
+#include <ntqrect.h>
+#include <ntqvaluelist.h>
+#include <ntqdatetime.h>
 
 class TQPrinter;
 class TQFontMetrics;
diff --git a/tools/linguist/linguist/simtexth.cpp b/tools/linguist/linguist/simtexth.cpp
index 70b88a397..931ba1377 100644
--- a/tools/linguist/linguist/simtexth.cpp
+++ b/tools/linguist/linguist/simtexth.cpp
@@ -35,12 +35,12 @@
 
 #include <metatranslator.h>
 
-#include <qcstring.h>
-#include <qdict.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <ntqcstring.h>
+#include <ntqdict.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqvaluelist.h>
 
 #include <string.h>
 
diff --git a/tools/linguist/linguist/simtexth.h b/tools/linguist/linguist/simtexth.h
index 87e0d9883..01ae6f485 100644
--- a/tools/linguist/linguist/simtexth.h
+++ b/tools/linguist/linguist/simtexth.h
@@ -34,8 +34,8 @@
 #ifndef SIMTEXTH_H
 #define SIMTEXTH_H
 
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <ntqstring.h>
+#include <ntqvaluelist.h>
 
 class MetaTranslator;
 
diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp
index ee61453b4..e174edc50 100644
--- a/tools/linguist/linguist/trwindow.cpp
+++ b/tools/linguist/linguist/trwindow.cpp
@@ -46,29 +46,29 @@
 #include "phraselv.h"
 #include "statistics.h"
 
-#include <qaccel.h>
-#include <qaction.h>
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qdict.h>
-#include <qdockarea.h>
-#include <qdockwindow.h>
-#include <qfile.h>
-#include <qfiledialog.h>
-#include <qfileinfo.h>
-#include <qheader.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qmenubar.h>
-#include <qmessagebox.h>
-#include <qpopupmenu.h>
-#include <qregexp.h>
-#include <qsettings.h>
-#include <qstatusbar.h>
-#include <qtoolbar.h>
-#include <qwhatsthis.h>
-#include <qprocess.h>
-#include <qassistantclient.h>
+#include <ntqaccel.h>
+#include <ntqaction.h>
+#include <ntqapplication.h>
+#include <ntqbitmap.h>
+#include <ntqdict.h>
+#include <ntqdockarea.h>
+#include <ntqdockwindow.h>
+#include <ntqfile.h>
+#include <ntqfiledialog.h>
+#include <ntqfileinfo.h>
+#include <ntqheader.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqmenubar.h>
+#include <ntqmessagebox.h>
+#include <ntqpopupmenu.h>
+#include <ntqregexp.h>
+#include <ntqsettings.h>
+#include <ntqstatusbar.h>
+#include <ntqtoolbar.h>
+#include <ntqwhatsthis.h>
+#include <ntqprocess.h>
+#include <ntqassistantclient.h>
 
 #include <stdlib.h>
 
diff --git a/tools/linguist/linguist/trwindow.h b/tools/linguist/linguist/trwindow.h
index ec2088558..af20b4873 100644
--- a/tools/linguist/linguist/trwindow.h
+++ b/tools/linguist/linguist/trwindow.h
@@ -38,13 +38,13 @@
 
 #include <metatranslator.h>
 
-#include <qmainwindow.h>
-#include <qptrlist.h>
-#include <qdict.h>
-#include <qprinter.h>
-#include <qstringlist.h>
-#include <qpixmap.h>
-#include <qlistview.h>
+#include <ntqmainwindow.h>
+#include <ntqptrlist.h>
+#include <ntqdict.h>
+#include <ntqprinter.h>
+#include <ntqstringlist.h>
+#include <ntqpixmap.h>
+#include <ntqlistview.h>
 
 class TQAction;
 class TQDialog;
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index 91d4dc73e..9dc6b07eb 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -34,13 +34,13 @@
 #include <metatranslator.h>
 #include <proparser.h>
 
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qtextstream.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqregexp.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqtextstream.h>
 
 #include <errno.h>
 
diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp
index 22967ed33..a557fd518 100644
--- a/tools/linguist/lupdate/fetchtr.cpp
+++ b/tools/linguist/lupdate/fetchtr.cpp
@@ -33,12 +33,12 @@
 
 #include <metatranslator.h>
 
-#include <qfile.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qtextstream.h>
-#include <qvaluestack.h>
-#include <qxml.h>
+#include <ntqfile.h>
+#include <ntqregexp.h>
+#include <ntqstring.h>
+#include <ntqtextstream.h>
+#include <ntqvaluestack.h>
+#include <ntqxml.h>
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 0e45ebff4..7c933afed 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -34,12 +34,12 @@
 #include <metatranslator.h>
 #include <proparser.h>
 
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qtextstream.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqtextstream.h>
 
 #include <errno.h>
 #include <string.h>
diff --git a/tools/linguist/lupdate/numberh.cpp b/tools/linguist/lupdate/numberh.cpp
index a06367103..52593b59e 100644
--- a/tools/linguist/lupdate/numberh.cpp
+++ b/tools/linguist/lupdate/numberh.cpp
@@ -33,10 +33,10 @@
 
 #include <metatranslator.h>
 
-#include <qmemarray.h>
-#include <qcstring.h>
-#include <qmap.h>
-#include <qstringlist.h>
+#include <ntqmemarray.h>
+#include <ntqcstring.h>
+#include <ntqmap.h>
+#include <ntqstringlist.h>
 
 #include <ctype.h>
 
diff --git a/tools/linguist/lupdate/sametexth.cpp b/tools/linguist/lupdate/sametexth.cpp
index 59542811a..d3d9619e2 100644
--- a/tools/linguist/lupdate/sametexth.cpp
+++ b/tools/linguist/lupdate/sametexth.cpp
@@ -33,8 +33,8 @@
 
 #include <metatranslator.h>
 
-#include <qcstring.h>
-#include <qmap.h>
+#include <ntqcstring.h>
+#include <ntqmap.h>
 
 typedef TQMap<TQCString, MetaTranslatorMessage> TMM;
 typedef TQValueList<MetaTranslatorMessage> TML;
diff --git a/tools/linguist/qm2ts/main.cpp b/tools/linguist/qm2ts/main.cpp
index 80f90a81d..c32c5248d 100644
--- a/tools/linguist/qm2ts/main.cpp
+++ b/tools/linguist/qm2ts/main.cpp
@@ -33,9 +33,9 @@
 
 #include <metatranslator.h>
 
-#include <qregexp.h>
-#include <qstring.h>
-#include <qtranslator.h>
+#include <ntqregexp.h>
+#include <ntqstring.h>
+#include <ntqtranslator.h>
 
 typedef TQValueList<TQTranslatorMessage> TML;
 
diff --git a/tools/linguist/shared/metatranslator.cpp b/tools/linguist/shared/metatranslator.cpp
index 643e95189..5da969d8b 100644
--- a/tools/linguist/shared/metatranslator.cpp
+++ b/tools/linguist/shared/metatranslator.cpp
@@ -33,13 +33,13 @@
 
 #include "metatranslator.h"
 
-#include <qapplication.h>
-#include <qcstring.h>
-#include <qfile.h>
-#include <qmessagebox.h>
-#include <qtextcodec.h>
-#include <qtextstream.h>
-#include <qxml.h>
+#include <ntqapplication.h>
+#include <ntqcstring.h>
+#include <ntqfile.h>
+#include <ntqmessagebox.h>
+#include <ntqtextcodec.h>
+#include <ntqtextstream.h>
+#include <ntqxml.h>
 
 static bool encodingIsUtf8( const TQXmlAttributes& atts )
 {
diff --git a/tools/linguist/shared/metatranslator.h b/tools/linguist/shared/metatranslator.h
index 0957ecb86..7e0419d21 100644
--- a/tools/linguist/shared/metatranslator.h
+++ b/tools/linguist/shared/metatranslator.h
@@ -34,10 +34,10 @@
 #ifndef METATRANSLATOR_H
 #define METATRANSLATOR_H
 
-#include <qmap.h>
-#include <qstring.h>
-#include <qtranslator.h>
-#include <qvaluelist.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
+#include <ntqtranslator.h>
+#include <ntqvaluelist.h>
 
 class TQTextCodec;
 
diff --git a/tools/linguist/shared/proparser.cpp b/tools/linguist/shared/proparser.cpp
index 6095d48de..be88eb861 100644
--- a/tools/linguist/shared/proparser.cpp
+++ b/tools/linguist/shared/proparser.cpp
@@ -33,12 +33,12 @@
 
 #include "proparser.h"
 
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
-#include <qstringlist.h>
-#include <qtextstream.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqregexp.h>
+#include <ntqstringlist.h>
+#include <ntqtextstream.h>
 
 #ifdef Q_OS_UNIX
 #include <unistd.h>
diff --git a/tools/linguist/shared/proparser.h b/tools/linguist/shared/proparser.h
index 3c1ca7c93..a18ccac8e 100644
--- a/tools/linguist/shared/proparser.h
+++ b/tools/linguist/shared/proparser.h
@@ -34,8 +34,8 @@
 #ifndef PROPARSER_H
 #define PROPARSER_H
 
-#include <qmap.h>
-#include <qstring.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
 
 TQMap<TQString, TQString> proFileTagMap( const TQString& text );
 
diff --git a/tools/linguist/tutorial/tt1/main.cpp b/tools/linguist/tutorial/tt1/main.cpp
index 2cee6e11e..2f38cc156 100644
--- a/tools/linguist/tutorial/tt1/main.cpp
+++ b/tools/linguist/tutorial/tt1/main.cpp
@@ -4,9 +4,9 @@
 **
 ****************************************************************/
 
-#include <qapplication.h>
-#include <qpushbutton.h>
-#include <qtranslator.h>
+#include <ntqapplication.h>
+#include <ntqpushbutton.h>
+#include <ntqtranslator.h>
 
 
 int main( int argc, char **argv )
diff --git a/tools/linguist/tutorial/tt2/arrowpad.cpp b/tools/linguist/tutorial/tt2/arrowpad.cpp
index 8e23d931d..d96f8f596 100644
--- a/tools/linguist/tutorial/tt2/arrowpad.cpp
+++ b/tools/linguist/tutorial/tt2/arrowpad.cpp
@@ -6,7 +6,7 @@
 
 #include "arrowpad.h"
 
-#include <qpushbutton.h>
+#include <ntqpushbutton.h>
 
 ArrowPad::ArrowPad( TQWidget *parent, const char *name )
     : TQGrid( 3, Horizontal, parent, name )
diff --git a/tools/linguist/tutorial/tt2/arrowpad.h b/tools/linguist/tutorial/tt2/arrowpad.h
index 06e11fa45..c973523bb 100644
--- a/tools/linguist/tutorial/tt2/arrowpad.h
+++ b/tools/linguist/tutorial/tt2/arrowpad.h
@@ -7,7 +7,7 @@
 #ifndef ARROWPAD_H
 #define ARROWPAD_H
 
-#include <qgrid.h>
+#include <ntqgrid.h>
 
 class ArrowPad : public TQGrid
 {
diff --git a/tools/linguist/tutorial/tt2/main.cpp b/tools/linguist/tutorial/tt2/main.cpp
index 132d4c49f..283afe5a6 100644
--- a/tools/linguist/tutorial/tt2/main.cpp
+++ b/tools/linguist/tutorial/tt2/main.cpp
@@ -6,10 +6,10 @@
 
 #include "mainwindow.h"
 
-#include <qapplication.h>
-#include <qstring.h>
-#include <qtextcodec.h>
-#include <qtranslator.h>
+#include <ntqapplication.h>
+#include <ntqstring.h>
+#include <ntqtextcodec.h>
+#include <ntqtranslator.h>
 
 int main( int argc, char **argv )
 {
diff --git a/tools/linguist/tutorial/tt2/mainwindow.cpp b/tools/linguist/tutorial/tt2/mainwindow.cpp
index fd381c283..6a9808de1 100644
--- a/tools/linguist/tutorial/tt2/mainwindow.cpp
+++ b/tools/linguist/tutorial/tt2/mainwindow.cpp
@@ -7,10 +7,10 @@
 #include "arrowpad.h"
 #include "mainwindow.h"
 
-#include <qaccel.h>
-#include <qapplication.h>
-#include <qmenubar.h>
-#include <qpopupmenu.h>
+#include <ntqaccel.h>
+#include <ntqapplication.h>
+#include <ntqmenubar.h>
+#include <ntqpopupmenu.h>
 
 MainWindow::MainWindow( TQWidget *parent, const char *name )
     : TQMainWindow( parent, name )
diff --git a/tools/linguist/tutorial/tt2/mainwindow.h b/tools/linguist/tutorial/tt2/mainwindow.h
index 0d023bb6b..0a190af08 100644
--- a/tools/linguist/tutorial/tt2/mainwindow.h
+++ b/tools/linguist/tutorial/tt2/mainwindow.h
@@ -7,7 +7,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <qmainwindow.h>
+#include <ntqmainwindow.h>
 
 class MainWindow : public TQMainWindow
 {
diff --git a/tools/linguist/tutorial/tt3/main.cpp b/tools/linguist/tutorial/tt3/main.cpp
index 0c2f083c6..c6989494b 100644
--- a/tools/linguist/tutorial/tt3/main.cpp
+++ b/tools/linguist/tutorial/tt3/main.cpp
@@ -6,10 +6,10 @@
 
 #include "mainwindow.h"
 
-#include <qapplication.h>
-#include <qstring.h>
-#include <qtextcodec.h>
-#include <qtranslator.h>
+#include <ntqapplication.h>
+#include <ntqstring.h>
+#include <ntqtextcodec.h>
+#include <ntqtranslator.h>
 
 int main( int argc, char **argv )
 {
diff --git a/tools/linguist/tutorial/tt3/mainwindow.cpp b/tools/linguist/tutorial/tt3/mainwindow.cpp
index 20edb3fbc..86d2e0073 100644
--- a/tools/linguist/tutorial/tt3/mainwindow.cpp
+++ b/tools/linguist/tutorial/tt3/mainwindow.cpp
@@ -7,11 +7,11 @@
 #include "mainwindow.h"
 #include "printpanel.h"
 
-#include <qaccel.h>
-#include <qapplication.h>
-#include <qmenubar.h>
-#include <qmessagebox.h>
-#include <qpopupmenu.h>
+#include <ntqaccel.h>
+#include <ntqapplication.h>
+#include <ntqmenubar.h>
+#include <ntqmessagebox.h>
+#include <ntqpopupmenu.h>
 
 MainWindow::MainWindow( TQWidget *parent, const char *name )
     : TQMainWindow( parent, name )
diff --git a/tools/linguist/tutorial/tt3/mainwindow.h b/tools/linguist/tutorial/tt3/mainwindow.h
index dc9ad11e1..c0b5812fb 100644
--- a/tools/linguist/tutorial/tt3/mainwindow.h
+++ b/tools/linguist/tutorial/tt3/mainwindow.h
@@ -7,7 +7,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <qmainwindow.h>
+#include <ntqmainwindow.h>
 
 class MainWindow : public TQMainWindow
 {
diff --git a/tools/linguist/tutorial/tt3/printpanel.cpp b/tools/linguist/tutorial/tt3/printpanel.cpp
index c377efc26..183a6f5b9 100644
--- a/tools/linguist/tutorial/tt3/printpanel.cpp
+++ b/tools/linguist/tutorial/tt3/printpanel.cpp
@@ -6,9 +6,9 @@
 
 #include "printpanel.h"
 
-#include <qlabel.h>
-#include <qradiobutton.h>
-#include <qhbuttongroup.h>
+#include <ntqlabel.h>
+#include <ntqradiobutton.h>
+#include <ntqhbuttongroup.h>
 
 PrintPanel::PrintPanel( TQWidget *parent, const char *name )
     : TQVBox( parent, name )
diff --git a/tools/linguist/tutorial/tt3/printpanel.h b/tools/linguist/tutorial/tt3/printpanel.h
index 8b1f9bc60..565b7b629 100644
--- a/tools/linguist/tutorial/tt3/printpanel.h
+++ b/tools/linguist/tutorial/tt3/printpanel.h
@@ -7,7 +7,7 @@
 #ifndef PRINTPANEL_H
 #define PRINTPANEL_H
 
-#include <qvbox.h>
+#include <ntqvbox.h>
 
 class PrintPanel : public TQVBox
 {