From aee4c06b8deb9bb910ff5baf324d790220ccffd8 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Wed, 19 Feb 2014 00:46:48 +0100 Subject: [PATCH] Renamed a member variable to have underscore prefix for consistency --- src/mirall/folderwatcher_mac.cpp | 12 ++++++------ src/mirall/folderwatcher_mac.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mirall/folderwatcher_mac.cpp b/src/mirall/folderwatcher_mac.cpp index f2e96e1110..abeec707ca 100644 --- a/src/mirall/folderwatcher_mac.cpp +++ b/src/mirall/folderwatcher_mac.cpp @@ -34,9 +34,9 @@ FolderWatcherPrivate::FolderWatcherPrivate(FolderWatcher *p, const QString& path FolderWatcherPrivate::~FolderWatcherPrivate() { - FSEventStreamStop(stream); - FSEventStreamInvalidate(stream); - FSEventStreamRelease(stream); + FSEventStreamStop(_stream); + FSEventStreamInvalidate(_stream); + FSEventStreamRelease(_stream); } static void callback( @@ -76,7 +76,7 @@ void FolderWatcherPrivate::startWatching() // TODO: Add kFSEventStreamCreateFlagFileEvents ? - stream = FSEventStreamCreate(NULL, + _stream = FSEventStreamCreate(NULL, &callback, &ctx, pathsToWatch, @@ -86,8 +86,8 @@ void FolderWatcherPrivate::startWatching() ); CFRelease(pathsToWatch); - FSEventStreamScheduleWithRunLoop(stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); - FSEventStreamStart(stream); + FSEventStreamScheduleWithRunLoop(_stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); + FSEventStreamStart(_stream); } void FolderWatcherPrivate::doNotifyParent(const QStringList &paths) { diff --git a/src/mirall/folderwatcher_mac.h b/src/mirall/folderwatcher_mac.h index 4f42e2d76a..c2e3821d23 100644 --- a/src/mirall/folderwatcher_mac.h +++ b/src/mirall/folderwatcher_mac.h @@ -41,7 +41,7 @@ private: QString _folder; - FSEventStreamRef stream; + FSEventStreamRef _stream; }; }