From kde-commits Sat Jan 18 19:23:16 2014 From: Casian Andrei Date: Sat, 18 Jan 2014 19:23:16 +0000 To: kde-commits Subject: [phonon/five] phonon: Remove the fromindex boogieman, no longer needed Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=139007300827042 Git commit 3bd0bbe80a2a1cad5156a7b50d389ef42fc7f18d by Casian Andrei. Committed on 18/01/2014 at 18:13. Pushed by casianandrei into branch 'five'. Remove the fromindex boogieman, no longer needed M +0 -13 phonon/objectdescription.cpp M +0 -9 phonon/objectdescription.h http://commits.kde.org/phonon/3bd0bbe80a2a1cad5156a7b50d389ef42fc7f18d diff --git a/phonon/objectdescription.cpp b/phonon/objectdescription.cpp index bbf91e8..ba13c8f 100644 --- a/phonon/objectdescription.cpp +++ b/phonon/objectdescription.cpp @@ -224,19 +224,6 @@ AudioOutputDevice::~AudioOutputDevice() qDebug() << Q_FUNC_INFO; } = -AudioOutputDevice AudioOutputDevice::fromIndex(int index) -{ - BackendInterface *iface =3D qobject_cast(Factory::= backend()); - if (iface) { - const QList devices =3D iface->audioOutputDevic= es(); - if (index >=3D 0 && index < devices.count() && devices[index].isAv= ailable()) { - return devices[index]; - } - } - - return AudioOutputDevice(); -} - AudioCaptureDevice::AudioCaptureDevice() : DeviceDescriptionBase() { diff --git a/phonon/objectdescription.h b/phonon/objectdescription.h index 66413f9..cdf0608 100644 --- a/phonon/objectdescription.h +++ b/phonon/objectdescription.h @@ -96,9 +96,6 @@ public: #warning possibly needs available param AudioOutputDevice(int index, QString name, QString description); ~AudioOutputDevice(); - -#warning fromindex boogieman - why here why at all what is the beef with g= lobalconfig... - static AudioOutputDevice fromIndex(int i); }; = class PHONON_EXPORT AudioCaptureDevice : public DeviceDescriptionBase @@ -107,9 +104,6 @@ public: AudioCaptureDevice(); AudioCaptureDevice(int index, QString name, QString description); ~AudioCaptureDevice(); - -#warning fromindex boogieman - static AudioCaptureDevice fromIndex(int i) { return AudioCaptureDevice= (0, "unknown ACD", "unknown ACD description"); } }; = class PHONON_EXPORT VideoCaptureDevice : public DeviceDescriptionBase @@ -118,9 +112,6 @@ public: VideoCaptureDevice(); VideoCaptureDevice(int index, QString name, QString description); ~VideoCaptureDevice(); - -#warning fromindex boogieman - static VideoCaptureDevice fromIndex(int i) { return VideoCaptureDevice= (0, "unknown VCD", "unknown VCD description"); } }; = class PHONON_EXPORT EffectDescription : public DescriptionBase