From d8cc8bdfa7fa624a526d5aa1626974e1444cb799 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 27 May 2011 19:21:21 +0000 Subject: TQt4 port k3b This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1233803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libk3b/videodvd/k3bvideodvdaudiostream.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libk3b/videodvd/k3bvideodvdaudiostream.h') diff --git a/libk3b/videodvd/k3bvideodvdaudiostream.h b/libk3b/videodvd/k3bvideodvdaudiostream.h index 78068f0..b5719f9 100644 --- a/libk3b/videodvd/k3bvideodvdaudiostream.h +++ b/libk3b/videodvd/k3bvideodvdaudiostream.h @@ -18,7 +18,7 @@ #include -#include +#include namespace K3bVideoDVD @@ -37,14 +37,14 @@ namespace K3bVideoDVD }; enum AudioQuantization { - AUDIO_QUANTIZATION_16BIT = 0, - AUDIO_QUANTIZATION_20BIT = 1, - AUDIO_QUANTIZATION_24BIT = 2 + AUDIO_TQUANTIZATION_16BIT = 0, + AUDIO_TQUANTIZATION_20BIT = 1, + AUDIO_TQUANTIZATION_24BIT = 2 }; enum AudioSampleFrequency { - AUDIO_SAMPLE_FREQ_48HZ = 0, - AUDIO_SAMPLE_FREQ_96HZ = 1 + AUDIO_SAMPLE_FRETQ_48HZ = 0, + AUDIO_SAMPLE_FRETQ_96HZ = 1 }; enum AudioCodeExtension { @@ -64,7 +64,7 @@ namespace K3bVideoDVD * \return A two chars language code or the empty string * if the language is undefined. */ - const QString& langCode() const { return m_langCode; } + const TQString& langCode() const { return m_langCode; } /** * \see AudioFormat @@ -103,7 +103,7 @@ namespace K3bVideoDVD unsigned short m_codeExtension; bool m_multiChannelExt; unsigned short m_channels:3; - QString m_langCode; + TQString m_langCode; friend class VideoDVD; }; -- cgit v1.2.3