commit b3e5a881

sum01 · 2018-04-21 22:53
b3e5a881f3593d26fbb2315e0f594c907164c4fb patch · browse files
parent 2cecc0450122d442ab30c6c01abe7f05ecb76e0b

Simplify some #if defined() stuff

No point having unused if's.

Changed files

M	sago/platform_folders.cpp before
M	sago/platform_folders.h before

diff --git a/sago/platform_folders.cpp b/sago/platform_folders.cpp index acac790..0fda5bb 100644 --- a/sago/platform_folders.cpp +++ b/sago/platform_folders.cpp

@@ -211,8 +211,7 @@ std::string getCacheDir() {

void appendAdditionalDataDirectories(std::vector<std::string>& homes) {

#if defined(_WIN32)

homes.push_back(GetAppDataCommon());

-#elif defined(__APPLE__)

-#else

+#elif !defined(__APPLE__)

appendExtraFolders("XDG_DATA_DIRS", "/usr/local/share/:/usr/share/", homes);

#endif

}

@@ -220,15 +219,12 @@ void appendAdditionalDataDirectories(std::vector<std::string>& homes) {

void appendAdditionalConfigDirectories(std::vector<std::string>& homes) {

#if defined(_WIN32)

homes.push_back(GetAppDataCommon());

-#elif defined(__APPLE__)

-#else

+#elif !defined(__APPLE__)

appendExtraFolders("XDG_CONFIG_DIRS", "/etc/xdg", homes);

#endif

}

-#if defined(_WIN32)

-#elif defined(__APPLE__)

-#else

+#if !defined(_WIN32) && !defined(__APPLE__)

struct PlatformFolders::PlatformFoldersData {

std::map<std::string, std::string> folders;

};

@@ -267,9 +263,7 @@ static void PlatformFoldersFillData(std::map<std::string, std::string>& folders)

#endif

PlatformFolders::PlatformFolders() {

-#if defined(_WIN32)

-#elif defined(__APPLE__)

-#else

+#if !defined(_WIN32) && !defined(__APPLE__)

this->data = new PlatformFolders::PlatformFoldersData();

try {

PlatformFoldersFillData(data->folders);

@@ -282,9 +276,7 @@ PlatformFolders::PlatformFolders() {

}

PlatformFolders::~PlatformFolders() {

-#if defined(_WIN32)

-#elif defined(__APPLE__)

-#else

+#if !defined(_WIN32) && !defined(__APPLE__)

delete this->data;

#endif

}

diff --git a/sago/platform_folders.h b/sago/platform_folders.h index bd6c0d5..193fa4d 100644 --- a/sago/platform_folders.h +++ b/sago/platform_folders.h

@@ -218,9 +218,7 @@ public:

private:

PlatformFolders(const PlatformFolders&);

PlatformFolders& operator=(const PlatformFolders&);

-#if defined(_WIN32)

-#elif defined(__APPLE__)

-#else

+#if !defined(_WIN32) && !defined(__APPLE__)

struct PlatformFoldersData;

PlatformFoldersData* data;

#endif