diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 22:51:17 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 22:51:17 +0200 |
commit | 54c9b1a80c04a5ecc685dc29e27a27de81d8cc1b (patch) | |
tree | aa2a0374e57a8fd82036485a77bacfcee208a532 /src/gui/kernel | |
parent | 181df199d31a8018cfcfc31b548909fe4b57ccbd (diff) |
even less QT3_SUPPORT
the new libQtGui should now be free of any
Qt3 related methods.
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qkeysequence.h | 3 | ||||
-rw-r--r-- | src/gui/kernel/qsound.cpp | 23 | ||||
-rw-r--r-- | src/gui/kernel/qsound.h | 5 |
3 files changed, 0 insertions, 31 deletions
diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index 9eabb89d29..c61501036a 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h @@ -161,9 +161,6 @@ public: NoMatch, PartialMatch, ExactMatch -#ifdef QT3_SUPPORT - , Identical = ExactMatch -#endif }; QString toString(SequenceFormat format = PortableText) const; diff --git a/src/gui/kernel/qsound.cpp b/src/gui/kernel/qsound.cpp index a61310a4eb..55a98758c3 100644 --- a/src/gui/kernel/qsound.cpp +++ b/src/gui/kernel/qsound.cpp @@ -189,29 +189,6 @@ QSound::QSound(const QString& filename, QObject* parent) server().init(this); } -#ifdef QT3_SUPPORT -/*! - \obsolete - - Constructs a QSound object from the file specified by the given \a - filename and with the given \a parent and \a name. Use the - QSound() construcor and QObject::setObjectName() instead. - - \oldcode - QSound *mySound = new QSound(filename, parent, name); - \newcode - QSounc *mySound = new QSound(filename, parent); - mySound->setObjectName(name); - \endcode -*/ -QSound::QSound(const QString& filename, QObject* parent, const char* name) - : QObject(*new QSoundPrivate(filename), parent) -{ - setObjectName(QString::fromAscii(name)); - server().init(this); -} -#endif - /*! Destroys this sound object. If the sound is not finished playing, the stop() function is called before the sound object is diff --git a/src/gui/kernel/qsound.h b/src/gui/kernel/qsound.h index 70957762b2..a0d058011a 100644 --- a/src/gui/kernel/qsound.h +++ b/src/gui/kernel/qsound.h @@ -76,11 +76,6 @@ public Q_SLOTS: void play(); void stop(); -public: -#ifdef QT3_SUPPORT - QT3_SUPPORT_CONSTRUCTOR QSound(const QString& filename, QObject* parent, const char* name); - static inline QT3_SUPPORT bool available() { return isAvailable(); } -#endif private: Q_DECLARE_PRIVATE(QSound) friend class QAuServer; |