From f104a9c30eedf5cc2ea3f2bd9c928bf5ca79da3d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 12 Jun 2011 06:03:55 +0000 Subject: Fix kdemultimedia Qt3 FTBFS git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236199 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kioslave/audiocd/plugins/flac/encoderflac.cpp | 4 ++-- noatun/modules/kjofol-skin/kjseeker.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kioslave/audiocd/plugins/flac/encoderflac.cpp b/kioslave/audiocd/plugins/flac/encoderflac.cpp index fd98f8b4..6b71d515 100644 --- a/kioslave/audiocd/plugins/flac/encoderflac.cpp +++ b/kioslave/audiocd/plugins/flac/encoderflac.cpp @@ -53,9 +53,9 @@ public: }; #ifdef LEGACY_FLAC -static FLAC__StreamEncoderWritetqStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) +static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) #else -static FLAC__StreamEncoderWritetqStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) +static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) #endif { EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data; diff --git a/noatun/modules/kjofol-skin/kjseeker.cpp b/noatun/modules/kjofol-skin/kjseeker.cpp index 0d30e506..24fc2da1 100644 --- a/noatun/modules/kjofol-skin/kjseeker.cpp +++ b/noatun/modules/kjofol-skin/kjseeker.cpp @@ -92,7 +92,7 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0) TQPixmap px=tqparent()->pixmap(parser()["backgroundimage"][1]); bitBlt(barmode[0], 0, 0, &px, x, y, xs, ys, TQt::CopyROP); px.convertFromImage(transtqmask); - barModeMask=TQBitmap(px); + barModeMask=px; // kdDebug(66666) << "END KJSeeker constructor" << endl; } -- cgit v1.2.3