merge noncore/applets/*

3 files changed, 28 insertions, 28 deletions

diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp
index 4e98b31..e2b0c2a 100644
--- a/noncore/applets/notesapplet/notes.cpp
+++ b/noncore/applets/notesapplet/notes.cpp
@@ -80,6 +80,6 @@ static char * notes_xpm[] = {
 
 
-NotesControl::NotesControl( QWidget *parent, const char *name )
-        : QFrame( parent, name,/* WDestructiveClose | */WStyle_StaysOnTop )
+NotesControl::NotesControl( QWidget *, const char * )
+        : QVBox( 0, "NotesControl",/* WDestructiveClose | */WStyle_StaysOnTop )
 //        : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup )
 {
@@ -92,5 +92,5 @@ NotesControl::NotesControl( QWidget *parent, const char *name )
     Config cfg("Notes");
      cfg.setGroup("Options");
-     showMax = cfg.readBoolEntry("ShowMax", false); 
+     showMax = cfg.readBoolEntry("ShowMax", false);
 
      setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
@@ -99,10 +99,10 @@ NotesControl::NotesControl( QWidget *parent, const char *name )
     doPopulate=true;
     isNew=false;
-    QVBoxLayout *vbox = new QVBoxLayout( this,0, -1, "Vlayout" );
-    QHBoxLayout *hbox = new QHBoxLayout( this, 0, -1, "HLayout" );
+    QVBox *vbox = new QVBox( this, "Vlayout" );
+    QHBox  *hbox = new QHBox( this, "HLayout" );
 
-    view = new QMultiLineEdit(this, "OpieNotesView");
+    view = new QMultiLineEdit(vbox, "OpieNotesView");
 
-    box = new QListBox(this, "OpieNotesBox");
+    box = new QListBox(vbox, "OpieNotesBox");
 
     QPEApplication::setStylusOperation( box->viewport(),QPEApplication::RightOnHold);
@@ -113,22 +113,20 @@ NotesControl::NotesControl( QWidget *parent, const char *name )
     vbox->setSpacing( 3 );
 
-    vbox->addWidget( view);
-    vbox->addWidget( box);
+
 
     setFocusPolicy(QWidget::StrongFocus);
 
-    newButton= new QPushButton( this, "newButton" );
+    newButton= new QPushButton( hbox, "newButton" );
     newButton->setText(tr("New"));
-    hbox->addWidget( newButton);
 
-    saveButton= new QPushButton( this, "saveButton" );
+
+    saveButton= new QPushButton( hbox, "saveButton" );
     saveButton->setText(tr("Save"));
-    hbox->addWidget( saveButton);
 
-    deleteButton= new QPushButton( this, "deleteButton" );
+
+    deleteButton= new QPushButton( hbox, "deleteButton" );
     deleteButton->setText(tr("Delete"));
-    hbox->addWidget( deleteButton);
-    
-    vbox->addItem(hbox);
+
+
 
     connect( box, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint&)),
@@ -148,5 +146,5 @@ NotesControl::NotesControl( QWidget *parent, const char *name )
     load();
     setCaption("Notes");
-      //  parent->setFocus();    
+      //  parent->setFocus();
 }
 
@@ -160,5 +158,5 @@ void NotesControl::slotDeleteButtonClicked() {
                                   ,tr("Do you really want to<BR><B> delete</B> this note ?")
                                   ,tr("Yes"),tr("No"),0,1,1) ) {
-      case 0: 
+      case 0:
           slotDeleteButton();
           break;
@@ -200,9 +198,9 @@ void NotesControl::slotDeleteButton() {
                 QFile f( fi);
                 if( !f.remove()) qDebug(".desktop file not removed");
-                
+
             }
         }
         view->clear();
-        
+
         populateBox();
     }
@@ -336,6 +334,6 @@ void NotesControl::save() {
         }
     cfg.writeEntry( "LastDoc",oldDocName );
-    cfg.write();    
-        
+    cfg.write();
+
     }
 }
@@ -469,4 +467,5 @@ NotesApplet::NotesApplet( QWidget *parent, const char *name )
 
 NotesApplet::~NotesApplet() {
+    delete vc;
 }
 
diff --git a/noncore/applets/notesapplet/notes.h b/noncore/applets/notesapplet/notes.h
index c428efe..08253cb 100644
--- a/noncore/applets/notesapplet/notes.h
+++ b/noncore/applets/notesapplet/notes.h
@@ -17,5 +17,5 @@
 
 #include <qwidget.h>
-#include <qframe.h>
+#include <qvbox.h>
 #include <qpixmap.h>
 #include <qguardedptr.h>
@@ -32,5 +32,5 @@ class QMultiLineEdit;
 class QListBox;
 class QListBoxItem;
-class NotesControl : public QFrame {
+class NotesControl : public QVBox {
     Q_OBJECT
 public:
@@ -47,5 +47,5 @@ public:
     void populateBox();
     void load();
-    
+
 private:
       QTimer menuTimer;
@@ -77,5 +77,5 @@ public:
     NotesApplet( QWidget *parent = 0, const char *name=0 );
     ~NotesApplet();
-    NotesControl *vc; 
+    NotesControl *vc;
 public slots:
 private:
@@ -87,5 +87,5 @@ private:
 private slots:
 
-        
+
 };
 
diff --git a/noncore/applets/notesapplet/notesappletimpl.cpp b/noncore/applets/notesapplet/notesappletimpl.cpp
index 93e1e97..0526bad 100644
--- a/noncore/applets/notesapplet/notesappletimpl.cpp
+++ b/noncore/applets/notesapplet/notesappletimpl.cpp
@@ -19,4 +19,5 @@ NotesAppletImpl::NotesAppletImpl()
 
 NotesAppletImpl::~NotesAppletImpl() {
+    // not needed though cause we should have a valid parent
     delete notes;
 }