diff options
| -rw-r--r-- | src/dirs.cpp | 2 | ||||
| -rw-r--r-- | src/fs/paths.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_video.cpp | 6 | ||||
| -rw-r--r-- | src/progs/manaplus/actions/actions.cpp | 3 | ||||
| -rw-r--r-- | src/progs/manaplus/client.cpp | 3 | ||||
| -rw-r--r-- | src/render/modernopenglgraphics.cpp | 3 | ||||
| -rw-r--r-- | src/render/modernopenglgraphics.h | 3 | ||||
| -rw-r--r-- | src/render/normalopenglgraphics.cpp | 3 | ||||
| -rw-r--r-- | src/render/normalopenglgraphics.h | 3 |
9 files changed, 19 insertions, 10 deletions
diff --git a/src/dirs.cpp b/src/dirs.cpp index e33407fff..44b23be0a 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -360,7 +360,7 @@ void Dirs::initLocalDataDir() #elif defined __native_client__ settings.localDataDir = pathJoin(_nacl_dir, "local"); #elif defined __SWITCH__ - settings.localDataDir = pathJoin(VirtFs::getUserDir(),"local"); + settings.localDataDir = pathJoin(VirtFs::getUserDir(), "local"); #else // __APPLE__ settings.localDataDir = pathJoin(VirtFs::getUserDir(), diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp index 273dbd59f..942f69471 100644 --- a/src/fs/paths.cpp +++ b/src/fs/paths.cpp @@ -92,7 +92,8 @@ std::string getRealPath(const std::string &str) { return std::string(); } -#if defined(__OpenBSD__) || defined(__ANDROID__) || defined(__native_client__) || defined(__SWITCH__) +#if defined(__OpenBSD__) || defined(__ANDROID__) || \ + defined(__native_client__) || defined(__SWITCH__) char *realPath = reinterpret_cast<char*>(calloc(PATH_MAX, sizeof(char))); if (!realPath) return ""; diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index f7d8348c6..f938f31f5 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -84,7 +84,8 @@ Setup_Video::Setup_Video(const Widget2 *const widget) : mAltFpsSlider(new Slider(this, 2.0, 160.0, 1.0)), // TRANSLATORS: video settings label mAltFpsLabel(new Label(this, _("Alt FPS limit: "))), -#if !defined(ANDROID) && !defined(__APPLE__) && !defined(__native_client__) && !defined(__SWITCH__) +#if !defined(ANDROID) && !defined(__APPLE__) && \ + !defined(__native_client__) && !defined(__SWITCH__) // TRANSLATORS: video settings button mDetectButton(new Button(this, _("Detect best mode"), "detect", BUTTON_SKIN, this)), @@ -195,7 +196,8 @@ Setup_Video::Setup_Video(const Widget2 *const widget) : place(0, 7, mAltFpsSlider, 1, 1); place(1, 7, mAltFpsLabel, 1, 1).setPadding(3); -#if !defined(ANDROID) && !defined(__APPLE__) && !defined(__native_client__) && !defined(__SWITCH__) +#if !defined(ANDROID) && !defined(__APPLE__) && \ + !defined(__native_client__) && !defined(__SWITCH__) place(0, 8, mDetectButton, 1, 1); #else // !defined(ANDROID) && !defined(__APPLE__) && // !defined(__native_client__) diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp index a4c6a63d2..c367b01ee 100644 --- a/src/progs/manaplus/actions/actions.cpp +++ b/src/progs/manaplus/actions/actions.cpp @@ -1528,7 +1528,8 @@ impHandler(dumpTests) impHandler0(dumpOGL) { -#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__) && !defined(__SWITCH__) +#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__) \ + && !defined(__SWITCH__) NormalOpenGLGraphics::dumpSettings(); #endif // defined(USE_OPENGL) && !defined(ANDROID) && // !defined(__native_client__) diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp index 349f02b4b..8670ae4ab 100644 --- a/src/progs/manaplus/client.cpp +++ b/src/progs/manaplus/client.cpp @@ -863,7 +863,8 @@ void Client::stateConnectServer1() #ifdef SAVE_PASSWORD LoginDialog::savedPassword = loginData.remember ? serverConfig.getValue("password", "") : ""; - loginData.password = settings.options.password = LoginDialog::savedPassword; + loginData.password = LoginDialog::savedPassword; + settings.options.password = LoginDialog::savedPassword; #endif settings.login = loginData.username; WindowManager::updateTitle(); diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index 15bb1505c..5f2fd7ddd 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -20,7 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__) && !defined(__SWITCH__) +#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__) \ + && !defined(__SWITCH__) #include "render/modernopenglgraphics.h" diff --git a/src/render/modernopenglgraphics.h b/src/render/modernopenglgraphics.h index 5c3e643ab..d5a9baf88 100644 --- a/src/render/modernopenglgraphics.h +++ b/src/render/modernopenglgraphics.h @@ -23,7 +23,8 @@ #ifndef RENDER_MODERNOPENGLGRAPHICS_H #define RENDER_MODERNOPENGLGRAPHICS_H -#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__) && !defined(__SWITCH__) +#if defined(USE_OPENGL) && !defined(ANDROID) && \ + !defined(__native_client__) && !defined(__SWITCH__) #include "localconsts.h" diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp index 666ef9ef4..51e50661b 100644 --- a/src/render/normalopenglgraphics.cpp +++ b/src/render/normalopenglgraphics.cpp @@ -20,7 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__) && !defined(__SWITCH__) +#if defined(USE_OPENGL) && !defined(ANDROID) && \ + !defined(__native_client__) && !defined(__SWITCH__) #include "render/normalopenglgraphics.h" diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h index 535d97f8e..9964a61b8 100644 --- a/src/render/normalopenglgraphics.h +++ b/src/render/normalopenglgraphics.h @@ -23,7 +23,8 @@ #ifndef RENDER_NORMALOPENGLGRAPHICS_H #define RENDER_NORMALOPENGLGRAPHICS_H -#if defined USE_OPENGL && !defined ANDROID && !defined(__native_client__) && !defined(__SWITCH__) +#if defined USE_OPENGL && !defined ANDROID && \ + !defined(__native_client__) && !defined(__SWITCH__) #include "localconsts.h" |