Test conversion to TQt3 from Qt3 8c6fc1f8e35fd264dd01c582ca5e7549b32ab731

7 files changed, 481 insertions, 0 deletions

diff --git a/plugins/src/imageformats/imageformats.pro b/plugins/src/imageformats/imageformats.pro
new file mode 100644
index 000000000..424da4879
--- /dev/null
+++ b/plugins/src/imageformats/imageformats.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+
+!no-png:!png:SUBDIRS   += png
+!no-jpeg:!jpeg:SUBDIRS += jpeg
+!no-mng:!mng:SUBDIRS   += mng
diff --git a/plugins/src/imageformats/jpeg/jpeg.pro b/plugins/src/imageformats/jpeg/jpeg.pro
new file mode 100644
index 000000000..3bff1e098
--- /dev/null
+++ b/plugins/src/imageformats/jpeg/jpeg.pro
@@ -0,0 +1,68 @@
+TEMPLATE = lib
+TARGET  += qjpeg
+
+CONFIG  += qt plugin
+DESTDIR  = ../../../imageformats
+
+VERSION = 1.0.0
+REQUIRES = !no-jpeg !jpeg
+
+SOURCES += main.cpp
+system-jpeg {
+        unix:LIBS += -ljpeg
+        win32:LIBS += libjpeg.lib
+}
+!system-jpeg {
+	INCLUDEPATH += ../../../../src/3rdparty/libjpeg
+	SOURCES  += \
+	    ../../../../src/3rdparty/libjpeg/jcapimin.c \
+	    ../../../../src/3rdparty/libjpeg/jcapistd.c \
+	    ../../../../src/3rdparty/libjpeg/jccoefct.c \
+	    ../../../../src/3rdparty/libjpeg/jccolor.c \
+	    ../../../../src/3rdparty/libjpeg/jcdctmgr.c \
+	    ../../../../src/3rdparty/libjpeg/jchuff.c \
+	    ../../../../src/3rdparty/libjpeg/jcinit.c \
+	    ../../../../src/3rdparty/libjpeg/jcmainct.c \
+	    ../../../../src/3rdparty/libjpeg/jcmarker.c \
+	    ../../../../src/3rdparty/libjpeg/jcmaster.c \
+	    ../../../../src/3rdparty/libjpeg/jcomapi.c \
+	    ../../../../src/3rdparty/libjpeg/jcparam.c \
+	    ../../../../src/3rdparty/libjpeg/jcphuff.c \
+	    ../../../../src/3rdparty/libjpeg/jcprepct.c \
+	    ../../../../src/3rdparty/libjpeg/jcsample.c \
+	    ../../../../src/3rdparty/libjpeg/jctrans.c \
+	    ../../../../src/3rdparty/libjpeg/jdapimin.c \
+	    ../../../../src/3rdparty/libjpeg/jdapistd.c \
+	    ../../../../src/3rdparty/libjpeg/jdatadst.c \
+	    ../../../../src/3rdparty/libjpeg/jdatasrc.c \
+	    ../../../../src/3rdparty/libjpeg/jdcoefct.c \
+	    ../../../../src/3rdparty/libjpeg/jdcolor.c \
+	    ../../../../src/3rdparty/libjpeg/jddctmgr.c \
+	    ../../../../src/3rdparty/libjpeg/jdhuff.c \
+	    ../../../../src/3rdparty/libjpeg/jdinput.c \
+	    ../../../../src/3rdparty/libjpeg/jdmainct.c \
+	    ../../../../src/3rdparty/libjpeg/jdmarker.c \
+	    ../../../../src/3rdparty/libjpeg/jdmaster.c \
+	    ../../../../src/3rdparty/libjpeg/jdmerge.c \
+	    ../../../../src/3rdparty/libjpeg/jdphuff.c \
+	    ../../../../src/3rdparty/libjpeg/jdpostct.c \
+	    ../../../../src/3rdparty/libjpeg/jdsample.c \
+	    ../../../../src/3rdparty/libjpeg/jdtrans.c \
+	    ../../../../src/3rdparty/libjpeg/jerror.c \
+	    ../../../../src/3rdparty/libjpeg/jfdctflt.c \
+	    ../../../../src/3rdparty/libjpeg/jfdctfst.c \
+	    ../../../../src/3rdparty/libjpeg/jfdctint.c \
+	    ../../../../src/3rdparty/libjpeg/jidctflt.c \
+	    ../../../../src/3rdparty/libjpeg/jidctfst.c \
+	    ../../../../src/3rdparty/libjpeg/jidctint.c \
+	    ../../../../src/3rdparty/libjpeg/jidctred.c \
+	    ../../../../src/3rdparty/libjpeg/jmemmgr.c \
+	    ../../../../src/3rdparty/libjpeg/jquant1.c \
+	    ../../../../src/3rdparty/libjpeg/jquant2.c \
+	    ../../../../src/3rdparty/libjpeg/jutils.c \
+	    ../../../../src/3rdparty/libjpeg/jmemnobs.c
+}
+
+
+target.path += $$plugins.path/imageformats
+INSTALLS += target
diff --git a/plugins/src/imageformats/jpeg/main.cpp b/plugins/src/imageformats/jpeg/main.cpp
new file mode 100644
index 000000000..691322bf3
--- /dev/null
+++ b/plugins/src/imageformats/jpeg/main.cpp
@@ -0,0 +1,76 @@
+#ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE
+#endif
+#include <qimageformatplugin.h>
+
+#ifndef QT_NO_IMAGEFORMATPLUGIN
+
+#ifdef QT_NO_IMAGEIO_JPEG
+#undef QT_NO_IMAGEIO_JPEG
+#endif
+#include "../../../../src/kernel/qjpegio.cpp"
+
+class JPEGFormat : public TQImageFormatPlugin
+{
+public:
+    JPEGFormat();
+
+    TQStringList keys() const;
+    bool loadImage( const TQString &format, const TQString &filename, TQImage * );
+    bool saveImage( const TQString &format, const TQString &filename, const TQImage & );
+    bool installIOHandler( const TQString & );
+};
+
+JPEGFormat::JPEGFormat()
+{
+}
+
+
+TQStringList JPEGFormat::keys() const
+{
+    TQStringList list;
+    list << "JPEG";
+
+    return list;
+}
+
+bool JPEGFormat::loadImage( const TQString &format, const TQString &filename, TQImage *image )
+{
+    if ( format != "JPEG" )
+	return FALSE;
+
+    TQImageIO io;
+    io.setFileName( filename );
+    io.setImage( *image );
+
+    read_jpeg_image( &io );
+
+    return TRUE;
+}
+
+bool JPEGFormat::saveImage( const TQString &format, const TQString &filename, const TQImage &image )
+{
+    if ( format != "JPEG" )
+	return FALSE;
+
+    TQImageIO io;
+    io.setFileName( filename );
+    io.setImage( image );
+
+    write_jpeg_image( &io );
+
+    return TRUE;
+}
+
+bool JPEGFormat::installIOHandler( const TQString &name )
+{
+    if ( name.upper() != "JPEG" )
+	return FALSE;
+
+    qInitJpegIO();
+    return TRUE;
+}
+
+Q_EXPORT_PLUGIN( JPEGFormat )
+
+#endif // QT_NO_IMAGEFORMATPLUGIN
diff --git a/plugins/src/imageformats/mng/main.cpp b/plugins/src/imageformats/mng/main.cpp
new file mode 100644
index 000000000..287a5cb21
--- /dev/null
+++ b/plugins/src/imageformats/mng/main.cpp
@@ -0,0 +1,59 @@
+#ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE
+#endif
+
+#include <qimageformatplugin.h>
+
+#ifndef QT_NO_IMAGEFORMATPLUGIN
+
+#ifdef QT_NO_IMAGEIO_MNG
+#undef QT_NO_IMAGEIO_MNG
+#endif
+#include "../../../../src/kernel/qmngio.cpp"
+
+class MNGFormat : public TQImageFormatPlugin
+{
+public:
+    MNGFormat();
+
+    TQStringList keys() const;
+    bool loadImage( const TQString &format, const TQString &filename, TQImage *image );
+    bool saveImage( const TQString &format, const TQString &filename, const TQImage &image );
+    bool installIOHandler( const TQString & );
+};
+
+MNGFormat::MNGFormat()
+{
+}
+
+
+TQStringList MNGFormat::keys() const
+{
+    TQStringList list;
+    list << "MNG";
+
+    return list;
+}
+
+bool MNGFormat::loadImage( const TQString &, const TQString &, TQImage * )
+{
+    return FALSE;
+}
+
+bool MNGFormat::saveImage( const TQString &, const TQString &, const TQImage& )
+{
+    return FALSE;
+}
+
+bool MNGFormat::installIOHandler( const TQString &name )
+{
+    if ( name != "MNG" )
+	return FALSE;
+
+    qInitMngIO();
+    return TRUE;
+}
+
+Q_EXPORT_PLUGIN( MNGFormat )
+
+#endif // QT_NO_IMAGEFORMATPLUGIN
diff --git a/plugins/src/imageformats/mng/mng.pro b/plugins/src/imageformats/mng/mng.pro
new file mode 100644
index 000000000..2c39f9412
--- /dev/null
+++ b/plugins/src/imageformats/mng/mng.pro
@@ -0,0 +1,142 @@
+TEMPLATE = lib
+TARGET  += qmng
+
+CONFIG  += qt plugin
+DESTDIR  = ../../../imageformats
+
+VERSION = 1.0.0
+REQUIRES = !no-mng !mng
+
+SOURCES += main.cpp
+
+win32-borland {
+	QMAKE_CFLAGS_WARN_ON	+= -w-par
+	QMAKE_CXXFLAGS_WARN_ON	+= -w-par
+}
+win32: CONFIG-=zlib system-zlib jpeg system-jpeg
+
+system-mng {
+        win32:LIBS += libmng.lib
+        unix:LIBS  += -lmng
+}
+!system-mng {
+	INCLUDEPATH += ../../../../src/3rdparty/libmng
+	SOURCES += \
+	../../../../src/3rdparty/libmng/libmng_callback_xs.c \
+	../../../../src/3rdparty/libmng/libmng_chunk_io.c \
+	../../../../src/3rdparty/libmng/libmng_chunk_prc.c \
+	../../../../src/3rdparty/libmng/libmng_chunk_xs.c \
+	../../../../src/3rdparty/libmng/libmng_cms.c \
+	../../../../src/3rdparty/libmng/libmng_display.c \
+	../../../../src/3rdparty/libmng/libmng_dither.c \
+	../../../../src/3rdparty/libmng/libmng_error.c \
+	../../../../src/3rdparty/libmng/libmng_filter.c \
+	../../../../src/3rdparty/libmng/libmng_hlapi.c \
+	../../../../src/3rdparty/libmng/libmng_jpeg.c \
+	../../../../src/3rdparty/libmng/libmng_object_prc.c \
+	../../../../src/3rdparty/libmng/libmng_pixels.c \
+	../../../../src/3rdparty/libmng/libmng_prop_xs.c \
+	../../../../src/3rdparty/libmng/libmng_read.c \
+	../../../../src/3rdparty/libmng/libmng_trace.c \
+	../../../../src/3rdparty/libmng/libmng_write.c \
+	../../../../src/3rdparty/libmng/libmng_zlib.c
+
+	HEADERS += ../../../../src/3rdparty/libmng/libmng.h \
+	../../../../src/3rdparty/libmng/libmng_chunks.h \
+	../../../../src/3rdparty/libmng/libmng_chunk_io.h \
+	../../../../src/3rdparty/libmng/libmng_chunk_prc.h \
+	../../../../src/3rdparty/libmng/libmng_cms.h \
+	../../../../src/3rdparty/libmng/libmng_conf.h \
+	../../../../src/3rdparty/libmng/libmng_data.h \
+	../../../../src/3rdparty/libmng/libmng_display.h \
+	../../../../src/3rdparty/libmng/libmng_dither.h \
+	../../../../src/3rdparty/libmng/libmng_error.h \
+	../../../../src/3rdparty/libmng/libmng_filter.h \
+	../../../../src/3rdparty/libmng/libmng_jpeg.h \
+	../../../../src/3rdparty/libmng/libmng_memory.h \
+	../../../../src/3rdparty/libmng/libmng_objects.h \
+	../../../../src/3rdparty/libmng/libmng_object_prc.h \
+	../../../../src/3rdparty/libmng/libmng_pixels.h \
+	../../../../src/3rdparty/libmng/libmng_read.h \
+	../../../../src/3rdparty/libmng/libmng_trace.h \
+	../../../../src/3rdparty/libmng/libmng_types.h \
+	../../../../src/3rdparty/libmng/libmng_write.h \
+	../../../../src/3rdparty/libmng/libmng_zlib.h
+}
+
+!system-zlib {
+	INCLUDEPATH += ../../../../src/3rdparty/zlib
+	SOURCES+= \
+	../../../../src/3rdparty/zlib/adler32.c \
+	../../../../src/3rdparty/zlib/compress.c \
+	../../../../src/3rdparty/zlib/crc32.c \
+	../../../../src/3rdparty/zlib/deflate.c \
+	../../../../src/3rdparty/zlib/gzio.c \
+	../../../../src/3rdparty/zlib/inffast.c \
+	../../../../src/3rdparty/zlib/inflate.c \
+	../../../../src/3rdparty/zlib/inftrees.c \
+	../../../../src/3rdparty/zlib/trees.c \
+	../../../../src/3rdparty/zlib/uncompr.c \
+	../../../../src/3rdparty/zlib/zutil.c
+}
+!no-zlib:!zlib:unix:LIBS += -lz
+!no-zlib:!zlib:mac:LIBS += -lz
+
+system-jpeg {
+        unix:LIBS  += -ljpeg
+        win32:LIBS += libjpeg.lib
+}
+!system-jpeg {
+	INCLUDEPATH += ../../../../src/3rdparty/libjpeg
+	SOURCES += \
+	    ../../../../src/3rdparty/libjpeg/jcapimin.c \
+	    ../../../../src/3rdparty/libjpeg/jcapistd.c \
+	    ../../../../src/3rdparty/libjpeg/jccoefct.c \
+	    ../../../../src/3rdparty/libjpeg/jccolor.c \
+	    ../../../../src/3rdparty/libjpeg/jcdctmgr.c \
+	    ../../../../src/3rdparty/libjpeg/jchuff.c \
+	    ../../../../src/3rdparty/libjpeg/jcinit.c \
+	    ../../../../src/3rdparty/libjpeg/jcmainct.c \
+	    ../../../../src/3rdparty/libjpeg/jcmarker.c \
+	    ../../../../src/3rdparty/libjpeg/jcmaster.c \
+	    ../../../../src/3rdparty/libjpeg/jcomapi.c \
+	    ../../../../src/3rdparty/libjpeg/jcparam.c \
+	    ../../../../src/3rdparty/libjpeg/jcphuff.c \
+	    ../../../../src/3rdparty/libjpeg/jcprepct.c \
+	    ../../../../src/3rdparty/libjpeg/jcsample.c \
+	    ../../../../src/3rdparty/libjpeg/jctrans.c \
+	    ../../../../src/3rdparty/libjpeg/jdapimin.c \
+	    ../../../../src/3rdparty/libjpeg/jdapistd.c \
+	    ../../../../src/3rdparty/libjpeg/jdatadst.c \
+	    ../../../../src/3rdparty/libjpeg/jdatasrc.c \
+	    ../../../../src/3rdparty/libjpeg/jdcoefct.c \
+	    ../../../../src/3rdparty/libjpeg/jdcolor.c \
+	    ../../../../src/3rdparty/libjpeg/jddctmgr.c \
+	    ../../../../src/3rdparty/libjpeg/jdhuff.c \
+	    ../../../../src/3rdparty/libjpeg/jdinput.c \
+	    ../../../../src/3rdparty/libjpeg/jdmainct.c \
+	    ../../../../src/3rdparty/libjpeg/jdmarker.c \
+	    ../../../../src/3rdparty/libjpeg/jdmaster.c \
+	    ../../../../src/3rdparty/libjpeg/jdmerge.c \
+	    ../../../../src/3rdparty/libjpeg/jdphuff.c \
+	    ../../../../src/3rdparty/libjpeg/jdpostct.c \
+	    ../../../../src/3rdparty/libjpeg/jdsample.c \
+	    ../../../../src/3rdparty/libjpeg/jdtrans.c \
+	    ../../../../src/3rdparty/libjpeg/jerror.c \
+	    ../../../../src/3rdparty/libjpeg/jfdctflt.c \
+	    ../../../../src/3rdparty/libjpeg/jfdctfst.c \
+	    ../../../../src/3rdparty/libjpeg/jfdctint.c \
+	    ../../../../src/3rdparty/libjpeg/jidctflt.c \
+	    ../../../../src/3rdparty/libjpeg/jidctfst.c \
+	    ../../../../src/3rdparty/libjpeg/jidctint.c \
+	    ../../../../src/3rdparty/libjpeg/jidctred.c \
+	    ../../../../src/3rdparty/libjpeg/jmemmgr.c \
+	    ../../../../src/3rdparty/libjpeg/jquant1.c \
+	    ../../../../src/3rdparty/libjpeg/jquant2.c \
+	    ../../../../src/3rdparty/libjpeg/jutils.c \
+	    ../../../../src/3rdparty/libjpeg/jmemnobs.c
+}
+
+
+target.path += $$plugins.path/imageformats
+INSTALLS += target
diff --git a/plugins/src/imageformats/png/main.cpp b/plugins/src/imageformats/png/main.cpp
new file mode 100644
index 000000000..7c1cd03b2
--- /dev/null
+++ b/plugins/src/imageformats/png/main.cpp
@@ -0,0 +1,76 @@
+#ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE
+#endif
+#include <qimageformatplugin.h>
+
+#ifndef QT_NO_IMAGEFORMATPLUGIN
+
+#ifdef QT_NO_IMAGEIO_PNG
+#undef QT_NO_IMAGEIO_PNG
+#endif
+#include "../../../../src/kernel/qpngio.cpp"
+
+class PNGFormat : public TQImageFormatPlugin
+{
+public:
+    PNGFormat();
+
+    TQStringList keys() const;
+    bool loadImage( const TQString &format, const TQString &filename, TQImage * );
+    bool saveImage( const TQString &format, const TQString &filename, const TQImage& );
+    bool installIOHandler( const TQString & );
+};
+
+PNGFormat::PNGFormat()
+{
+}
+
+
+TQStringList PNGFormat::keys() const
+{
+    TQStringList list;
+    list << "PNG";
+
+    return list;
+}
+
+bool PNGFormat::loadImage( const TQString &format, const TQString &filename, TQImage *image )
+{
+    if ( format != "PNG" )
+	return FALSE;
+
+    TQImageIO io;
+    io.setFileName( filename );
+    io.setImage( *image );
+
+    read_png_image( &io );
+
+    return TRUE;
+}
+
+bool PNGFormat::saveImage( const TQString &format, const TQString &filename, const TQImage &image )
+{
+    if ( format != "PNG" )
+	return FALSE;
+
+    TQImageIO io;
+    io.setFileName( filename );
+    io.setImage( image );
+
+    write_png_image( &io );
+
+    return TRUE;
+}
+
+bool PNGFormat::installIOHandler( const TQString &name )
+{
+    if ( name != "PNG" ) 
+	return FALSE;
+
+    qInitPngIO();
+    return TRUE;
+}
+
+Q_EXPORT_PLUGIN( PNGFormat )
+
+#endif // QT_NO_IMAGEFORMATPLUGIN
diff --git a/plugins/src/imageformats/png/png.pro b/plugins/src/imageformats/png/png.pro
new file mode 100644
index 000000000..fd1db1c3f
--- /dev/null
+++ b/plugins/src/imageformats/png/png.pro
@@ -0,0 +1,55 @@
+TEMPLATE = lib
+TARGET  += qpng
+
+CONFIG += qt plugin
+DESTDIR = ../../../imageformats
+
+VERSION = 1.0.0
+REQUIRES = !no-png !png
+
+SOURCES += main.cpp
+
+system-png {
+        unix:LIBS  += -lpng
+        win32:LIBS += libpng.lib
+}
+!system-png {
+	INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/libpng
+	INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
+	SOURCES += \
+    	    ../../../../src/3rdparty/libpng/png.c \
+	    ../../../../src/3rdparty/libpng/pngerror.c \
+	    ../../../../src/3rdparty/libpng/pngget.c \
+	    ../../../../src/3rdparty/libpng/pngmem.c \
+	    ../../../../src/3rdparty/libpng/pngpread.c \
+	    ../../../../src/3rdparty/libpng/pngread.c \
+	    ../../../../src/3rdparty/libpng/pngrio.c \
+	    ../../../../src/3rdparty/libpng/pngrtran.c \
+	    ../../../../src/3rdparty/libpng/pngrutil.c \
+	    ../../../../src/3rdparty/libpng/pngset.c \
+	    ../../../../src/3rdparty/libpng/pngtrans.c \
+	    ../../../../src/3rdparty/libpng/pngwio.c \
+	    ../../../../src/3rdparty/libpng/pngwrite.c \
+	    ../../../../src/3rdparty/libpng/pngwtran.c \
+	    ../../../../src/3rdparty/libpng/pngwutil.c
+}
+
+!system-zlib:SOURCES += \
+	../../../../src/3rdparty/zlib/adler32.c \
+	../../../../src/3rdparty/zlib/compress.c \
+	../../../../src/3rdparty/zlib/crc32.c \
+	../../../../src/3rdparty/zlib/deflate.c \
+	../../../../src/3rdparty/zlib/gzio.c \
+	../../../../src/3rdparty/zlib/inffast.c \
+	../../../../src/3rdparty/zlib/inflate.c \
+	../../../../src/3rdparty/zlib/inftrees.c \
+	../../../../src/3rdparty/zlib/trees.c \
+	../../../../src/3rdparty/zlib/uncompr.c \
+	../../../../src/3rdparty/zlib/zutil.c
+
+system-zlib:unix:LIBS += -lz
+system-zlib:mac:LIBS += -lz
+
+
+target.path += $$plugins.path/imageformats
+INSTALLS += target