diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-25 10:53:26 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 02:47:41 +0200 |
| commit | b0809c027c9fe2e49d37dff45aa4f03b0a4e0743 (patch) | |
| tree | d647951ecb69c9b39f004198d76fbc4972174549 /src/plugins/v4l/radio | |
| parent | bba28afe559837321a2083b3ce046ab774a7ef6b (diff) | |
Rename availabilityError to availability.
It's perhaps clearer in the usual case.
Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/plugins/v4l/radio')
| -rw-r--r-- | src/plugins/v4l/radio/v4lradiocontrol.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/v4l/radio/v4lradiocontrol.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/v4l/radio/v4lradiocontrol.cpp b/src/plugins/v4l/radio/v4lradiocontrol.cpp index 06be59abd..6b36bba65 100644 --- a/src/plugins/v4l/radio/v4lradiocontrol.cpp +++ b/src/plugins/v4l/radio/v4lradiocontrol.cpp @@ -88,10 +88,10 @@ bool V4LRadioControl::isAvailable() const return available; } -QtMultimedia::AvailabilityError V4LRadioControl::availabilityError() const +QtMultimedia::AvailabilityStatus V4LRadioControl::availability() const { if (fd > 0) - return QtMultimedia::NoError; + return QtMultimedia::Available; else return QtMultimedia::ResourceError; } diff --git a/src/plugins/v4l/radio/v4lradiocontrol.h b/src/plugins/v4l/radio/v4lradiocontrol.h index 6b683dc61..56e1ee2a6 100644 --- a/src/plugins/v4l/radio/v4lradiocontrol.h +++ b/src/plugins/v4l/radio/v4lradiocontrol.h @@ -65,7 +65,7 @@ public: ~V4LRadioControl(); bool isAvailable() const; - QtMultimedia::AvailabilityError availabilityError() const; + QtMultimedia::AvailabilityStatus availability() const; QRadioTuner::State state() const; |