merge noncore/applets/*

3 files changed, 17 insertions, 17 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
@@ -81,4 +81,4 @@ 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 )
@@ -100,8 +100,8 @@ NotesControl::NotesControl( QWidget *parent, const char *name )
     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");
 
@@ -114,4 +114,3 @@ NotesControl::NotesControl( QWidget *parent, const char *name )
 
-    vbox->addWidget( view);
-    vbox->addWidget( box);
+
 
@@ -119,15 +118,14 @@ NotesControl::NotesControl( QWidget *parent, const char *name )
 
-    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);
+
 
@@ -470,2 +468,3 @@ 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
@@ -18,3 +18,3 @@
 #include <qwidget.h>
-#include <qframe.h>
+#include <qvbox.h>
 #include <qpixmap.h>
@@ -33,3 +33,3 @@ class QListBox;
 class QListBoxItem;
-class NotesControl : public QFrame {
+class NotesControl : public QVBox {
     Q_OBJECT
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
@@ -20,2 +20,3 @@ NotesAppletImpl::NotesAppletImpl()
 NotesAppletImpl::~NotesAppletImpl() {
+    // not needed though cause we should have a valid parent
     delete notes;