removed silly functions that arent called

4 files changed, 82 insertions, 56 deletions

diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index ed601cf..40b8b87 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -19,8 +19,9 @@
 **********************************************************************/
 
 #include "soundsettings.h"
 
+#include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/storage.h>
 
@@ -40,8 +41,9 @@ SoundSettings::SoundSettings( QWidget* parent,  const char* name, WFlags fl )
     mic->setValue(100-config.readNumEntry("Mic"));
 //     touchsound->setChecked(config.readBoolEntry("TouchSound"));
 //     keysound->setChecked(config.readBoolEntry("KeySound"));
     Config cfg("Vmemo");
+    connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
     AlertCheckBox->setChecked(cfg.readBoolEntry("Alert"));
     
     cfg.setGroup("Record");
     int rate=config.readNumEntry("SampleRate", 22050);
@@ -67,57 +69,58 @@ SoundSettings::SoundSettings( QWidget* parent,  const char* name, WFlags fl )
     connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &)));
 //     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 }
 
-void SoundSettings::reject()
-{
-  qDebug("here");
-    Config config( "qpe");
-    config.setGroup( "Volume");
-
-    setVolume(100-config.readNumEntry("VolumePercent"));
-    setMic(100-config.readNumEntry("Mic"));
-
-//   config.setGroup("Record");
-//     int rate=config.readNumEntry("SampleRate", 11025);
-//     if(rate == 11025)
-//         sampleRate->setCurrentItem(0);
-//     else if(rate == 22050)
-//         sampleRate->setCurrentItem(1);
-//     else if(rate == 32000)
-//         sampleRate->setCurrentItem(2);
-//     else if(rate==44100)
-//         sampleRate->setCurrentItem(3);
-//   stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
-//   sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
-    ::exit(-1);
-//    QDialog::reject();
-}
-
-void SoundSettings::accept()
-{
-    Config config( "qpe" );
-    config.setGroup( "Volume" );
-    config.writeEntry("VolumePercent",100-volume->value());
-    config.writeEntry("Mic",100-mic->value());
-//     config.writeEntry("TouchSound",touchsound->isChecked());
-//     config.writeEntry("KeySound",keysound->isChecked());
-
-    Config cfg("Vmemo");
-    cfg.writeEntry("Alert",AlertCheckBox->isChecked());
-    setVolume(volume->value());
-    setMic(mic->value());
-
-    cfg.setGroup("Record");
-    cfg.writeEntry("SampleRate",sampleRate->currentText());
-    cfg.writeEntry("Stereo",stereoCheckBox->isChecked());
-    cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
-//     Config cfg( "VMemo" );
-//     cfg.setGroup( "Defaults" );
-//     cfg.writeEntry( "hideIcon", HideIcon_CheckBox->isChecked());  
-//    QDialog::accept();
-    ::exit(0);
-}
+// void SoundSettings::reject()
+// {
+//   qDebug("reject");
+//     Config config( "qpe");
+//     config.setGroup( "Volume");
+
+//     setVolume(100-config.readNumEntry("VolumePercent"));
+//     setMic(100-config.readNumEntry("Mic"));
+
+// //   config.setGroup("Record");
+// //     int rate=config.readNumEntry("SampleRate", 11025);
+// //     if(rate == 11025)
+// //         sampleRate->setCurrentItem(0);
+// //     else if(rate == 22050)
+// //         sampleRate->setCurrentItem(1);
+// //     else if(rate == 32000)
+// //         sampleRate->setCurrentItem(2);
+// //     else if(rate==44100)
+// //         sampleRate->setCurrentItem(3);
+// //   stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
+// //   sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
+//     qDebug("QDialog::reject();");
+//     ::exit(-1);
+// }
+
+// void SoundSettings::accept()
+// {
+//   qDebug("accept");
+//   Config config( "qpe" );
+//     config.setGroup( "Volume" );
+//     config.writeEntry("VolumePercent",100-volume->value());
+//     config.writeEntry("Mic",100-mic->value());
+// //     config.writeEntry("TouchSound",touchsound->isChecked());
+// //     config.writeEntry("KeySound",keysound->isChecked());
+
+//     Config cfg("Vmemo");
+//     cfg.writeEntry("Alert",AlertCheckBox->isChecked());
+//     setVolume(volume->value());
+//     setMic(mic->value());
+
+//     cfg.setGroup("Record");
+//     cfg.writeEntry("SampleRate",sampleRate->currentText());
+//     cfg.writeEntry("Stereo",stereoCheckBox->isChecked());
+//     cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
+// //     Config cfg( "VMemo" );
+// //     cfg.setGroup( "Defaults" );
+// //     cfg.writeEntry( "hideIcon", HideIcon_CheckBox->isChecked());  
+//     qDebug("QDialog::accept();");
+//     ::exit(0);
+// }
 
 void SoundSettings::setVolume(int v)
 {
     Config config( "qpe" );
@@ -174,4 +177,24 @@ void SoundSettings::setLocation(const QString & string) {
    config.setGroup( "System" );
    config.writeEntry("RecLocation",string);
 
 }
+
+void SoundSettings::cleanUp() {
+  qDebug("cleanup");
+  Config config( "qpe" );
+    config.setGroup( "Volume" );
+    config.writeEntry("VolumePercent",100-volume->value());
+    config.writeEntry("Mic",100-mic->value());
+//     config.writeEntry("TouchSound",touchsound->isChecked());
+//     config.writeEntry("KeySound",keysound->isChecked());
+
+    Config cfg("Vmemo");
+    cfg.writeEntry("Alert",AlertCheckBox->isChecked());
+    setVolume(volume->value());
+    setMic(mic->value());
+
+    cfg.setGroup("Record");
+    cfg.writeEntry("SampleRate",sampleRate->currentText());
+    cfg.writeEntry("Stereo",stereoCheckBox->isChecked());
+    cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
+}
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h
index aec7614..cbec724 100644
--- a/noncore/settings/sound/soundsettings.h
+++ b/noncore/settings/sound/soundsettings.h
@@ -31,15 +31,15 @@ Q_OBJECT
 public:
  SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   
 protected:
- void accept();
- void reject();
+/*  void accept(); */
+/*  void reject(); */
  void updateStorageCombo();
   
 private slots:
  void setLocation(const QString &);
-    
+ void cleanUp();    
  void setVolume(int);
  void setMic(int); 
 
  void volumeChanged( bool muted );
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp
index f86db78..727d202 100644
--- a/noncore/settings/sound/soundsettingsbase.cpp
+++ b/noncore/settings/sound/soundsettingsbase.cpp
@@ -12,8 +12,9 @@
 #include <qcombobox.h>
 #include <qgroupbox.h>
 #include <qmainwindow.h>
 
+#include <qpe/qpeapplication.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qslider.h>
 #include <qlayout.h>
@@ -83,8 +84,9 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
     if ( !name )
   setName( "SoundSettingsBase" );
     resize( 255, 301 ); 
     setCaption( tr( "Vmemo Settings" ) );
+
     SoundSettingsBaseLayout = new QGridLayout( this ); 
     SoundSettingsBaseLayout->setSpacing( 6 );
     SoundSettingsBaseLayout->setMargin( 11 );
 
@@ -250,5 +252,4 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent,  const char* name, bool m
 SoundSettingsBase::~SoundSettingsBase()
 {
     // no need to delete child widgets, Qt does it all for us
 }
-
diff --git a/noncore/settings/sound/soundsettingsbase.h b/noncore/settings/sound/soundsettingsbase.h
index e65c813..7a939ea 100644
--- a/noncore/settings/sound/soundsettingsbase.h
+++ b/noncore/settings/sound/soundsettingsbase.h
@@ -10,8 +10,10 @@
 #define SOUNDSETTINGSBASE_H
 
 #include <qvariant.h>
 #include <qdialog.h>
+#include <qmainwindow.h>
+
 class QVBoxLayout; 
 class QHBoxLayout; 
 class QGridLayout; 
 class QCheckBox;
@@ -19,9 +21,9 @@ class QComboBox;
 class QGroupBox;
 class QLabel;
 class QSlider;
 
-class SoundSettingsBase : public QDialog
+class SoundSettingsBase : public QMainWindow
 { 
     Q_OBJECT
 
 public:
@@ -44,10 +46,8 @@ public:
     QCheckBox* sixteenBitCheckBox;
     QCheckBox* AlertCheckBox;
     QLabel* TextLabel1;
     QComboBox* LocationComboBox;
-/*      QCheckBox* touchsound; */
-/*      QCheckBox* keysound; */
 
 protected:
     QGridLayout* SoundSettingsBaseLayout;
     QVBoxLayout* GroupBox3Layout;
@@ -57,7 +57,9 @@ protected:
     QHBoxLayout* Layout12;
     QHBoxLayout* Layout17;
     QVBoxLayout* Layout12_2;
     QVBoxLayout* Layout11;
+protected slots:
+        
 };
 
 #endif // SOUNDSETTINGSBASE_H