[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [phonon/five] phonon: Remove the fromindex boogieman, no longer needed
From:       Casian Andrei <skeletk13 () gmail ! com>
Date:       2014-01-18 19:23:16
Message-ID: E1W4bUC-0007J4-QQ () scm ! kde ! org
[Download RAW message or body]

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 = qobject_cast<BackendInterface *>(Factory::backend());
-    if (iface) {
-        const QList<AudioOutputDevice> devices = iface->audioOutputDevices();
-        if (index >= 0 && index < devices.count() && devices[index].isAvailable()) {
-            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 \
                globalconfig...
-    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


[prev in list] [next in list] [prev in thread] [next in thread]