diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-02 19:23:46 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-02 19:23:46 +0000 |
| commit | eba47f8f0637f451e21348187591e1f1fd58ac74 (patch) | |
| tree | 448f10b95c656604acc331a3236c1e59bde5c1ad /kfile-plugins | |
| parent | c7e8736c69373f48b0401319757c742e8607431a (diff) | |
| download | tdegraphics-eba47f8f0637f451e21348187591e1f1fd58ac74.tar.gz tdegraphics-eba47f8f0637f451e21348187591e1f1fd58ac74.zip | |
TQt conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1158446 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kfile-plugins')
40 files changed, 547 insertions, 547 deletions
diff --git a/kfile-plugins/bmp/kfile_bmp.cpp b/kfile-plugins/bmp/kfile_bmp.cpp index b9d6a7ad..790161a6 100644 --- a/kfile-plugins/bmp/kfile_bmp.cpp +++ b/kfile-plugins/bmp/kfile_bmp.cpp @@ -26,11 +26,11 @@ #include <kstringvalidator.h> #include <kdebug.h> -#include <qdict.h> -#include <qvalidator.h> -#include <qcstring.h> -#include <qfile.h> -#include <qdatetime.h> +#include <tqdict.h> +#include <tqvalidator.h> +#include <tqcstring.h> +#include <tqfile.h> +#include <tqdatetime.h> #if !defined(__osf__) #include <inttypes.h> @@ -43,8 +43,8 @@ typedef KGenericFactory<KBmpPlugin> BmpFactory; K_EXPORT_COMPONENT_FACTORY(kfile_bmp, BmpFactory( "kfile_bmp" )) -KBmpPlugin::KBmpPlugin(QObject *parent, const char *name, - const QStringList &args) +KBmpPlugin::KBmpPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { @@ -56,16 +56,16 @@ KBmpPlugin::KBmpPlugin(QObject *parent, const char *name, KFileMimeTypeInfo::ItemInfo* item; - item = addItemInfo(group, "Type", i18n("Type"), QVariant::String); + item = addItemInfo(group, "Type", i18n("Type"), TQVariant::String); - item = addItemInfo(group, "Dimensions", i18n("Dimensions"), QVariant::Size); + item = addItemInfo(group, "Dimensions", i18n("Dimensions"), TQVariant::Size); setHint( item, KFileMimeTypeInfo::Size ); setUnit(item, KFileMimeTypeInfo::Pixels); - item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), QVariant::Int); + item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), TQVariant::Int); setUnit(item, KFileMimeTypeInfo::BitsPerPixel); - item = addItemInfo(group, "Compression", i18n("Compression"), QVariant::String); + item = addItemInfo(group, "Compression", i18n("Compression"), TQVariant::String); } @@ -79,18 +79,18 @@ bool KBmpPlugin::readInfo( KFileMetaInfo& info, uint what) const char * bmptype_ic = "IC"; const char * bmptype_pt = "PT"; - QFile file(info.path()); + TQFile file(info.path()); if (!file.open(IO_ReadOnly)) { - kdDebug(7034) << "Couldn't open " << QFile::encodeName(info.path()) << endl; + kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl; return false; } - QDataStream dstream(&file); + TQDataStream dstream(&file); // BMP files are little-endian - dstream.setByteOrder(QDataStream::LittleEndian); + dstream.setByteOrder(TQDataStream::LittleEndian); // create this now because we output image type early on KFileMetaInfoGroup group = appendGroup(info, "Technical"); @@ -148,7 +148,7 @@ bool KBmpPlugin::readInfo( KFileMetaInfo& info, uint what) // output the useful bits - appendItem(group, "Dimensions", QSize(bmpi_width, bmpi_height)); + appendItem(group, "Dimensions", TQSize(bmpi_width, bmpi_height)); appendItem(group, "BitDepth", bmpi_bitcount); switch (bmpi_compression) { diff --git a/kfile-plugins/bmp/kfile_bmp.h b/kfile-plugins/bmp/kfile_bmp.h index b72ee16d..f34e3e86 100644 --- a/kfile-plugins/bmp/kfile_bmp.h +++ b/kfile-plugins/bmp/kfile_bmp.h @@ -22,14 +22,14 @@ #include <kfilemetainfo.h> -class QStringList; +class TQStringList; class KBmpPlugin: public KFilePlugin { Q_OBJECT public: - KBmpPlugin( QObject *parent, const char *name, const QStringList& args ); + KBmpPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/dds/kfile_dds.cpp b/kfile-plugins/dds/kfile_dds.cpp index dd7f8f1e..f8c3346e 100644 --- a/kfile-plugins/dds/kfile_dds.cpp +++ b/kfile-plugins/dds/kfile_dds.cpp @@ -26,11 +26,11 @@ #include <kstringvalidator.h> #include <kdebug.h> -#include <qdict.h> -#include <qvalidator.h> -#include <qcstring.h> -#include <qfile.h> -#include <qdatetime.h> +#include <tqdict.h> +#include <tqvalidator.h> +#include <tqcstring.h> +#include <tqfile.h> +#include <tqdatetime.h> typedef KGenericFactory<KDdsPlugin> DdsFactory; @@ -96,7 +96,7 @@ namespace { // Private. uint amask; }; - QDataStream & operator>> ( QDataStream & s, DDSPixelFormat & pf ) + TQDataStream & operator>> ( TQDataStream & s, DDSPixelFormat & pf ) { s >> pf.size; s >> pf.flags; @@ -116,7 +116,7 @@ namespace { // Private. uint caps4; }; - QDataStream & operator>> ( QDataStream & s, DDSCaps & caps ) + TQDataStream & operator>> ( TQDataStream & s, DDSCaps & caps ) { s >> caps.caps1; s >> caps.caps2; @@ -139,7 +139,7 @@ namespace { // Private. uint notused; }; - QDataStream & operator>> ( QDataStream & s, DDSHeader & header ) + TQDataStream & operator>> ( TQDataStream & s, DDSHeader & header ) { s >> header.size; s >> header.flags; @@ -182,7 +182,7 @@ namespace { // Private. K_EXPORT_COMPONENT_FACTORY(kfile_dds, DdsFactory( "kfile_dds" )) // Constructor, init mime type info. -KDdsPlugin::KDdsPlugin(QObject *parent, const char *name, const QStringList &args) : +KDdsPlugin::KDdsPlugin(TQObject *parent, const char *name, const TQStringList &args) : KFilePlugin(parent, name, args) { KFileMimeTypeInfo * info = addMimeTypeInfo( "image/x-dds" ); @@ -193,41 +193,41 @@ KDdsPlugin::KDdsPlugin(QObject *parent, const char *name, const QStringList &arg KFileMimeTypeInfo::ItemInfo * item; - item = addItemInfo(group, "Dimensions", i18n("Dimensions"), QVariant::Size); + item = addItemInfo(group, "Dimensions", i18n("Dimensions"), TQVariant::Size); setHint(item, KFileMimeTypeInfo::Size); setUnit(item, KFileMimeTypeInfo::Pixels); - item = addItemInfo(group, "Depth", i18n("Depth"), QVariant::Int); + item = addItemInfo(group, "Depth", i18n("Depth"), TQVariant::Int); setUnit(item, KFileMimeTypeInfo::Pixels); - item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), QVariant::Int); + item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), TQVariant::Int); setUnit(item, KFileMimeTypeInfo::BitsPerPixel); - addItemInfo(group, "MipmapCount", i18n("Mipmap Count"), QVariant::Int); + addItemInfo(group, "MipmapCount", i18n("Mipmap Count"), TQVariant::Int); - addItemInfo(group, "Type", i18n("Type"), QVariant::String); - addItemInfo(group, "ColorMode", i18n("Color Mode"), QVariant::String); - addItemInfo(group, "Compression", i18n("Compression"), QVariant::String); + addItemInfo(group, "Type", i18n("Type"), TQVariant::String); + addItemInfo(group, "ColorMode", i18n("Color Mode"), TQVariant::String); + addItemInfo(group, "Compression", i18n("Compression"), TQVariant::String); } // Read mime type info. bool KDdsPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) { - QFile file(info.path()); + TQFile file(info.path()); if (!file.open(IO_ReadOnly)) { - kdDebug(7034) << "Couldn't open " << QFile::encodeName(info.path()) << endl; + kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl; return false; } - QDataStream s(&file); - s.setByteOrder(QDataStream::LittleEndian); + TQDataStream s(&file); + s.setByteOrder(TQDataStream::LittleEndian); // Validate header. uint fourcc; s >> fourcc; if( fourcc != FOURCC_DDS ) { - kdDebug(7034) << QFile::encodeName(info.path()) << " is not a DDS file." << endl; + kdDebug(7034) << TQFile::encodeName(info.path()) << " is not a DDS file." << endl; return false; } @@ -237,13 +237,13 @@ bool KDdsPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) // Check image file format. if( s.atEnd() || !IsValid( header ) ) { - kdDebug(7034) << QFile::encodeName(info.path()) << " is not a valid DDS file." << endl; + kdDebug(7034) << TQFile::encodeName(info.path()) << " is not a valid DDS file." << endl; return false; } // Set file info. KFileMetaInfoGroup group = appendGroup(info, "Technical"); - appendItem(group, "Dimensions", QSize(header.width, header.height)); + appendItem(group, "Dimensions", TQSize(header.width, header.height)); appendItem(group, "MipmapCount", header.mipmapcount); // Set file type. diff --git a/kfile-plugins/dds/kfile_dds.h b/kfile-plugins/dds/kfile_dds.h index 342581bb..63dd156b 100644 --- a/kfile-plugins/dds/kfile_dds.h +++ b/kfile-plugins/dds/kfile_dds.h @@ -22,14 +22,14 @@ #include <kfilemetainfo.h> -class QStringList; +class TQStringList; class KDdsPlugin: public KFilePlugin { Q_OBJECT public: - KDdsPlugin( QObject *parent, const char *name, const QStringList& args ); + KDdsPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/dvi/kfile_dvi.cpp b/kfile-plugins/dvi/kfile_dvi.cpp index 4140b98b..e8fb7af7 100644 --- a/kfile-plugins/dvi/kfile_dvi.cpp +++ b/kfile-plugins/dvi/kfile_dvi.cpp @@ -27,19 +27,19 @@ #include <klocale.h> #include <kfilemetainfo.h> -#include <qstring.h> -#include <qvariant.h> -#include <qdatetime.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qregexp.h> +#include <tqstring.h> +#include <tqvariant.h> +#include <tqdatetime.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqregexp.h> // preprocessormacro K_EXPORT_COMPONENT_FACTORY loads shared library 'kfile_dvi.so' dynamic if necessary typedef KGenericFactory<KDviPlugin> DviFactory; K_EXPORT_COMPONENT_FACTORY(kfile_dvi, DviFactory("kfile_dvi")) -KDviPlugin::KDviPlugin (QObject * parent, const char * name, const QStringList & preferredItems) +KDviPlugin::KDviPlugin (TQObject * parent, const char * name, const TQStringList & preferredItems) : KFilePlugin(parent, name, preferredItems) { kdDebug(7034) << "dvi plugin" << endl; @@ -50,9 +50,9 @@ KDviPlugin::KDviPlugin (QObject * parent, const char * name, const QStringList & KFileMimeTypeInfo::GroupInfo * group = this->addGroupInfo(info, "General", "General"); - this->addItemInfo(group, "3_Created", i18n("Created"), QVariant::String); - this->addItemInfo(group, "6_Comment", i18n("Comment"), QVariant::String); - this->addItemInfo(group, "7_Pages", i18n("Pages"), QVariant::UInt); + this->addItemInfo(group, "3_Created", i18n("Created"), TQVariant::String); + this->addItemInfo(group, "6_Comment", i18n("Comment"), TQVariant::String); + this->addItemInfo(group, "7_Pages", i18n("Pages"), TQVariant::UInt); } bool KDviPlugin::readInfo (KFileMetaInfo & info, uint /* what (unused in this plugin) */) @@ -60,11 +60,11 @@ bool KDviPlugin::readInfo (KFileMetaInfo & info, uint /* what (unused in this pl if ( info.path().isEmpty() ) return false; KFileMetaInfoGroup GeneralGroup = appendGroup(info, "General"); - QFile f(info.path()); - QFileInfo f_info; + TQFile f(info.path()); + TQFileInfo f_info; Q_UINT16 bytes_to_read; Q_UINT8 comment_length; - QString comment; + TQString comment; Q_UINT16 pages; Q_UINT8 buffer[270]; // buffer for reading data; no data is read with more than 270 bytes Q_UINT32 ptr; @@ -134,14 +134,14 @@ bool KDviPlugin::readInfo (KFileMetaInfo & info, uint /* what (unused in this pl pages = buffer[0]; pages = (pages << 8) | buffer[1]; - appendItem(GeneralGroup, "7_Pages", QVariant(pages) ); + appendItem(GeneralGroup, "7_Pages", TQVariant(pages) ); f.close(); // now get and set up some basic informations about the file (same informations would be displayed, if there is no dvi-plugin) - appendItem(GeneralGroup, "1_Type", QVariant( i18n("TeX Device Independent file") ) ); // set up type of file + appendItem(GeneralGroup, "1_Type", TQVariant( i18n("TeX Device Independent file") ) ); // set up type of file - appendItem(GeneralGroup, "4_Modified", QVariant(f_info.lastModified().toString("yyyy-MM-dd hh:mm")) ); + appendItem(GeneralGroup, "4_Modified", TQVariant(f_info.lastModified().toString("yyyy-MM-dd hh:mm")) ); // ISO 8601 date format (without seconds) return true; diff --git a/kfile-plugins/dvi/kfile_dvi.h b/kfile-plugins/dvi/kfile_dvi.h index 66e7b218..60326144 100644 --- a/kfile-plugins/dvi/kfile_dvi.h +++ b/kfile-plugins/dvi/kfile_dvi.h @@ -23,13 +23,13 @@ #include <kfilemetainfo.h> -class QStringList; +class TQStringList; class KDviPlugin : public KFilePlugin { Q_OBJECT public: - KDviPlugin ( QObject * parent, const char * name, const QStringList & preferredItems ); + KDviPlugin ( TQObject * parent, const char * name, const TQStringList & preferredItems ); virtual bool readInfo (KFileMetaInfo & info, uint what); }; diff --git a/kfile-plugins/exr/kfile_exr.cpp b/kfile-plugins/exr/kfile_exr.cpp index 2e995fc6..e2ae9a06 100644 --- a/kfile-plugins/exr/kfile_exr.cpp +++ b/kfile-plugins/exr/kfile_exr.cpp @@ -45,12 +45,12 @@ #include <kgenericfactory.h> #include <kdebug.h> -#include <qcstring.h> -#include <qfile.h> -#include <qdatetime.h> -#include <qdict.h> -#include <qvalidator.h> -#include <qimage.h> +#include <tqcstring.h> +#include <tqfile.h> +#include <tqdatetime.h> +#include <tqdict.h> +#include <tqvalidator.h> +#include <tqimage.h> #include "kfile_exr.h" @@ -60,8 +60,8 @@ typedef KGenericFactory<KExrPlugin> ExrFactory; K_EXPORT_COMPONENT_FACTORY(kfile_exr, ExrFactory("kfile_exr")) -KExrPlugin::KExrPlugin(QObject *parent, const char *name, - const QStringList &args) +KExrPlugin::KExrPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { // set up our mime type @@ -72,92 +72,92 @@ KExrPlugin::KExrPlugin(QObject *parent, const char *name, // info group group = addGroupInfo( info, "Info", i18n("Information") ); - addItemInfo( group, "Version", i18n("Format Version"), QVariant::Int ); - addItemInfo( group, "Tiled image", i18n("Tiled Image"), QVariant::String ); - item = addItemInfo( group, "Dimensions", i18n("Dimensions"), QVariant::Size ); + addItemInfo( group, "Version", i18n("Format Version"), TQVariant::Int ); + addItemInfo( group, "Tiled image", i18n("Tiled Image"), TQVariant::String ); + item = addItemInfo( group, "Dimensions", i18n("Dimensions"), TQVariant::Size ); setHint( item, KFileMimeTypeInfo::Size ); setUnit( item, KFileMimeTypeInfo::Pixels ); item = addItemInfo( group, "ThumbnailDimensions", - i18n("Thumbnail Dimensions"), QVariant::Size ); + i18n("Thumbnail Dimensions"), TQVariant::Size ); setHint( item, KFileMimeTypeInfo::Size ); setUnit( item, KFileMimeTypeInfo::Pixels ); - addItemInfo( group, "Comment", i18n("Comment"), QVariant::String ); - item = addItemInfo( group, "Thumbnail", i18n("Thumbnail"), QVariant::Image ); + addItemInfo( group, "Comment", i18n("Comment"), TQVariant::String ); + item = addItemInfo( group, "Thumbnail", i18n("Thumbnail"), TQVariant::Image ); setHint( item, KFileMimeTypeInfo::Thumbnail ); // standard attributes group group = addGroupInfo( info, "Standard", i18n("Standard Attributes") ); - addItemInfo( group, "Owner", i18n("Owner"), QVariant::String ); - addItemInfo( group, "Comments", i18n("Comments"), QVariant::String ); - addItemInfo( group, "Capture Date", i18n("Capture Date"), QVariant::String ); - item = addItemInfo( group, "UTC Offset", i18n("UTC Offset"), QVariant::String ); - item = addItemInfo( group, "Exposure time", i18n("Exposure Time"), QVariant::Double); + addItemInfo( group, "Owner", i18n("Owner"), TQVariant::String ); + addItemInfo( group, "Comments", i18n("Comments"), TQVariant::String ); + addItemInfo( group, "Capture Date", i18n("Capture Date"), TQVariant::String ); + item = addItemInfo( group, "UTC Offset", i18n("UTC Offset"), TQVariant::String ); + item = addItemInfo( group, "Exposure time", i18n("Exposure Time"), TQVariant::Double); setUnit( item, KFileMimeTypeInfo::Seconds ); - item = addItemInfo( group, "Focus", i18n("Focus"), QVariant::Double); + item = addItemInfo( group, "Focus", i18n("Focus"), TQVariant::Double); setSuffix( item, i18n("Metres", "m") ); - item = addItemInfo( group, "X Density", i18n("X Density"), QVariant::Double); + item = addItemInfo( group, "X Density", i18n("X Density"), TQVariant::Double); setSuffix( item, i18n("Pixels Per Inch", " ppi") ); - item = addItemInfo( group, "White luminance", i18n("White Luminance"), QVariant::Double); + item = addItemInfo( group, "White luminance", i18n("White Luminance"), TQVariant::Double); setSuffix( item, i18n("Candelas per square metre", " Nits") ); - addItemInfo( group, "Longitude", i18n("Longitude"), QVariant::String ); - addItemInfo( group, "Latitude", i18n("Latitude"), QVariant::String ); - item = addItemInfo( group, "Altitude", i18n("Altitude"), QVariant::String ); + addItemInfo( group, "Longitude", i18n("Longitude"), TQVariant::String ); + addItemInfo( group, "Latitude", i18n("Latitude"), TQVariant::String ); + item = addItemInfo( group, "Altitude", i18n("Altitude"), TQVariant::String ); setSuffix( item, i18n("Metres", "m") ); - addItemInfo( group, "ISO speed", i18n("ISO Speed"), QVariant::Double ); - addItemInfo( group, "Aperture", i18n("Aperture"), QVariant::Double ); + addItemInfo( group, "ISO speed", i18n("ISO Speed"), TQVariant::Double ); + addItemInfo( group, "Aperture", i18n("Aperture"), TQVariant::Double ); // channel group group = addGroupInfo( info, "Channel", i18n("Channels") ); - addItemInfo( group, "A", i18n("A"), QVariant::String ); - addItemInfo( group, "R", i18n("R"), QVariant::String ); - addItemInfo( group, "G", i18n("G"), QVariant::String ); - addItemInfo( group, "B", i18n("B"), QVariant::String ); - addItemInfo( group, "Z", i18n("Z"), QVariant::String ); - addItemInfo( group, "NX", i18n("NX"), QVariant::String ); - addItemInfo( group, "NY", i18n("NY"), QVariant::String ); - addItemInfo( group, "NZ", i18n("NZ"), QVariant::String ); - addItemInfo( group, "R", i18n("R"), QVariant::String ); - addItemInfo( group, "U", i18n("U"), QVariant::String ); - addItemInfo( group, "V", i18n("V"), QVariant::String ); - addItemInfo( group, "materialID", i18n("materialID"), QVariant::String ); - addItemInfo( group, "objectID", i18n("objectID"), QVariant::String ); - addItemInfo( group, "renderID", i18n("renderID"), QVariant::String ); - addItemInfo( group, "pixelCover", i18n("pixelCover"), QVariant::String ); - addItemInfo( group, "velX", i18n("velX"), QVariant::String ); - addItemInfo( group, "velY", i18n("velY"), QVariant::String ); - addItemInfo( group, "packedRGBA", i18n("packedRGBA"), QVariant::String ); + addItemInfo( group, "A", i18n("A"), TQVariant::String ); + addItemInfo( group, "R", i18n("R"), TQVariant::String ); + addItemInfo( group, "G", i18n("G"), TQVariant::String ); + addItemInfo( group, "B", i18n("B"), TQVariant::String ); + addItemInfo( group, "Z", i18n("Z"), TQVariant::String ); + addItemInfo( group, "NX", i18n("NX"), TQVariant::String ); + addItemInfo( group, "NY", i18n("NY"), TQVariant::String ); + addItemInfo( group, "NZ", i18n("NZ"), TQVariant::String ); + addItemInfo( group, "R", i18n("R"), TQVariant::String ); + addItemInfo( group, "U", i18n("U"), TQVariant::String ); + addItemInfo( group, "V", i18n("V"), TQVariant::String ); + addItemInfo( group, "materialID", i18n("materialID"), TQVariant::String ); + addItemInfo( group, "objectID", i18n("objectID"), TQVariant::String ); + addItemInfo( group, "renderID", i18n("renderID"), TQVariant::String ); + addItemInfo( group, "pixelCover", i18n("pixelCover"), TQVariant::String ); + addItemInfo( group, "velX", i18n("velX"), TQVariant::String ); + addItemInfo( group, "velY", i18n("velY"), TQVariant::String ); + addItemInfo( group, "packedRGBA", i18n("packedRGBA"), TQVariant::String ); // technical group group = addGroupInfo( info, "Technical", i18n("Technical Details") ); - addItemInfo( group, "Compression", i18n("Compression"), QVariant::String ); - addItemInfo( group, "Line Order", i18n("Line Order"), QVariant::String ); + addItemInfo( group, "Compression", i18n("Compression"), TQVariant::String ); + addItemInfo( group, "Line Order", i18n("Line Order"), TQVariant::String ); // 3dsMax group // This supports a special plugin for 3D Studio Max group = addGroupInfo( info, "3dsMax", i18n("3dsMax Details") ); - addItemInfo( group, "Local time", i18n("Local Time"), QVariant::String ); - addItemInfo( group, "System time", i18n("System Time"), QVariant::String ); - addItemInfo( group, "Plugin version", i18n("Plugin Version"), QVariant::String ); - addItemInfo( group, "EXR version", i18n("EXR Version"), QVariant::String ); - addItemInfo( group, "Computer name", i18n("Computer Name"), QVariant::String ); + addItemInfo( group, "Local time", i18n("Local Time"), TQVariant::String ); + addItemInfo( group, "System time", i18n("System Time"), TQVariant::String ); + addItemInfo( group, "Plugin version", i18n("Plugin Version"), TQVariant::String ); + addItemInfo( group, "EXR version", i18n("EXR Version"), TQVariant::String ); + addItemInfo( group, "Computer name", i18n("Computer Name"), TQVariant::String ); } -QCString doType( PixelType pt ) +TQCString doType( PixelType pt ) { switch (pt) { case UINT: - return QCString("32-bit unsigned integer"); + return TQCString("32-bit unsigned integer"); break; case HALF: - return QCString("16-bit floating-point"); + return TQCString("16-bit floating-point"); break; case FLOAT: - return QCString("32-bit floating-point"); + return TQCString("32-bit floating-point"); break; default: - return QCString(); + return TQCString(); break; } } @@ -183,13 +183,13 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what) } Imath::Box2i dw = h.dataWindow(); - appendItem( infogroup, "Dimensions", QSize( (dw.max.x - dw.min.x + 1 ), + appendItem( infogroup, "Dimensions", TQSize( (dw.max.x - dw.min.x + 1 ), (dw.max.y - dw.min.y + 1 ) ) ); if ( h.hasPreviewImage() ) { const PreviewImage &preview = in.header().previewImage(); - appendItem( infogroup, "ThumbnailDimensions", QSize(preview.width(), preview.height()) ); - QImage qpreview(preview.width(), preview.height(), 32, 0, QImage::BigEndian); + appendItem( infogroup, "ThumbnailDimensions", TQSize(preview.width(), preview.height()) ); + TQImage qpreview(preview.width(), preview.height(), 32, 0, TQImage::BigEndian); for ( unsigned int y=0; y < preview.height(); y++ ) { for ( unsigned int x=0; x < preview.width(); x++ ) { const PreviewRgba &q = preview.pixels()[x+(y*preview.width())]; @@ -202,7 +202,7 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what) const StringAttribute *commentSA = h.findTypedAttribute <StringAttribute> ("comment"); if (commentSA) { std::string commentString = commentSA->value(); - QString qcommentString(commentString.data()); + TQString qcommentString(commentString.data()); qcommentString.setLength(commentString.size()); appendItem( infogroup, "Comment", qcommentString ); } @@ -211,19 +211,19 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what) // meaningfully represent. if ( hasComments(h) ) { std::string commentsString = comments(h); - QString qcommentsString(commentsString.data()); + TQString qcommentsString(commentsString.data()); qcommentsString.setLength(commentsString.size()); appendItem( stdgroup, "Comments", qcommentsString ); } if ( hasOwner(h) ) { std::string ownerString = owner(h); - QString qownerString(ownerString.data()); + TQString qownerString(ownerString.data()); qownerString.setLength(ownerString.size()); appendItem( stdgroup, "Owner", qownerString ); } if ( hasCapDate(h) ) { std::string capDateString = capDate(h); - QString qcapDateString(capDateString.data()); + TQString qcapDateString(capDateString.data()); qcapDateString.setLength(capDateString.size()); appendItem( stdgroup, "Capture Date", qcapDateString ); } @@ -235,12 +235,12 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what) // This is the 1.6.0 and later version if ( hasUtcOffset(h) ) { #endif - QString UTCOffset; + TQString UTCOffset; if (utcOffset(h)>0.0) { - UTCOffset.append(QString("%1").arg(utcOffset(h)/3600, 0, 'f', 1)); + UTCOffset.append(TQString("%1").arg(utcOffset(h)/3600, 0, 'f', 1)); UTCOffset.append(" hours behind UTC"); } else { - UTCOffset.append(QString("%1").arg(-1.0*utcOffset(h)/3600, 0, 'f', 1)); + UTCOffset.append(TQString("%1").arg(-1.0*utcOffset(h)/3600, 0, 'f', 1)); UTCOffset.append(" hours ahead of UTC"); } appendItem( stdgroup, "UTC Offset", UTCOffset); @@ -262,30 +262,30 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what) appendItem( stdgroup, "White luminance", WhiteLuminance ); } if ( hasLongitude(h) ) { - QString Longitude; + TQString Longitude; if (longitude(h)<0.0) { - Longitude.append(QString("%1").arg(-1.0*longitude(h),0,'f',3)); + Longitude.append(TQString("%1").arg(-1.0*longitude(h),0,'f',3)); Longitude.append(" deg West"); } else { - Longitude.append(QString("%1").arg(longitude(h),0,'f',3)); + Longitude.append(TQString("%1").arg(longitude(h),0,'f',3)); Longitude.append(" deg East"); } appendItem( stdgroup, "Longitude", Longitude); } if ( hasLatitude(h) ) { - QString Latitude; + TQString Latitude; if (latitude(h)<0.0) { - Latitude.append(QString("%1").arg(-1.0*latitude(h),0,'f',3)); + Latitude.append(TQString("%1").arg(-1.0*latitude(h),0,'f',3)); Latitude.append(" deg South"); } else { - Latitude.append(QString("%1").arg(latitude(h),0,'f',3)); + Latitude.append(TQString("%1").arg(latitude(h),0,'f',3)); Latitude.append(" deg North"); } appendItem( stdgroup, "Latitude", Latitude ); } if ( hasAltitude(h) ) { double Altitude = altitude(h); - appendItem( stdgroup, "Altitude", QString("%1").arg(Altitude,0,'f',1) ); + appendItem( stdgroup, "Altitude", TQString("%1").arg(Altitude,0,'f',1) ); } if ( hasIsoSpeed(h) ) { double IsoSpeed = isoSpeed(h); @@ -348,35 +348,35 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what) const StringAttribute *ver3DSM = h.findTypedAttribute <StringAttribute> ("version3dsMax"); if (ver3DSM) { std::string ver3DSMstring = ver3DSM->value(); - QString qver3DSMstring(ver3DSMstring.data()); + TQString qver3DSMstring(ver3DSMstring.data()); qver3DSMstring.setLength(ver3DSMstring.size()); appendItem( threedsmaxgroup, "Plugin version", qver3DSMstring ); } const StringAttribute *verEXR = h.findTypedAttribute <StringAttribute> ("versionEXR"); if (verEXR) { std::string verEXRstring = verEXR->value(); - QString qverEXRstring(verEXRstring.data()); + TQString qverEXRstring(verEXRstring.data()); qverEXRstring.setLength(verEXRstring.size()); - appendItem( threedsmaxgroup, "EXR version", QString( verEXRstring.data() ) ); + appendItem( threedsmaxgroup, "EXR version", TQString( verEXRstring.data() ) ); } const StringAttribute *localTime = h.findTypedAttribute <StringAttribute> ("localTime"); if (localTime) { std::string localTimeString = localTime->value(); - QString qlocalTimeString(localTimeString.data()); + TQString qlocalTimeString(localTimeString.data()); qlocalTimeString.setLength(localTimeString.size()); appendItem( threedsmaxgroup, "Local time", qlocalTimeString ); } const StringAttribute *systemTime = h.findTypedAttribute <StringAttribute> ("systemTime"); if (systemTime) { std::string systemTimeString = systemTime->value(); - QString qsystemTimeString(systemTimeString.data()); + TQString qsystemTimeString(systemTimeString.data()); qsystemTimeString.setLength(systemTimeString.size()); appendItem( threedsmaxgroup, "System time", qsystemTimeString ); } const StringAttribute *computerName = h.findTypedAttribute <StringAttribute> ("computerName"); if (computerName) { std::string computerNameString = computerName->value(); - QString qcomputerNameString(computerNameString.data()); + TQString qcomputerNameString(computerNameString.data()); qcomputerNameString.setLength(computerNameString.size()); appendItem( threedsmaxgroup, "Computer name", qcomputerNameString ); } diff --git a/kfile-plugins/exr/kfile_exr.h b/kfile-plugins/exr/kfile_exr.h index cb795ba5..d3718792 100644 --- a/kfile-plugins/exr/kfile_exr.h +++ b/kfile-plugins/exr/kfile_exr.h @@ -24,14 +24,14 @@ #include <kfilemetainfo.h> #include <kurl.h> -class QStringList; +class TQStringList; class KExrPlugin: public KFilePlugin { Q_OBJECT public: - KExrPlugin( QObject *parent, const char *name, const QStringList& preferredItems ); + KExrPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems ); virtual bool readInfo( KFileMetaInfo& info, uint ); }; diff --git a/kfile-plugins/gif/kfile_gif.cpp b/kfile-plugins/gif/kfile_gif.cpp index 3c29f05f..ce54458b 100644 --- a/kfile-plugins/gif/kfile_gif.cpp +++ b/kfile-plugins/gif/kfile_gif.cpp @@ -31,19 +31,19 @@ #include <kgenericfactory.h> #include <kdebug.h> -#include <qcstring.h> -#include <qfile.h> -#include <qdatetime.h> -#include <qdict.h> -#include <qvalidator.h> -#include <qimage.h> +#include <tqcstring.h> +#include <tqfile.h> +#include <tqdatetime.h> +#include <tqdict.h> +#include <tqvalidator.h> +#include <tqimage.h> typedef KGenericFactory<KGifPlugin> GifFactory; K_EXPORT_COMPONENT_FACTORY(kfile_gif, GifFactory("kfile_gif")) -KGifPlugin::KGifPlugin(QObject *parent, const char *name, - const QStringList &args) +KGifPlugin::KGifPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { kdDebug(7034) << "gif KFileMetaInfo plugin\n"; @@ -56,13 +56,13 @@ KGifPlugin::KGifPlugin(QObject *parent, const char *name, KFileMimeTypeInfo::ItemInfo* item; - item = addItemInfo(group, "Version", i18n("Version"), QVariant::String); + item = addItemInfo(group, "Version", i18n("Version"), TQVariant::String); - item = addItemInfo( group, "Dimensions", i18n("Dimensions"), QVariant::Size ); + item = addItemInfo( group, "Dimensions", i18n("Dimensions"), TQVariant::Size ); setHint( item, KFileMimeTypeInfo::Size ); setUnit( item, KFileMimeTypeInfo::Pixels ); - item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), QVariant::Int); + item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), TQVariant::Int); setUnit(item, KFileMimeTypeInfo::BitsPerPixel); } @@ -73,14 +73,14 @@ bool KGifPlugin::readInfo( KFileMetaInfo& info, uint what ) kdDebug(7034) << "gif KFileMetaInfo readInfo\n"; - QFile file(info.path()); + TQFile file(info.path()); if (!file.open(IO_ReadOnly)) { - kdDebug(7034) << "Couldn't open " << QFile::encodeName(info.path()) << endl; + kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl; return false; } - QDataStream fstream(&file); + TQDataStream fstream(&file); bool isGIF87a = false; char magic[7]; @@ -92,7 +92,7 @@ bool KGifPlugin::readInfo( KFileMetaInfo& info, uint what ) magic[6] = 0x00; // null terminate // I have special requirements... - fstream.setByteOrder( QDataStream::LittleEndian ); + fstream.setByteOrder( TQDataStream::LittleEndian ); fstream >> width; fstream >> height; fstream >> miscInfo; @@ -108,7 +108,7 @@ bool KGifPlugin::readInfo( KFileMetaInfo& info, uint what ) appendItem( group, "Version", i18n("Unknown") ); } - appendItem( group, "Dimensions", QSize(width, height) ); + appendItem( group, "Dimensions", TQSize(width, height) ); if ( isGIF87a ) { appendItem( group, "BitDepth", ( (miscInfo & 0x07) + 1) ); diff --git a/kfile-plugins/gif/kfile_gif.h b/kfile-plugins/gif/kfile_gif.h index 6f932f37..f4c0be51 100644 --- a/kfile-plugins/gif/kfile_gif.h +++ b/kfile-plugins/gif/kfile_gif.h @@ -22,14 +22,14 @@ #include <kfilemetainfo.h> #include <kurl.h> -class QStringList; +class TQStringList; class KGifPlugin: public KFilePlugin { Q_OBJECT public: - KGifPlugin( QObject *parent, const char *name, const QStringList& args ); + KGifPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo ( KFileMetaInfo& info, uint what ); }; diff --git a/kfile-plugins/ico/kfile_ico.cpp b/kfile-plugins/ico/kfile_ico.cpp index 01c5b65e..e85935fb 100644 --- a/kfile-plugins/ico/kfile_ico.cpp +++ b/kfile-plugins/ico/kfile_ico.cpp @@ -26,11 +26,11 @@ #include <kstringvalidator.h> #include <kdebug.h> -#include <qdict.h> -#include <qvalidator.h> -#include <qcstring.h> -#include <qfile.h> -#include <qdatetime.h> +#include <tqdict.h> +#include <tqvalidator.h> +#include <tqcstring.h> +#include <tqfile.h> +#include <tqdatetime.h> #if !defined(__osf__) #include <inttypes.h> @@ -44,8 +44,8 @@ typedef KGenericFactory<KIcoPlugin> IcoFactory; K_EXPORT_COMPONENT_FACTORY(kfile_ico, IcoFactory( "kfile_ico" )) -KIcoPlugin::KIcoPlugin(QObject *parent, const char *name, - const QStringList &args) +KIcoPlugin::KIcoPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { @@ -57,13 +57,13 @@ KIcoPlugin::KIcoPlugin(QObject *parent, const char *name, KFileMimeTypeInfo::ItemInfo* item; - item = addItemInfo(group, "Number", i18n("Number of Icons"), QVariant::Int); + item = addItemInfo(group, "Number", i18n("Number of Icons"), TQVariant::Int); - item = addItemInfo(group, "Dimensions", i18n("Dimensions"), QVariant::Size); - item = addItemInfo(group, "Colors", i18n("Colors"), QVariant::Int); + item = addItemInfo(group, "Dimensions", i18n("Dimensions"), TQVariant::Size); + item = addItemInfo(group, "Colors", i18n("Colors"), TQVariant::Int); - item = addItemInfo(group, "DimensionsM", i18n("Dimensions (1st icon)"), QVariant::Size); - item = addItemInfo(group, "ColorsM", i18n("Colors (1st icon)"), QVariant::Int); + item = addItemInfo(group, "DimensionsM", i18n("Dimensions (1st icon)"), TQVariant::Size); + item = addItemInfo(group, "ColorsM", i18n("Colors (1st icon)"), TQVariant::Int); } @@ -71,18 +71,18 @@ bool KIcoPlugin::readInfo( KFileMetaInfo& info, uint what) { - QFile file(info.path()); + TQFile file(info.path()); if (!file.open(IO_ReadOnly)) { - kdDebug(7034) << "Couldn't open " << QFile::encodeName(info.path()) << endl; + kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl; return false; } - QDataStream dstream(&file); + TQDataStream dstream(&file); // ICO files are little-endian - dstream.setByteOrder(QDataStream::LittleEndian); + dstream.setByteOrder(TQDataStream::LittleEndian); // read the beginning of the file and make sure it looks ok @@ -124,7 +124,7 @@ bool KIcoPlugin::readInfo( KFileMetaInfo& info, uint what) appendItem(group, "Number", ico_count); if (ico_count == 1) { - appendItem(group, "Dimensions", QSize(icoe_width, icoe_height)); + appendItem(group, "Dimensions", TQSize(icoe_width, icoe_height)); if (icoe_colorcount > 0) appendItem(group, "Colors", icoe_colorcount); @@ -133,7 +133,7 @@ bool KIcoPlugin::readInfo( KFileMetaInfo& info, uint what) } else { - appendItem(group, "DimensionsM", QSize(icoe_width, icoe_height)); + appendItem(group, "DimensionsM", TQSize(icoe_width, icoe_height)); if (icoe_colorcount > 0) appendItem(group, "ColorsM", icoe_colorcount); diff --git a/kfile-plugins/ico/kfile_ico.h b/kfile-plugins/ico/kfile_ico.h index e06e8094..b354fe22 100644 --- a/kfile-plugins/ico/kfile_ico.h +++ b/kfile-plugins/ico/kfile_ico.h @@ -22,14 +22,14 @@ #include <kfilemetainfo.h> -class QStringList; +class TQStringList; class KIcoPlugin: public KFilePlugin { Q_OBJECT public: - KIcoPlugin( QObject *parent, const char *name, const QStringList& args ); + KIcoPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/jpeg/exif.cpp b/kfile-plugins/jpeg/exif.cpp index f25e8a78..b6a2f88b 100644 --- a/kfile-plugins/jpeg/exif.cpp +++ b/kfile-plugins/jpeg/exif.cpp @@ -9,7 +9,7 @@ #include "exif.h" -#include <qwmatrix.h> +#include <tqwmatrix.h> #include <kglobal.h> @@ -214,7 +214,7 @@ static int BytesPerFormat[] = {0,1,1,2,4,8,1,1,2,4,8,4,8}; //-------------------------------------------------------------------------- // Parse the marker stream until SOS or EOI is seen; //-------------------------------------------------------------------------- -int ExifData::ReadJpegSections (QFile & infile, ReadMode_t ReadMode) +int ExifData::ReadJpegSections (TQFile & infile, ReadMode_t ReadMode) { int a; @@ -525,11 +525,11 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa switch(Tag){ case TAG_MAKE: - ExifData::CameraMake = QString::fromLatin1((const char*)ValuePtr, 31); + ExifData::CameraMake = TQString::fromLatin1((const char*)ValuePtr, 31); break; case TAG_MODEL: - ExifData::CameraModel = QString::fromLatin1((const char*)ValuePtr, 39); + ExifData::CameraModel = TQString::fromLatin1((const char*)ValuePtr, 39); break; case TAG_ORIENTATION: @@ -537,7 +537,7 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa break; case TAG_DATETIME_ORIGINAL: - DateTime = QString::fromLatin1((const char*)ValuePtr, 19); + DateTime = TQString::fromLatin1((const char*)ValuePtr, 19); break; case TAG_USERCOMMENT: @@ -558,12 +558,12 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa int c; c = (ValuePtr)[a]; if (c != '\0' && c != ' '){ - UserComment = QString::fromLatin1((const char*)(a+ValuePtr), 199); + UserComment = TQString::fromLatin1((const char*)(a+ValuePtr), 199); break; } } }else{ - UserComment = QString::fromLatin1((const char*)ValuePtr, 199); + UserComment = TQString::fromLatin1((const char*)ValuePtr, 199); } break; @@ -740,7 +740,7 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa //-------------------------------------------------------------------------- void ExifData::process_COM (const uchar * Data, int length) { - Comment = QString::fromUtf8((char *)Data+2, (length-2)); + Comment = TQString::fromUtf8((char *)Data+2, (length-2)); } @@ -880,11 +880,11 @@ ExifData::ExifData() //-------------------------------------------------------------------------- // process a EXIF jpeg file //-------------------------------------------------------------------------- -bool ExifData::scan(const QString & path) +bool ExifData::scan(const TQString & path) { int ret; - QFile f(path); + TQFile f(path); if ( !f.open(IO_ReadOnly) ) return false; @@ -940,13 +940,13 @@ bool ExifData::isThumbnailSane() { // return a thumbnail that respects the orientation flag // only if it seems sane //-------------------------------------------------------------------------- -QImage ExifData::getThumbnail() { +TQImage ExifData::getThumbnail() { if (!isThumbnailSane()) return NULL; if (!Orientation || Orientation == 1) return Thumbnail; // now fix orientation - QWMatrix M; - QWMatrix flip= QWMatrix(-1,0,0,1,0,0); + TQWMatrix M; + TQWMatrix flip= TQWMatrix(-1,0,0,1,0,0); switch (Orientation) { // notice intentional fallthroughs case 2: M = flip; break; case 4: M = flip; diff --git a/kfile-plugins/jpeg/exif.h b/kfile-plugins/jpeg/exif.h index 2b4e5606..f8eb13ef 100644 --- a/kfile-plugins/jpeg/exif.h +++ b/kfile-plugins/jpeg/exif.h @@ -10,9 +10,9 @@ #include <math.h> #include <time.h> -#include "qstring.h" -#include "qfile.h" -#include "qimage.h" +#include "tqstring.h" +#include "tqfile.h" +#include "tqimage.h" #include <kdebug.h> typedef enum { @@ -42,9 +42,9 @@ typedef struct { class ExifData { Section_t Sections[MAX_SECTIONS]; - QString CameraMake; - QString CameraModel; - QString DateTime; + TQString CameraMake; + TQString CameraModel; + TQString DateTime; int Orientation; int Height, Width; int ExifImageLength, ExifImageWidth; @@ -62,11 +62,11 @@ class ExifData { int ExposureProgram; int ISOequivalent; int CompressionLevel; - QString UserComment; - QString Comment; - QImage Thumbnail; + TQString UserComment; + TQString Comment; + TQImage Thumbnail; - int ReadJpegSections (QFile & infile, ReadMode_t ReadMode); + int ReadJpegSections (TQFile & infile, ReadMode_t ReadMode); void DiscardData(void); int Get16u(void * Short); int Get32s(void * Long); @@ -82,10 +82,10 @@ class ExifData { public: ExifData(); - bool scan(const QString &); - QString getCameraMake() { return CameraMake; } - QString getCameraModel() { return CameraModel; } - QString getDateTime() { return DateTime; } + bool scan(const TQString &); + TQString getCameraMake() { return CameraMake; } + TQString getCameraModel() { return CameraModel; } + TQString getDateTime() { return DateTime; } int getOrientation() { return Orientation; } int getHeight() { return Height; } int getWidth() { return Width; } @@ -103,9 +103,9 @@ public: int getExposureProgram() { return ExposureProgram; } int getISOequivalent() { return ISOequivalent; } int getCompressionLevel() { return CompressionLevel; } - QString getUserComment() { return UserComment; } - QString getComment() { return Comment; } - QImage getThumbnail(); + TQString getUserComment() { return UserComment; } + TQString getComment() { return Comment; } + TQImage getThumbnail(); bool isThumbnailSane(); bool isNullThumbnail() { return !isThumbnailSane(); } }; diff --git a/kfile-plugins/jpeg/kfile_jpeg.cpp b/kfile-plugins/jpeg/kfile_jpeg.cpp index d302cf65..5c7e8076 100644 --- a/kfile-plugins/jpeg/kfile_jpeg.cpp +++ b/kfile-plugins/jpeg/kfile_jpeg.cpp @@ -29,12 +29,12 @@ #include <kgenericfactory.h> #include <kdebug.h> -#include <qcstring.h> -#include <qfile.h> -#include <qdatetime.h> -#include <qdict.h> -#include <qvalidator.h> -#include <qimage.h> +#include <tqcstring.h> +#include <tqfile.h> +#include <tqdatetime.h> +#include <tqdict.h> +#include <tqvalidator.h> +#include <tqimage.h> #include "exif.h" @@ -44,8 +44,8 @@ typedef KGenericFactory<KJpegPlugin> JpegFactory; K_EXPORT_COMPONENT_FACTORY(kfile_jpeg, JpegFactory("kfile_jpeg")) -KJpegPlugin::KJpegPlugin(QObject *parent, const char *name, - const QStringList &args ) +KJpegPlugin::KJpegPlugin(TQObject *parent, const char *name, + const TQStringList &args ) : KFilePlugin(parent, name, args) { kdDebug(7034) << "jpeg plugin\n"; @@ -58,110 +58,110 @@ KJpegPlugin::KJpegPlugin(QObject *parent, const char *name, i18n("JPEG Exif") ); KFileMimeTypeInfo::ItemInfo* item; - item = addItemInfo( exifGroup, "Comment", i18n("Comment"), QVariant::String); + item = addItemInfo( exifGroup, "Comment", i18n("Comment"), TQVariant::String); setAttributes( item, KFileMimeTypeInfo::Modifiable | KFileMimeTypeInfo::Addable | KFileMimeTypeInfo::MultiLine ); item = addItemInfo( exifGroup, "Manufacturer", i18n("Camera Manufacturer"), - QVariant::String ); + TQVariant::String ); item = addItemInfo( exifGroup, "Model", i18n("Camera Model"), - QVariant::String ); + TQVariant::String ); item = addItemInfo( exifGroup, "Date/time", i18n("Date/Time"), - QVariant::DateTime ); + TQVariant::DateTime ); item = addItemInfo( exifGroup, "CreationDate", i18n("Creation Date"), - QVariant::Date ); + TQVariant::Date ); item = addItemInfo( exifGroup, "CreationTime", i18n("Creation Time"), - QVariant::Time ); + TQVariant::Time ); item = addItemInfo( exifGroup, "Dimensions", i18n("Dimensions"), - QVariant::Size ); + TQVariant::Size ); setHint( item, KFileMimeTypeInfo::Size ); setUnit( item, KFileMimeTypeInfo::Pixels ); item = addItemInfo( exifGroup, "Orientation", i18n("Orientation"), - QVariant::Int ); + TQVariant::Int ); item = addItemInfo( exifGroup, "ColorMode", i18n("Color Mode"), - QVariant::String ); + TQVariant::String ); item = addItemInfo( exifGroup, "Flash used", i18n("Flash Used"), - QVariant::String ); + TQVariant::String ); item = addItemInfo( exifGroup, "Focal length", i18n("Focal Length"), - QVariant::String ); + TQVariant::String ); setUnit( item, KFileMimeTypeInfo::Millimeters ); item = addItemInfo( exifGroup, "35mm equivalent", i18n("35mm Equivalent"), - QVariant::Int ); + TQVariant::Int ); setUnit( item, KFileMimeTypeInfo::Millimeters ); item = addItemInfo( exifGroup, "CCD width", i18n("CCD Width"), - QVariant::String ); + TQVariant::String ); setUnit( item, KFileMimeTypeInfo::Millimeters ); item = addItemInfo( exifGroup, "Exposure time", i18n("Exposure Time"), - QVariant::String ); + TQVariant::String ); setHint( item, KFileMimeTypeInfo::Seconds ); item = addItemInfo( exifGroup, "Aperture", i18n("Aperture"), - QVariant::String ); + TQVariant::String ); item = addItemInfo( exifGroup, "Focus dist.", i18n("Focus Dist."), - QVariant::String ); + TQVariant::String ); item = addItemInfo( exifGroup, "Exposure bias", i18n("Exposure Bias"), - QVariant::String ); + TQVariant::String ); item = addItemInfo( exifGroup, "Whitebalance", i18n("Whitebalance"), - QVariant::String ); + TQVariant::String ); item = addItemInfo( exifGroup, "Metering mode", i18n("Metering Mode"), - QVariant::String ); + TQVariant::String ); item = addItemInfo( exifGroup, "Exposure", i18n("Exposure"), - QVariant::String ); + TQVariant::String ); item = addItemInfo( exifGroup, "ISO equiv.", i18n("ISO Equiv."), - QVariant::String ); + TQVariant::String ); item = addItemInfo( exifGroup, "JPEG quality", i18n("JPEG Quality"), - QVariant::String ); + TQVariant::String ); item = addItemInfo( exifGroup, "User comment", i18n("User Comment"), - QVariant::String ); + TQVariant::String ); setHint(item, KFileMimeTypeInfo::Description); item = addItemInfo( exifGroup, "JPEG process", i18n("JPEG Process"), - QVariant::String ); + TQVariant::String ); item = addItemInfo( exifGroup, "Thumbnail", i18n("Thumbnail"), - QVariant::Image ); + TQVariant::Image ); setHint( item, KFileMimeTypeInfo::Thumbnail ); // ### // exifGroup.setSupportsVariableKeys(true); } -QValidator* KJpegPlugin::createValidator(const KFileMetaInfoItem& /*item*/, - QObject */*parent*/, +TQValidator* KJpegPlugin::createValidator(const KFileMetaInfoItem& /*item*/, + TQObject */*parent*/, const char */*name*/ ) const { // no need to return a validator that validates everything as OK :) // if (item.isEditable()) -// return new QRegExpValidator(QRegExp(".*"), parent, name); +// return new TQRegExpValidator(TQRegExp(".*"), parent, name); // else return 0L; } bool KJpegPlugin::writeInfo( const KFileMetaInfo& info ) const { - QString comment = info[EXIFGROUP].value("Comment").toString(); - QString path = info.path(); + TQString comment = info[EXIFGROUP].value("Comment").toString(); + TQString path = info.path(); kdDebug(7034) << "exif writeInfo: " << info.path() << " \"" << comment << "\"\n"; @@ -182,7 +182,7 @@ bool KJpegPlugin::writeInfo( const KFileMetaInfo& info ) const which is fully backwards compatible with readers expecting ascii. Readers expecting a national character set are out of luck... */ - if( safe_copy_and_modify( QFile::encodeName( path ), comment.utf8() ) ) { + if( safe_copy_and_modify( TQFile::encodeName( path ), comment.utf8() ) ) { return false; } return true; @@ -190,11 +190,11 @@ bool KJpegPlugin::writeInfo( const KFileMetaInfo& info ) const bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what ) { - const QString path( info.path() ); + const TQString path( info.path() ); if ( path.isEmpty() ) // remote file return false; - QString tag; + TQString tag; ExifData ImageInfo; // parse the jpeg file now @@ -230,7 +230,7 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what ) tag = ImageInfo.getDateTime(); if (tag.length()){ - QDateTime dt = parseDateTime( tag.stripWhiteSpace() ); + TQDateTime dt = parseDateTime( tag.stripWhiteSpace() ); if ( dt.isValid() ) { appendItem( exifGroup, "Date/time", dt ); appendItem( exifGroup, "CreationDate", dt.date() ); @@ -238,7 +238,7 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what ) } } - appendItem( exifGroup,"Dimensions", QSize( ImageInfo.getWidth(), + appendItem( exifGroup,"Dimensions", TQSize( ImageInfo.getWidth(), ImageInfo.getHeight() ) ); if ( ImageInfo.getOrientation() ) @@ -249,7 +249,7 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what ) int flashUsed = ImageInfo.getFlashUsed(); // -1, <set> if ( flashUsed >= 0 ) { - QString flash = i18n("Flash", "(unknown)"); + TQString flash = i18n("Flash", "(unknown)"); switch ( flashUsed ) { case 0: flash = i18n("Flash", "No"); break; @@ -286,7 +286,7 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what ) if (ImageInfo.getFocalLength()){ appendItem( exifGroup, "Focal length", - QString().sprintf("%4.1f", ImageInfo.getFocalLength()) ); + TQString().sprintf("%4.1f", ImageInfo.getFocalLength()) ); if (ImageInfo.getCCDWidth()){ appendItem( exifGroup, "35mm equivalent", @@ -296,21 +296,21 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what ) if (ImageInfo.getCCDWidth()){ appendItem( exifGroup, "CCD width", - QString().sprintf("%4.2f", ImageInfo.getCCDWidth()) ); + TQString().sprintf("%4.2f", ImageInfo.getCCDWidth()) ); } if (ImageInfo.getExposureTime()){ - tag=QString().sprintf("%6.3f", ImageInfo.getExposureTime()); + tag=TQString().sprintf("%6.3f", ImageInfo.getExposureTime()); float exposureTime = ImageInfo.getExposureTime(); if (exposureTime > 0 && exposureTime <= 0.5){ - tag+=QString().sprintf(" (1/%d)", (int)(0.5 + 1/exposureTime) ); + tag+=TQString().sprintf(" (1/%d)", (int)(0.5 + 1/exposureTime) ); } appendItem( exifGroup, "Exposure time", tag ); } if (ImageInfo.getApertureFNumber()){ appendItem( exifGroup, "Aperture", - QString().sprintf("f/%3.1f", + TQString().sprintf("f/%3.1f", (double)ImageInfo.getApertureFNumber())); } @@ -318,14 +318,14 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what ) if (ImageInfo.getDistance() < 0){ tag=i18n("Infinite"); }else{ - tag=QString().sprintf("%5.2fm",(double)ImageInfo.getDistance()); + tag=TQString().sprintf("%5.2fm",(double)ImageInfo.getDistance()); } appendItem( exifGroup, "Focus dist.", tag ); } if (ImageInfo.getExposureBias()){ appendItem( exifGroup, "Exposure bias", - QString().sprintf("%4.2f", + TQString().sprintf("%4.2f", (double)ImageInfo.getExposureBias()) ); } @@ -443,7 +443,7 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what ) if (ImageInfo.getISOequivalent()){ appendItem( exifGroup, "ISO equiv.", - QString().sprintf("%2d", + TQString().sprintf("%2d", (int)ImageInfo.getISOequivalent()) ); } @@ -473,7 +473,7 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what ) for (a=0;;a++){ if (ProcessTable[a].Tag == ImageInfo.getProcess() || ProcessTable[a].Tag == 0){ appendItem( exifGroup, "JPEG process", - QString::fromUtf8( ProcessTable[a].Desc) ); + TQString::fromUtf8( ProcessTable[a].Desc) ); break; } } @@ -487,18 +487,18 @@ bool KJpegPlugin::readInfo( KFileMetaInfo& info, uint what ) // format of the string is: // YYYY:MM:DD HH:MM:SS -QDateTime KJpegPlugin::parseDateTime( const QString& string ) +TQDateTime KJpegPlugin::parseDateTime( const TQString& string ) { - QDateTime dt; + TQDateTime dt; if ( string.length() != 19 ) return dt; - QString year = string.left( 4 ); - QString month = string.mid( 5, 2 ); - QString day = string.mid( 8, 2 ); - QString hour = string.mid( 11, 2 ); - QString minute = string.mid( 14, 2 ); - QString seconds = string.mid( 17, 2 ); + TQString year = string.left( 4 ); + TQString month = string.mid( 5, 2 ); + TQString day = string.mid( 8, 2 ); + TQString hour = string.mid( 11, 2 ); + TQString minute = string.mid( 14, 2 ); + TQString seconds = string.mid( 17, 2 ); bool ok; bool allOk = true; @@ -521,8 +521,8 @@ QDateTime KJpegPlugin::parseDateTime( const QString& string ) allOk &= ok; if ( allOk ) { - dt.setDate( QDate( y, mo, d ) ); - dt.setTime( QTime( h, mi, s ) ); + dt.setDate( TQDate( y, mo, d ) ); + dt.setTime( TQTime( h, mi, s ) ); } return dt; diff --git a/kfile-plugins/jpeg/kfile_jpeg.h b/kfile-plugins/jpeg/kfile_jpeg.h index 5c585fb0..70c14501 100644 --- a/kfile-plugins/jpeg/kfile_jpeg.h +++ b/kfile-plugins/jpeg/kfile_jpeg.h @@ -20,7 +20,7 @@ #ifndef __KFILE_JPEG_H__ #define __KFILE_JPEG_H__ -#include <qdatetime.h> +#include <tqdatetime.h> #include <kfilemetainfo.h> class KJpegPlugin: public KFilePlugin @@ -28,16 +28,16 @@ class KJpegPlugin: public KFilePlugin Q_OBJECT public: - KJpegPlugin( QObject *parent, const char *name, - const QStringList& args ); + KJpegPlugin( TQObject *parent, const char *name, + const TQStringList& args ); virtual bool readInfo ( KFileMetaInfo& info, uint what ); virtual bool writeInfo( const KFileMetaInfo& info ) const; - virtual QValidator* createValidator( const KFileMetaInfoItem& item, - QObject* parent, const char* name) const; + virtual TQValidator* createValidator( const KFileMetaInfoItem& item, + TQObject* parent, const char* name) const; private: - QDateTime parseDateTime( const QString& string ); + TQDateTime parseDateTime( const TQString& string ); }; #endif diff --git a/kfile-plugins/pcx/kfile_pcx.cpp b/kfile-plugins/pcx/kfile_pcx.cpp index a7468a57..5dceec9d 100644 --- a/kfile-plugins/pcx/kfile_pcx.cpp +++ b/kfile-plugins/pcx/kfile_pcx.cpp @@ -22,14 +22,14 @@ #include <kgenericfactory.h> #include <kdebug.h> -#include <qdatastream.h> -#include <qfile.h> +#include <tqdatastream.h> +#include <tqfile.h> typedef KGenericFactory<KPcxPlugin> PcxFactory; K_EXPORT_COMPONENT_FACTORY(kfile_pcx, PcxFactory("kfile_pcx")) -QDataStream &operator>>( QDataStream &s, PALETTE &pal ) +TQDataStream &operator>>( TQDataStream &s, PALETTE &pal ) { for ( int i=0; i<16; ++i ) s >> pal.p[ i ].r >> pal.p[ i ].g >> pal.p[ i ].b; @@ -37,7 +37,7 @@ QDataStream &operator>>( QDataStream &s, PALETTE &pal ) return s; } -QDataStream &operator>>( QDataStream &s, PCXHEADER &ph ) +TQDataStream &operator>>( TQDataStream &s, PCXHEADER &ph ) { s >> ph.Manufacturer; s >> ph.Version; @@ -56,8 +56,8 @@ QDataStream &operator>>( QDataStream &s, PCXHEADER &ph ) return s; } -KPcxPlugin::KPcxPlugin( QObject *parent, const char *name, - const QStringList &args ) : KFilePlugin( parent, name, args ) +KPcxPlugin::KPcxPlugin( TQObject *parent, const char *name, + const TQStringList &args ) : KFilePlugin( parent, name, args ) { kdDebug(7034) << "PCX file meta info plugin" << endl; KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-pcx" ); @@ -67,17 +67,17 @@ KPcxPlugin::KPcxPlugin( QObject *parent, const char *name, KFileMimeTypeInfo::ItemInfo* item; item = addItemInfo( group, "Dimensions", i18n( "Dimensions" ), - QVariant::Size ); + TQVariant::Size ); setHint( item, KFileMimeTypeInfo::Size ); setUnit( item, KFileMimeTypeInfo::Pixels ); item = addItemInfo( group, "BitDepth", i18n( "Bit Depth" ), - QVariant::Int ); + TQVariant::Int ); setUnit( item, KFileMimeTypeInfo::BitsPerPixel ); item = addItemInfo( group, "Resolution", i18n( "Resolution" ), - QVariant::Size ); + TQVariant::Size ); setUnit( item, KFileMimeTypeInfo::DotsPerInch ); item = addItemInfo( group, "Compression", i18n( "Compression" ), - QVariant::String ); + TQVariant::String ); } bool KPcxPlugin::readInfo( KFileMetaInfo& info, uint ) @@ -87,12 +87,12 @@ bool KPcxPlugin::readInfo( KFileMetaInfo& info, uint ) struct PCXHEADER header; - QFile f( info.path() ); + TQFile f( info.path() ); if ( !f.open( IO_ReadOnly ) ) return false; - QDataStream s( &f ); - s.setByteOrder( QDataStream::LittleEndian ); + TQDataStream s( &f ); + s.setByteOrder( TQDataStream::LittleEndian ); s >> header; @@ -102,9 +102,9 @@ bool KPcxPlugin::readInfo( KFileMetaInfo& info, uint ) KFileMetaInfoGroup group = appendGroup( info, "General" ); - appendItem( group, "Dimensions", QSize( w, h ) ); + appendItem( group, "Dimensions", TQSize( w, h ) ); appendItem( group, "BitDepth", bpp ); - appendItem( group, "Resolution", QSize( header.HDpi, header.YDpi ) ); + appendItem( group, "Resolution", TQSize( header.HDpi, header.YDpi ) ); if ( header.Encoding == 1 ) appendItem( group, "Compression", i18n( "Yes (RLE)" ) ); else diff --git a/kfile-plugins/pcx/kfile_pcx.h b/kfile-plugins/pcx/kfile_pcx.h index 434f89a3..2d9b772f 100644 --- a/kfile-plugins/pcx/kfile_pcx.h +++ b/kfile-plugins/pcx/kfile_pcx.h @@ -75,7 +75,7 @@ class KPcxPlugin: public KFilePlugin Q_OBJECT public: - KPcxPlugin(QObject *parent, const char *name, const QStringList& args); + KPcxPlugin(TQObject *parent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); private: diff --git a/kfile-plugins/pdf/kfile_pdf.cpp b/kfile-plugins/pdf/kfile_pdf.cpp index d5beeb60..a3dcbde7 100644 --- a/kfile-plugins/pdf/kfile_pdf.cpp +++ b/kfile-plugins/pdf/kfile_pdf.cpp @@ -27,7 +27,7 @@ typedef KGenericFactory<KPdfPlugin> PdfFactory; K_EXPORT_COMPONENT_FACTORY(kfile_pdf, PdfFactory("kfile_pdf")) -KPdfPlugin::KPdfPlugin(QObject *parent, const char *name, const QStringList &preferredItems) +KPdfPlugin::KPdfPlugin(TQObject *parent, const char *name, const TQStringList &preferredItems) : KFilePlugin(parent, name, preferredItems) { kdDebug(7034) << "pdf plugin\n"; @@ -40,21 +40,21 @@ KPdfPlugin::KPdfPlugin(QObject *parent, const char *name, const QStringList &pre KFileMimeTypeInfo::ItemInfo* item; - item = addItemInfo(group, "Title", i18n("Title"), QVariant::String); + item = addItemInfo(group, "Title", i18n("Title"), TQVariant::String); setHint(item, KFileMimeTypeInfo::Name); - item = addItemInfo(group, "Subject", i18n("Subject"), QVariant::String); + item = addItemInfo(group, "Subject", i18n("Subject"), TQVariant::String); setHint(item, KFileMimeTypeInfo::Description); - item = addItemInfo(group, "Author", i18n("Author"), QVariant::String); + item = addItemInfo(group, "Author", i18n("Author"), TQVariant::String); setHint(item, KFileMimeTypeInfo::Author); - addItemInfo(group, "Keywords", i18n("Key Words"), QVariant::String); - addItemInfo(group, "Creator", i18n("Creator"), QVariant::String); - addItemInfo(group, "Producer", i18n("Producer"), QVariant::String); - addItemInfo(group, "CreationDate", i18n("Creation Date"), QVariant::DateTime); - addItemInfo(group, "ModificationDate", i18n("Modified"), QVariant::DateTime); - addItemInfo(group, "Pages", i18n("Pages"), QVariant::Int); - addItemInfo(group, "Protected", i18n("Protected"), QVariant::String); - addItemInfo(group, "Linearized", i18n("Linearized"), QVariant::String); - addItemInfo(group, "Version", i18n("Version"), QVariant::String); + addItemInfo(group, "Keywords", i18n("Key Words"), TQVariant::String); + addItemInfo(group, "Creator", i18n("Creator"), TQVariant::String); + addItemInfo(group, "Producer", i18n("Producer"), TQVariant::String); + addItemInfo(group, "CreationDate", i18n("Creation Date"), TQVariant::DateTime); + addItemInfo(group, "ModificationDate", i18n("Modified"), TQVariant::DateTime); + addItemInfo(group, "Pages", i18n("Pages"), TQVariant::Int); + addItemInfo(group, "Protected", i18n("Protected"), TQVariant::String); + addItemInfo(group, "Linearized", i18n("Linearized"), TQVariant::String); + addItemInfo(group, "Version", i18n("Version"), TQVariant::String); } bool KPdfPlugin::readInfo( KFileMetaInfo& info, uint /* what */) @@ -79,7 +79,7 @@ bool KPdfPlugin::readInfo( KFileMetaInfo& info, uint /* what */) appendItem(generalGroup, "ModificationDate", doc->getDate("ModDate") ); appendItem(generalGroup, "Pages", doc->getNumPages() ); - QString enc; + TQString enc; if (doc->isEncrypted()) { enc = i18n("Yes (Can Print:%1 Can Copy:%2 Can Change:%3 Can Add notes:%4)") @@ -92,7 +92,7 @@ bool KPdfPlugin::readInfo( KFileMetaInfo& info, uint /* what */) appendItem(generalGroup, "Protected", enc ); appendItem(generalGroup, "Linearized", doc->isLinearized() ? i18n("Yes") : i18n("No") ); - QString versionString = QString("%1").arg( doc->getPDFVersion(), 0, 'f', 1 ); + TQString versionString = TQString("%1").arg( doc->getPDFVersion(), 0, 'f', 1 ); appendItem(generalGroup, "Version", versionString ); delete doc; diff --git a/kfile-plugins/pdf/kfile_pdf.h b/kfile-plugins/pdf/kfile_pdf.h index b0214f54..eaecdb5d 100644 --- a/kfile-plugins/pdf/kfile_pdf.h +++ b/kfile-plugins/pdf/kfile_pdf.h @@ -24,13 +24,13 @@ #include <kfilemetainfo.h> #include <poppler-qt.h> -class QStringList; +class TQStringList; class KPdfPlugin: public KFilePlugin { Q_OBJECT public: - KPdfPlugin( QObject *parent, const char *name, const QStringList& preferredItems ); + KPdfPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems ); virtual bool readInfo(KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/png/kfile_png.cpp b/kfile-plugins/png/kfile_png.cpp index c3e54b66..531fdfe3 100644 --- a/kfile-plugins/png/kfile_png.cpp +++ b/kfile-plugins/png/kfile_png.cpp @@ -27,11 +27,11 @@ #include <kgenericfactory.h> #include <kdebug.h> -#include <qcstring.h> -#include <qfile.h> -#include <qdatetime.h> -#include <qdict.h> -#include <qvalidator.h> +#include <tqcstring.h> +#include <tqfile.h> +#include <tqdatetime.h> +#include <tqdict.h> +#include <tqvalidator.h> #include <zlib.h> // some defines to make it easier @@ -87,8 +87,8 @@ typedef KGenericFactory<KPngPlugin> PngFactory; K_EXPORT_COMPONENT_FACTORY(kfile_png, PngFactory("kfile_png")) -KPngPlugin::KPngPlugin(QObject *parent, const char *name, - const QStringList &args) +KPngPlugin::KPngPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { kdDebug(7034) << "png plugin\n"; @@ -101,32 +101,32 @@ KPngPlugin::KPngPlugin(QObject *parent, const char *name, // comment group group = addGroupInfo(info, "Comment", i18n("Comment")); - addVariableInfo(group, QVariant::String, 0); + addVariableInfo(group, TQVariant::String, 0); // technical group group = addGroupInfo(info, "Technical", i18n("Technical Details")); - item = addItemInfo(group, "Dimensions", i18n("Dimensions"), QVariant::Size); + item = addItemInfo(group, "Dimensions", i18n("Dimensions"), TQVariant::Size); setHint( item, KFileMimeTypeInfo::Size ); setUnit(item, KFileMimeTypeInfo::Pixels); - item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), QVariant::Int); + item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), TQVariant::Int); setUnit(item, KFileMimeTypeInfo::BitsPerPixel); - addItemInfo(group, "ColorMode", i18n("Color Mode"), QVariant::String); - addItemInfo(group, "Compression", i18n("Compression"), QVariant::String); - addItemInfo(group, "InterlaceMode", i18n("Interlace Mode"),QVariant::String); + addItemInfo(group, "ColorMode", i18n("Color Mode"), TQVariant::String); + addItemInfo(group, "Compression", i18n("Compression"), TQVariant::String); + addItemInfo(group, "InterlaceMode", i18n("Interlace Mode"),TQVariant::String); } bool KPngPlugin::readInfo( KFileMetaInfo& info, uint what) { if ( info.path().isEmpty() ) // remote file return false; - QFile f(info.path()); + TQFile f(info.path()); if ( !f.open(IO_ReadOnly) ) return false; - QIODevice::Offset fileSize = f.size(); + TQIODevice::Offset fileSize = f.size(); if (fileSize < 29) return false; // the technical group will be read from the first 29 bytes. If the file @@ -176,7 +176,7 @@ bool KPngPlugin::readInfo( KFileMetaInfo& info, uint what) KFileMetaInfoGroup techgroup = appendGroup(info, "Technical"); - appendItem(techgroup, "Dimensions", QSize(x, y)); + appendItem(techgroup, "Dimensions", TQSize(x, y)); appendItem(techgroup, "BitDepth", bpp); appendItem(techgroup, "ColorMode", (type < sizeof(colors)/sizeof(colors[0])) @@ -227,7 +227,7 @@ bool KPngPlugin::readInfo( KFileMetaInfo& info, uint what) if (8+index+keysize>=fileSize) goto end; - QByteArray arr; + TQByteArray arr; if(!strncmp((char*)CHUNK_TYPE(data,index), "zTXt", 4)) { kdDebug(7034) << "We found a zTXt field\n"; // we get the compression method after the key @@ -288,7 +288,7 @@ bool KPngPlugin::readInfo( KFileMetaInfo& info, uint what) goto end; arr.resize(textsize); - arr = QByteArray(textsize).duplicate((const char*)text, + arr = TQByteArray(textsize).duplicate((const char*)text, textsize); } else { @@ -296,11 +296,11 @@ bool KPngPlugin::readInfo( KFileMetaInfo& info, uint what) goto end; } appendItem(commentGroup, - QString(reinterpret_cast<char*>(key)), - QString(arr)); + TQString(reinterpret_cast<char*>(key)), + TQString(arr)); kdDebug(7034) << "adding " << key << " / " - << QString(arr) << endl; + << TQString(arr) << endl; index += CHUNK_SIZE(data, index) + CHUNK_HEADER_SIZE; } diff --git a/kfile-plugins/png/kfile_png.h b/kfile-plugins/png/kfile_png.h index 0873d55d..54e626de 100644 --- a/kfile-plugins/png/kfile_png.h +++ b/kfile-plugins/png/kfile_png.h @@ -24,14 +24,14 @@ #include <kfilemetainfo.h> #include <kurl.h> -class QStringList; +class TQStringList; class KPngPlugin: public KFilePlugin { Q_OBJECT public: - KPngPlugin( QObject *parent, const char *name, const QStringList& preferredItems ); + KPngPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems ); virtual bool readInfo( KFileMetaInfo& info, uint ); }; diff --git a/kfile-plugins/pnm/kfile_pnm.cpp b/kfile-plugins/pnm/kfile_pnm.cpp index b0a1dcca..abe576b4 100644 --- a/kfile-plugins/pnm/kfile_pnm.cpp +++ b/kfile-plugins/pnm/kfile_pnm.cpp @@ -21,8 +21,8 @@ #include <math.h> #include <kgenericfactory.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqtextstream.h> static const char* formats[] = { I18N_NOOP("plain"), @@ -33,14 +33,14 @@ typedef KGenericFactory<KPnmPlugin> PnmFactory; K_EXPORT_COMPONENT_FACTORY(kfile_pnm, PnmFactory("kfile_pnm")) -KPnmPlugin::KPnmPlugin(QObject *parent, const char *name, const QStringList &args) : KFilePlugin(parent, name, args) +KPnmPlugin::KPnmPlugin(TQObject *parent, const char *name, const TQStringList &args) : KFilePlugin(parent, name, args) { makeMimeTypeInfo( "image/x-portable-bitmap" ); makeMimeTypeInfo( "image/x-portable-greymap" ); makeMimeTypeInfo( "image/x-portable-pixmap" ); } -void KPnmPlugin::makeMimeTypeInfo(const QString& mimetype) +void KPnmPlugin::makeMimeTypeInfo(const TQString& mimetype) { KFileMimeTypeInfo* info = addMimeTypeInfo( mimetype ); @@ -49,26 +49,26 @@ void KPnmPlugin::makeMimeTypeInfo(const QString& mimetype) group = addGroupInfo(info, "General", i18n("General")); - addItemInfo(group, "Format", i18n("Format"), QVariant::String); + addItemInfo(group, "Format", i18n("Format"), TQVariant::String); - item = addItemInfo(group, "Dimensions", i18n("Dimensions"), QVariant::Size); + item = addItemInfo(group, "Dimensions", i18n("Dimensions"), TQVariant::Size); setUnit(item, KFileMimeTypeInfo::Pixels); - item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), QVariant::Int); + item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), TQVariant::Int); setUnit(item, KFileMimeTypeInfo::BitsPerPixel); - addItemInfo(group, "Comment", i18n("Comment"), QVariant::String); + addItemInfo(group, "Comment", i18n("Comment"), TQVariant::String); } bool KPnmPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) { - QFile f(info.path()); + TQFile f(info.path()); if(!f.open(IO_ReadOnly)) return false; if(f.size() <= 2) return false; - QTextStream stream(&f); + TQTextStream stream(&f); char c; stream >> c; @@ -83,7 +83,7 @@ bool KPnmPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) return false; int type = (n - 1) % 3; - QString comments, buffer; + TQString comments, buffer; while(!stream.atEnd()) { stream >> c; // comment @@ -94,11 +94,11 @@ bool KPnmPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) } // image size // unfortunately Qt doesn't have some kind of push-back method for - // QTextStream, so we need to manually decode the first part of the + // TQTextStream, so we need to manually decode the first part of the // image size. if( c >= '0' && c <= '9' ) { buffer = ""; - QChar tmp(c); + TQChar tmp(c); while(!stream.atEnd() && tmp.isDigit()) { buffer += tmp; stream >> tmp; @@ -125,7 +125,7 @@ bool KPnmPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) KFileMetaInfoGroup group = appendGroup(info, "General"); appendItem(group, "Format", formats[format]); - appendItem(group, "Dimensions", QSize(x, y)); + appendItem(group, "Dimensions", TQSize(x, y)); if(!comments.isEmpty()) appendItem(group, "Comment", comments.stripWhiteSpace()); appendItem(group, "BitDepth", bpp); diff --git a/kfile-plugins/pnm/kfile_pnm.h b/kfile-plugins/pnm/kfile_pnm.h index 4f1043e5..59b146e5 100644 --- a/kfile-plugins/pnm/kfile_pnm.h +++ b/kfile-plugins/pnm/kfile_pnm.h @@ -22,18 +22,18 @@ #include <kfilemetainfo.h> -class QStringList; +class TQStringList; class KPnmPlugin: public KFilePlugin { Q_OBJECT public: - KPnmPlugin( QObject *parent, const char *name, const QStringList& preferredItems ); + KPnmPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems ); virtual bool readInfo( KFileMetaInfo& info, uint ); private: - void makeMimeTypeInfo( const QString&); + void makeMimeTypeInfo( const TQString&); }; #endif diff --git a/kfile-plugins/ps/gscreator.cpp b/kfile-plugins/ps/gscreator.cpp index 33cbc141..0f0c50e8 100644 --- a/kfile-plugins/ps/gscreator.cpp +++ b/kfile-plugins/ps/gscreator.cpp @@ -69,10 +69,10 @@ #include <errno.h> #include <kdemacros.h> -#include <qcolor.h> -#include <qfile.h> -#include <qimage.h> -#include <qregexp.h> +#include <tqcolor.h> +#include <tqfile.h> +#include <tqimage.h> +#include <tqregexp.h> #include "gscreator.h" @@ -161,7 +161,7 @@ static const char *dvipsargs[] = { 0 }; -static bool correctDVI(const QString& filename); +static bool correctDVI(const TQString& filename); namespace { @@ -172,7 +172,7 @@ namespace { } -bool GSCreator::create(const QString &path, int width, int height, QImage &img) +bool GSCreator::create(const TQString &path, int width, int height, TQImage &img) { // The code in the loop (when testing whether got_sig_term got set) // should read some variation of: @@ -194,7 +194,7 @@ bool GSCreator::create(const QString &path, int width, int height, QImage &img) int output[2]; int dvipipe[2]; - QByteArray data(1024); + TQByteArray data(1024); bool ok = false; @@ -216,7 +216,7 @@ bool GSCreator::create(const QString &path, int width, int height, QImage &img) if (no_dvi) { - FILE* fp = fopen(QFile::encodeName(path), "r"); + FILE* fp = fopen(TQFile::encodeName(path), "r"); if (fp == 0) return false; char buf[4096]; @@ -234,7 +234,7 @@ bool GSCreator::create(const QString &path, int width, int height, QImage &img) } const bool is_encapsulated = no_dvi && - (path.find(QRegExp("\\.epsi?$", false, false)) > 0) && + (path.find(TQRegExp("\\.epsi?$", false, false)) > 0) && (dsc.bbox()->width() > 0) && (dsc.bbox()->height() > 0) && (dsc.page_count() <= 1); @@ -246,7 +246,7 @@ bool GSCreator::create(const QString &path, int width, int height, QImage &img) // GhostScript's rendering at the extremely low resolutions // required for thumbnails leaves something to be desired. To // get nicer images, we render to four times the required - // resolution and let QImage scale the result. + // resolution and let TQImage scale the result. const int hres = (width * 72) / bbox->width(); const int vres = (height * 72) / bbox->height(); const int resolution = (hres > vres ? vres : hres) * 4; @@ -317,7 +317,7 @@ bool GSCreator::create(const QString &path, int width, int height, QImage &img) } // find next zero entry and put the filename there - QCString fname = QFile::encodeName( path ); + TQCString fname = TQFile::encodeName( path ); while (*arg) ++arg; if( no_dvi ) @@ -478,9 +478,9 @@ void GSCreator::comment(Name name) // Quick function to check if the filename corresponds to a valid DVI // file. Returns true if <filename> is a DVI file, false otherwise. -static bool correctDVI(const QString& filename) +static bool correctDVI(const TQString& filename) { - QFile f(filename); + TQFile f(filename); if (!f.open(IO_ReadOnly)) return FALSE; @@ -501,11 +501,11 @@ static bool correctDVI(const QString& filename) return TRUE; } -bool GSCreator::getEPSIPreview(const QString &path, long start, long - end, QImage &outimg, int imgwidth, int imgheight) +bool GSCreator::getEPSIPreview(const TQString &path, long start, long + end, TQImage &outimg, int imgwidth, int imgheight) { FILE *fp; - fp = fopen(QFile::encodeName(path), "r"); + fp = fopen(TQFile::encodeName(path), "r"); if (fp == 0) return false; const long previewsize = end - start + 1; @@ -521,7 +521,7 @@ bool GSCreator::getEPSIPreview(const QString &path, long start, long return false; } - QString previewstr = QString::fromLatin1(buf); + TQString previewstr = TQString::fromLatin1(buf); free(buf); int offset = 0; @@ -560,7 +560,7 @@ bool GSCreator::getEPSIPreview(const QString &path, long start, long } unsigned int colors = (1U << depth); - QImage img(width, height, imagedepth, colors); + TQImage img(width, height, imagedepth, colors); img.setAlphaBuffer(false); if (imagedepth <= 8) { @@ -575,7 +575,7 @@ bool GSCreator::getEPSIPreview(const QString &path, long start, long unsigned int bytes_per_scan_line = bits_per_scan_line / 8; if (bits_per_scan_line % 8) bytes_per_scan_line++; const unsigned int bindatabytes = height * bytes_per_scan_line; - QMemArray<unsigned char> bindata(bindatabytes); + TQMemArray<unsigned char> bindata(bindatabytes); for (unsigned int i = 0; i < bindatabytes; i++) { if (offset >= previewsize) diff --git a/kfile-plugins/ps/gscreator.h b/kfile-plugins/ps/gscreator.h index b91fb0b0..7139b233 100644 --- a/kfile-plugins/ps/gscreator.h +++ b/kfile-plugins/ps/gscreator.h @@ -27,14 +27,14 @@ class GSCreator : public ThumbCreator, public KDSCCommentHandler { public: GSCreator() {}; - virtual bool create(const QString &path, int, int, QImage &img); + virtual bool create(const TQString &path, int, int, TQImage &img); virtual Flags flags() const; void comment(Name name); private: - static bool getEPSIPreview(const QString &path, + static bool getEPSIPreview(const TQString &path, long start, long end, - QImage &outimg, + TQImage &outimg, int imgwidth, int imgheight); bool endComments; }; diff --git a/kfile-plugins/ps/kfile_ps.cpp b/kfile-plugins/ps/kfile_ps.cpp index 6d3caa31..01136d88 100644 --- a/kfile-plugins/ps/kfile_ps.cpp +++ b/kfile-plugins/ps/kfile_ps.cpp @@ -20,7 +20,7 @@ #include "kfile_ps.h" -#include <qfile.h> +#include <tqfile.h> #include <klocale.h> #include <kgenericfactory.h> @@ -30,8 +30,8 @@ typedef KGenericFactory<KPSPlugin> PSFactory; K_EXPORT_COMPONENT_FACTORY(kfile_ps, PSFactory("kfile_ps")) -KPSPlugin::KPSPlugin(QObject *parent, const char *name, - const QStringList &preferredItems) : +KPSPlugin::KPSPlugin(TQObject *parent, const char *name, + const TQStringList &preferredItems) : KFilePlugin( parent, name, preferredItems ) { kdDebug(7034) << "ps plugin\n"; @@ -47,11 +47,11 @@ void KPSPlugin::makeMimeTypeInfo( const char* mimeType ) // general group KFileMimeTypeInfo::GroupInfo* group = addGroupInfo(info, "General", i18n("General")); - addItemInfo(group, "Title", i18n("Title"), QVariant::String); - addItemInfo(group, "Creator", i18n("Creator"), QVariant::String); - addItemInfo(group, "CreationDate", i18n("Creation Date"), QVariant::String); - addItemInfo(group, "For", i18n("For"), QVariant::String); - addItemInfo(group, "Pages", i18n("Pages"), QVariant::UInt); + addItemInfo(group, "Title", i18n("Title"), TQVariant::String); + addItemInfo(group, "Creator", i18n("Creator"), TQVariant::String); + addItemInfo(group, "CreationDate", i18n("Creation Date"), TQVariant::String); + addItemInfo(group, "For", i18n("For"), TQVariant::String); + addItemInfo(group, "Pages", i18n("Pages"), TQVariant::UInt); } bool KPSPlugin::readInfo( KFileMetaInfo& info, uint /* what */) @@ -63,7 +63,7 @@ bool KPSPlugin::readInfo( KFileMetaInfo& info, uint /* what */) _dsc = new KDSC; _dsc->setCommentHandler( this ); - FILE* fp = fopen( QFile::encodeName( info.path() ), "r" ); + FILE* fp = fopen( TQFile::encodeName( info.path() ), "r" ); if( fp == 0 ) return false; diff --git a/kfile-plugins/ps/kfile_ps.h b/kfile-plugins/ps/kfile_ps.h index 339020d1..96a400a8 100644 --- a/kfile-plugins/ps/kfile_ps.h +++ b/kfile-plugins/ps/kfile_ps.h @@ -25,14 +25,14 @@ #include "dscparse_adapter.h" -class QStringList; +class TQStringList; class KPSPlugin: public KFilePlugin, public KDSCCommentHandler { Q_OBJECT public: - KPSPlugin( QObject *parent, const char *name, - const QStringList& preferredItems ); + KPSPlugin( TQObject *parent, const char *name, + const TQStringList& preferredItems ); virtual bool readInfo( KFileMetaInfo& info, uint what); diff --git a/kfile-plugins/raw/kcamerarawplugin.cpp b/kfile-plugins/raw/kcamerarawplugin.cpp index 525e53ae..8a0b0ce8 100644 --- a/kfile-plugins/raw/kcamerarawplugin.cpp +++ b/kfile-plugins/raw/kcamerarawplugin.cpp @@ -28,9 +28,9 @@ #include <kdebug.h> #include <ktempfile.h> #include <kimageio.h> -#include <qfile.h> -#include <qimage.h> -#include <qwmatrix.h> +#include <tqfile.h> +#include <tqimage.h> +#include <tqwmatrix.h> #include <cstdio> @@ -49,10 +49,10 @@ extern "C" { extern char model[]; } -bool KCameraRawPlugin::createPreview(const QString &path, QImage &img) +bool KCameraRawPlugin::createPreview(const TQString &path, TQImage &img) { /* Open file and extract thumbnail */ - FILE* input = fopen( QFile::encodeName(path), "rb" ); + FILE* input = fopen( TQFile::encodeName(path), "rb" ); if( !input ) return false; KTempFile output; output.setAutoDelete(true); @@ -66,8 +66,8 @@ bool KCameraRawPlugin::createPreview(const QString &path, QImage &img) if( !img.load( output.name() ) ) return false; if(orientation) { - QWMatrix M; - QWMatrix flip= QWMatrix(-1,0,0,1,0,0); + TQWMatrix M; + TQWMatrix flip= TQWMatrix(-1,0,0,1,0,0); switch(orientation+1) { // notice intentional fallthroughs case 2: M = flip; break; case 4: M = flip; @@ -83,8 +83,8 @@ bool KCameraRawPlugin::createPreview(const QString &path, QImage &img) return true; } -KCameraRawPlugin::KCameraRawPlugin(QObject *parent, const char *name, - const QStringList &args ) +KCameraRawPlugin::KCameraRawPlugin(TQObject *parent, const char *name, + const TQStringList &args ) : KFilePlugin(parent, name, args) { kdDebug(7034) << "KCameraRawPlugin c'tor" << endl; @@ -98,11 +98,11 @@ KCameraRawPlugin::KCameraRawPlugin(QObject *parent, const char *name, KFileMimeTypeInfo::ItemInfo* item; item = addItemInfo( group, "Manufacturer", i18n("Camera Manufacturer"), - QVariant::String ); + TQVariant::String ); item = addItemInfo( group, "Model", i18n("Camera Model"), - QVariant::String ); + TQVariant::String ); item = addItemInfo( group, "Thumbnail", i18n("Thumbnail"), - QVariant::Image ); + TQVariant::Image ); setHint( item, KFileMimeTypeInfo::Thumbnail ); } @@ -110,20 +110,20 @@ bool KCameraRawPlugin::readInfo( KFileMetaInfo& info, uint what ) { kdDebug(7034) << "KCameraRawPlugin::readInfo()" << endl; - const QString path( info.path() ); + const TQString path( info.path() ); if ( path.isEmpty() ) // remote file return false; KFileMetaInfoGroup group = appendGroup( info, "Info" ); if ( what & KFileMetaInfo::Thumbnail ){ - QImage img; + TQImage img; if( createPreview( path,img ) ) { appendItem( group, "Thumbnail", img ); kdDebug(7034) << "thumbnail " << path << " created" << endl; } } else { // HACK: We have to extract thumbnail to get any info... - QImage img; + TQImage img; createPreview( path,img ); } kdDebug(7034) << "make=" << make << endl; diff --git a/kfile-plugins/raw/kcamerarawplugin.h b/kfile-plugins/raw/kcamerarawplugin.h index 5a097784..e205aa37 100644 --- a/kfile-plugins/raw/kcamerarawplugin.h +++ b/kfile-plugins/raw/kcamerarawplugin.h @@ -22,17 +22,17 @@ #include <kfilemetainfo.h> -class QImage; +class TQImage; class KCameraRawPlugin: public KFilePlugin { Q_OBJECT public: - KCameraRawPlugin(QObject *parent, const char *name, const QStringList& args); + KCameraRawPlugin(TQObject *parent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); private: - bool createPreview(const QString &path, QImage &img); + bool createPreview(const TQString &path, TQImage &img); }; #endif /* KCAMERARAWPLUGIN_H */ diff --git a/kfile-plugins/rgb/kfile_rgb.cpp b/kfile-plugins/rgb/kfile_rgb.cpp index b7b55035..cf832343 100644 --- a/kfile-plugins/rgb/kfile_rgb.cpp +++ b/kfile-plugins/rgb/kfile_rgb.cpp @@ -20,8 +20,8 @@ #include <config.h> #include "kfile_rgb.h" -#include <qfile.h> -#include <qvalidator.h> +#include <tqfile.h> +#include <tqvalidator.h> #include <kdebug.h> #include <kgenericfactory.h> @@ -32,7 +32,7 @@ typedef KGenericFactory<KRgbPlugin> RgbFactory; K_EXPORT_COMPONENT_FACTORY(kfile_rgb, RgbFactory("kfile_rgb")) -KRgbPlugin::KRgbPlugin(QObject *parent, const char *name, const QStringList &args) : +KRgbPlugin::KRgbPlugin(TQObject *parent, const char *name, const TQStringList &args) : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo("image/x-rgb"); @@ -43,39 +43,39 @@ KRgbPlugin::KRgbPlugin(QObject *parent, const char *name, const QStringList &arg group = addGroupInfo(info, "Comment", i18n("Comment")); - item = addItemInfo(group, "ImageName", i18n("Name"), QVariant::String); + item = addItemInfo(group, "ImageName", i18n("Name"), TQVariant::String); setAttributes(item, KFileMimeTypeInfo::Modifiable); setHint(item, KFileMimeTypeInfo::Description); group = addGroupInfo(info, "Technical", i18n("Technical Details")); - item = addItemInfo(group, "Dimensions", i18n("Dimensions"), QVariant::Size); + item = addItemInfo(group, "Dimensions", i18n("Dimensions"), TQVariant::Size); setHint(item, KFileMimeTypeInfo::Size); setUnit(item, KFileMimeTypeInfo::Pixels); - item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), QVariant::Int); + item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), TQVariant::Int); setUnit(item, KFileMimeTypeInfo::BitsPerPixel); - item = addItemInfo(group, "ColorMode", i18n("Color Mode"), QVariant::String); - item = addItemInfo(group, "Compression", i18n("Compression"), QVariant::String); + item = addItemInfo(group, "ColorMode", i18n("Color Mode"), TQVariant::String); + item = addItemInfo(group, "Compression", i18n("Compression"), TQVariant::String); item = addItemInfo(group, "SharedRows", i18n("percentage of avoided vertical redundancy (the higher the better)", - "Shared Rows"), QVariant::String); + "Shared Rows"), TQVariant::String); } bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/) { - QFile file(info.path()); + TQFile file(info.path()); if (!file.open(IO_ReadOnly)) { - kdDebug(7034) << "Couldn't open " << QFile::encodeName(info.path()) << endl; + kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl; return false; } - QDataStream dstream(&file); + TQDataStream dstream(&file); Q_UINT16 magic; Q_UINT8 storage; @@ -116,7 +116,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/) if (dimension == 1) ysize = 1; - appendItem(group, "Dimensions", QSize(xsize, ysize)); + appendItem(group, "Dimensions", TQSize(xsize, ysize)); appendItem(group, "BitDepth", zsize * 8 * bpc); if (zsize == 1) @@ -134,13 +134,13 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/) long compressed = file.size() - 512; long verbatim = xsize * ysize * zsize; appendItem(group, "Compression", i18n("Runlength Encoded") - + QString(", %1%").arg(compressed * 100.0 / verbatim, 0, 'f', 1)); + + TQString(", %1%").arg(compressed * 100.0 / verbatim, 0, 'f', 1)); long k; Q_UINT32 offs; - QMap<Q_UINT32, uint> map; - QMap<Q_UINT32, uint>::Iterator it; - QMap<Q_UINT32, uint>::Iterator end = map.end(); + TQMap<Q_UINT32, uint> map; + TQMap<Q_UINT32, uint>::Iterator it; + TQMap<Q_UINT32, uint>::Iterator end = map.end(); for (k = 0; k < (ysize * zsize); k++) { dstream >> offs; if ((it = map.find(offs)) != end) @@ -152,7 +152,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/) k += it.data(); if (k) - appendItem(group, "SharedRows", QString("%1%").arg(k * 100.0 + appendItem(group, "SharedRows", TQString("%1%").arg(k * 100.0 / (ysize * zsize), 0, 'f', 1)); else appendItem(group, "SharedRows", i18n("None")); @@ -170,10 +170,10 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/) bool KRgbPlugin::writeInfo(const KFileMetaInfo& info) const { - QFile file(info.path()); + TQFile file(info.path()); if (!file.open(IO_WriteOnly|IO_Raw)) { - kdDebug(7034) << "couldn't open " << QFile::encodeName(info.path()) << endl; + kdDebug(7034) << "couldn't open " << TQFile::encodeName(info.path()) << endl; return false; } @@ -182,8 +182,8 @@ bool KRgbPlugin::writeInfo(const KFileMetaInfo& info) const return false; } - QDataStream dstream(&file); - QString s = info["Comment"]["ImageName"].value().toString(); + TQDataStream dstream(&file); + TQString s = info["Comment"]["ImageName"].value().toString(); s.truncate(79); unsigned i; @@ -198,10 +198,10 @@ bool KRgbPlugin::writeInfo(const KFileMetaInfo& info) const // restrict to 79 ASCII characters -QValidator* KRgbPlugin::createValidator(const QString&, const QString &, - const QString &, QObject* parent, const char* name) const +TQValidator* KRgbPlugin::createValidator(const TQString&, const TQString &, + const TQString &, TQObject* parent, const char* name) const { - return new QRegExpValidator(QRegExp("[\x0020-\x007E]{79}"), parent, name); + return new TQRegExpValidator(TQRegExp("[\x0020-\x007E]{79}"), parent, name); } diff --git a/kfile-plugins/rgb/kfile_rgb.h b/kfile-plugins/rgb/kfile_rgb.h index dbbfef0e..c00ddfb5 100644 --- a/kfile-plugins/rgb/kfile_rgb.h +++ b/kfile-plugins/rgb/kfile_rgb.h @@ -22,19 +22,19 @@ #include <kfilemetainfo.h> -class QStringList; +class TQStringList; class KRgbPlugin : public KFilePlugin { Q_OBJECT public: - KRgbPlugin(QObject *parent, const char *name, const QStringList& args); + KRgbPlugin(TQObject *parent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); virtual bool writeInfo(const KFileMetaInfo& info) const; - virtual QValidator* createValidator(const QString& mimetype, - const QString &group, const QString &key, - QObject* parent, const char* name) const; + virtual TQValidator* createValidator(const TQString& mimetype, + const TQString &group, const TQString &key, + TQObject* parent, const char* name) const; }; diff --git a/kfile-plugins/tga/kfile_tga.cpp b/kfile-plugins/tga/kfile_tga.cpp index 9c2c24dc..21d2c6d2 100644 --- a/kfile-plugins/tga/kfile_tga.cpp +++ b/kfile-plugins/tga/kfile_tga.cpp @@ -26,11 +26,11 @@ #include <kstringvalidator.h> #include <kdebug.h> -#include <qdict.h> -#include <qvalidator.h> -#include <qcstring.h> -#include <qfile.h> -#include <qdatetime.h> +#include <tqdict.h> +#include <tqvalidator.h> +#include <tqcstring.h> +#include <tqfile.h> +#include <tqdatetime.h> #if !defined(__osf__) #include <inttypes.h> @@ -44,8 +44,8 @@ typedef KGenericFactory<KTgaPlugin> TgaFactory; K_EXPORT_COMPONENT_FACTORY(kfile_tga, TgaFactory( "kfile_tga" )) -KTgaPlugin::KTgaPlugin(QObject *parent, const char *name, - const QStringList &args) +KTgaPlugin::KTgaPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { @@ -57,15 +57,15 @@ KTgaPlugin::KTgaPlugin(QObject *parent, const char *name, KFileMimeTypeInfo::ItemInfo* item; - item = addItemInfo(group, "Dimensions", i18n("Dimensions"), QVariant::Size); + item = addItemInfo(group, "Dimensions", i18n("Dimensions"), TQVariant::Size); setHint( item, KFileMimeTypeInfo::Size ); setUnit(item, KFileMimeTypeInfo::Pixels); - item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), QVariant::Int); + item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), TQVariant::Int); setUnit(item, KFileMimeTypeInfo::BitsPerPixel); - item = addItemInfo(group, "ColorMode", i18n("Color Mode"), QVariant::String); - item = addItemInfo(group, "Compression", i18n("Compression"), QVariant::String); + item = addItemInfo(group, "ColorMode", i18n("Color Mode"), TQVariant::String); + item = addItemInfo(group, "Compression", i18n("Compression"), TQVariant::String); } @@ -73,18 +73,18 @@ bool KTgaPlugin::readInfo( KFileMetaInfo& info, uint what) { - QFile file(info.path()); + TQFile file(info.path()); if (!file.open(IO_ReadOnly)) { - kdDebug(7034) << "Couldn't open " << QFile::encodeName(info.path()) << endl; + kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl; return false; } - QDataStream dstream(&file); + TQDataStream dstream(&file); // TGA files are little-endian - dstream.setByteOrder(QDataStream::LittleEndian); + dstream.setByteOrder(TQDataStream::LittleEndian); // the vars for the image data uint8_t tga_idlength; @@ -116,7 +116,7 @@ bool KTgaPlugin::readInfo( KFileMetaInfo& info, uint what) // output the useful bits KFileMetaInfoGroup group = appendGroup(info, "Technical"); - appendItem(group, "Dimensions", QSize(tga_imagespec_width, tga_imagespec_height)); + appendItem(group, "Dimensions", TQSize(tga_imagespec_width, tga_imagespec_height)); appendItem(group, "BitDepth", tga_imagespec_depth); switch (tga_imagetype) { diff --git a/kfile-plugins/tga/kfile_tga.h b/kfile-plugins/tga/kfile_tga.h index cd224fdf..8b130e49 100644 --- a/kfile-plugins/tga/kfile_tga.h +++ b/kfile-plugins/tga/kfile_tga.h @@ -22,14 +22,14 @@ #include <kfilemetainfo.h> -class QStringList; +class TQStringList; class KTgaPlugin: public KFilePlugin { Q_OBJECT public: - KTgaPlugin( QObject *parent, const char *name, const QStringList& args ); + KTgaPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/tiff/kfile_tiff.cpp b/kfile-plugins/tiff/kfile_tiff.cpp index 1e844d0d..ce55e5b3 100644 --- a/kfile-plugins/tiff/kfile_tiff.cpp +++ b/kfile-plugins/tiff/kfile_tiff.cpp @@ -22,10 +22,10 @@ #include <kgenericfactory.h> #include <kdebug.h> -#include <qstringlist.h> -#include <qfile.h> -#include <qdatetime.h> -#include <qregexp.h> +#include <tqstringlist.h> +#include <tqfile.h> +#include <tqdatetime.h> +#include <tqregexp.h> #include <tiff.h> #include <tiffio.h> @@ -34,8 +34,8 @@ typedef KGenericFactory<KTiffPlugin> TiffFactory; K_EXPORT_COMPONENT_FACTORY(kfile_tiff, TiffFactory("kfile_tiff")) -KTiffPlugin::KTiffPlugin(QObject *parent, const char *name, - const QStringList &args) : KFilePlugin(parent, name, args) +KTiffPlugin::KTiffPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { kdDebug(7034) << "TIFF file meta info plugin" << endl; KFileMimeTypeInfo* info = addMimeTypeInfo( "image/tiff" ); @@ -45,121 +45,121 @@ KTiffPlugin::KTiffPlugin(QObject *parent, const char *name, KFileMimeTypeInfo::ItemInfo* item; item = addItemInfo(group, "Description", i18n("Description"), - QVariant::String); + TQVariant::String); setHint(item, KFileMimeTypeInfo::Description); item = addItemInfo(group, "Copyright", i18n("Copyright"), - QVariant::String); + TQVariant::String); item = addItemInfo(group, "ColorMode", i18n("Color Mode"), - QVariant::String); + TQVariant::String); item = addItemInfo(group, "Dimensions", i18n("Dimensions"), - QVariant::Size); + TQVariant::Size); setHint(item, KFileMimeTypeInfo::Size); setUnit(item, KFileMimeTypeInfo::Pixels); item = addItemInfo(group, "Resolution", i18n("Resolution"), - QVariant::Size); + TQVariant::Size); setUnit(item, KFileMimeTypeInfo::DotsPerInch); item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), - QVariant::Int); + TQVariant::Int); setUnit(item, KFileMimeTypeInfo::BitsPerPixel); item = addItemInfo(group, "Compression", i18n("Compression"), - QVariant::String); + TQVariant::String); item = addItemInfo(group, "Software", i18n("Software"), - QVariant::String); + TQVariant::String); item = addItemInfo(group, "DateTime", i18n("Date/Time"), - QVariant::DateTime); + TQVariant::DateTime); item = addItemInfo(group, "Artist", i18n("Artist"), - QVariant::String); + TQVariant::String); setHint(item, KFileMimeTypeInfo::Author); item = addItemInfo(group, "FaxPages", i18n("Fax Pages"), - QVariant::Int); + TQVariant::Int); group = addGroupInfo(info, "Scanner", i18n("Scanner")); - item = addItemInfo(group, "Make", i18n("Make"), QVariant::String); - item = addItemInfo(group, "Model", i18n("Model"), QVariant::String); + item = addItemInfo(group, "Make", i18n("Make"), TQVariant::String); + item = addItemInfo(group, "Model", i18n("Model"), TQVariant::String); m_colorMode.setAutoDelete(true); m_imageCompression.setAutoDelete(true); m_colorMode.insert(PHOTOMETRIC_MINISWHITE, - new QString(I18N_NOOP("Monochrome"))); + new TQString(I18N_NOOP("Monochrome"))); m_colorMode.insert(PHOTOMETRIC_MINISBLACK, - new QString(I18N_NOOP("Monochrome"))); + new TQString(I18N_NOOP("Monochrome"))); m_colorMode.insert(PHOTOMETRIC_RGB, - new QString(I18N_NOOP("RGB"))); + new TQString(I18N_NOOP("RGB"))); m_colorMode.insert(PHOTOMETRIC_PALETTE, - new QString(I18N_NOOP("Palette color"))); + new TQString(I18N_NOOP("Palette color"))); m_colorMode.insert(PHOTOMETRIC_MASK, - new QString(I18N_NOOP("Transparency mask"))); + new TQString(I18N_NOOP("Transparency mask"))); m_colorMode.insert(PHOTOMETRIC_SEPARATED, - new QString(I18N_NOOP("Color separations"))); + new TQString(I18N_NOOP("Color separations"))); m_colorMode.insert(PHOTOMETRIC_YCBCR, - new QString(I18N_NOOP("YCbCr"))); + new TQString(I18N_NOOP("YCbCr"))); m_colorMode.insert(PHOTOMETRIC_CIELAB, - new QString(I18N_NOOP("CIE Lab"))); + new TQString(I18N_NOOP("CIE Lab"))); #ifdef PHOTOMETRIC_ITULAB m_colorMode.insert(PHOTOMETRIC_ITULAB, - new QString(I18N_NOOP("ITU Lab"))); + new TQString(I18N_NOOP("ITU Lab"))); #endif m_colorMode.insert(PHOTOMETRIC_LOGL, - new QString(I18N_NOOP("LOGL"))); + new TQString(I18N_NOOP("LOGL"))); m_colorMode.insert(PHOTOMETRIC_LOGLUV, - new QString(I18N_NOOP("LOGLUV"))); + new TQString(I18N_NOOP("LOGLUV"))); m_imageCompression.insert(COMPRESSION_NONE, - new QString(I18N_NOOP("None"))); + new TQString(I18N_NOOP("None"))); m_imageCompression.insert(COMPRESSION_CCITTRLE, - new QString(I18N_NOOP("RLE"))); + new TQString(I18N_NOOP("RLE"))); m_imageCompression.insert(COMPRESSION_CCITTFAX3, - new QString(I18N_NOOP("G3 Fax"))); + new TQString(I18N_NOOP("G3 Fax"))); m_imageCompression.insert(COMPRESSION_CCITTFAX4, - new QString(I18N_NOOP("G4 Fax"))); + new TQString(I18N_NOOP("G4 Fax"))); m_imageCompression.insert(COMPRESSION_LZW, - new QString(I18N_NOOP("LZW"))); + new TQString(I18N_NOOP("LZW"))); m_imageCompression.insert(COMPRESSION_OJPEG, - new QString(I18N_NOOP("JPEG"))); + new TQString(I18N_NOOP("JPEG"))); m_imageCompression.insert(COMPRESSION_JPEG, - new QString(I18N_NOOP("JPEG DCT"))); + new TQString(I18N_NOOP("JPEG DCT"))); #ifdef COMPRESSION_ADOBE_DEFLATE m_imageCompression.insert(COMPRESSION_ADOBE_DEFLATE, - new QString(I18N_NOOP("Adobe Deflate"))); + new TQString(I18N_NOOP("Adobe Deflate"))); #endif m_imageCompression.insert(COMPRESSION_NEXT, - new QString(I18N_NOOP("NeXT 2-bit RLE"))); + new TQString(I18N_NOOP("NeXT 2-bit RLE"))); m_imageCompression.insert(COMPRESSION_CCITTRLEW, - new QString(I18N_NOOP("RLE Word"))); + new TQString(I18N_NOOP("RLE Word"))); m_imageCompression.insert(COMPRESSION_PACKBITS, - new QString(I18N_NOOP("Packbits"))); + new TQString(I18N_NOOP("Packbits"))); m_imageCompression.insert(COMPRESSION_THUNDERSCAN, - new QString(I18N_NOOP("Thunderscan RLE"))); + new TQString(I18N_NOOP("Thunderscan RLE"))); m_imageCompression.insert(COMPRESSION_IT8CTPAD, - new QString(I18N_NOOP("IT8 CT w/padding"))); + new TQString(I18N_NOOP("IT8 CT w/padding"))); m_imageCompression.insert(COMPRESSION_IT8LW, - new QString(I18N_NOOP("IT8 linework RLE"))); + new TQString(I18N_NOOP("IT8 linework RLE"))); m_imageCompression.insert(COMPRESSION_IT8MP, - new QString(I18N_NOOP("IT8 monochrome"))); + new TQString(I18N_NOOP("IT8 monochrome"))); m_imageCompression.insert(COMPRESSION_IT8BL, - new QString(I18N_NOOP("IT8 binary lineart"))); + new TQString(I18N_NOOP("IT8 binary lineart"))); m_imageCompression.insert(COMPRESSION_PIXARFILM, - new QString(I18N_NOOP("Pixar 10-bit LZW"))); + new TQString(I18N_NOOP("Pixar 10-bit LZW"))); m_imageCompression.insert(COMPRESSION_PIXARLOG, - new QString(I18N_NOOP("Pixar 11-bit ZIP"))); + new TQString(I18N_NOOP("Pixar 11-bit ZIP"))); m_imageCompression.insert(COMPRESSION_DEFLATE, - new QString(I18N_NOOP("Pixar deflate"))); + new TQString(I18N_NOOP("Pixar deflate"))); m_imageCompression.insert(COMPRESSION_DCS, - new QString(I18N_NOOP("Kodak DCS"))); + new TQString(I18N_NOOP("Kodak DCS"))); m_imageCompression.insert(COMPRESSION_JBIG, - new QString(I18N_NOOP("ISO JBIG"))); + new TQString(I18N_NOOP("ISO JBIG"))); m_imageCompression.insert(COMPRESSION_SGILOG, - new QString(I18N_NOOP("SGI log luminance RLE"))); + new TQString(I18N_NOOP("SGI log luminance RLE"))); m_imageCompression.insert(COMPRESSION_SGILOG24, - new QString(I18N_NOOP("SGI log 24-bit packed"))); + new TQString(I18N_NOOP("SGI log 24-bit packed"))); } -QDateTime KTiffPlugin::tiffDate(const QString& s) const +TQDateTime KTiffPlugin::tiffDate(const TQString& s) const { - QDateTime dt; - QRegExp rxDate("^([0-9]{4}):([0-9]{2}):([0-9]{2})\\s" + TQDateTime dt; + TQRegExp rxDate("^([0-9]{4}):([0-9]{2}):([0-9]{2})\\s" "([0-9]{2}):([0-9]{2}):([0-9]{2})$"); if (rxDate.search(s) != -1) @@ -171,8 +171,8 @@ QDateTime KTiffPlugin::tiffDate(const QString& s) const int min = rxDate.cap(5).toInt(); int sec = rxDate.cap(6).toInt(); - QDate d = QDate(year, month, day); - QTime t = QTime(hour, min, sec); + TQDate d = TQDate(year, month, day); + TQTime t = TQTime(hour, min, sec); if (d.isValid() && t.isValid()) { @@ -186,7 +186,7 @@ QDateTime KTiffPlugin::tiffDate(const QString& s) const bool KTiffPlugin::readInfo(KFileMetaInfo& info, uint) { - TIFF *tiff = TIFFOpen(QFile::encodeName(info.path()), "r"); + TIFF *tiff = TIFFOpen(TQFile::encodeName(info.path()), "r"); if (!tiff) return false; @@ -248,15 +248,15 @@ bool KTiffPlugin::readInfo(KFileMetaInfo& info, uint) int imageBpp = bitsPerSample*samplesPerPixel; if (imageAlpha && colorMode==PHOTOMETRIC_RGB) - m_colorMode.replace(PHOTOMETRIC_RGB, new QString(I18N_NOOP("RGBA"))); + m_colorMode.replace(PHOTOMETRIC_RGB, new TQString(I18N_NOOP("RGBA"))); KFileMetaInfoGroup group = appendGroup(info, "General"); if (description) - appendItem(group, "Description", QString(description)); - appendItem(group, "Dimensions", QSize(imageWidth, imageLength)); + appendItem(group, "Description", TQString(description)); + appendItem(group, "Dimensions", TQSize(imageWidth, imageLength)); appendItem(group, "BitDepth", imageBpp); if (imageXResolution>0 && imageYResolution>0) - appendItem(group, "Resolution", QSize( + appendItem(group, "Resolution", TQSize( static_cast<int>(imageXResolution), static_cast<int>(imageYResolution))); if (m_colorMode[colorMode]) @@ -265,16 +265,16 @@ bool KTiffPlugin::readInfo(KFileMetaInfo& info, uint) appendItem(group, "Compression", *m_imageCompression[imageCompression]); if (datetime) { - QDateTime dt = tiffDate(QString(datetime)); + TQDateTime dt = tiffDate(TQString(datetime)); if (dt.isValid()) appendItem(group, "DateTime", dt); } if (copyright) - appendItem(group, "Copyright", QString(copyright)); + appendItem(group, "Copyright", TQString(copyright)); if (software) - appendItem(group, "Software", QString(software)); + appendItem(group, "Software", TQString(software)); if (artist) - appendItem(group, "Artist", QString(artist)); + appendItem(group, "Artist", TQString(artist)); if (faxPages>0 && (imageCompression==COMPRESSION_CCITTFAX3 || imageCompression==COMPRESSION_CCITTFAX4)) @@ -286,9 +286,9 @@ bool KTiffPlugin::readInfo(KFileMetaInfo& info, uint) { group = appendGroup(info, "Scanner"); if (scannerMake) - appendItem(group, "Make", QString(scannerMake)); + appendItem(group, "Make", TQString(scannerMake)); if (scannerModel) - appendItem(group, "Model", QString(scannerModel)); + appendItem(group, "Model", TQString(scannerModel)); } TIFFClose(tiff); diff --git a/kfile-plugins/tiff/kfile_tiff.h b/kfile-plugins/tiff/kfile_tiff.h index 8985288d..54087ea4 100644 --- a/kfile-plugins/tiff/kfile_tiff.h +++ b/kfile-plugins/tiff/kfile_tiff.h @@ -22,21 +22,21 @@ #include <kfilemetainfo.h> -#include <qintdict.h> +#include <tqintdict.h> class KTiffPlugin: public KFilePlugin { Q_OBJECT public: - KTiffPlugin(QObject *parent, const char *name, const QStringList& args); + KTiffPlugin(TQObject *parent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); private: - QDateTime tiffDate(const QString&) const; + TQDateTime tiffDate(const TQString&) const; - QIntDict<QString> m_colorMode; - QIntDict<QString> m_imageCompression; + TQIntDict<TQString> m_colorMode; + TQIntDict<TQString> m_imageCompression; }; #endif diff --git a/kfile-plugins/xbm/kfile_xbm.cpp b/kfile-plugins/xbm/kfile_xbm.cpp index d62471f5..755201a3 100644 --- a/kfile-plugins/xbm/kfile_xbm.cpp +++ b/kfile-plugins/xbm/kfile_xbm.cpp @@ -26,11 +26,11 @@ #include <kstringvalidator.h> #include <kdebug.h> -#include <qdict.h> -#include <qvalidator.h> -#include <qcstring.h> -#include <qfile.h> -#include <qdatetime.h> +#include <tqdict.h> +#include <tqvalidator.h> +#include <tqcstring.h> +#include <tqfile.h> +#include <tqdatetime.h> #if !defined(__osf__) #include <inttypes.h> @@ -42,8 +42,8 @@ typedef KGenericFactory<KXbmPlugin> XbmFactory; K_EXPORT_COMPONENT_FACTORY(kfile_xbm, XbmFactory( "kfile_xbm" )) -KXbmPlugin::KXbmPlugin(QObject *parent, const char *name, - const QStringList &args) +KXbmPlugin::KXbmPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { @@ -55,7 +55,7 @@ KXbmPlugin::KXbmPlugin(QObject *parent, const char *name, KFileMimeTypeInfo::ItemInfo* item; - item = addItemInfo(group, "Dimensions", i18n("Dimensions"), QVariant::Size); + item = addItemInfo(group, "Dimensions", i18n("Dimensions"), TQVariant::Size); setHint( item, KFileMimeTypeInfo::Size ); setUnit(item, KFileMimeTypeInfo::Pixels); } @@ -96,11 +96,11 @@ unsigned long KXbmPlugin::xbm_processLine(char * linebuf) bool KXbmPlugin::readInfo( KFileMetaInfo& info, uint what) { - QFile file(info.path()); + TQFile file(info.path()); if (!file.open(IO_ReadOnly)) { - kdDebug(7034) << "Couldn't open " << QFile::encodeName(info.path()) << endl; + kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl; return false; } @@ -118,7 +118,7 @@ bool KXbmPlugin::readInfo( KFileMetaInfo& info, uint what) if ((width > 0) && (height > 0)) { // we have valid looking data KFileMetaInfoGroup group = appendGroup(info, "Technical"); - appendItem(group, "Dimensions", QSize(width, height)); + appendItem(group, "Dimensions", TQSize(width, height)); return true; } diff --git a/kfile-plugins/xbm/kfile_xbm.h b/kfile-plugins/xbm/kfile_xbm.h index 8cc571e1..7b62047c 100644 --- a/kfile-plugins/xbm/kfile_xbm.h +++ b/kfile-plugins/xbm/kfile_xbm.h @@ -22,14 +22,14 @@ #include <kfilemetainfo.h> -class QStringList; +class TQStringList; class KXbmPlugin: public KFilePlugin { Q_OBJECT public: - KXbmPlugin( QObject *parent, const char *name, const QStringList& args ); + KXbmPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); diff --git a/kfile-plugins/xpm/kfile_xpm.cpp b/kfile-plugins/xpm/kfile_xpm.cpp index 3fd188b7..c0e80027 100644 --- a/kfile-plugins/xpm/kfile_xpm.cpp +++ b/kfile-plugins/xpm/kfile_xpm.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include <config.h> -#include <qimage.h> +#include <tqimage.h> #include "kfile_xpm.h" #include <kgenericfactory.h> @@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY(kfile_xpm, xpmFactory( "kfile_xpm" )) //-------------------------------------------------------------------------------- -xpmPlugin::xpmPlugin(QObject *parent, const char *name, const QStringList &args) +xpmPlugin::xpmPlugin(TQObject *parent, const char *name, const TQStringList &args) : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-xpm" ); @@ -44,11 +44,11 @@ xpmPlugin::xpmPlugin(QObject *parent, const char *name, const QStringList &args) KFileMimeTypeInfo::ItemInfo* item; // our new items in the group - item = addItemInfo(group, "Dimension", i18n("Dimension"), QVariant::Size); + item = addItemInfo(group, "Dimension", i18n("Dimension"), TQVariant::Size); setHint(item, KFileMimeTypeInfo::Size); setUnit(item, KFileMimeTypeInfo::Pixels); - item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), QVariant::Int); + item = addItemInfo(group, "BitDepth", i18n("Bit Depth"), TQVariant::Int); setUnit(item, KFileMimeTypeInfo::BitsPerPixel); } @@ -56,7 +56,7 @@ xpmPlugin::xpmPlugin(QObject *parent, const char *name, const QStringList &args) bool xpmPlugin::readInfo(KFileMetaInfo& info, uint /*what*/) { - QImage pix; + TQImage pix; if ( ! pix.load(info.path(), "XPM") ) return false; diff --git a/kfile-plugins/xpm/kfile_xpm.h b/kfile-plugins/xpm/kfile_xpm.h index c68ad4eb..f4660c45 100644 --- a/kfile-plugins/xpm/kfile_xpm.h +++ b/kfile-plugins/xpm/kfile_xpm.h @@ -29,14 +29,14 @@ */ #include <kfilemetainfo.h> -class QStringList; +class TQStringList; class xpmPlugin: public KFilePlugin { Q_OBJECT public: - xpmPlugin(QObject *parent, const char *name, const QStringList& args); + xpmPlugin(TQObject *parent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); }; |