TDE
/
soundkonverter
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/soundkonverter
0
0
Fork 0
Code Issues Releases Wiki Activity

Update various qt function definitions and static methods for tqt3

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 865bb406a1
commit 17fa026619
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

12
acinclude.m4
Unescape View File

@ -1104,7 +1104,7 @@ EOF
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210 #if TQT_VERSION < 210
#error 1 #error 1
#endif #endif
EOF EOF
@ -1201,22 +1201,22 @@ fi
if test -z "$3"; then if test -z "$3"; then
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000" kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else else
kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000" kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
fi fi
fi fi
if test $kde_qtver = 2; then if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 222" kde_qt_verstring="TQT_VERSION >= 222"
else else
kde_qt_verstring="QT_VERSION >= 200" kde_qt_verstring="TQT_VERSION >= 200"
fi fi
fi fi
if test $kde_qtver = 1; then if test $kde_qtver = 1; then
kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200" kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
fi fi
else else
kde_qt_verstring="$3" kde_qt_verstring="$3"

2
src/replaygainscanner.cpp
Unescape View File

@ -168,7 +168,7 @@ void ReplayGainScanner::showDirDialog()
DirDialog *dialog = new DirDialog( config, DirDialog::ReplayGain, this, "DirDialog" ); DirDialog *dialog = new DirDialog( config, DirDialog::ReplayGain, this, "DirDialog" );
Q_CHECK_PTR( dialog ); TQ_CHECK_PTR( dialog );
if( dialog->exec() ) { if( dialog->exec() ) {
emit addDir( dialog->directory, dialog->selectedFileTypes, dialog->recursive ); emit addDir( dialog->directory, dialog->selectedFileTypes, dialog->recursive );

12
src/soundkonverter.cpp
Unescape View File

@ -347,7 +347,7 @@ void soundKonverter::openArgFiles( const TQStringList &files )
TQT_TQOBJECT(fileList), TQT_SLOT(addFiles(TQStringList)) TQT_TQOBJECT(fileList), TQT_SLOT(addFiles(TQStringList))
); );
Q_CHECK_PTR( dialog ); TQ_CHECK_PTR( dialog );
if( profile != "" ) { if( profile != "" ) {
dialog->setProfile( profile ); dialog->setProfile( profile );
@ -511,7 +511,7 @@ void soundKonverter::showDirDialog()
DirDialog *dialog = new DirDialog( config, DirDialog::Convert, this, "DirDialog" ); DirDialog *dialog = new DirDialog( config, DirDialog::Convert, this, "DirDialog" );
Q_CHECK_PTR( dialog ); TQ_CHECK_PTR( dialog );
if( dialog->exec() ) { if( dialog->exec() ) {
fileList->addDir( dialog->directory, dialog->selectedFileTypes, dialog->recursive ); fileList->addDir( dialog->directory, dialog->selectedFileTypes, dialog->recursive );
@ -535,7 +535,7 @@ void soundKonverter::showCdDialog( bool intern )
// TQT_TQOBJECT(fileList), TQT_SLOT(addFiles(TQStringList)) // TQT_TQOBJECT(fileList), TQT_SLOT(addFiles(TQStringList))
// ); // );
Q_CHECK_PTR( dialog ); TQ_CHECK_PTR( dialog );
if( profile != "" ) { if( profile != "" ) {
dialog->setProfile( profile ); dialog->setProfile( profile );
@ -590,7 +590,7 @@ void soundKonverter::showCdDialog( bool intern )
device = ""; device = "";
Q_CHECK_PTR( dialog ); TQ_CHECK_PTR( dialog );
if( !dialog->noCD ) if( !dialog->noCD )
{ {
@ -696,7 +696,7 @@ void soundKonverter::showConfigDialog()
{ {
ConfigDialog *dialog = new ConfigDialog( config, this, "ConfigDialog", ConfigDialog::Page(configStartPage) ); ConfigDialog *dialog = new ConfigDialog( config, this, "ConfigDialog", ConfigDialog::Page(configStartPage) );
Q_CHECK_PTR( dialog ); TQ_CHECK_PTR( dialog );
//dialog->setGeometry( frameGeometry() ); //dialog->setGeometry( frameGeometry() );
dialog->resize( size() ); dialog->resize( size() );
@ -724,7 +724,7 @@ void soundKonverter::showConfigEnvironmentPage()
// { // {
// AboutPlugins *dialog = new AboutPlugins( config, this, "AboutPlugins" ); // AboutPlugins *dialog = new AboutPlugins( config, this, "AboutPlugins" );
// //
// Q_CHECK_PTR( dialog ); // TQ_CHECK_PTR( dialog );
// //
// dialog->exec(); // dialog->exec();
// //

Write Preview
Loading…
Cancel
Save