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/raw/kcamerarawplugin.cpp | 4 ++-- kfile-plugins/raw/kcamerarawplugin.h | 3 ++- kfile-plugins/raw/parse.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'kfile-plugins/raw') diff --git a/kfile-plugins/raw/kcamerarawplugin.cpp b/kfile-plugins/raw/kcamerarawplugin.cpp index 8a0b0ce8..62b00404 100644 --- a/kfile-plugins/raw/kcamerarawplugin.cpp +++ b/kfile-plugins/raw/kcamerarawplugin.cpp @@ -83,9 +83,9 @@ bool KCameraRawPlugin::createPreview(const TQString &path, TQImage &img) return true; } -KCameraRawPlugin::KCameraRawPlugin(TQObject *parent, const char *name, +KCameraRawPlugin::KCameraRawPlugin(TQObject *tqparent, const char *name, const TQStringList &args ) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { kdDebug(7034) << "KCameraRawPlugin c'tor" << endl; diff --git a/kfile-plugins/raw/kcamerarawplugin.h b/kfile-plugins/raw/kcamerarawplugin.h index e205aa37..fa583c4f 100644 --- a/kfile-plugins/raw/kcamerarawplugin.h +++ b/kfile-plugins/raw/kcamerarawplugin.h @@ -26,9 +26,10 @@ class TQImage; class KCameraRawPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KCameraRawPlugin(TQObject *parent, const char *name, const TQStringList& args); + KCameraRawPlugin(TQObject *tqparent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); private: diff --git a/kfile-plugins/raw/parse.c b/kfile-plugins/raw/parse.c index 1abbbfce..a256f04e 100644 --- a/kfile-plugins/raw/parse.c +++ b/kfile-plugins/raw/parse.c @@ -284,7 +284,7 @@ int parse_tiff_ifd (int base, int level) case 0x111: /* StripOffset */ if (!offset || is_dng) offset = val; break; - case 0x112: /* Orientation */ + case 0x112: /* Qt::Orientation */ flip = flip_map[(val-1) & 7]; break; case 0x117: /* StripByteCounts */ -- cgit v1.2.1