mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-18 19:48:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove const to fix build

Browse source
This commit is contained in:
Benjamin Reis 2017-10-19 15:18:23 +02:00
parent 1b82a7570e
commit f291076f88
12 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/core.cpp
View file

@ -69,12 +69,12 @@ const list<shared_ptr<ChatRoom>> &Core::getChatRooms () const {
return d->chatRooms;
}
const std::string &Core::getDataPath() const {
string Core::getDataPath() const {
L_D();
return Paths::getPath(Paths::Data, static_cast<PlatformHelpers *>(d->cCore->platform_helper));
}
const std::string &Core::getConfigPath() const {
string Core::getConfigPath() const {
L_D();
return Paths::getPath(Paths::Config, static_cast<PlatformHelpers *>(d->cCore->platform_helper));
}

4
src/core/core.h
View file

@ -39,8 +39,8 @@ public:
std::shared_ptr<ChatRoom> createClientGroupChatRoom (const std::string &subject);
std::shared_ptr<ChatRoom> getOrCreateChatRoom (const std::string &peerAddress, bool isRtt = false) const;
const std::list<std::shared_ptr<ChatRoom>> &getChatRooms () const;
const std::string &getDataPath() const;
const std::string &getConfigPath() const;
std::string getDataPath() const;
std::string getConfigPath() const;
private:
L_DECLARE_PRIVATE(Core);

4
src/core/paths/paths-android.cpp
View file

@ -28,14 +28,14 @@
LINPHONE_BEGIN_NAMESPACE
const std::string &SysPaths::getDataPath (PlatformHelpers *platformHelper) {
std::string SysPaths::getDataPath (PlatformHelpers *platformHelper) {
if (!platformHelper) {
return Utils::getEmptyConstRefObject<std::string>();
}
return platformHelper->getDataPath();
}
const std::string &SysPaths::getConfigPath (PlatformHelpers *platformHelper) {
std::string SysPaths::getConfigPath (PlatformHelpers *platformHelper) {
if (!platformHelper) {
return Utils::getEmptyConstRefObject<std::string>();
}

4
src/core/paths/paths-android.h
View file

@ -30,8 +30,8 @@ LINPHONE_BEGIN_NAMESPACE
class PlatformHelpers;
namespace SysPaths {
LINPHONE_PUBLIC const std::string &getDataPath (PlatformHelpers *platformHelper);
LINPHONE_PUBLIC const std::string &getConfigPath (PlatformHelpers *platformHelper);
LINPHONE_PUBLIC std::string getDataPath (PlatformHelpers *platformHelper);
LINPHONE_PUBLIC std::string getConfigPath (PlatformHelpers *platformHelper);
}
LINPHONE_END_NAMESPACE

4
src/core/paths/paths-apple.h
View file

@ -30,8 +30,8 @@ LINPHONE_BEGIN_NAMESPACE
class PlatformHelpers;
namespace SysPaths {
LINPHONE_PUBLIC const std::string &getDataPath (PlatformHelpers *platformHelper);
LINPHONE_PUBLIC const std::string &getConfigPath (PlatformHelpers *platformHelper);
LINPHONE_PUBLIC std::string getDataPath (PlatformHelpers *platformHelper);
LINPHONE_PUBLIC std::string getConfigPath (PlatformHelpers *platformHelper);
}
LINPHONE_END_NAMESPACE

4
src/core/paths/paths-apple.mm
View file

@ -30,7 +30,7 @@
LINPHONE_BEGIN_NAMESPACE
const std::string &SysPaths::getDataPath (PlatformHelpers *platformHelper) {
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 (PlatformHelpers *platformHelper) {
return Utils::getEmptyConstRefObject<std::string>();
}
const std::string &SysPaths::getConfigPath (PlatformHelpers *platformHelper) {
std::string SysPaths::getConfigPath (PlatformHelpers *platformHelper) {
#ifdef __OBJC__
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
NSString *configPath = [paths objectAtIndex:0];

4
src/core/paths/paths-linux.cpp
View file

@ -26,12 +26,12 @@
LINPHONE_BEGIN_NAMESPACE
const std::string &SysPaths::getDataPath (PlatformHelpers *platformHelper) {
std::string SysPaths::getDataPath (PlatformHelpers *platformHelper) {
//TODO.
return Utils::getEmptyConstRefObject<std::string>();
}
const std::string &SysPaths::getConfigPath (PlatformHelpers *platformHelper) {
std::string SysPaths::getConfigPath (PlatformHelpers *platformHelper) {
//TODO.
return Utils::getEmptyConstRefObject<std::string>();
}

4
src/core/paths/paths-linux.h
View file

@ -30,8 +30,8 @@ LINPHONE_BEGIN_NAMESPACE
class PlatformHelpers;
namespace SysPaths {
LINPHONE_PUBLIC const std::string &getDataPath (PlatformHelpers *platformHelper);
LINPHONE_PUBLIC const std::string &getConfigPath (PlatformHelpers *platformHelper);
LINPHONE_PUBLIC std::string getDataPath (PlatformHelpers *platformHelper);
LINPHONE_PUBLIC std::string getConfigPath (PlatformHelpers *platformHelper);
}
LINPHONE_END_NAMESPACE

4
src/core/paths/paths-windows.cpp
View file

@ -26,12 +26,12 @@
LINPHONE_BEGIN_NAMESPACE
const std::string &SysPaths::getDataPath (PlatformHelpers *platformHelper) {
std::string SysPaths::getDataPath (PlatformHelpers *platformHelper) {
//TODO.
return Utils::getEmptyConstRefObject<std::string>();
}
const std::string &SysPaths::getConfigPath (PlatformHelpers *platformHelper) {
std::string SysPaths::getConfigPath (PlatformHelpers *platformHelper) {
//TODO.
return Utils::getEmptyConstRefObject<std::string>();
}

4
src/core/paths/paths-windows.h
View file

@ -30,8 +30,8 @@ LINPHONE_BEGIN_NAMESPACE
class PlatformHelpers;
namespace SysPaths {
LINPHONE_PUBLIC const std::string &getDataPath (PlatformHelpers *platformHelper);
LINPHONE_PUBLIC const std::string &getConfigPath (PlatformHelpers *platformHelper);
LINPHONE_PUBLIC std::string getDataPath (PlatformHelpers *platformHelper);
LINPHONE_PUBLIC std::string getConfigPath (PlatformHelpers *platformHelper);
}
LINPHONE_END_NAMESPACE

2
src/core/paths/paths.cpp
View file

@ -38,7 +38,7 @@ using namespace std;
LINPHONE_BEGIN_NAMESPACE
const string &Paths::getPath (Paths::Type type, PlatformHelpers *platformHelper) {
string Paths::getPath (Paths::Type type, PlatformHelpers *platformHelper) {
switch (type) {
case Data:
return SysPaths::getDataPath(platformHelper);

2
src/core/paths/paths.h
View file

@ -35,7 +35,7 @@ namespace Paths {
Config
};
LINPHONE_PUBLIC const std::string &getPath(Type type, PlatformHelpers *platformHelper);
LINPHONE_PUBLIC std::string getPath(Type type, PlatformHelpers *platformHelper);
}
LINPHONE_END_NAMESPACE