1 files changed, 9 insertions, 21 deletions

diff --git a/examples/opiecore/onotifydemo/onotifydemo.cpp b/examples/opiecore/onotifydemo/onotifydemo.cpp
index b9ff9db..a38ffee 100644
--- a/examples/opiecore/onotifydemo/onotifydemo.cpp
+++ b/examples/opiecore/onotifydemo/onotifydemo.cpp
@@ -1,6 +1,8 @@
+#include "onotifydemo.h"
+
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/oapplication.h>
 #include <opie2/ofiledialog.h>
 #include <opie2/olistview.h>
 #include <opie2/ofilenotify.h>
@@ -13,17 +15,13 @@ using namespace Opie::Ui;
 #include <qhbox.h>
 #include <qhbuttongroup.h>
 #include <qvbuttongroup.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 
-class DemoApp : public OApplication
-{
-  Q_OBJECT
-public:
-  DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2 notify demo" )
+DemoApp::DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2 notify demo" )
   {
 
     QVBox* vbox = new QVBox();
     setMainWidget( vbox );
 
     l = new OListView( vbox );
@@ -67,14 +65,13 @@ public:
     l->show();
     hbox->show();
     vbox->show();
     showMainWidget( vbox );
   }
 
-public:
-    void addTrigger( bool multi = false )
+    void DemoApp::addTrigger( bool multi )
     {
         if ( !m )
         {
             QMessageBox::warning( 0, "Add Trigger", "<p>Can't add trigger without at least one selected trigger type</p>", "&Sorry", 0 );
             return;
         }
@@ -97,18 +94,17 @@ public:
         else
         {
             odebug << "cancelled." << oendl;
         }
     }
 
-public slots:
-    void modifierClicked( int modifier ) { m = static_cast<OFileNotificationType>( (int)m ^ int(modifier) ); };
-    void addSingle() { addTrigger(); };
-    void addMulti() { addTrigger( true ); };
+    void DemoApp::modifierClicked( int modifier ) { m = static_cast<OFileNotificationType>( (int)m ^ int(modifier) ); };
+    void DemoApp::addSingle() { addTrigger(); };
+    void DemoApp::addMulti() { addTrigger( true ); };
 
-    void delTrigger()
+    void DemoApp::delTrigger()
     {
         QListViewItem* item = l->selectedItem();
         if ( !item )
         {
             QMessageBox::warning( 0, "Del Trigger", "<p>No trigger selected!</p>", "&Sorry", 0 );
             return;
@@ -117,28 +113,20 @@ public slots:
         {
             QString filename( item->text( 0 ) );
             odebug << "Filename = " << filename << oendl;
         }
     }
 
-    void trigger()
+    void DemoApp::trigger()
     {
         owarn << "FIRE!" << oendl;
     }
 
-private:
-  OListView* l;
-  QButtonGroup* g1;
-  QButtonGroup* g2;
-  OFileNotificationType m;
-};
-
 int main( int argc, char** argv )
 {
     DemoApp* app = new DemoApp( argc, argv );
     app->exec();
 
     return 0;
 
 }
 
-#include "moc/onotifydemo.moc"