summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-06-06 13:00:12 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-06-06 13:00:12 +0900
commit8c029298d9d3f1f84b65ac4a3a16cd1fa28d9cde (patch)
tree3427fe04e3116ccbd16fa98e57abd5d118f82353 /src
parent0881ed5059c46ce73e8241e6260b82b92f6d0e55 (diff)
downloadtqt3-8c029298d9d3f1f84b65ac4a3a16cd1fa28d9cde.tar.gz
tqt3-8c029298d9d3f1f84b65ac4a3a16cd1fa28d9cde.zip
Rename image nt* related files to equivalent tq*
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src')
-rw-r--r--src/canvas/tqcanvas.cpp2
-rw-r--r--src/dialogs/qcolordialog.cpp2
-rw-r--r--src/dialogs/qmessagebox.cpp2
-rw-r--r--src/kernel/ntqasyncimageio.h2
-rw-r--r--src/kernel/ntqdragobject.h2
-rw-r--r--src/kernel/ntqnamespace.h2
-rw-r--r--src/kernel/ntqpngio.h2
-rw-r--r--src/kernel/ntqt.h6
-rw-r--r--src/kernel/qbitmap.cpp2
-rw-r--r--src/kernel/qcursor.cpp2
-rw-r--r--src/kernel/qcursor_x11.cpp2
-rw-r--r--src/kernel/qfontengine_x11.cpp2
-rw-r--r--src/kernel/qiconset.cpp2
-rw-r--r--src/kernel/qjpegio.cpp2
-rw-r--r--src/kernel/qmngio.cpp4
-rw-r--r--src/kernel/qpainter.cpp2
-rw-r--r--src/kernel/qpicture.cpp2
-rw-r--r--src/kernel/qpixmap.cpp2
-rw-r--r--src/kernel/qpixmap_x11.cpp4
-rw-r--r--src/kernel/qpsprinter.cpp2
-rw-r--r--src/kernel/qregion_x11.cpp2
-rw-r--r--src/kernel/qrichtext.cpp2
-rw-r--r--src/kernel/qt_kernel.pri10
-rw-r--r--src/kernel/qt_pch.h2
-rw-r--r--src/kernel/qvariant.cpp2
-rw-r--r--src/kernel/tqimage.cpp (renamed from src/kernel/qimage.cpp)6
-rw-r--r--src/kernel/tqimage.h (renamed from src/kernel/ntqimage.h)0
-rw-r--r--src/kernel/tqimageformatinterface_p.h (renamed from src/kernel/qimageformatinterface_p.h)0
-rw-r--r--src/kernel/tqimageformatplugin.cpp (renamed from src/kernel/qimageformatplugin.cpp)8
-rw-r--r--src/kernel/tqimageformatplugin.h (renamed from src/kernel/ntqimageformatplugin.h)0
-rw-r--r--src/kernel/tqwidget_x11.cpp2
-rw-r--r--src/opengl/qgl.cpp2
-rw-r--r--src/qt.pro4
-rw-r--r--src/styles/qmotifstyle.cpp2
-rw-r--r--src/styles/qwindowsstyle.cpp2
-rw-r--r--src/tools/qfeatures.txt2
-rw-r--r--src/widgets/qeffects.cpp2
-rw-r--r--src/widgets/qiconview.cpp2
-rw-r--r--src/widgets/qlabel.cpp2
-rw-r--r--src/widgets/qtextbrowser.cpp2
-rw-r--r--src/widgets/qtitlebar.cpp2
-rw-r--r--src/widgets/qtoolbutton.cpp2
-rw-r--r--src/workspace/qworkspace.cpp2
-rw-r--r--src/xml/qsvgdevice.cpp2
44 files changed, 55 insertions, 55 deletions
diff --git a/src/canvas/tqcanvas.cpp b/src/canvas/tqcanvas.cpp
index 6e1db596b..aa38c2055 100644
--- a/src/canvas/tqcanvas.cpp
+++ b/src/canvas/tqcanvas.cpp
@@ -42,7 +42,7 @@
#ifndef TQT_NO_CANVAS
#include "ntqapplication.h"
#include "ntqbitmap.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "tqptrdict.h"
#include "ntqpainter.h"
#include "ntqpolygonscanner.h"
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp
index df0424376..ca38f9c10 100644
--- a/src/dialogs/qcolordialog.cpp
+++ b/src/dialogs/qcolordialog.cpp
@@ -47,7 +47,7 @@
#include "ntqlabel.h"
#include "ntqpushbutton.h"
#include "ntqlineedit.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqpixmap.h"
#include "ntqdrawutil.h"
#include "ntqvalidator.h"
diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp
index 29005500c..6d991b3b7 100644
--- a/src/dialogs/qmessagebox.cpp
+++ b/src/dialogs/qmessagebox.cpp
@@ -45,7 +45,7 @@
#include "ntqaccel.h"
#include "ntqlabel.h"
#include "ntqpushbutton.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqapplication.h"
#include "ntqstyle.h"
#include "tqobjectlist.h"
diff --git a/src/kernel/ntqasyncimageio.h b/src/kernel/ntqasyncimageio.h
index 54255978a..28d5bd50e 100644
--- a/src/kernel/ntqasyncimageio.h
+++ b/src/kernel/ntqasyncimageio.h
@@ -42,7 +42,7 @@
#define TQASYNCIMAGEIO_H
#ifndef QT_H
-#include "ntqimage.h"
+#include "tqimage.h"
#endif // QT_H
#ifndef TQT_NO_ASYNC_IMAGE_IO
diff --git a/src/kernel/ntqdragobject.h b/src/kernel/ntqdragobject.h
index 60a43ca34..5f6147409 100644
--- a/src/kernel/ntqdragobject.h
+++ b/src/kernel/ntqdragobject.h
@@ -47,7 +47,7 @@ class TQImageDragData;
#ifndef QT_H
#include "tqobject.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqstrlist.h"
#include "ntqcolor.h"
#endif // QT_H
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index abc3bfb8b..c540c549b 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -272,7 +272,7 @@ public:
// Image conversion flags. The unusual ordering is caused by
// compatibility and default requirements.
- // Documented in qimage.cpp
+ // Documented in tqimage.cpp
enum ImageConversionFlags {
ColorMode_Mask = 0x00000003,
diff --git a/src/kernel/ntqpngio.h b/src/kernel/ntqpngio.h
index ebb817d6a..42c85c653 100644
--- a/src/kernel/ntqpngio.h
+++ b/src/kernel/ntqpngio.h
@@ -42,7 +42,7 @@
#define TQPNGIO_H
#ifndef QT_H
-#include "ntqimage.h"
+#include "tqimage.h"
#endif // QT_H
#ifndef TQT_NO_IMAGEIO_PNG
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index fd10a18b0..a11383bb5 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -105,8 +105,8 @@
#include <ntqhttp.h>
#include <ntqaction.h>
#include "ntqbuffer.h"
-#include "ntqimage.h"
-#include <ntqimageformatplugin.h>
+#include "tqimage.h"
+#include <tqimageformatplugin.h>
#include "ntqlineedit.h"
#include <ntqintcache.h>
#include "ntqintdict.h"
@@ -278,7 +278,7 @@
#include <private/qucom_p.h>
#include "private/qgfxdriverinterface_p.h"
#include "private/qcom_p.h"
-#include "private/qimageformatinterface_p.h"
+#include "private/tqimageformatinterface_p.h"
#include "private/qisciicodec_p.h"
#include "private/qkbddriverinterface_p.h"
#include "private/qlayoutengine_p.h"
diff --git a/src/kernel/qbitmap.cpp b/src/kernel/qbitmap.cpp
index 9a075b8f4..3c64c22b0 100644
--- a/src/kernel/qbitmap.cpp
+++ b/src/kernel/qbitmap.cpp
@@ -39,7 +39,7 @@
**********************************************************************/
#include "ntqbitmap.h"
-#include "ntqimage.h"
+#include "tqimage.h"
/*!
diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp
index 7d128c159..d6b736460 100644
--- a/src/kernel/qcursor.cpp
+++ b/src/kernel/qcursor.cpp
@@ -43,7 +43,7 @@
#ifndef TQT_NO_CURSOR
#include "ntqbitmap.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqdatastream.h"
diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp
index f3b034da8..8cf9f6dde 100644
--- a/src/kernel/qcursor_x11.cpp
+++ b/src/kernel/qcursor_x11.cpp
@@ -40,7 +40,7 @@
#include "ntqcursor.h"
#include "ntqbitmap.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqapplication.h"
#include "ntqdatastream.h"
#include "ntqnamespace.h"
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index 96f011927..5cf756265 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -49,7 +49,7 @@
#include "ntqpaintdevice.h"
#include "ntqpaintdevicemetrics.h"
#include "ntqpainter.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "qt_x11_p.h"
diff --git a/src/kernel/qiconset.cpp b/src/kernel/qiconset.cpp
index 43e74b2ba..0b17d6193 100644
--- a/src/kernel/qiconset.cpp
+++ b/src/kernel/qiconset.cpp
@@ -45,7 +45,7 @@
#include "ntqapplication.h"
#include "ntqbitmap.h"
#include "ntqcleanuphandler.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqpainter.h"
enum { NumSizes = 2, NumModes = 3, NumStates = 2 };
diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp
index 91df6f976..c30853d02 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/qjpegio.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqimage.h"
+#include "tqimage.h"
#ifndef TQT_NO_IMAGEIO_JPEG
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index fad1aa9b3..deb0225c3 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/qmngio.cpp
@@ -42,7 +42,7 @@
#ifndef TQT_NO_IMAGEIO_MNG
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqasyncimageio.h"
#include "ntqiodevice.h"
#include "ntqmngio.h"
@@ -310,7 +310,7 @@ TQMNGFormat::TQMNGFormat()
TQMNGFormat::~TQMNGFormat()
{
// We're setting the consumer to 0 since it may have been
- // deleted by read_async_image in qimage.cpp
+ // deleted by read_async_image in tqimage.cpp
consumer = 0;
if (handle) mng_cleanup(&handle);
}
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index da78db89f..3f91a8023 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -45,7 +45,7 @@
#include "tqptrdict.h"
#include "ntqdatastream.h"
#include "tqwidget.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqpaintdevicemetrics.h"
#include "ntqapplication.h"
#include "qrichtext_p.h"
diff --git a/src/kernel/qpicture.cpp b/src/kernel/qpicture.cpp
index 0fd609d79..912fbfb5b 100644
--- a/src/kernel/qpicture.cpp
+++ b/src/kernel/qpicture.cpp
@@ -44,7 +44,7 @@
#include "ntqpainter.h"
#include "ntqpixmap.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqfile.h"
#include "ntqdatastream.h"
#include "ntqpaintdevicemetrics.h"
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index 9c93632c1..7ba49ee4e 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -41,7 +41,7 @@
#include "ntqpixmap.h"
#include "ntqbitmap.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "tqwidget.h"
#include "ntqpainter.h"
#include "ntqdatastream.h"
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp
index d0bfa97a2..b40247af9 100644
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/qpixmap_x11.cpp
@@ -69,7 +69,7 @@
#include "ntqbitmap.h"
#include "ntqpaintdevicemetrics.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqwmatrix.h"
#include "ntqapplication.h"
#include "qt_x11_p.h"
@@ -286,7 +286,7 @@ static XImage* qt_XShmGetImage( const TQPixmap* pix, int format,
Internal functions
*****************************************************************************/
-extern const uchar *qt_get_bitflip_array(); // defined in qimage.cpp
+extern const uchar *qt_get_bitflip_array(); // defined in tqimage.cpp
static uchar *flip_bits( const uchar *bits, int len )
{
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index 58a23dfcf..d845f8c30 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -59,7 +59,7 @@
#include "ntqpainter.h"
#include "ntqapplication.h"
#include "ntqpaintdevicemetrics.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqdatetime.h"
#include "ntqstring.h"
#include "ntqdict.h"
diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp
index b5417a40a..7662a168d 100644
--- a/src/kernel/qregion_x11.cpp
+++ b/src/kernel/qregion_x11.cpp
@@ -41,7 +41,7 @@
#include "ntqregion.h"
#include "ntqpointarray.h"
#include "ntqbuffer.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqbitmap.h"
#include "qt_x11_p.h"
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index a74433d47..c5e4be5e3 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -52,7 +52,7 @@
#include "ntqfileinfo.h"
#include "ntqstylesheet.h"
#include "ntqmime.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqdragobject.h"
#include "ntqpaintdevicemetrics.h"
#include "ntqpainter.h"
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index f21fbfd17..cf370058b 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -32,9 +32,9 @@ kernel {
$$KERNEL_H/ntqguardedptr.h \
$$KERNEL_H/ntqgif.h \
$$KERNEL_H/ntqiconset.h \
- $$KERNEL_H/ntqimage.h \
- $$KERNEL_P/qimageformatinterface_p.h \
- $$KERNEL_H/ntqimageformatplugin.h \
+ $$KERNEL_H/tqimage.h \
+ $$KERNEL_P/tqimageformatinterface_p.h \
+ $$KERNEL_H/tqimageformatplugin.h \
$$KERNEL_H/ntqkeycode.h \
$$KERNEL_H/ntqkeysequence.h \
$$KERNEL_H/ntqlayout.h \
@@ -216,8 +216,8 @@ kernel {
$$KERNEL_CPP/qfontdatabase.cpp \
$$KERNEL_CPP/qguardedptr.cpp \
$$KERNEL_CPP/qiconset.cpp \
- $$KERNEL_CPP/qimage.cpp \
- $$KERNEL_CPP/qimageformatplugin.cpp \
+ $$KERNEL_CPP/tqimage.cpp \
+ $$KERNEL_CPP/tqimageformatplugin.cpp \
$$KERNEL_CPP/qkeysequence.cpp \
$$KERNEL_CPP/qlayout.cpp \
$$KERNEL_CPP/qlayoutengine.cpp \
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index 54b968234..49f0cf73d 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -28,7 +28,7 @@
#include <ntqcursor.h>
#include <ntqdatetime.h>
#include <ntqglobal.h>
-#include <ntqimage.h>
+#include <tqimage.h>
#include <ntqmetaobject.h> // All moc genereated code has this include
#include <tqobject.h>
#include <ntqpainter.h>
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index f7479fb68..991dfcd35 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -46,7 +46,7 @@
#include "ntqcstring.h"
#include "ntqfont.h"
#include "ntqpixmap.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqbrush.h"
#include "ntqpoint.h"
#include "ntqrect.h"
diff --git a/src/kernel/qimage.cpp b/src/kernel/tqimage.cpp
index 3d7c15bfa..7a454818e 100644
--- a/src/kernel/qimage.cpp
+++ b/src/kernel/tqimage.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqregexp.h"
#include "ntqfile.h"
#include "ntqdatastream.h"
@@ -51,7 +51,7 @@
#include "ntqjpegio.h"
#include "tqmap.h"
#include <private/qpluginmanager_p.h>
-#include "qimageformatinterface_p.h"
+#include "tqimageformatinterface_p.h"
#include "ntqwmatrix.h"
#include "ntqapplication.h"
#include "ntqmime.h"
@@ -3716,7 +3716,7 @@ static void swapPixel01( TQImage *image ) // 1-bpp: swap 0 and 1 pixels
*****************************************************************************/
/*!
- \class TQImageIO ntqimage.h
+ \class TQImageIO tqimage.h
\brief The TQImageIO class contains parameters for loading and
saving images.
diff --git a/src/kernel/ntqimage.h b/src/kernel/tqimage.h
index 32f20b23f..32f20b23f 100644
--- a/src/kernel/ntqimage.h
+++ b/src/kernel/tqimage.h
diff --git a/src/kernel/qimageformatinterface_p.h b/src/kernel/tqimageformatinterface_p.h
index 8abe49c2d..8abe49c2d 100644
--- a/src/kernel/qimageformatinterface_p.h
+++ b/src/kernel/tqimageformatinterface_p.h
diff --git a/src/kernel/qimageformatplugin.cpp b/src/kernel/tqimageformatplugin.cpp
index 3982053e0..ad9057d2c 100644
--- a/src/kernel/qimageformatplugin.cpp
+++ b/src/kernel/tqimageformatplugin.cpp
@@ -36,13 +36,13 @@
**
**********************************************************************/
-#include "ntqimageformatplugin.h"
+#include "tqimageformatplugin.h"
#ifndef TQT_NO_IMAGEFORMATPLUGIN
-#include "qimageformatinterface_p.h"
-#include "ntqimage.h"
+#include "tqimageformatinterface_p.h"
+#include "tqimage.h"
/*!
- \class TQImageFormatPlugin ntqimageformatplugin.h
+ \class TQImageFormatPlugin tqimageformatplugin.h
\brief The TQImageFormatPlugin class provides an abstract base for custom image format plugins.
\ingroup plugins
diff --git a/src/kernel/ntqimageformatplugin.h b/src/kernel/tqimageformatplugin.h
index 237817e9f..237817e9f 100644
--- a/src/kernel/ntqimageformatplugin.h
+++ b/src/kernel/tqimageformatplugin.h
diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index 88bed113c..8329bf7a8 100644
--- a/src/kernel/tqwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -44,7 +44,7 @@
#include "ntqpaintdevicemetrics.h"
#include "ntqpainter.h"
#include "ntqbitmap.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "tqobjectlist.h"
#include "ntqlayout.h"
#include "ntqtextcodec.h"
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 6882259d8..0436c01c2 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -41,7 +41,7 @@
#include "ntqgl.h"
#include "ntqpixmap.h"
#include "ntqpaintdevicemetrics.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqcleanuphandler.h"
#include "tqptrdict.h"
diff --git a/src/qt.pro b/src/qt.pro
index 8e6298fb1..e66adeef5 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -180,14 +180,14 @@ wince-* {
message( ...removing plugin stuff... (not permanent) )
HEADERS -= $$TOOLS_CPP/qcomlibrary.h \
$$KERNEL_CPP/ntqgplugin.h \
- $$KERNEL_CPP/ntqimageformatplugin.h \
+ $$KERNEL_CPP/tqimageformatplugin.h \
$$STYLES_CPP/ntqstyleplugin.h \
$$CODECS_CPP/ntqtextcodecplugin.h \
$$WIDGETS_CPP/tqwidgetplugin.h
SOURCES -= $$TOOLS_CPP/qcomlibrary.cpp \
$$KERNEL_CPP/qgplugin.cpp \
- $$KERNEL_CPP/qimageformatplugin.cpp \
+ $$KERNEL_CPP/tqimageformatplugin.cpp \
$$STYLES_CPP/qstyleplugin.cpp \
$$CODECS_CPP/qtextcodecplugin.cpp \
$$WIDGETS_CPP/tqwidgetplugin.cpp
diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp
index 36d85aafc..a611426e2 100644
--- a/src/styles/qmotifstyle.cpp
+++ b/src/styles/qmotifstyle.cpp
@@ -60,7 +60,7 @@
#include "ntqdockwindow.h"
#include "ntqdockarea.h"
#include "ntqprogressbar.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include <limits.h>
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index b8f3a5410..b979e9a0b 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/qwindowsstyle.cpp
@@ -49,7 +49,7 @@
#include "ntqpixmap.h" // for now
#include "tqwidget.h"
#include "ntqlabel.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqpushbutton.h"
#include "ntqcombobox.h"
#include "ntqlistbox.h"
diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt
index 6a9b92bf3..f528e8e74 100644
--- a/src/tools/qfeatures.txt
+++ b/src/tools/qfeatures.txt
@@ -1283,7 +1283,7 @@ SeeAlso: ???
Feature: IMAGEFORMATPLUGIN
Section: Images
Requires: COMPONENT IMAGEIO
-Name: QImageFormatPlugin
+Name: TQImageFormatPlugin
SeeAlso: ???
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index d40cdb868..07dee3f56 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -43,7 +43,7 @@
#include "tqwidget.h"
#include "qeffects_p.h"
#include "ntqpixmap.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqtimer.h"
#include "ntqdatetime.h"
#include "ntqguardedptr.h"
diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp
index 82ee76060..049338708 100644
--- a/src/widgets/qiconview.cpp
+++ b/src/widgets/qiconview.cpp
@@ -53,7 +53,7 @@
#include "ntqevent.h"
#include "ntqpalette.h"
#include "ntqmime.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqpen.h"
#include "ntqbrush.h"
#include "ntqtimer.h"
diff --git a/src/widgets/qlabel.cpp b/src/widgets/qlabel.cpp
index a9b485af8..d376b1fff 100644
--- a/src/widgets/qlabel.cpp
+++ b/src/widgets/qlabel.cpp
@@ -44,7 +44,7 @@
#include "ntqdrawutil.h"
#include "ntqaccel.h"
#include "ntqmovie.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqbitmap.h"
#include "ntqpicture.h"
#include "ntqapplication.h"
diff --git a/src/widgets/qtextbrowser.cpp b/src/widgets/qtextbrowser.cpp
index c9baa8144..23b2452f6 100644
--- a/src/widgets/qtextbrowser.cpp
+++ b/src/widgets/qtextbrowser.cpp
@@ -53,7 +53,7 @@
#include "ntqlayout.h"
#include "ntqbitmap.h"
#include "ntqtimer.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqsimplerichtext.h"
#include "ntqdragobject.h"
#include "ntqurl.h"
diff --git a/src/widgets/qtitlebar.cpp b/src/widgets/qtitlebar.cpp
index 97b2288e5..0879c3226 100644
--- a/src/widgets/qtitlebar.cpp
+++ b/src/widgets/qtitlebar.cpp
@@ -50,7 +50,7 @@
#include "ntqdatetime.h"
#include "private/qapplication_p.h"
#include "ntqtooltip.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqtimer.h"
#include "ntqpainter.h"
#include "ntqstyle.h"
diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp
index b2a4443bf..c2cdaa93f 100644
--- a/src/widgets/qtoolbutton.cpp
+++ b/src/widgets/qtoolbutton.cpp
@@ -50,7 +50,7 @@
#include "ntqmainwindow.h"
#include "ntqtooltip.h"
#include "ntqtoolbar.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqiconset.h"
#include "ntqtimer.h"
#include "ntqpopupmenu.h"
diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp
index 4479c0d8a..4e1ae7f01 100644
--- a/src/workspace/qworkspace.cpp
+++ b/src/workspace/qworkspace.cpp
@@ -58,7 +58,7 @@
#include "ntqdatetime.h"
#include "ntqtooltip.h"
#include "ntqwmatrix.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqscrollbar.h"
#include "ntqstyle.h"
#include "ntqbitmap.h"
diff --git a/src/xml/qsvgdevice.cpp b/src/xml/qsvgdevice.cpp
index ceeb8b6e6..d2895838f 100644
--- a/src/xml/qsvgdevice.cpp
+++ b/src/xml/qsvgdevice.cpp
@@ -47,7 +47,7 @@
#include "ntqregexp.h"
#include "tqvaluelist.h"
#include "ntqtextstream.h"
-#include "ntqimage.h"
+#include "tqimage.h"
#include "ntqpixmap.h"
#include <math.h>