From abc21952ac547e45f72d35c35bc7d746648947cc Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 22 Jul 2011 08:36:52 +0000
Subject: Fix k3b FTBFS under Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1242628 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 libk3b/plugin/k3baudiodecoder.cpp        | 2 +-
 libk3b/videodvd/configure.in.in          | 2 +-
 plugins/decoder/flac/configure.in.in     | 2 +-
 plugins/decoder/flac/k3bflacdecoder.cpp  | 2 +-
 plugins/decoder/mp3/configure.in.in      | 2 +-
 plugins/decoder/musepack/configure.in.in | 6 +++---
 plugins/encoder/lame/configure.in.in     | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libk3b/plugin/k3baudiodecoder.cpp b/libk3b/plugin/k3baudiodecoder.cpp
index 54fe8ad..cf9add3 100644
--- a/libk3b/plugin/k3baudiodecoder.cpp
+++ b/libk3b/plugin/k3baudiodecoder.cpp
@@ -321,7 +321,7 @@ int K3bAudioDecoder::decode( char* _data, int maxLen )
 int K3bAudioDecoder::resample( char* data, int maxLen )
 {
   if( !d->resampleState ) {
-    d->resampleState = src_new( SRC_SINC_MEDIUM_TQUALITY, d->channels, 0 );
+    d->resampleState = src_new( SRC_SINC_MEDIUM_QUALITY, d->channels, 0 );
     if( !d->resampleState ) {
       kdDebug() << "(K3bAudioDecoder) unable to initialize resampler." << endl;
       return -1;
diff --git a/libk3b/videodvd/configure.in.in b/libk3b/videodvd/configure.in.in
index f5ec969..33d3df0 100644
--- a/libk3b/videodvd/configure.in.in
+++ b/libk3b/videodvd/configure.in.in
@@ -11,7 +11,7 @@ have_libdvdread=no
 if test "$ac_cv_use_libdvdread" = "yes"; then
 	KDE_CHECK_HEADERS(dvdread/dvd_reader.h, 
 	[
-		AC_CHECK_LIB(dvdread,
+		KDE_CHECK_LIB(dvdread,
 			DVDOpen,
 			[
         	           AC_DEFINE(HAVE_LIBDVDREAD,1,[Defined if you have libdvdread headers and libs installed.])
diff --git a/plugins/decoder/flac/configure.in.in b/plugins/decoder/flac/configure.in.in
index e6a3700..4679bf7 100644
--- a/plugins/decoder/flac/configure.in.in
+++ b/plugins/decoder/flac/configure.in.in
@@ -9,7 +9,7 @@ AC_ARG_WITH(
 have_flac=no
 if test "$ac_cv_use_flac" = "yes"; then
   KDE_CHECK_HEADERS(FLAC++/decoder.h, [
-     AC_CHECK_LIB(FLAC,FLAC__stream_decoder_process_single,
+     KDE_CHECK_LIB(FLAC,FLAC__stream_decoder_process_single,
 	        have_flac=yes,[],$all_libraries)])
 
     AC_MSG_CHECKING(for libFLAC newer than 1.1.1)
diff --git a/plugins/decoder/flac/k3bflacdecoder.cpp b/plugins/decoder/flac/k3bflacdecoder.cpp
index 4e537b0..495e3d9 100644
--- a/plugins/decoder/flac/k3bflacdecoder.cpp
+++ b/plugins/decoder/flac/k3bflacdecoder.cpp
@@ -56,7 +56,7 @@ public:
     file = f;
     file->open(IO_ReadOnly);
     
-    internalBuffer->flush();
+    TQT_TQIODEVICE(internalBuffer)->flush();
     
     set_metadata_respond(FLAC__METADATA_TYPE_STREAMINFO);
     set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT);
diff --git a/plugins/decoder/mp3/configure.in.in b/plugins/decoder/mp3/configure.in.in
index fb92936..9da5da7 100644
--- a/plugins/decoder/mp3/configure.in.in
+++ b/plugins/decoder/mp3/configure.in.in
@@ -9,7 +9,7 @@ AC_ARG_WITH(
 if test "$ac_cv_use_libmad" = "yes"; then
   MAD_LIB=""
   KDE_CHECK_HEADER(mad.h, [
-	AC_CHECK_LIB(mad, mad_synth_frame, [
+	KDE_CHECK_LIB(mad, mad_synth_frame, [
 		MAD_LIB="-lmad"
 		AC_DEFINE(HAVE_LIBMAD,1,[defined if you have libmad headers and libraries])],
 		[],
diff --git a/plugins/decoder/musepack/configure.in.in b/plugins/decoder/musepack/configure.in.in
index ca42976..1500ae3 100644
--- a/plugins/decoder/musepack/configure.in.in
+++ b/plugins/decoder/musepack/configure.in.in
@@ -15,7 +15,7 @@ if test "$ac_cv_use_mpc" = "yes"; then
   dnl - search for both the new and the old naming -
 
   KDE_CHECK_HEADERS(mpcdec/mpcdec.h, [
-  	AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
+  	KDE_CHECK_LIB(mpcdec, mpc_decoder_setup, [
   		have_mpc=yes
 		MPC_LIBS="-lmpcdec"
 		AC_DEFINE(
@@ -28,7 +28,7 @@ if test "$ac_cv_use_mpc" = "yes"; then
 
   if test "$have_mpc" = "no"; then
     KDE_CHECK_HEADERS(mpc/mpcdec.h, [
-        AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
+        KDE_CHECK_LIB(mpcdec, mpc_decoder_setup, [
                 have_mpc=yes
                 MPC_LIBS="-lmpcdec"
                 AC_DEFINE(
@@ -42,7 +42,7 @@ if test "$ac_cv_use_mpc" = "yes"; then
 	
   if test "$have_mpc" = "no"; then
     KDE_CHECK_HEADERS(musepack/musepack.h, [
-    	  AC_CHECK_LIB(musepack, mpc_decoder_setup, [
+    	  KDE_CHECK_LIB(musepack, mpc_decoder_setup, [
   		  have_mpc=yes
 		  MPC_LIBS="-lmusepack"
 		  AC_DEFINE(
diff --git a/plugins/encoder/lame/configure.in.in b/plugins/encoder/lame/configure.in.in
index f2a5283..11ce49d 100644
--- a/plugins/encoder/lame/configure.in.in
+++ b/plugins/encoder/lame/configure.in.in
@@ -9,7 +9,7 @@ AC_ARG_WITH(
 have_lame=no
 if test "$ac_cv_use_lame" = "yes"; then
   KDE_CHECK_HEADERS(lame/lame.h, [
-  	AC_CHECK_LIB(mp3lame, lame_init, [
+  	KDE_CHECK_LIB(mp3lame, lame_init, [
   		have_lame=yes
   		AC_DEFINE(HAVE_LAME,1,[defined if you have the lame header and lib])
   		], [], $all_libraries -lm)
-- 
cgit v1.2.3