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

2 files changed, 5 insertions, 4 deletions

diff --git a/kfile-plugins/xpm/kfile_xpm.cpp b/kfile-plugins/xpm/kfile_xpm.cpp
index c0e80027..bc6806cf 100644
--- a/kfile-plugins/xpm/kfile_xpm.cpp
+++ b/kfile-plugins/xpm/kfile_xpm.cpp
@@ -32,8 +32,8 @@ K_EXPORT_COMPONENT_FACTORY(kfile_xpm, xpmFactory( "kfile_xpm" ))
 
 //--------------------------------------------------------------------------------
 
-xpmPlugin::xpmPlugin(TQObject *parent, const char *name, const TQStringList &args)
-  : KFilePlugin(parent, name, args)
+xpmPlugin::xpmPlugin(TQObject *tqparent, const char *name, const TQStringList &args)
+  : KFilePlugin(tqparent, name, args)
 {
   KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-xpm" );
 
@@ -62,7 +62,7 @@ bool xpmPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
 
   KFileMetaInfoGroup group = appendGroup(info, "xpmInfo");
 
-  appendItem(group, "Dimension", pix.size());
+  appendItem(group, "Dimension", TQSize(pix.size()));
   appendItem(group, "BitDepth", pix.depth());
 
   return true;
diff --git a/kfile-plugins/xpm/kfile_xpm.h b/kfile-plugins/xpm/kfile_xpm.h
index f4660c45..abebe119 100644
--- a/kfile-plugins/xpm/kfile_xpm.h
+++ b/kfile-plugins/xpm/kfile_xpm.h
@@ -34,9 +34,10 @@ class TQStringList;
 class xpmPlugin: public KFilePlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    xpmPlugin(TQObject *parent, const char *name, const TQStringList& args);
+    xpmPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
 
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 };