Fix kdemultimedia Qt3 FTBFS

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236199 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 44fe0cfe4e
commit f104a9c30e

@ -53,9 +53,9 @@ public:
}; };
#ifdef LEGACY_FLAC #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 #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 #endif
{ {
EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data; EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;

@ -92,7 +92,7 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0)
TQPixmap px=tqparent()->pixmap(parser()["backgroundimage"][1]); TQPixmap px=tqparent()->pixmap(parser()["backgroundimage"][1]);
bitBlt(barmode[0], 0, 0, &px, x, y, xs, ys, TQt::CopyROP); bitBlt(barmode[0], 0, 0, &px, x, y, xs, ys, TQt::CopyROP);
px.convertFromImage(transtqmask); px.convertFromImage(transtqmask);
barModeMask=TQBitmap(px); barModeMask=px;
// kdDebug(66666) << "END KJSeeker constructor" << endl; // kdDebug(66666) << "END KJSeeker constructor" << endl;
} }

Loading…
Cancel
Save