Implement settings as pointer

[qcpufreq] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8ea4a24..022d628 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -28,13 +28,11 @@
 #endif
 
 #define APPNAME "QCPUFreq"
-#define APPVERSION "0.3.4"
+#define APPVERSION "0.3.99"
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
-    //do not allow overclocking per default
-    allowOverclocking(false),
     //create helper process
     helperProcess( this ),
     //create a new, stackable help window
@@ -42,11 +40,7 @@ MainWindow::MainWindow(QWidget *parent) :
     //create UI refresh timer
     refreshTimer( this ),
     //create a QGraphicsScene for the little chip icon
-    scene( this ),
-    //the settings widget
-    settings(this),
-    //show errors about the sudo setup only once
-    showSudoError( true )
+    scene( this )
 {
     //this is a stacked window on Maemo 5
     #if defined(Q_WS_MAEMO_5)
@@ -74,7 +68,11 @@ MainWindow::MainWindow(QWidget *parent) :
     helpWindow.setWindowFlags( windowFlags() | Qt::Window );
 
     //Settings widget
-    settings.hide();
+    settings = new Settings;
+    settings->hide();
+
+    //show errors about the sudo setup only once
+    showSudoError = true;
 
     //connect signals and slots
     connect(ui->actionHelp, SIGNAL(triggered()), this, SLOT(showHelp()));
@@ -83,19 +81,13 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(orientationChanged()));
     connect(ui->sr_box, SIGNAL(clicked()), this, SLOT(setSmartReflex()));
     connect(&refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
-    connect(ui->actionOverclocking, SIGNAL(toggled(bool)), this, SLOT(setOverclocking()));
     connect(ui->actionSettings, SIGNAL(triggered()), this, SLOT(showSettings()));
 
-
-    //disable overclocking button on vanilla kernels
-    if (!powerKernel) {
-        ui->actionOverclocking->setDisabled(true);
-    }
-
 }
 
 MainWindow::~MainWindow()
 {
+    delete settings;
     delete ui;
 }
 
@@ -132,8 +124,8 @@ void MainWindow::adjustFreq()
 
     //check for overclocking
     #if defined(Q_WS_MAEMO_5)
-    if (this->allowOverclocking == false && newmax > 600000) {
-        QMaemo5InformationBox::information(this, tr( "You need to enable overclocking in QCPUFreq's menu for setting frequencies above 600MHz!"), 0);
+    if (!settings->useOverclocking() && newmax > 600000) {
+        QMaemo5InformationBox::information(this, tr( "You need to enable overclocking in QCPUFreq's settings in order to set frequencies above 600MHz!"), 0);
         refresh();
         return;
     }
@@ -311,7 +303,6 @@ int MainWindow::getSmartReflexState()
   *  - scalingSteps
   *  - scalingFrequencies
   *  - minFreq
-  *  - powerKernel
   */
 void MainWindow::init()
 {
@@ -344,13 +335,6 @@ void MainWindow::init()
     } else {
         this->minFreq = min.toInt();
     }
-
-    //check if we are using a power kernel
-    if ( getScalingFreq(getScalingSteps()) > 600000 ) {
-        this->powerKernel = true;
-    } else {
-        this->powerKernel = false;
-    }
 }
 
 
@@ -416,8 +400,6 @@ void MainWindow::refresh()
     ui->freq_adjust->setMinimum( 1 );
     ui->freq_adjust->setMaximum( getScalingSteps() );
     ui->freq_adjust->setSliderPosition( getScalingStep(getMaxFreq()) );
-
-    //ui->retranslateUi(this);
 }
 
 
@@ -456,28 +438,12 @@ void MainWindow::orientationChanged()
 void MainWindow::setAutoRotation()
 {
 #if defined(Q_WS_MAEMO_5)
-    setAttribute(Qt::WA_Maemo5AutoOrientation, settings.useAutoRotate());
+    setAttribute(Qt::WA_Maemo5AutoOrientation, settings->useAutoRotate());
 #endif
 }
 
 
 /**
-  * SLOT: enable/disable overclocking.
-  */
-void MainWindow::setOverclocking()
-{
-    if (ui->actionOverclocking->isChecked()) {
-        #if defined(Q_WS_MAEMO_5)
-        QMaemo5InformationBox::information(this, tr( "Please note that overclocking voids your warranty and may break your device! Be careful!"), 0);
-        #endif
-        this->allowOverclocking = true;
-    } else {
-        this->allowOverclocking = false;
-    }
-}
-
-
-/**
   * SLOT: Enables or disables Smart Reflex(tm) after pressing sr_btn
   */
 void MainWindow::setSmartReflex()
@@ -511,8 +477,8 @@ void MainWindow::showHelp()
   */
 void MainWindow::showSettings()
 {
-    settings.reset();
-    settings.show();
+    settings->reset();
+    settings->show();
 }