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

List:       kde-commits
Subject:    [phonon/five] phonon: Remove the index attribute from the object descriptions
From:       Casian Andrei <skeletk13 () gmail ! com>
Date:       2014-01-18 19:23:17
Message-ID: E1W4bUD-0007J4-LL () scm ! kde ! org
[Download RAW message or body]

Git commit 89b07a7a747c9ce196e08317e4b3c3dff4cee52b by Casian Andrei.
Committed on 18/01/2014 at 18:13.
Pushed by casianandrei into branch 'five'.

Remove the index attribute from the object descriptions

M  +10   -21   phonon/objectdescription.cpp
M  +4    -5    phonon/objectdescription.h
M  +3    -8    phonon/objectdescription_p.h

http://commits.kde.org/phonon/89b07a7a747c9ce196e08317e4b3c3dff4cee52b

diff --git a/phonon/objectdescription.cpp b/phonon/objectdescription.cpp
index ba13c8f..9f28850 100644
--- a/phonon/objectdescription.cpp
+++ b/phonon/objectdescription.cpp
@@ -37,18 +37,16 @@ class DescriptionBasePrivate
 public:
     DescriptionBasePrivate()
         : valid(false)
-        , index(-1)
         , name()
         , description()
     {
         qDebug() << Q_FUNC_INFO;
     }
 
-    void init(int _index, QString _name, QString _description)
+    void init(QString _name, QString _description)
     {
-        qDebug() << Q_FUNC_INFO << _index << _name << _description;
+        qDebug() << Q_FUNC_INFO << _name << _description;
         valid = true;
-        index = _index;
         name = _name;
         description = _description;
     }
@@ -57,7 +55,6 @@ public:
     {
         qDebug() << Q_FUNC_INFO;
         return (valid == other.valid) &&
-                (index == other.index) &&
                 (name == other.name) &&
                 (description == other.description);
     }
@@ -66,14 +63,12 @@ public:
     {
         qDebug() << Q_FUNC_INFO;
         return (valid != other.valid) &&
-                (index != other.index) &&
                 (name != other.name) &&
                 (description != other.description);
     }
 
     bool valid;
 
-    int index;
     QString name;
     QString description;
 
@@ -87,12 +82,6 @@ DescriptionBase::DescriptionBase()
     qDebug() << Q_FUNC_INFO;
 }
 
-int DescriptionBase::index() const
-{
-    P_D(const DescriptionBase);
-    return d->index;
-}
-
 QString DescriptionBase::name() const
 {
     P_D(const DescriptionBase);
@@ -153,12 +142,12 @@ EffectDescription::EffectDescription()
     qDebug() << Q_FUNC_INFO;
 }
 
-EffectDescription::EffectDescription(int index, QString name, QString description)
+EffectDescription::EffectDescription(QString name, QString description)
     : DescriptionBase()
 {
     qDebug() << Q_FUNC_INFO;
     P_D(DescriptionBase);
-    d->init(index, name, description);
+    d->init(name, description);
 }
 
 class DeviceDescriptionBasePrivate : public DescriptionBasePrivate
@@ -211,12 +200,12 @@ AudioOutputDevice::AudioOutputDevice()
     qDebug() << Q_FUNC_INFO;
 }
 
-AudioOutputDevice::AudioOutputDevice(int index, QString name, QString description)
+AudioOutputDevice::AudioOutputDevice(QString name, QString description)
     : DeviceDescriptionBase()
 {
     qDebug() << Q_FUNC_INFO;
     P_D(DeviceDescriptionBase);
-    d->init(index, name, description);
+    d->init(name, description);
 }
 
 AudioOutputDevice::~AudioOutputDevice()
@@ -230,12 +219,12 @@ AudioCaptureDevice::AudioCaptureDevice()
     qDebug() << Q_FUNC_INFO;
 }
 
-AudioCaptureDevice::AudioCaptureDevice(int index, QString name, QString description)
+AudioCaptureDevice::AudioCaptureDevice(QString name, QString description)
     : DeviceDescriptionBase()
 {
     qDebug() << Q_FUNC_INFO;
     P_D(DeviceDescriptionBase);
-    d->init(index, name, description);
+    d->init(name, description);
 }
 
 AudioCaptureDevice::~AudioCaptureDevice()
@@ -249,12 +238,12 @@ VideoCaptureDevice::VideoCaptureDevice()
     qDebug() << Q_FUNC_INFO;
 }
 
-VideoCaptureDevice::VideoCaptureDevice(int index, QString name, QString description)
+VideoCaptureDevice::VideoCaptureDevice(QString name, QString description)
     : DeviceDescriptionBase()
 {
     qDebug() << Q_FUNC_INFO;
     P_D(DeviceDescriptionBase);
-    d->init(index, name, description);
+    d->init(name, description);
 }
 
 VideoCaptureDevice::~VideoCaptureDevice()
diff --git a/phonon/objectdescription.h b/phonon/objectdescription.h
index cdf0608..7c7cc6a 100644
--- a/phonon/objectdescription.h
+++ b/phonon/objectdescription.h
@@ -42,7 +42,6 @@ class DescriptionBasePrivate;
 class PHONON_EXPORT DescriptionBase
 {
 public:
-    int index() const;
     QString name() const;
     QString description() const;
 #warning need QString iconHint name of icon to use for this device
@@ -94,7 +93,7 @@ class PHONON_EXPORT AudioOutputDevice : public DeviceDescriptionBase
 public:
     AudioOutputDevice();
 #warning possibly needs available param
-    AudioOutputDevice(int index, QString name, QString description);
+    AudioOutputDevice(QString name, QString description);
     ~AudioOutputDevice();
 };
 
@@ -102,7 +101,7 @@ class PHONON_EXPORT AudioCaptureDevice : public DeviceDescriptionBase
 {
 public:
     AudioCaptureDevice();
-    AudioCaptureDevice(int index, QString name, QString description);
+    AudioCaptureDevice(QString name, QString description);
     ~AudioCaptureDevice();
 };
 
@@ -110,7 +109,7 @@ class PHONON_EXPORT VideoCaptureDevice : public DeviceDescriptionBase
 {
 public:
     VideoCaptureDevice();
-    VideoCaptureDevice(int index, QString name, QString description);
+    VideoCaptureDevice(QString name, QString description);
     ~VideoCaptureDevice();
 };
 
@@ -118,7 +117,7 @@ class PHONON_EXPORT EffectDescription : public DescriptionBase
 {
 public:
     EffectDescription(); /* constructs invalid description */
-    EffectDescription(int index, QString name, QString description);
+    EffectDescription(QString name, QString description);
 };
 
 
diff --git a/phonon/objectdescription_p.h b/phonon/objectdescription_p.h
index d5aa21d..ffe01df 100644
--- a/phonon/objectdescription_p.h
+++ b/phonon/objectdescription_p.h
@@ -34,9 +34,8 @@ namespace Phonon
     class ObjectDescriptionPrivate
     {
         public:
-            ObjectDescriptionPrivate(int _index, const QHash<QByteArray, QVariant> &_properties)
-                : index(_index),
-                name(_properties["name"].toString()),
+            ObjectDescriptionPrivate(const QHash<QByteArray, QVariant> &_properties)
+                : name(_properties["name"].toString()),
                 description(_properties["description"].toString()),
                 properties(_properties)
             {
@@ -44,13 +43,9 @@ namespace Phonon
 
             bool operator==(const ObjectDescriptionPrivate &rhs) const
             {
-                if (index == rhs.index && (name != rhs.name || description != rhs.description))
-                    pError() << "Same index (" << index <<
-                        "), but different name/description. This is a bug in the Phonon backend.";
-                return index == rhs.index;// && name == rhs.name && description == rhs.description;
+                return name == rhs.name && description == rhs.description;
             }
 
-            int index;
             QString name, description;
             QHash<QByteArray, QVariant> properties;
     };

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