Rename graphics class nt* related files to equivalent tq* (part 1)

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

44 files changed, 59 insertions, 59 deletions

diff --git a/src/widgets/ntqsyntaxhighlighter.h b/src/widgets/ntqsyntaxhighlighter.h
index aa4c1ada2..81556553e 100644
--- a/src/widgets/ntqsyntaxhighlighter.h
+++ b/src/widgets/ntqsyntaxhighlighter.h
@@ -42,8 +42,8 @@
 #define TQSYNTAXHIGHLIGHTER_H
 
 #ifndef QT_H
-#include "ntqfont.h"
-#include "ntqcolor.h"
+#include "tqfont.h"
+#include "tqcolor.h"
 #include "tqstring.h"
 #endif // QT_H
 
diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp
index edc62375e..a74074121 100644
--- a/src/widgets/qbutton.cpp
+++ b/src/widgets/qbutton.cpp
@@ -42,7 +42,7 @@
 #ifndef TQT_NO_BUTTON
 #include "ntqbuttongroup.h"
 #include "tqbitmap.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "tqtimer.h"
 #include "ntqaccel.h"
 #include "ntqpixmapcache.h"
diff --git a/src/widgets/qcheckbox.cpp b/src/widgets/qcheckbox.cpp
index 7c749998a..00e87041c 100644
--- a/src/widgets/qcheckbox.cpp
+++ b/src/widgets/qcheckbox.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqcheckbox.h"
 #ifndef TQT_NO_CHECKBOX
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqpixmap.h"
 #include "ntqpixmapcache.h"
diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp
index 2e2be8d8f..3a7153f23 100644
--- a/src/widgets/qcombobox.cpp
+++ b/src/widgets/qcombobox.cpp
@@ -42,7 +42,7 @@
 #ifndef TQT_NO_COMBOBOX
 #include "tqpopupmenu.h"
 #include "ntqlistbox.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "tqstrlist.h"
 #include "ntqpixmap.h"
diff --git a/src/widgets/qdial.cpp b/src/widgets/qdial.cpp
index 741f2c70b..8e2a63b5a 100644
--- a/src/widgets/qdial.cpp
+++ b/src/widgets/qdial.cpp
@@ -42,9 +42,9 @@
 
 #ifndef TQT_NO_DIAL
 
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqpointarray.h"
-#include "ntqcolor.h"
+#include "tqcolor.h"
 #include "ntqapplication.h"
 #include "ntqregion.h"
 #include "tqbitmap.h"
@@ -54,7 +54,7 @@
 #endif
 
 #include <math.h> // sin(), cos(), atan()
-//### Forutsetter linking med math lib - Jfr kommentar i qpainter_x11.cpp!
+//### Forutsetter linking med math lib - Jfr kommentar i tqpainter_x11.cpp!
 
 static const double m_pi = 3.14159265358979323846;
 static const double rad_factor = 180.0 / m_pi;
diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp
index 65b2fe8ae..07ebbaa03 100644
--- a/src/widgets/qdockarea.cpp
+++ b/src/widgets/qdockarea.cpp
@@ -45,7 +45,7 @@
 #include "ntqlayout.h"
 #include "tqptrvector.h"
 #include "ntqapplication.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "tqwidgetlist.h"
 #include "tqmap.h"
 #include "tqmainwindow.h"
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index df2c2cd7c..c7f6af826 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -45,7 +45,7 @@
 #include "ntqdockarea.h"
 #include "tqwidgetresizehandler_p.h"
 #include "qtitlebar_p.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqapplication.h"
 #include "tqtoolbutton.h"
 #include "tqtoolbar.h"
diff --git a/src/widgets/qframe.cpp b/src/widgets/qframe.cpp
index 4ab1e729e..c07820400 100644
--- a/src/widgets/qframe.cpp
+++ b/src/widgets/qframe.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqframe.h"
 #ifndef TQT_NO_FRAME
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqframe.h"
 #include "tqbitmap.h"
diff --git a/src/widgets/qgridview.cpp b/src/widgets/qgridview.cpp
index 8776ba843..7210a4d81 100644
--- a/src/widgets/qgridview.cpp
+++ b/src/widgets/qgridview.cpp
@@ -43,7 +43,7 @@
 
 #ifndef TQT_NO_GRIDVIEW
 
-#include "ntqpainter.h"
+#include "tqpainter.h"
 
 /*!
     \class TQGridView ntqgridview.h
diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/qgroupbox.cpp
index 2803c6760..5145a5698 100644
--- a/src/widgets/qgroupbox.cpp
+++ b/src/widgets/qgroupbox.cpp
@@ -41,7 +41,7 @@
 #include "ntqgroupbox.h"
 #ifndef TQT_NO_GROUPBOX
 #include "ntqlayout.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "tqbitmap.h"
 #include "ntqaccel.h"
 #include "ntqradiobutton.h"
diff --git a/src/widgets/qheader.cpp b/src/widgets/qheader.cpp
index 848ea25cc..c01ae5cc5 100644
--- a/src/widgets/qheader.cpp
+++ b/src/widgets/qheader.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqheader.h"
 #ifndef TQT_NO_HEADER
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqpixmap.h"
 #include "tqbitarray.h"
diff --git a/src/widgets/qlabel.cpp b/src/widgets/qlabel.cpp
index 948dab440..87ba9da9e 100644
--- a/src/widgets/qlabel.cpp
+++ b/src/widgets/qlabel.cpp
@@ -40,10 +40,10 @@
 
 #include "ntqlabel.h"
 #ifndef TQT_NO_LABEL
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqaccel.h"
-#include "ntqmovie.h"
+#include "tqmovie.h"
 #include "tqimage.h"
 #include "tqbitmap.h"
 #include "ntqpicture.h"
diff --git a/src/widgets/qlcdnumber.cpp b/src/widgets/qlcdnumber.cpp
index 2036e3a80..246804f45 100644
--- a/src/widgets/qlcdnumber.cpp
+++ b/src/widgets/qlcdnumber.cpp
@@ -41,7 +41,7 @@
 #include "ntqlcdnumber.h"
 #ifndef TQT_NO_LCDNUMBER
 #include "tqbitarray.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 
 
 /*!
diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp
index 787f20926..5a3a43ae7 100644
--- a/src/widgets/qlineedit.cpp
+++ b/src/widgets/qlineedit.cpp
@@ -46,9 +46,9 @@
 #include "ntqinputcontext.h"
 #endif
 
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
-#include "ntqfontmetrics.h"
+#include "tqfontmetrics.h"
 #include "ntqpixmap.h"
 #include "tqclipboard.h"
 #include "ntqapplication.h"
diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp
index 16e1870af..e9167ed62 100644
--- a/src/widgets/qlistbox.cpp
+++ b/src/widgets/qlistbox.cpp
@@ -47,8 +47,8 @@
 #include "ntqlistbox.h"
 #ifndef TQT_NO_LISTBOX
 #include "tqmemarray.h"
-#include "ntqfontmetrics.h"
-#include "ntqpainter.h"
+#include "tqfontmetrics.h"
+#include "tqpainter.h"
 #include "tqstrlist.h"
 #include "ntqpixmap.h"
 #include "ntqapplication.h"
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index e0ad57d87..0ad2bc374 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -42,7 +42,7 @@
 #ifndef TQT_NO_LISTVIEW
 #include "tqtimer.h"
 #include "ntqheader.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqcursor.h"
 #include "tqptrstack.h"
 #include "tqptrlist.h"
diff --git a/src/widgets/qmultilineedit.cpp b/src/widgets/qmultilineedit.cpp
index e19cae977..a0a7ebee3 100644
--- a/src/widgets/qmultilineedit.cpp
+++ b/src/widgets/qmultilineedit.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqmultilineedit.h"
 #ifndef TQT_NO_MULTILINEEDIT
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqscrollbar.h"
 #include "ntqcursor.h"
 #include "tqclipboard.h"
diff --git a/src/widgets/qprogressbar.cpp b/src/widgets/qprogressbar.cpp
index 86616f0c3..c40bb19e9 100644
--- a/src/widgets/qprogressbar.cpp
+++ b/src/widgets/qprogressbar.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqprogressbar.h"
 #ifndef TQT_NO_PROGRESSBAR
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqpixmap.h"
 #include "tqstyle.h"
diff --git a/src/widgets/qpushbutton.cpp b/src/widgets/qpushbutton.cpp
index c9c01b86b..d87473237 100644
--- a/src/widgets/qpushbutton.cpp
+++ b/src/widgets/qpushbutton.cpp
@@ -41,8 +41,8 @@
 #include "ntqpushbutton.h"
 #ifndef TQT_NO_PUSHBUTTON
 #include "ntqdialog.h"
-#include "ntqfontmetrics.h"
-#include "ntqpainter.h"
+#include "tqfontmetrics.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqpixmap.h"
 #include "tqbitmap.h"
diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/qradiobutton.cpp
index 681610ffe..a0baddeee 100644
--- a/src/widgets/qradiobutton.cpp
+++ b/src/widgets/qradiobutton.cpp
@@ -41,7 +41,7 @@
 #include "ntqradiobutton.h"
 #ifndef TQT_NO_RADIOBUTTON
 #include "ntqbuttongroup.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqpixmap.h"
 #include "ntqpixmapcache.h"
diff --git a/src/widgets/qscrollbar.cpp b/src/widgets/qscrollbar.cpp
index 58cb9a3bd..2b350c30a 100644
--- a/src/widgets/qscrollbar.cpp
+++ b/src/widgets/qscrollbar.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqscrollbar.h"
 #ifndef TQT_NO_SCROLLBAR
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "tqbitmap.h"
 #include "ntqapplication.h"
 #include "tqtimer.h"
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index a07a3cce5..939f4da12 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -42,7 +42,7 @@
 #ifndef TQT_NO_SCROLLVIEW
 #include "ntqscrollbar.h"
 #include "tqobjectlist.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqpixmap.h"
 #include "ntqcursor.h"
 #include "ntqfocusdata.h"
diff --git a/src/widgets/qslider.cpp b/src/widgets/qslider.cpp
index 902fda036..df7555031 100644
--- a/src/widgets/qslider.cpp
+++ b/src/widgets/qslider.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqslider.h"
 #ifndef TQT_NO_SLIDER
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "tqtimer.h"
 #include "tqbitmap.h"
diff --git a/src/widgets/qspinbox.cpp b/src/widgets/qspinbox.cpp
index d068a581b..f11d42c8c 100644
--- a/src/widgets/qspinbox.cpp
+++ b/src/widgets/qspinbox.cpp
@@ -43,7 +43,7 @@
 
 #include "ntqcursor.h"
 #include "ntqpushbutton.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "tqbitmap.h"
 #include "ntqlineedit.h"
 #include "ntqvalidator.h"
diff --git a/src/widgets/qspinwidget.cpp b/src/widgets/qspinwidget.cpp
index e2d67796d..f46dfc40f 100644
--- a/src/widgets/qspinwidget.cpp
+++ b/src/widgets/qspinwidget.cpp
@@ -43,7 +43,7 @@
 #include "ntqrect.h"
 #include "tqtimer.h"
 #include "tqstyle.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 
 class TQSpinWidgetPrivate
 {
diff --git a/src/widgets/qsplashscreen.cpp b/src/widgets/qsplashscreen.cpp
index 6468a2508..fa9e6a49d 100644
--- a/src/widgets/qsplashscreen.cpp
+++ b/src/widgets/qsplashscreen.cpp
@@ -41,7 +41,7 @@
 #ifndef TQT_NO_SPLASHSCREEN
 
 #include "ntqapplication.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqpixmap.h"
 
 class TQSplashScreenPrivate
diff --git a/src/widgets/qsplitter.cpp b/src/widgets/qsplitter.cpp
index 0994e892a..2a4a193bb 100644
--- a/src/widgets/qsplitter.cpp
+++ b/src/widgets/qsplitter.cpp
@@ -48,7 +48,7 @@
 #include "ntqdrawutil.h"
 #include "tqmemarray.h"
 #include "tqobjectlist.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "tqptrlist.h"
 #include "tqstyle.h"
 
diff --git a/src/widgets/qtabbar.cpp b/src/widgets/qtabbar.cpp
index 50c452489..e740a4782 100644
--- a/src/widgets/qtabbar.cpp
+++ b/src/widgets/qtabbar.cpp
@@ -44,7 +44,7 @@
 #include "tqtooltip.h"
 #include "ntqapplication.h"
 #include "tqstyle.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "tqiconset.h"
 #include "ntqcursor.h"
 #include "../kernel/qinternal_p.h"
diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp
index be6186222..bd698765f 100644
--- a/src/widgets/qtabwidget.cpp
+++ b/src/widgets/qtabwidget.cpp
@@ -47,7 +47,7 @@
 #include "tqbitmap.h"
 #include "ntqaccel.h"
 #include "tqstyle.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "tqtoolbutton.h"
 
 #ifdef Q_OS_MACX
diff --git a/src/widgets/qtitlebar.cpp b/src/widgets/qtitlebar.cpp
index 444a12115..c97c47320 100644
--- a/src/widgets/qtitlebar.cpp
+++ b/src/widgets/qtitlebar.cpp
@@ -52,7 +52,7 @@
 #include "tqtooltip.h"
 #include "tqimage.h"
 #include "tqtimer.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "tqstyle.h"
 #include "private/qinternal_p.h"
 #ifndef TQT_NO_WORKSPACE
diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp
index 41f9aa9d5..82f645830 100644
--- a/src/widgets/qwhatsthis.cpp
+++ b/src/widgets/qwhatsthis.cpp
@@ -39,9 +39,9 @@
 #include "ntqwhatsthis.h"
 #ifndef TQT_NO_WHATSTHIS
 #include "ntqapplication.h"
-#include "ntqpaintdevicemetrics.h"
+#include "tqpaintdevicemetrics.h"
 #include "ntqpixmap.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "tqtimer.h"
 #include "tqptrdict.h"
 #include "tqtoolbutton.h"
diff --git a/src/widgets/tqiconview.cpp b/src/widgets/tqiconview.cpp
index 0c42ab611..f79ac974a 100644
--- a/src/widgets/tqiconview.cpp
+++ b/src/widgets/tqiconview.cpp
@@ -48,14 +48,14 @@
 
 #ifndef TQT_NO_ICONVIEW
 
-#include "ntqfontmetrics.h"
-#include "ntqpainter.h"
+#include "tqfontmetrics.h"
+#include "tqpainter.h"
 #include "ntqevent.h"
 #include "ntqpalette.h"
 #include "tqmime.h"
 #include "tqimage.h"
 #include "ntqpen.h"
-#include "ntqbrush.h"
+#include "tqbrush.h"
 #include "tqtimer.h"
 #include "ntqcursor.h"
 #include "ntqapplication.h"
diff --git a/src/widgets/tqiconview.h b/src/widgets/tqiconview.h
index 7b52985b7..625f18d54 100644
--- a/src/widgets/tqiconview.h
+++ b/src/widgets/tqiconview.h
@@ -47,7 +47,7 @@
 #include "ntqrect.h"
 #include "ntqpoint.h"
 #include "tqsize.h"
-#include "ntqfont.h" // TQString->TQFont conversion
+#include "tqfont.h" // TQString->TQFont conversion
 #include "tqdragobject.h"
 #include "tqbitmap.h"
 #include "ntqpicture.h"
diff --git a/src/widgets/tqmainwindow.cpp b/src/widgets/tqmainwindow.cpp
index be6f08cd2..071a330ff 100644
--- a/src/widgets/tqmainwindow.cpp
+++ b/src/widgets/tqmainwindow.cpp
@@ -49,7 +49,7 @@
 #include "tqptrlist.h"
 #include "tqmap.h"
 #include "ntqcursor.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "tqmenubar.h"
 #include "tqpopupmenu.h"
 #include "tqtoolbar.h"
diff --git a/src/widgets/tqmenubar.cpp b/src/widgets/tqmenubar.cpp
index 82734d688..1f1dc08c5 100644
--- a/src/widgets/tqmenubar.cpp
+++ b/src/widgets/tqmenubar.cpp
@@ -46,7 +46,7 @@
 #include "tqmenubar.h"
 #include "tqpopupmenu.h"
 #include "ntqaccel.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqapplication.h"
 #include "ntqguardedptr.h"
diff --git a/src/widgets/tqmenudata.h b/src/widgets/tqmenudata.h
index 69ab1ca5b..5abace6a2 100644
--- a/src/widgets/tqmenudata.h
+++ b/src/widgets/tqmenudata.h
@@ -47,7 +47,7 @@
 #include "ntqkeysequence.h"
 #include "tqstring.h"
 #include "tqsignal.h"
-#include "ntqfont.h"
+#include "tqfont.h"
 #endif // QT_H
 
 #ifndef TQT_NO_MENUDATA
diff --git a/src/widgets/tqpopupmenu.cpp b/src/widgets/tqpopupmenu.cpp
index 2da9a89de..5be453508 100644
--- a/src/widgets/tqpopupmenu.cpp
+++ b/src/widgets/tqpopupmenu.cpp
@@ -42,7 +42,7 @@
 #ifndef TQT_NO_POPUPMENU
 #include "tqmenubar.h"
 #include "ntqaccel.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqapplication.h"
 #include "ntqpixmap.h"
diff --git a/src/widgets/tqstatusbar.cpp b/src/widgets/tqstatusbar.cpp
index d4193d937..746f45e5a 100644
--- a/src/widgets/tqstatusbar.cpp
+++ b/src/widgets/tqstatusbar.cpp
@@ -43,7 +43,7 @@
 
 #include "tqptrlist.h"
 #include "ntqlayout.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "tqtimer.h"
 #include "ntqdrawutil.h"
 #include "tqstyle.h"
diff --git a/src/widgets/tqtextbrowser.cpp b/src/widgets/tqtextbrowser.cpp
index 03152ac1a..fd4bced0a 100644
--- a/src/widgets/tqtextbrowser.cpp
+++ b/src/widgets/tqtextbrowser.cpp
@@ -44,7 +44,7 @@
 
 #include "ntqapplication.h"
 #include "ntqlayout.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 
 #include "tqvaluestack.h"
 #include "stdio.h"
diff --git a/src/widgets/tqtextbrowser.h b/src/widgets/tqtextbrowser.h
index c68031ff1..659ff5d15 100644
--- a/src/widgets/tqtextbrowser.h
+++ b/src/widgets/tqtextbrowser.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqptrlist.h"
 #include "ntqpixmap.h"
-#include "ntqcolor.h"
+#include "tqcolor.h"
 #include "tqtextedit.h"
 #endif // QT_H
 
diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp
index dd7c1116b..a966110ce 100644
--- a/src/widgets/tqtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -48,12 +48,12 @@
 #endif
 
 #include "../kernel/qrichtext_p.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqpen.h"
-#include "ntqbrush.h"
+#include "tqbrush.h"
 #include "ntqpixmap.h"
-#include "ntqfont.h"
-#include "ntqcolor.h"
+#include "tqfont.h"
+#include "tqcolor.h"
 #include "tqstyle.h"
 #include "tqsize.h"
 #include "ntqevent.h"
@@ -63,8 +63,8 @@
 #include "ntqvbox.h"
 #include "ntqapplication.h"
 #include "tqclipboard.h"
-#include "ntqcolordialog.h"
-#include "ntqfontdialog.h"
+#include "tqcolordialog.h"
+#include "tqfontdialog.h"
 #include "tqstylesheet.h"
 #include "tqdragobject.h"
 #include "tqurl.h"
diff --git a/src/widgets/tqtoolbar.cpp b/src/widgets/tqtoolbar.cpp
index 819bc0e5e..a94185bec 100644
--- a/src/widgets/tqtoolbar.cpp
+++ b/src/widgets/tqtoolbar.cpp
@@ -47,7 +47,7 @@
 #include "ntqlayout.h"
 #include "ntqframe.h"
 #include "tqobjectlist.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "tqtoolbutton.h"
 #include "tqpopupmenu.h"
diff --git a/src/widgets/tqtoolbox.cpp b/src/widgets/tqtoolbox.cpp
index f67486a4a..17580a0e7 100644
--- a/src/widgets/tqtoolbox.cpp
+++ b/src/widgets/tqtoolbox.cpp
@@ -45,7 +45,7 @@
 #include <ntqbutton.h>
 #include <ntqlayout.h>
 #include <ntqscrollview.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqstyle.h>
 #include <tqobjectlist.h>
 #include <ntqapplication.h>
diff --git a/src/widgets/tqtoolbutton.cpp b/src/widgets/tqtoolbutton.cpp
index 222c608a7..78becfbe3 100644
--- a/src/widgets/tqtoolbutton.cpp
+++ b/src/widgets/tqtoolbutton.cpp
@@ -42,7 +42,7 @@
 #ifndef TQT_NO_TOOLBUTTON
 
 #include "ntqdrawutil.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqpixmap.h"
 #include "ntqwmatrix.h"
 #include "ntqapplication.h"