summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp4
-rw-r--r--libopie/odevice.cpp8
-rw-r--r--libopie/odevice.h5
3 files changed, 8 insertions, 9 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index 68c2929..eda0c1f 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -71,5 +71,5 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
71 } 71 }
72 72
73 QStrList freq = ODevice::inst()->cpuFrequencies(); 73 QStrList freq = ODevice::inst()->allowedCpuFrequencies();
74 if ( freq.count() ) { 74 if ( freq.count() ) {
75 frequency->insertStrList( freq ); 75 frequency->insertStrList( freq );
@@ -211,5 +211,5 @@ void LightSettings::setFrequency ( int index )
211{ 211{
212qWarning("LightSettings::setFrequency(%d)", index); 212qWarning("LightSettings::setFrequency(%d)", index);
213 ODevice::inst ( )-> setCpuFrequency(index); 213 ODevice::inst ( )-> setCurrentCpuFrequency(index);
214} 214}
215 215
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 4c33a0e..d6e6892 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -776,7 +776,7 @@ int ODevice::lightSensorResolution ( ) const
776 776
777/** 777/**
778 * @return a list with valid CPU frequency 778 * @return a list with CPU frequencies supported by the hardware
779 */ 779 */
780QStrList &ODevice::cpuFrequencies ( ) const 780const QStrList &ODevice::allowedCpuFrequencies ( ) const
781{ 781{
782 return *d->m_cpu_frequencies; 782 return *d->m_cpu_frequencies;
@@ -785,9 +785,9 @@ QStrList &ODevice::cpuFrequencies ( ) const
785 785
786/** 786/**
787 * Set desired cpu frequency 787 * Set desired CPU frequency
788 * 788 *
789 * @param index index into d->m_cpu_frequencies of the frequency to be set 789 * @param index index into d->m_cpu_frequencies of the frequency to be set
790 */ 790 */
791bool ODevice::setCpuFrequency(uint index) 791bool ODevice::setCurrentCpuFrequency(uint index)
792{ 792{
793 if (index >= d->m_cpu_frequencies->count()) 793 if (index >= d->m_cpu_frequencies->count())
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 18ff5f1..f2f6467 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -199,7 +199,6 @@ public:
199 virtual int lightSensorResolution ( ) const; 199 virtual int lightSensorResolution ( ) const;
200 200
201 QStrList &cpuFrequencies() const; 201 const QStrList &allowedCpuFrequencies() const;
202 bool setCpuFrequency(uint index); 202 bool setCurrentCpuFrequency(uint index);
203 int cpuFrequency() const;
204 203
205 /** 204 /**