TQt4 port kdegraphics

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 9 insertions, 8 deletions

diff --git a/kfile-plugins/gif/gif-info.1 b/kfile-plugins/gif/gif-info.1
index 6c36b1c4..f5397472 100644
--- a/kfile-plugins/gif/gif-info.1
+++ b/kfile-plugins/gif/gif-info.1
@@ -15,7 +15,7 @@ displays information about the given gif (Graphic Interchange Format) image.  If
 .PP
 Write a empty comment ('') to delete the comment block.
 .PP
-The GIF standard allows any number of 256 byte comment blocks in an image file, but most implementations (including this one) restrict you to just one block.  The GIF standard restricts comment blocks to "7 Bit ASCII", but this is widely ignored.  You are welcome to store text in your own native language, and are especially encouraged to use comments in utf-8 unicode format.
+The GIF standard allows any number of 256 byte comment blocks in an image file, but most implementations (including this one) restrict you to just one block.  The GIF standard restricts comment blocks to "7 Bit ASCII", but this is widely ignored.  You are welcome to store text in your own native language, and are especially encouraged to use comments in utf-8 tqunicode format.
 
 .SH "SEE ALSO"
 .BR wrjpgcom (1)
diff --git a/kfile-plugins/gif/kfile_gif.cpp b/kfile-plugins/gif/kfile_gif.cpp
index ce54458b..9c45f257 100644
--- a/kfile-plugins/gif/kfile_gif.cpp
+++ b/kfile-plugins/gif/kfile_gif.cpp
@@ -42,9 +42,9 @@ typedef KGenericFactory<KGifPlugin> GifFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_gif, GifFactory("kfile_gif"))
 
-KGifPlugin::KGifPlugin(TQObject *parent, const char *name,
+KGifPlugin::KGifPlugin(TQObject *tqparent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     kdDebug(7034) << "gif KFileMetaInfo plugin\n";
 
@@ -76,7 +76,7 @@ bool KGifPlugin::readInfo( KFileMetaInfo& info, uint what )
     TQFile file(info.path());
 
     if (!file.open(IO_ReadOnly)) {
-	kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+	kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()).data() << endl;
 	return false;
     }
 
@@ -84,9 +84,9 @@ bool KGifPlugin::readInfo( KFileMetaInfo& info, uint what )
 
     bool isGIF87a = false;
     char magic[7];
-    Q_UINT16 width = 0;
-    Q_UINT16 height = 0;
-    Q_UINT8 miscInfo = 0;
+    TQ_UINT16 width = 0;
+    TQ_UINT16 height = 0;
+    TQ_UINT8 miscInfo = 0;
 
     fstream.readRawBytes( magic, 6 ); 
     magic[6] = 0x00; // null terminate
diff --git a/kfile-plugins/gif/kfile_gif.h b/kfile-plugins/gif/kfile_gif.h
index f4c0be51..a5d69910 100644
--- a/kfile-plugins/gif/kfile_gif.h
+++ b/kfile-plugins/gif/kfile_gif.h
@@ -27,9 +27,10 @@ class TQStringList;
 class KGifPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KGifPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KGifPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
 
     virtual bool readInfo ( KFileMetaInfo& info, uint what );
 };