first sketch at ODirNotification class

2 files changed, 31 insertions, 10 deletions

diff --git a/libopie2/opiecore/ofilenotify.cpp b/libopie2/opiecore/ofilenotify.cpp
index efd041a..11d4f87 100644
--- a/libopie2/opiecore/ofilenotify.cpp
+++ b/libopie2/opiecore/ofilenotify.cpp
@@ -95,7 +95,2 @@ int OFileNotification::watch( const QString& path, bool sshot, OFileNotification
 
-    if ( notification_list.isEmpty() )
-    {
-        OFileNotification::registerEventHandler();
-    }
-
     return startWatching( path, sshot, type );
@@ -106,2 +101,7 @@ int OFileNotification::startWatching( const QString& path, bool sshot, OFileNoti
 {
+    if ( notification_list.isEmpty() )
+    {
+        OFileNotification::registerEventHandler();
+    }
+
     struct inotify_watch_request iwr;
@@ -257,7 +257,22 @@ int ODirNotification::watch( const QString& path, bool sshot, OFileNotificationT
     qDebug( "ODirNotification::watch( %s, %d, 0x%08x, %d )", (const char*) path, sshot, type, recurse );
-    return 0;
-}
 
+    if ( recurse == 0 )
+    {
+        OFileNotification* fn = new OFileNotification( this, "ODirNotification delegate" );
+        int result = fn->startWatching( path, sshot, type );
+        if ( result != -1 )
+        {
+            connect( fn, SIGNAL( triggered( const QString& ) ), this, SIGNAL( triggered( const QString& ) ) );
+            return result;
+        }
+    }
+    else
+    {
+        qDebug( "ODirNotification::watch(), recursion not yet implemented... :)" );
+        return -1;
+    }
 }
 
-}
\ No newline at end of file
+} // namespace Ui
+
+} // namespace Opie
diff --git a/libopie2/opiecore/ofilenotify.h b/libopie2/opiecore/ofilenotify.h
index 41ba84d..3eb917e 100644
--- a/libopie2/opiecore/ofilenotify.h
+++ b/libopie2/opiecore/ofilenotify.h
@@ -131,3 +131,3 @@ class OFileNotification : public QObject
      *         OApplication a( argc, argv, "File Notification Example" );
-     *         OFileNotification::singleShot( "/tmp/quit", &a, SLOT(quit()), Create );
+     *         OFileNotification::singleShot( "/tmp/quit", &a, SLOT(quit()), Access );
      *         ... // create and show your widgets
@@ -137,3 +137,3 @@ class OFileNotification : public QObject
      *
-     * This sample program automatically terminates when the file "/tmp/quit" has been created.
+     * This sample program automatically terminates when the file "/tmp/quit" has been accessed.
      *
@@ -224,2 +224,8 @@ class ODirNotification : public QObject
     int watch( const QString& path, bool sshot = false, OFileNotificationType type = Modify, int recurse = 0 );
+
+  signals:
+    /**
+     * This signal is emitted if an event happens of the specified type happens to the directory being watched.
+     **/
+    void triggered( const QString& name );
 };