From 952f28dc507ef04df1d546561a7d8c71f146e0b8 Mon Sep 17 00:00:00 2001
From: Daniel Klaffenbach <danielklaffenbach@gmail.com>
Date: Tue, 22 Jun 2010 23:09:44 +0200
Subject: [PATCH] Renamed readScalingFile() to readSysFile()

For SmartReflex support some other files from /sys need to be
accessed which is why readScalingFile() was renamed to readSysFile()
in order to be more generic.
---
 src/mainwindow.cpp |   28 +++++++++++++---------------
 src/mainwindow.h   |   10 +++++-----
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e33d4d5..5e69f2b 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -56,6 +56,7 @@ MainWindow::~MainWindow()
     delete scene;
 }
 
+
 /**
   * SLOT: Displays an about box
   */
@@ -91,34 +92,31 @@ void MainWindow::adjustFreq()
 
 
 /**
-  * Returns the current CPU frequency
+  * Returns the maximum CPU frequency
   */
-int MainWindow::getCurFreq()
-{
-    QString tmp = readScalingFile( "scaling_cur_freq" );
-    return tmp.toInt();
-}
-
 int MainWindow::getMaxFreq()
 {
-    QString tmp = readScalingFile( "scaling_max_freq" );
+    QString tmp = readSysFile( "devices/system/cpu/cpu0/cpufreq/scaling_max_freq" );
     return tmp.toInt();
 }
 
+
+/**
+  * Returns the minimum CPU frequency
+  */
 int MainWindow::getMinFreq()
 {
-    QString tmp = readScalingFile( "scaling_min_freq" );
+    QString tmp = readSysFile( "devices/system/cpu/cpu0/cpufreq/scaling_min_freq" );
     return tmp.toInt();
 }
 
 
-
 /**
   * Returns the CPU frequency for the specified scaling step
   */
 int MainWindow::getScalingFreq(int step)
 {
-    QString tmp = readScalingFile( "scaling_available_frequencies" );
+    QString tmp = readSysFile( "devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies" );
     QStringList freqs = tmp.split( " " );
     step = step - 1;
     if ( step < 0 )
@@ -133,7 +131,7 @@ int MainWindow::getScalingFreq(int step)
 
 QString MainWindow::getScalingGovernor()
 {
-    return readScalingFile( "scaling_governor" );
+    return readSysFile( "devices/system/cpu/cpu0/cpufreq/scaling_governor" );
 }
 
 /**
@@ -141,7 +139,7 @@ QString MainWindow::getScalingGovernor()
   */
 int MainWindow::getScalingSteps()
 {
-    QString tmp = readScalingFile( "scaling_available_frequencies" );
+    QString tmp = readSysFile( "devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies" );
     QStringList freqs = tmp.split( " " );
     return (freqs.size() - 1);
 }
@@ -160,9 +158,9 @@ int MainWindow::getScalingStep( int freq )
     return 1;
 }
 
-QString MainWindow::readScalingFile(QString scaling_file)
+QString MainWindow::readSysFile(QString sys_file)
 {
-    QFile file( "/sys/devices/system/cpu/cpu0/cpufreq/"+scaling_file );
+    QFile file( "/sys/"+sys_file );
 
     //open the file
     if ( !file.exists() || !file.open( QIODevice::ReadOnly ) ) {
diff --git a/src/mainwindow.h b/src/mainwindow.h
index c15ab45..91a0c29 100755
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -38,21 +38,21 @@ public slots:
     void about();
     void adjustFreq();
     void orientationChanged();
-    void setAutoRotaion();
     void refresh();
+    void setAutoRotaion();
 
 
 private:
     Ui::MainWindow *ui;
-    QGraphicsScene *scene;
-    QString readScalingFile( QString scaling_file );
-    int getCurFreq();
     int getMaxFreq();
     int getMinFreq();
     int getScalingFreq( int step );
     QString getScalingGovernor();
-    int getScalingSteps();
     int getScalingStep( int freq );
+    int getScalingSteps();
+    QString readSysFile( QString sys_file );
+    //! the QGraphicsScene will contain the large chip icon displayed in the UI
+    QGraphicsScene *scene;
     bool usePortrait();
 };
 
-- 
1.7.9.5