diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-08-23 22:20:47 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-08-24 21:08:17 +0300 |
| commit | 576b7dca4676ba2c1ea63afb6bbc96fd11183048 (patch) | |
| tree | 5eef4087911e0e74ebcfb4d2026b811f0256cc71 /src/client.h | |
| parent | c97f245c597ebe8f488e72c435960dbee9bf66c6 (diff) | |
| download | manaplus-576b7dca4676ba2c1ea63afb6bbc96fd11183048.tar.gz manaplus-576b7dca4676ba2c1ea63afb6bbc96fd11183048.tar.bz2 manaplus-576b7dca4676ba2c1ea63afb6bbc96fd11183048.tar.xz manaplus-576b7dca4676ba2c1ea63afb6bbc96fd11183048.zip | |
improve dirs usage in Client.
Diffstat (limited to 'src/client.h')
| -rw-r--r-- | src/client.h | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/client.h b/src/client.h index 73d4ae28b..3c7951ffc 100644 --- a/src/client.h +++ b/src/client.h @@ -235,29 +235,32 @@ public: void setState(const State state) { mState = state; } - State getState() A_WARN_UNUSED + State getState() const A_WARN_UNUSED { return mState; } - static const std::string &getPackageDirectory() A_WARN_UNUSED - { return instance()->mPackageDir; } + const std::string &getPackageDirectory() const A_WARN_UNUSED + { return mPackageDir; } - static const std::string &getConfigDirectory() A_WARN_UNUSED - { return instance()->mConfigDir; } + const std::string &getConfigDirectory() const A_WARN_UNUSED + { return mConfigDir; } - static const std::string &getLocalDataDirectory() A_WARN_UNUSED - { return instance()->mLocalDataDir; } + const std::string &getLocalDataDirectory() const A_WARN_UNUSED + { return mLocalDataDir; } - static const std::string &getTempDirectory() A_WARN_UNUSED - { return instance()->mTempDir; } + const std::string &getTempDirectory() const A_WARN_UNUSED + { return mTempDir; } - static const std::string &getScreenshotDirectory() A_WARN_UNUSED - { return instance()->mScreenshotDir; } + const std::string &getScreenshotDirectory() const A_WARN_UNUSED + { return mScreenshotDir; } - static const std::string getServerConfigDirectory() A_WARN_UNUSED; + const std::string getServerConfigDirectory() const A_WARN_UNUSED + { return mServerConfigDir; } - static const std::string getUsersDirectory() A_WARN_UNUSED; + const std::string getUsersDirectory() const A_WARN_UNUSED + { return mUsersDir; } - static const std::string getNpcsDirectory() A_WARN_UNUSED; + const std::string getNpcsDirectory() const A_WARN_UNUSED + { return mNpcsDir; } static bool getIsMinimized() A_WARN_UNUSED { return instance()->mIsMinimized; } |