13 files changed, 43 insertions, 43 deletions
diff --git a/tools/qvfb/README b/tools/qvfb/README
index c62704129..3261b4751 100644
--- a/tools/qvfb/README
+++ b/tools/qvfb/README
@@ -15,7 +15,7 @@ framebuffer.
 
 To use the virtual framebuffer:
 
-1. Ensure QT_NO_QWS_VFB is not set in qconfig.h (when you configure Qt,
+1. Ensure QT_NO_QWS_VFB is not set in ntqconfig.h (when you configure Qt,
    add the -qvfb option).
 2. Start qvfb (qvfb should be compiled as a normal Qt/X11 application,
    NOT as a Qt/Embedded application!).
diff --git a/tools/qvfb/gammaview.h b/tools/qvfb/gammaview.h
index f2ebefba3..67d4695a2 100644
--- a/tools/qvfb/gammaview.h
+++ b/tools/qvfb/gammaview.h
@@ -34,7 +34,7 @@
 #ifndef GAMMAVIEW_H
 #define GAMMAVIEW_H
 
-#include <qwidget.h>
+#include <ntqwidget.h>
 
 class GammaView: public TQWidget
 {
diff --git a/tools/qvfb/main.cpp b/tools/qvfb/main.cpp
index a70018950..aa408fa64 100644
--- a/tools/qvfb/main.cpp
+++ b/tools/qvfb/main.cpp
@@ -33,9 +33,9 @@
 
 #include "qvfb.h"
 
-#include <qapplication.h>
-#include <qpainter.h>
-#include <qregexp.h>
+#include <ntqapplication.h>
+#include <ntqpainter.h>
+#include <ntqregexp.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tools/qvfb/qanimationwriter.cpp b/tools/qvfb/qanimationwriter.cpp
index 9bb273293..76dc94644 100644
--- a/tools/qvfb/qanimationwriter.cpp
+++ b/tools/qvfb/qanimationwriter.cpp
@@ -34,7 +34,7 @@
 #include "qanimationwriter.h"
 
 #define QT_CLEAN_NAMESPACE
-#include <qfile.h>
+#include <ntqfile.h>
 
 #include <png.h>
 #include <netinet/in.h> // for htonl
diff --git a/tools/qvfb/qanimationwriter.h b/tools/qvfb/qanimationwriter.h
index 2f9e265fb..13e8ea136 100644
--- a/tools/qvfb/qanimationwriter.h
+++ b/tools/qvfb/qanimationwriter.h
@@ -34,7 +34,7 @@
 #ifndef TQANIMATIONWRITER_H
 #define TQANIMATIONWRITER_H
 
-#include <qimage.h>
+#include <ntqimage.h>
 
 class TQAnimationWriterData;
 
diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp
index d5557fd69..5ba0ea876 100644
--- a/tools/qvfb/qvfb.cpp
+++ b/tools/qvfb/qvfb.cpp
@@ -37,21 +37,21 @@
 #include "config.h"
 #include "skin.h"
 
-#include <qmenubar.h>
-#include <qpopupmenu.h>
-#include <qapplication.h>
-#include <qmessagebox.h>
-#include <qcombobox.h>
-#include <qlabel.h>
-#include <qfiledialog.h>
-#include <qslider.h>
-#include <qspinbox.h>
-#include <qradiobutton.h>
-#include <qimage.h>
-#include <qpixmap.h>
-#include <qcursor.h>
-#include <qdragobject.h>
-#include <qcheckbox.h>
+#include <ntqmenubar.h>
+#include <ntqpopupmenu.h>
+#include <ntqapplication.h>
+#include <ntqmessagebox.h>
+#include <ntqcombobox.h>
+#include <ntqlabel.h>
+#include <ntqfiledialog.h>
+#include <ntqslider.h>
+#include <ntqspinbox.h>
+#include <ntqradiobutton.h>
+#include <ntqimage.h>
+#include <ntqpixmap.h>
+#include <ntqcursor.h>
+#include <ntqdragobject.h>
+#include <ntqcheckbox.h>
 
 TQVFb::TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *parent,
 	    const char *name, uint flags )
diff --git a/tools/qvfb/qvfb.h b/tools/qvfb/qvfb.h
index a283161d9..59a051d57 100644
--- a/tools/qvfb/qvfb.h
+++ b/tools/qvfb/qvfb.h
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <qmainwindow.h>
+#include <ntqmainwindow.h>
 
 class TQVFbView;
 class TQVFbRateDialog;
diff --git a/tools/qvfb/qvfbratedlg.cpp b/tools/qvfb/qvfbratedlg.cpp
index 44de476d3..c10de3ef7 100644
--- a/tools/qvfb/qvfbratedlg.cpp
+++ b/tools/qvfb/qvfbratedlg.cpp
@@ -33,10 +33,10 @@
 
 #include "qvfbratedlg.h"
 
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qslider.h>
-#include <qpushbutton.h>
+#include <ntqlayout.h>
+#include <ntqlabel.h>
+#include <ntqslider.h>
+#include <ntqpushbutton.h>
 
 TQVFbRateDialog::TQVFbRateDialog( int rate, TQWidget *parent, const char *name,
     bool modal )
diff --git a/tools/qvfb/qvfbratedlg.h b/tools/qvfb/qvfbratedlg.h
index 0781fe599..28c9c17d7 100644
--- a/tools/qvfb/qvfbratedlg.h
+++ b/tools/qvfb/qvfbratedlg.h
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <qdialog.h>
+#include <ntqdialog.h>
 
 class TQLabel;
 class TQSlider;
diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp
index dcb56bf45..08566fd94 100644
--- a/tools/qvfb/qvfbview.cpp
+++ b/tools/qvfb/qvfbview.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include "qglobal.h"
+#include "ntqglobal.h"
 #if !defined( Q_WS_QWS ) || defined( QT_NO_QWS_MULTIPROCESS )
 #define TQLock TQWSSemaphore
 #undef QT_NO_QWS_MULTIPROCESS
@@ -41,16 +41,16 @@
 #endif
 
 #include "qvfbview.h"
-#include "qvfbhdr.h"
+#include "ntqvfbhdr.h"
 
 #define TQTE_PIPE "TQtEmbedded-%1"
 
-#include <qapplication.h>
-#include <qimage.h>
-#include <qbitmap.h>
-#include <qtimer.h>
-#include <qwmatrix.h>
-#include <qpainter.h>
+#include <ntqapplication.h>
+#include <ntqimage.h>
+#include <ntqbitmap.h>
+#include <ntqtimer.h>
+#include <ntqwmatrix.h>
+#include <ntqpainter.h>
 #include "qanimationwriter.h"
 
 #include <unistd.h>
diff --git a/tools/qvfb/qvfbview.h b/tools/qvfb/qvfbview.h
index 48892879d..5220cb2a9 100644
--- a/tools/qvfb/qvfbview.h
+++ b/tools/qvfb/qvfbview.h
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <qscrollview.h>
+#include <ntqscrollview.h>
 
 class TQImage;
 class TQTimer;
diff --git a/tools/qvfb/skin.cpp b/tools/qvfb/skin.cpp
index bb406fbe1..9961d0a99 100644
--- a/tools/qvfb/skin.cpp
+++ b/tools/qvfb/skin.cpp
@@ -35,11 +35,11 @@
 #include "qvfb.h"
 #include "qvfbview.h"
 
-#include <qbitmap.h>
-#include <qpixmap.h>
-#include <qtextstream.h>
-#include <qfile.h>
-#include <qpainter.h>
+#include <ntqbitmap.h>
+#include <ntqpixmap.h>
+#include <ntqtextstream.h>
+#include <ntqfile.h>
+#include <ntqpainter.h>
 #ifdef Q_WS_MAC
 # include <qt_mac.h>
 #endif
diff --git a/tools/qvfb/skin.h b/tools/qvfb/skin.h
index 83cb363f4..c2ee4c10f 100644
--- a/tools/qvfb/skin.h
+++ b/tools/qvfb/skin.h
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <qwidget.h>
+#include <ntqwidget.h>
 
 
 class TQVFb;