Commit 1b82a757 authored by Benjamin REIS's avatar Benjamin REIS

use right class name ...

parent aea1b122
......@@ -71,12 +71,12 @@ const list<shared_ptr<ChatRoom>> &Core::getChatRooms () const {
const std::string &Core::getDataPath() const {
L_D();
return Paths::getPath(Paths::Data, static_cast<PlatformHelper *>(d->cCore->platform_helper));
return Paths::getPath(Paths::Data, static_cast<PlatformHelpers *>(d->cCore->platform_helper));
}
const std::string &Core::getConfigPath() const {
L_D();
return Paths::getPath(Paths::Config, static_cast<PlatformHelper *>(d->cCore->platform_helper));
return Paths::getPath(Paths::Config, static_cast<PlatformHelpers *>(d->cCore->platform_helper));
}
// -----------------------------------------------------------------------------
......
......@@ -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<std::string>();
}
return platformHelper->getDataPath();
}
const std::string &SysPaths::getConfigPath (PlatformHelper *platformHelper) {
const std::string &SysPaths::getConfigPath (PlatformHelpers *platformHelper) {
if (!platformHelper) {
return Utils::getEmptyConstRefObject<std::string>();
}
......
......@@ -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
......
......@@ -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
......
......@@ -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<std::string>();
}
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];
......
......@@ -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<std::string>();
}
const std::string &SysPaths::getConfigPath (PlatformHelper *platformHelper) {
const std::string &SysPaths::getConfigPath (PlatformHelpers *platformHelper) {
//TODO.
return Utils::getEmptyConstRefObject<std::string>();
}
......
......@@ -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
......
......@@ -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<std::string>();
}
const std::string &SysPaths::getConfigPath (PlatformHelper *platformHelper) {
const std::string &SysPaths::getConfigPath (PlatformHelpers *platformHelper) {
//TODO.
return Utils::getEmptyConstRefObject<std::string>();
}
......
......@@ -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
......
......@@ -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);
......
......@@ -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
......
......@@ -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 <string>
......@@ -69,4 +69,4 @@ PlatformHelpers *createAndroidPlatformHelpers (LinphoneCore *lc, void *system_co
LINPHONE_END_NAMESPACE
#endif
#endif // indef _PLATFORM_HELPERS_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment