From 1b82a7570e68089af343bd349b7833d514538005 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Thu, 19 Oct 2017 15:06:49 +0200 Subject: [PATCH] use right class name ... --- src/core/core.cpp | 4 ++-- src/core/paths/paths-android.cpp | 4 ++-- src/core/paths/paths-android.h | 6 +++--- src/core/paths/paths-apple.h | 6 +++--- src/core/paths/paths-apple.mm | 4 ++-- src/core/paths/paths-linux.cpp | 4 ++-- src/core/paths/paths-linux.h | 6 +++--- src/core/paths/paths-windows.cpp | 4 ++-- src/core/paths/paths-windows.h | 6 +++--- src/core/paths/paths.cpp | 2 +- src/core/paths/paths.h | 4 ++-- src/core/platform-helpers/platform-helpers.h | 6 +++--- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/core/core.cpp b/src/core/core.cpp index 27fcd0e32..9b43fe38c 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -71,12 +71,12 @@ const list> &Core::getChatRooms () const { const std::string &Core::getDataPath() const { L_D(); - return Paths::getPath(Paths::Data, static_cast(d->cCore->platform_helper)); + return Paths::getPath(Paths::Data, static_cast(d->cCore->platform_helper)); } const std::string &Core::getConfigPath() const { L_D(); - return Paths::getPath(Paths::Config, static_cast(d->cCore->platform_helper)); + return Paths::getPath(Paths::Config, static_cast(d->cCore->platform_helper)); } // ----------------------------------------------------------------------------- diff --git a/src/core/paths/paths-android.cpp b/src/core/paths/paths-android.cpp index 52ac08424..84533965d 100644 --- a/src/core/paths/paths-android.cpp +++ b/src/core/paths/paths-android.cpp @@ -28,14 +28,14 @@ LINPHONE_BEGIN_NAMESPACE -const std::string &SysPaths::getDataPath (PlatformHelper *platformHelper) { +const std::string &SysPaths::getDataPath (PlatformHelpers *platformHelper) { if (!platformHelper) { return Utils::getEmptyConstRefObject(); } return platformHelper->getDataPath(); } -const std::string &SysPaths::getConfigPath (PlatformHelper *platformHelper) { +const std::string &SysPaths::getConfigPath (PlatformHelpers *platformHelper) { if (!platformHelper) { return Utils::getEmptyConstRefObject(); } diff --git a/src/core/paths/paths-android.h b/src/core/paths/paths-android.h index 7822cc993..ab4848028 100644 --- a/src/core/paths/paths-android.h +++ b/src/core/paths/paths-android.h @@ -28,10 +28,10 @@ LINPHONE_BEGIN_NAMESPACE -class PlatformHelper; +class PlatformHelpers; namespace SysPaths { - LINPHONE_PUBLIC const std::string &getDataPath (PlatformHelper *platformHelper); - LINPHONE_PUBLIC const std::string &getConfigPath (PlatformHelper *platformHelper); + LINPHONE_PUBLIC const std::string &getDataPath (PlatformHelpers *platformHelper); + LINPHONE_PUBLIC const std::string &getConfigPath (PlatformHelpers *platformHelper); } LINPHONE_END_NAMESPACE diff --git a/src/core/paths/paths-apple.h b/src/core/paths/paths-apple.h index 4cb7fe237..f8b031892 100644 --- a/src/core/paths/paths-apple.h +++ b/src/core/paths/paths-apple.h @@ -28,10 +28,10 @@ LINPHONE_BEGIN_NAMESPACE -class PlatformHelper; +class PlatformHelpers; namespace SysPaths { - LINPHONE_PUBLIC const std::string &getDataPath (PlatformHelper *platformHelper); - LINPHONE_PUBLIC const std::string &getConfigPath (PlatformHelper *platformHelper); + LINPHONE_PUBLIC const std::string &getDataPath (PlatformHelpers *platformHelper); + LINPHONE_PUBLIC const std::string &getConfigPath (PlatformHelpers *platformHelper); } LINPHONE_END_NAMESPACE diff --git a/src/core/paths/paths-apple.mm b/src/core/paths/paths-apple.mm index 6b13317a4..e4d272713 100644 --- a/src/core/paths/paths-apple.mm +++ b/src/core/paths/paths-apple.mm @@ -30,7 +30,7 @@ LINPHONE_BEGIN_NAMESPACE -const std::string &SysPaths::getDataPath (PlatformHelper *platformHelper) { +const std::string &SysPaths::getDataPath (PlatformHelpers *platformHelper) { #ifdef __OBJC__ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES); NSString *writablePath = [paths objectAtIndex:0]; @@ -41,7 +41,7 @@ const std::string &SysPaths::getDataPath (PlatformHelper *platformHelper) { return Utils::getEmptyConstRefObject(); } -const std::string &SysPaths::getConfigPath (PlatformHelper *platformHelper) { +const std::string &SysPaths::getConfigPath (PlatformHelpers *platformHelper) { #ifdef __OBJC__ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES); NSString *configPath = [paths objectAtIndex:0]; diff --git a/src/core/paths/paths-linux.cpp b/src/core/paths/paths-linux.cpp index b52bc05ff..f1662690c 100644 --- a/src/core/paths/paths-linux.cpp +++ b/src/core/paths/paths-linux.cpp @@ -26,12 +26,12 @@ LINPHONE_BEGIN_NAMESPACE -const std::string &SysPaths::getDataPath (PlatformHelper *platformHelper) { +const std::string &SysPaths::getDataPath (PlatformHelpers *platformHelper) { //TODO. return Utils::getEmptyConstRefObject(); } -const std::string &SysPaths::getConfigPath (PlatformHelper *platformHelper) { +const std::string &SysPaths::getConfigPath (PlatformHelpers *platformHelper) { //TODO. return Utils::getEmptyConstRefObject(); } diff --git a/src/core/paths/paths-linux.h b/src/core/paths/paths-linux.h index 6e4780d41..6e7f4e4c5 100644 --- a/src/core/paths/paths-linux.h +++ b/src/core/paths/paths-linux.h @@ -28,10 +28,10 @@ LINPHONE_BEGIN_NAMESPACE -class PlatformHelper; +class PlatformHelpers; namespace SysPaths { - LINPHONE_PUBLIC const std::string &getDataPath (PlatformHelper *platformHelper); - LINPHONE_PUBLIC const std::string &getConfigPath (PlatformHelper *platformHelper); + LINPHONE_PUBLIC const std::string &getDataPath (PlatformHelpers *platformHelper); + LINPHONE_PUBLIC const std::string &getConfigPath (PlatformHelpers *platformHelper); } LINPHONE_END_NAMESPACE diff --git a/src/core/paths/paths-windows.cpp b/src/core/paths/paths-windows.cpp index 85d75c7be..749f62afa 100644 --- a/src/core/paths/paths-windows.cpp +++ b/src/core/paths/paths-windows.cpp @@ -26,12 +26,12 @@ LINPHONE_BEGIN_NAMESPACE -const std::string &SysPaths::getDataPath (PlatformHelper *platformHelper) { +const std::string &SysPaths::getDataPath (PlatformHelpers *platformHelper) { //TODO. return Utils::getEmptyConstRefObject(); } -const std::string &SysPaths::getConfigPath (PlatformHelper *platformHelper) { +const std::string &SysPaths::getConfigPath (PlatformHelpers *platformHelper) { //TODO. return Utils::getEmptyConstRefObject(); } diff --git a/src/core/paths/paths-windows.h b/src/core/paths/paths-windows.h index f0f9b387a..7390b3b83 100644 --- a/src/core/paths/paths-windows.h +++ b/src/core/paths/paths-windows.h @@ -28,10 +28,10 @@ LINPHONE_BEGIN_NAMESPACE -class PlatformHelper; +class PlatformHelpers; namespace SysPaths { - LINPHONE_PUBLIC const std::string &getDataPath (PlatformHelper *platformHelper); - LINPHONE_PUBLIC const std::string &getConfigPath (PlatformHelper *platformHelper); + LINPHONE_PUBLIC const std::string &getDataPath (PlatformHelpers *platformHelper); + LINPHONE_PUBLIC const std::string &getConfigPath (PlatformHelpers *platformHelper); } LINPHONE_END_NAMESPACE diff --git a/src/core/paths/paths.cpp b/src/core/paths/paths.cpp index f8c0be1f4..c9172c454 100644 --- a/src/core/paths/paths.cpp +++ b/src/core/paths/paths.cpp @@ -38,7 +38,7 @@ using namespace std; LINPHONE_BEGIN_NAMESPACE -const string &Paths::getPath (Paths::Type type, PlatformHelper *platformHelper) { +const string &Paths::getPath (Paths::Type type, PlatformHelpers *platformHelper) { switch (type) { case Data: return SysPaths::getDataPath(platformHelper); diff --git a/src/core/paths/paths.h b/src/core/paths/paths.h index 70deea899..ae4355f2b 100644 --- a/src/core/paths/paths.h +++ b/src/core/paths/paths.h @@ -28,14 +28,14 @@ LINPHONE_BEGIN_NAMESPACE -class PlatformHelper; +class PlatformHelpers; namespace Paths { enum Type { Data, Config }; - LINPHONE_PUBLIC const std::string &getPath(Type type, PlatformHelper *platformHelper); + LINPHONE_PUBLIC const std::string &getPath(Type type, PlatformHelpers *platformHelper); } LINPHONE_END_NAMESPACE diff --git a/src/core/platform-helpers/platform-helpers.h b/src/core/platform-helpers/platform-helpers.h index 0c689a29e..02c312629 100644 --- a/src/core/platform-helpers/platform-helpers.h +++ b/src/core/platform-helpers/platform-helpers.h @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef platform_helpers_h -#define platform_helpers_h +#ifndef _PLATFORM_HELPERS_H_ +#define _PLATFORM_HELPERS_H_ #include @@ -69,4 +69,4 @@ PlatformHelpers *createAndroidPlatformHelpers (LinphoneCore *lc, void *system_co LINPHONE_END_NAMESPACE -#endif +#endif // indef _PLATFORM_HELPERS_H_