From e69e8b1d09fb579316595b4e6a850e717358a8b1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 19 Jun 2011 19:03:33 +0000 Subject: 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 --- kfile-plugins/bmp/kfile_bmp.cpp | 6 +++--- kfile-plugins/bmp/kfile_bmp.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'kfile-plugins/bmp') diff --git a/kfile-plugins/bmp/kfile_bmp.cpp b/kfile-plugins/bmp/kfile_bmp.cpp index 790161a6..a682da7c 100644 --- a/kfile-plugins/bmp/kfile_bmp.cpp +++ b/kfile-plugins/bmp/kfile_bmp.cpp @@ -43,10 +43,10 @@ typedef KGenericFactory BmpFactory; K_EXPORT_COMPONENT_FACTORY(kfile_bmp, BmpFactory( "kfile_bmp" )) -KBmpPlugin::KBmpPlugin(TQObject *parent, const char *name, +KBmpPlugin::KBmpPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-bmp" ); @@ -83,7 +83,7 @@ bool KBmpPlugin::readInfo( KFileMetaInfo& info, uint what) 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; } diff --git a/kfile-plugins/bmp/kfile_bmp.h b/kfile-plugins/bmp/kfile_bmp.h index f34e3e86..c2c5c007 100644 --- a/kfile-plugins/bmp/kfile_bmp.h +++ b/kfile-plugins/bmp/kfile_bmp.h @@ -27,9 +27,10 @@ class TQStringList; class KBmpPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KBmpPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KBmpPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; -- cgit v1.2.1