From b4071cec0194a5e7ed699b376523cc4a0e57aa9d Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 26 Sep 2014 12:34:30 +0200 Subject: [PATCH] DiscoveryPhase: fix the name of a function It was renamed from white list to black list long ago --- src/mirall/discoveryphase.cpp | 4 ++-- src/mirall/discoveryphase.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mirall/discoveryphase.cpp b/src/mirall/discoveryphase.cpp index f81dc0a26d..edc2295a06 100644 --- a/src/mirall/discoveryphase.cpp +++ b/src/mirall/discoveryphase.cpp @@ -45,7 +45,7 @@ bool DiscoveryJob::isInBlackList(const QString& path) const return false; } -int DiscoveryJob::isInWhiteListCallBack(void *data, const char *path) +int DiscoveryJob::isInBlackListCallBack(void *data, const char *path) { return static_cast(data)->isInBlackList(QString::fromUtf8(path)); } @@ -72,7 +72,7 @@ void DiscoveryJob::update_job_update_callback (bool local, void DiscoveryJob::start() { _selectiveSyncBlackList.sort(); - _csync_ctx->checkBlackListHook = isInWhiteListCallBack; + _csync_ctx->checkBlackListHook = isInBlackListCallBack; _csync_ctx->checkBlackListData = this; _csync_ctx->callbacks.update_callback = update_job_update_callback; diff --git a/src/mirall/discoveryphase.h b/src/mirall/discoveryphase.h index 7788f6d02c..5625d7fde8 100644 --- a/src/mirall/discoveryphase.h +++ b/src/mirall/discoveryphase.h @@ -41,7 +41,7 @@ class DiscoveryJob : public QObject { * false if the path should be ignored */ bool isInBlackList(const QString &path) const; - static int isInWhiteListCallBack(void *, const char *); + static int isInBlackListCallBack(void *, const char *); static void update_job_update_callback (bool local, const char *dirname,