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/xbm/kfile_xbm.cpp | 6 +++--- kfile-plugins/xbm/kfile_xbm.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'kfile-plugins/xbm') diff --git a/kfile-plugins/xbm/kfile_xbm.cpp b/kfile-plugins/xbm/kfile_xbm.cpp index 755201a3..7929a1bd 100644 --- a/kfile-plugins/xbm/kfile_xbm.cpp +++ b/kfile-plugins/xbm/kfile_xbm.cpp @@ -42,10 +42,10 @@ typedef KGenericFactory XbmFactory; K_EXPORT_COMPONENT_FACTORY(kfile_xbm, XbmFactory( "kfile_xbm" )) -KXbmPlugin::KXbmPlugin(TQObject *parent, const char *name, +KXbmPlugin::KXbmPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-xbm" ); @@ -100,7 +100,7 @@ bool KXbmPlugin::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/xbm/kfile_xbm.h b/kfile-plugins/xbm/kfile_xbm.h index 7b62047c..b30e04cb 100644 --- a/kfile-plugins/xbm/kfile_xbm.h +++ b/kfile-plugins/xbm/kfile_xbm.h @@ -27,9 +27,10 @@ class TQStringList; class KXbmPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KXbmPlugin( TQObject *parent, const char *name, const TQStringList& args ); + KXbmPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); -- cgit v1.2.1