cleanup

1 files changed, 3 insertions, 33 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index c5d0a5b..4c07b3a 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -213,4 +213,2 @@ VMemo::VMemo( QWidget *parent, const char *_name )
   
-  recording = FALSE;
-
   t_timer = new QTimer( this );
@@ -239,3 +237,2 @@ VMemo::VMemo( QWidget *parent, const char *_name )
     if( toggleKey != -1 ) {
-      //            QPEApplication::grabKeyboard();
       QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)");
@@ -253,2 +250,3 @@ VMemo::VMemo( QWidget *parent, const char *_name )
       hide();
+    recording = FALSE;
   }
@@ -264,6 +262,4 @@ void VMemo::receive( const QCString &msg, const QByteArray &data ) {
   if (msg == "toggleRecord()")  {
-
       if (recording) {
           fromToggle = TRUE;
-          mouseReleaseEvent(NULL);
           stopRecording();
@@ -271,3 +267,2 @@ void VMemo::receive( const QCString &msg, const QByteArray &data ) {
           fromToggle = TRUE;
-            //      mousePressEvent(NULL);
           startRecording();
@@ -283,12 +278,6 @@ void VMemo::paintEvent( QPaintEvent* ) {
 void VMemo::mousePressEvent( QMouseEvent * me) {
-  // just to be safe
-//     if (recording) {
-//           recording = FALSE;
-//           return;
-//         }
   /*  No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
          mousePressEvent and mouseReleaseEvent with a NULL parameter.  */
-//    if ( me->button() != LeftButton && me != NULL /*&& !systemZaurus*/) {
         
-  //  if (!systemZaurus && me != NULL)
+//  if (!systemZaurus && me != NULL)
 //        return;
@@ -303,4 +292,2 @@ void VMemo::mousePressEvent( QMouseEvent * me) {
 void VMemo::mouseReleaseEvent( QMouseEvent * ) {
-//      if(usingIcon && !recording)
-//          stopRecording();
 }
@@ -308,6 +295,2 @@ void VMemo::mouseReleaseEvent( QMouseEvent * ) {
 bool VMemo::startRecording() {
-
-  if ( recording)
-    return FALSE;
-
   Config config( "Vmemo" );
@@ -323,9 +306,2 @@ bool VMemo::startRecording() {
 
-  //      if(useAlerts) 
-  //  QMessageBox::message("VMemo","Really Record?");//) ==1)
-  //             return;
-  //     } else {
-  //         if (!systemZaurus )
-  //     QSound::play(Resource::findSound("vmemob"));
-  //     }
   qDebug("Start recording engines");
@@ -334,4 +310,2 @@ bool VMemo::startRecording() {
   if (openDSP() == -1)  {
-    //        QMessageBox::critical(0, "vmemo", "Could not open dsp device.\n"+errorMsg, "Abort");
-    //      delete msgLabel;       
     recording = FALSE;
@@ -578,3 +552,3 @@ bool VMemo::record() {
         perror("dev/dsp's is a lookin' messy");
-        QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName);
+        QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
           break;
@@ -608,8 +582,4 @@ bool VMemo::record() {
 
-  //     if(useAlerts) 
-  //         QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName);
   qDebug("done recording "+fileName);
 
-//  QSound::play(Resource::findSound("vmemoe"));
-
   Config cfg("qpe");