summaryrefslogtreecommitdiff
path: root/libopie2
Side-by-side diff
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/ofilenotify.cpp31
-rw-r--r--libopie2/opiecore/ofilenotify.h10
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
@@ -94,9 +94,4 @@ int OFileNotification::watch( const QString& path, bool sshot, OFileNotification
}
- if ( notification_list.isEmpty() )
- {
- OFileNotification::registerEventHandler();
- }
-
return startWatching( path, sshot, type );
}
@@ -105,4 +100,9 @@ int OFileNotification::watch( const QString& path, bool sshot, OFileNotification
int OFileNotification::startWatching( const QString& path, bool sshot, OFileNotificationType type )
{
+ if ( notification_list.isEmpty() )
+ {
+ OFileNotification::registerEventHandler();
+ }
+
struct inotify_watch_request iwr;
::memset( &iwr, 0, sizeof iwr );
@@ -256,8 +256,23 @@ 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
@@ -130,5 +130,5 @@ 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
* return a.exec();
@@ -136,5 +136,5 @@ class OFileNotification : public QObject
* </pre>
*
- * 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.
*
*
@@ -223,4 +223,10 @@ 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 );
};