diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-01 11:55:45 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-01 11:55:45 +0300 |
| commit | 3b4a8ac5cadf6b0c5f6ae6f650da94435aba29c7 (patch) | |
| tree | bfd15f6646b91a072db12f0aa5d8d257f3138733 | |
| parent | ec5a06754164bb2f77d3627990f896c040fc1c76 (diff) | |
| download | manaplus-3b4a8ac5cadf6b0c5f6ae6f650da94435aba29c7.tar.gz manaplus-3b4a8ac5cadf6b0c5f6ae6f650da94435aba29c7.tar.bz2 manaplus-3b4a8ac5cadf6b0c5f6ae6f650da94435aba29c7.tar.xz manaplus-3b4a8ac5cadf6b0c5f6ae6f650da94435aba29c7.zip | |
fix code style.
| -rw-r--r-- | src/client.cpp | 2 | ||||
| -rw-r--r-- | src/client.h | 2 | ||||
| -rw-r--r-- | src/game.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_video.cpp | 4 |
4 files changed, 8 insertions, 1 deletions
diff --git a/src/client.cpp b/src/client.cpp index ea800468f..4d301ccfe 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2361,6 +2361,7 @@ void Client::accountLogin(LoginData *const data) const serverConfig.setValue("remember", remember); } +#ifndef ANDROID void Client::storeSafeParameters() const { bool tmpHwaccel; @@ -2479,6 +2480,7 @@ void Client::storeSafeParameters() const config.setValue("screenheight", height); } } +#endif void Client::initTradeFilter() const { diff --git a/src/client.h b/src/client.h index 90198abf4..92daff44b 100644 --- a/src/client.h +++ b/src/client.h @@ -373,7 +373,9 @@ private: void accountLogin(LoginData *const data) const; +#ifndef ANDROID void storeSafeParameters() const; +#endif void backupConfig() const; diff --git a/src/game.cpp b/src/game.cpp index 91a9038c8..6e4341372 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -524,7 +524,6 @@ bool Game::saveScreenshot(SDL_Surface *const screenshot) } // Search for an unused screenshot name - std::stringstream filenameSuffix; std::stringstream filename; std::fstream testExists; bool found = false; diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index c977318e6..45ada01df 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -84,7 +84,9 @@ class ModeListModel final : public gcn::ListModel int getIndexOf(const std::string &widthXHeightMode); private: +#ifndef ANDROID void addCustomMode(const std::string &mode); +#endif StringVect mVideoModes; }; @@ -130,6 +132,7 @@ ModeListModel::ModeListModel() : #endif } +#ifndef ANDROID void ModeListModel::addCustomMode(const std::string &mode) { StringVectCIter it = mVideoModes.begin(); @@ -142,6 +145,7 @@ void ModeListModel::addCustomMode(const std::string &mode) } mVideoModes.push_back(mode); } +#endif int ModeListModel::getIndexOf(const std::string &widthXHeightMode) { |