diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-14 21:06:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-14 21:06:33 -0600 |
| commit | c9518bd2e05ec21f6b71b3f7197687f4c061c08c (patch) | |
| tree | beccb2f1dddb1f9055bc56b7592cde68e1e8786a | |
| parent | efa306db3a6799ef40296aa7baed4b798e93868a (diff) | |
| download | amarok-c9518bd2.tar.gz amarok-c9518bd2.zip | |
Update various qt function definitions and static methods for tqt3
| -rw-r--r-- | acinclude.m4 | 12 | ||||
| -rw-r--r-- | amarok/src/mediabrowser.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 96a42fa0..08f2aa0b 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/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp index 5a89e560..db639ecb 100644 --- a/amarok/src/mediabrowser.cpp +++ b/amarok/src/mediabrowser.cpp @@ -1965,7 +1965,7 @@ MediaDevice::MediaDevice() , m_staleItem( 0 ) , m_orphanedItem( 0 ) { - sysProc = new KShellProcess(); Q_CHECK_PTR(sysProc); + sysProc = new KShellProcess(); TQ_CHECK_PTR(sysProc); } void MediaDevice::init( MediaBrowser* parent ) |