diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-14 21:12:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-14 21:12:05 -0600 |
| commit | 17fa0266197f917cbedd25e957c0a4e0922adb78 (patch) | |
| tree | 99955d8a1c279f0c9cae25cbe6e09ad1cd40895b | |
| parent | 865bb406a1161cf415ee1e1f11efd4af72256bee (diff) | |
| download | soundkonverter-17fa0266.tar.gz soundkonverter-17fa0266.zip | |
Update various qt function definitions and static methods for tqt3
| -rw-r--r-- | acinclude.m4 | 12 | ||||
| -rwxr-xr-x | src/replaygainscanner.cpp | 2 | ||||
| -rwxr-xr-x | src/soundkonverter.cpp | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index a844011..5ead3b1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1104,7 +1104,7 @@ EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <<EOF -#if QT_VERSION < 210 +#if TQT_VERSION < 210 #error 1 #endif EOF @@ -1201,22 +1201,22 @@ fi if test -z "$3"; then if test $kde_qtver = 3; 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,'` kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` else - kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000" + kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000" fi fi if test $kde_qtver = 2; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 222" + kde_qt_verstring="TQT_VERSION >= 222" else - kde_qt_verstring="QT_VERSION >= 200" + kde_qt_verstring="TQT_VERSION >= 200" fi fi 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 else kde_qt_verstring="$3" diff --git a/src/replaygainscanner.cpp b/src/replaygainscanner.cpp index 2bafc9e..0e34b88 100755 --- a/src/replaygainscanner.cpp +++ b/src/replaygainscanner.cpp @@ -168,7 +168,7 @@ void ReplayGainScanner::showDirDialog() DirDialog *dialog = new DirDialog( config, DirDialog::ReplayGain, this, "DirDialog" ); - Q_CHECK_PTR( dialog ); + TQ_CHECK_PTR( dialog ); if( dialog->exec() ) { emit addDir( dialog->directory, dialog->selectedFileTypes, dialog->recursive ); diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp index dd7dcd9..61e3561 100755 --- a/src/soundkonverter.cpp +++ b/src/soundkonverter.cpp @@ -347,7 +347,7 @@ void soundKonverter::openArgFiles( const TQStringList &files ) TQT_TQOBJECT(fileList), TQT_SLOT(addFiles(TQStringList)) ); - Q_CHECK_PTR( dialog ); + TQ_CHECK_PTR( dialog ); if( profile != "" ) { dialog->setProfile( profile ); @@ -511,7 +511,7 @@ void soundKonverter::showDirDialog() DirDialog *dialog = new DirDialog( config, DirDialog::Convert, this, "DirDialog" ); - Q_CHECK_PTR( dialog ); + TQ_CHECK_PTR( dialog ); if( dialog->exec() ) { fileList->addDir( dialog->directory, dialog->selectedFileTypes, dialog->recursive ); @@ -535,7 +535,7 @@ void soundKonverter::showCdDialog( bool intern ) // TQT_TQOBJECT(fileList), TQT_SLOT(addFiles(TQStringList)) // ); - Q_CHECK_PTR( dialog ); + TQ_CHECK_PTR( dialog ); if( profile != "" ) { dialog->setProfile( profile ); @@ -590,7 +590,7 @@ void soundKonverter::showCdDialog( bool intern ) device = ""; - Q_CHECK_PTR( dialog ); + TQ_CHECK_PTR( dialog ); if( !dialog->noCD ) { @@ -696,7 +696,7 @@ void soundKonverter::showConfigDialog() { ConfigDialog *dialog = new ConfigDialog( config, this, "ConfigDialog", ConfigDialog::Page(configStartPage) ); - Q_CHECK_PTR( dialog ); + TQ_CHECK_PTR( dialog ); //dialog->setGeometry( frameGeometry() ); dialog->resize( size() ); @@ -724,7 +724,7 @@ void soundKonverter::showConfigEnvironmentPage() // { // AboutPlugins *dialog = new AboutPlugins( config, this, "AboutPlugins" ); // -// Q_CHECK_PTR( dialog ); +// TQ_CHECK_PTR( dialog ); // // dialog->exec(); // |