4 files changed, 11 insertions, 34 deletions
diff --git a/src/multimedia/radio/qradiodata.cpp b/src/multimedia/radio/qradiodata.cpp
index 7ea099c28..30a495a1a 100644
--- a/src/multimedia/radio/qradiodata.cpp
+++ b/src/multimedia/radio/qradiodata.cpp
@@ -133,29 +133,16 @@ QRadioData::~QRadioData()
 }
 
 /*!
-    Returns true if the radio data service is ready to use.
-*/
-bool QRadioData::isAvailable() const
-{
-    Q_D(const QRadioData);
-
-    if (d->control != 0)
-        return d_func()->control->isAvailable();
-    else
-        return false;
-}
-
-/*!
-    Returns the availability error state.
+    Returns the availability of the radio data service.
 */
 QtMultimedia::AvailabilityError QRadioData::availabilityError() const
 {
     Q_D(const QRadioData);
 
-    if (d->control != 0)
-        return d_func()->control->availabilityError();
-    else
+    if (d->control == 0)
         return QtMultimedia::ServiceMissingError;
+
+    return QMediaObject::availabilityError();
 }
 
 /*!
diff --git a/src/multimedia/radio/qradiodata.h b/src/multimedia/radio/qradiodata.h
index c6c07ade0..03c503134 100644
--- a/src/multimedia/radio/qradiodata.h
+++ b/src/multimedia/radio/qradiodata.h
@@ -90,7 +90,6 @@ public:
     QRadioData(QObject *parent = 0);
     ~QRadioData();
 
-    bool isAvailable() const;
     QtMultimedia::AvailabilityError availabilityError() const;
 
     QString stationId() const;
diff --git a/src/multimedia/radio/qradiotuner.cpp b/src/multimedia/radio/qradiotuner.cpp
index 30b77ebd8..e847d05e0 100644
--- a/src/multimedia/radio/qradiotuner.cpp
+++ b/src/multimedia/radio/qradiotuner.cpp
@@ -149,25 +149,17 @@ QRadioTuner::~QRadioTuner()
 }
 
 /*!
-    Returns true if the radio tuner service is ready to use.
-*/
-bool QRadioTuner::isAvailable() const
-{
-    if (d_func()->control != NULL)
-        return d_func()->control->isAvailable();
-    else
-        return false;
-}
-
-/*!
-    Returns the availability error state.
+    Returns the availability of the radio tuner.
 */
 QtMultimedia::AvailabilityError QRadioTuner::availabilityError() const
 {
-    if (d_func()->control != NULL)
-        return d_func()->control->availabilityError();
-    else
+    if (d_func()->control == 0)
         return QtMultimedia::ServiceMissingError;
+
+    if (!d_func()->control->isAntennaConnected())
+        return QtMultimedia::ResourceError;
+
+    return QMediaObject::availabilityError();
 }
 
 /*!
diff --git a/src/multimedia/radio/qradiotuner.h b/src/multimedia/radio/qradiotuner.h
index 46c6cfeb1..059d54098 100644
--- a/src/multimedia/radio/qradiotuner.h
+++ b/src/multimedia/radio/qradiotuner.h
@@ -86,7 +86,6 @@ public:
     QRadioTuner(QObject *parent = 0);
     ~QRadioTuner();
 
-    bool isAvailable() const;
     QtMultimedia::AvailabilityError availabilityError() const;
 
     State state() const;