From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- mpeglib/example/yaf/yafcdda/Makefile.am | 2 +- mpeglib/example/yaf/yafcore/buffer.cpp | 2 +- mpeglib/example/yaf/yafcore/buffer.h | 2 +- mpeglib/example/yaf/yafcore/inputDecoder.cpp | 4 ++-- mpeglib/example/yaf/yafcore/inputDecoder.h | 4 ++-- mpeglib/example/yaf/yafcore/lineStack.cpp | 4 ++-- mpeglib/example/yaf/yafcore/parser.cpp | 2 +- mpeglib/example/yaf/yafcore/yaf_control.cpp | 2 +- mpeglib/example/yaf/yafmpgplay/Makefile.am | 2 +- mpeglib/example/yaf/yafsplay/Makefile.am | 2 +- mpeglib/example/yaf/yaftplay/Makefile.am | 2 +- mpeglib/example/yaf/yafvorbis/Makefile.am | 2 +- mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp | 6 +++--- mpeglib/example/yaf/yafyuv/Makefile.am | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) (limited to 'mpeglib/example/yaf') diff --git a/mpeglib/example/yaf/yafcdda/Makefile.am b/mpeglib/example/yaf/yafcdda/Makefile.am index 2930f348..287fc8ea 100644 --- a/mpeglib/example/yaf/yafcdda/Makefile.am +++ b/mpeglib/example/yaf/yafcdda/Makefile.am @@ -10,7 +10,7 @@ yaf_cdda_SOURCES = cdda_control.cpp noinst_HEADERS = -yaf_cdda_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_cdda_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_cdda_LDADD = ../yafxplayer/libyafxplayer.la \ diff --git a/mpeglib/example/yaf/yafcore/buffer.cpp b/mpeglib/example/yaf/yafcore/buffer.cpp index 3c58f0ee..3f3d6158 100644 --- a/mpeglib/example/yaf/yafcore/buffer.cpp +++ b/mpeglib/example/yaf/yafcore/buffer.cpp @@ -122,7 +122,7 @@ void Buffer::grow(int size) { } -int Buffer::find(char zeichen) { +int Buffer::tqfind(char zeichen) { int i; int nlen=len(); for(i=0;ifind('\n'); + nPos=stack->tqfind('\n'); if (nPos == -1) return false; return true; @@ -45,7 +45,7 @@ void LineStack::nextLine(Buffer* nextLine) { char* data=stack->getData(); int nSize=stack->getSize(); - nPos=stack->find('\n'); + nPos=stack->tqfind('\n'); if (nPos == -1) { nextLine->clear(); return; diff --git a/mpeglib/example/yaf/yafcore/parser.cpp b/mpeglib/example/yaf/yafcore/parser.cpp index 21b27c6b..f9e8fdaa 100644 --- a/mpeglib/example/yaf/yafcore/parser.cpp +++ b/mpeglib/example/yaf/yafcore/parser.cpp @@ -101,7 +101,7 @@ void Parser::parse(char* strStart,int* nCommand){ int Parser::isOK(){ - // a Commandline ist valid when it contains : + // a Commandline ist valid when it tqcontains : // * 2 * (identifer/value) // * first identifier ist "Command" diff --git a/mpeglib/example/yaf/yafcore/yaf_control.cpp b/mpeglib/example/yaf/yafcore/yaf_control.cpp index 6e789588..6192f36b 100644 --- a/mpeglib/example/yaf/yafcore/yaf_control.cpp +++ b/mpeglib/example/yaf/yafcore/yaf_control.cpp @@ -37,7 +37,7 @@ void yaf_control(InputInterface* input, while(1) { - status=decoder->getDecoderStatus(); + status=decoder->getDecodertqStatus(); if (status == _DECODER_STATUS_EXIT) { break; diff --git a/mpeglib/example/yaf/yafmpgplay/Makefile.am b/mpeglib/example/yaf/yafmpgplay/Makefile.am index c9fd9b55..811e3d9a 100644 --- a/mpeglib/example/yaf/yafmpgplay/Makefile.am +++ b/mpeglib/example/yaf/yafmpgplay/Makefile.am @@ -11,7 +11,7 @@ yaf_mpgplay_SOURCES = mpg_control.cpp noinst_HEADERS = -yaf_mpgplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_mpgplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_mpgplay_LDADD = ../yafcore/libyafcore.la \ diff --git a/mpeglib/example/yaf/yafsplay/Makefile.am b/mpeglib/example/yaf/yafsplay/Makefile.am index 463ec7db..40c8196d 100644 --- a/mpeglib/example/yaf/yafsplay/Makefile.am +++ b/mpeglib/example/yaf/yafsplay/Makefile.am @@ -11,7 +11,7 @@ yaf_splay_SOURCES = splay_control.cpp noinst_HEADERS = -yaf_splay_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_splay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_splay_LDADD = ../yafxplayer/libyafxplayer.la \ diff --git a/mpeglib/example/yaf/yaftplay/Makefile.am b/mpeglib/example/yaf/yaftplay/Makefile.am index 2d82700d..96b596ba 100644 --- a/mpeglib/example/yaf/yaftplay/Makefile.am +++ b/mpeglib/example/yaf/yaftplay/Makefile.am @@ -9,7 +9,7 @@ yaf_tplay_SOURCES = tplay_control.cpp noinst_HEADERS = -yaf_tplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_tplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_tplay_LDADD = ../yafcore/libyafcore.la \ diff --git a/mpeglib/example/yaf/yafvorbis/Makefile.am b/mpeglib/example/yaf/yafvorbis/Makefile.am index f0a01965..d07fdbdf 100644 --- a/mpeglib/example/yaf/yafvorbis/Makefile.am +++ b/mpeglib/example/yaf/yafvorbis/Makefile.am @@ -10,7 +10,7 @@ yaf_vorbis_SOURCES = vorbis_control.cpp noinst_HEADERS = -yaf_vorbis_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_vorbis_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_vorbis_LDADD = \ ../yafcore/libyafcore.la \ diff --git a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp index 4b3bf3b3..00e9a213 100644 --- a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp +++ b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp @@ -29,7 +29,7 @@ InputDecoderXPlayer::InputDecoderXPlayer(YafOutputStream* yafOutput) : this->yafOutput=yafOutput; ct=new CommandTableXPlayer(); - setDecoderStatus(_DECODER_STATUS_IDLE); + setDecodertqStatus(_DECODER_STATUS_IDLE); appendCommandTable(ct); majorMode=_PLAYER_MAJOR_MODE_OFF; setRuntimeInfo(false); @@ -161,7 +161,7 @@ const char* InputDecoderXPlayer::processCommand(int command,const char* args){ } if (command == _PLAYER_PLAY) { - setDecoderStatus(_DECODER_STATUS_WORKING); + setDecodertqStatus(_DECODER_STATUS_WORKING); setMajorMode(_PLAYER_MAJOR_MODE_PLAYING); return""; } @@ -186,7 +186,7 @@ const char* InputDecoderXPlayer::processCommand(int command,const char* args){ return "already output file selected"; } yafOutput->setStreamFile(args); - // now we have set the fifo. But we must say the parent + // now we have set the fifo. But we must say the tqparent // process that we start with waiting cout << "Command:0 Msg:fileopen before"<