1 files changed, 6 insertions, 4 deletions

diff --git a/examples/opiecore/onotifydemo/onotifydemo.cpp b/examples/opiecore/onotifydemo/onotifydemo.cpp
index 2beda2a..e147c6a 100644
--- a/examples/opiecore/onotifydemo/onotifydemo.cpp
+++ b/examples/opiecore/onotifydemo/onotifydemo.cpp
@@ -61,118 +61,120 @@ DemoApp::DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2
     connect( g2, SIGNAL( pressed(int) ), this, SLOT( modifierClicked(int) ) );
 
     g1 = new QVButtonGroup( "Add/Remove", hbox );
     QPushButton* plus1 = new QPushButton( "Add\n&Single", g1 );
     QPushButton* plus2 = new QPushButton( "Add\n&Multi", g1 );
     QPushButton* minus = new QPushButton( "&Remove\nIt!", g1 );
     g1->insert( plus1, 0 );
     g1->insert( plus2, 1 );
     g1->insert( minus, 2 );
     connect( plus1, SIGNAL( clicked() ), this, SLOT( addSingle() ) );
     connect( plus2, SIGNAL( clicked() ), this, SLOT( addMulti() ) );
     connect( minus, SIGNAL( clicked() ), this, SLOT( delTrigger() ) );
 
     g1->show();
     g2->show();
     l->show();
     hbox->show();
     vbox->show();
     showMainWidget( vbox );
   }
 
     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;
         }
 
         QString filename = OFileDialog::getOpenFileName( OFileSelector::ExtendedAll );
         if ( !filename.isEmpty() )
         {
             bool success = true;
             odebug << "Filename = " << filename << oendl;
 
             int fntype = m;
             QString modifier = QString().sprintf( " = 0x%08x", fntype );
 
             if ( QFileInfo( filename ).isFile() )
             {
                 if ( !multi )
                 {
                     success = OFileNotification::singleShot( filename, this, SLOT( unnamedTrigger() ), (OFileNotificationType) fntype );
                 }
                 else
                 {
                     OFileNotification* fn = new OFileNotification();
                     success = fn->watch( filename, false, (OFileNotificationType) fntype );
-                    connect( fn, SIGNAL( triggered( const QString& ) ), this, SLOT( namedTrigger( const QString& ) ) );
+                    connect( fn, SIGNAL(triggered(const QString&,unsigned int,const QString&)),
+                             this, SLOT(namedTrigger(const QString&,unsigned int,const QString&)) );
                 }
             }
             else if ( QFileInfo( filename ).isDir() )
             {
                 ODirNotification* dn = new ODirNotification();
                 success = dn->watch( filename, !multi, (OFileNotificationType) fntype );
-                connect( dn, SIGNAL( triggered( const QString& ) ), this, SLOT( namedTrigger( const QString& ) ) );
+                connect( dn, SIGNAL(triggered(const QString&,unsigned int,const QString&)),
+                         this, SLOT(namedTrigger(const QString&,unsigned int,const QString&)) );
             }
             else
             {
                 odebug << "Huh!? Neither file nor directory..." << oendl;
                 return;
             }
 
 /*            if ( !success )
             {
                 QMessageBox::warning( 0, "Add Trigger", "<p>Couldn't add trigger :(</p>", "&Sorry", 0 );
                 return;
             }
             else
 */            {
                 new OListViewItem( l, filename, multi ? "MULTI" : "SINGLE", modifier );
             }
             return;
         }
         else
         {
             odebug << "cancelled." << oendl;
         }
     }
 
     void DemoApp::modifierClicked( int modifier ) { m = static_cast<OFileNotificationType>( (int)m ^ int(modifier) ); };
     void DemoApp::addSingle() { addTrigger(); };
     void DemoApp::addMulti() { addTrigger( true ); };
 
     void DemoApp::delTrigger()
     {
         QListViewItem* item = l->selectedItem();
         if ( !item )
         {
             QMessageBox::warning( 0, "Del Trigger", "<p>No trigger selected!</p>", "&Sorry", 0 );
             return;
         }
         else
         {
             QString filename( item->text( 0 ) );
             odebug << "Filename = " << filename << oendl;
         }
     }
 
     void DemoApp::unnamedTrigger()
     {
         owarn << "DemoApp::singleShotStrigger() : F I R E !!!!!" << oendl;
     }
 
-    void DemoApp::namedTrigger( const QString& path )
+    void DemoApp::namedTrigger( const QString& path, unsigned int type, const QString& name )
     {
-        owarn << "DemoApp::named trigger = " << path << " : F I R E !!!!!" << oendl;
+        owarn << "DemoApp::named trigger = ( " << path << ", " << type << ", " << name << " ) : F I R E !!!!!" << oendl;
     }
 
 int main( int argc, char** argv )
 {
     DemoApp* app = new DemoApp( argc, argv );
     app->exec();
 
     return 0;
 
 }