diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-12-22 02:03:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-12-22 02:03:59 +0300 |
| commit | 5133814218de74d57c7febadf61b3ab05216dc25 (patch) | |
| tree | 60b88270c9a50ef333fefed38c805baab00429a1 /src/gui | |
| parent | cc7a39f467a49b2e91717739cb6e7c3c4b34a245 (diff) | |
| download | manaplus-5133814218de74d57c7febadf61b3ab05216dc25.tar.gz manaplus-5133814218de74d57c7febadf61b3ab05216dc25.tar.bz2 manaplus-5133814218de74d57c7febadf61b3ab05216dc25.tar.xz manaplus-5133814218de74d57c7febadf61b3ab05216dc25.zip | |
Remove default parameters from properties.h
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/tabs/debugwindowtabs.cpp | 8 | ||||
| -rw-r--r-- | src/gui/windows/minimap.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windows/questswindow.cpp | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/widgets/tabs/debugwindowtabs.cpp b/src/gui/widgets/tabs/debugwindowtabs.cpp index 321c3bcad..6199fccca 100644 --- a/src/gui/widgets/tabs/debugwindowtabs.cpp +++ b/src/gui/widgets/tabs/debugwindowtabs.cpp @@ -199,16 +199,16 @@ void MapDebugTab::logic() // TRANSLATORS: debug window label mMusicFileLabel->setCaption(strprintf("%s %s", _("Music:"), - map->getProperty("music").c_str())); + map->getProperty("music", std::string()).c_str())); // TRANSLATORS: debug window label mMinimapLabel->setCaption(strprintf("%s %s", _("Minimap:"), - map->getProperty("minimap").c_str())); + map->getProperty("minimap", std::string()).c_str())); // TRANSLATORS: debug window label mMapLabel->setCaption(strprintf("%s %s", _("Map:"), - map->getProperty("_realfilename").c_str())); + map->getProperty("_realfilename", std::string()).c_str())); // TRANSLATORS: debug window label mMapNameLabel->setCaption(strprintf("%s %s", _("Map name:"), - map->getProperty("name").c_str())); + map->getProperty("name", std::string()).c_str())); if (mUpdateTime != cur_time) { diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 7f48f4a10..cf46bb6c6 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -181,7 +181,8 @@ void Minimap::setMap(const Map *const map) std::string tempname = pathJoin(paths.getStringValue("minimaps"), map->getFilename()).append(".png"); - std::string minimapName = map->getProperty("minimap"); + std::string minimapName = map->getProperty("minimap", + std::string()); if (minimapName.empty() && VirtFs::exists(tempname)) minimapName = tempname; diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index 269f2aab9..80d853778 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -378,7 +378,8 @@ void QuestsWindow::setMap(const Map *const map) if (mMap == nullptr) return; - const std::string name = mMap->getProperty("shortName"); + const std::string name = mMap->getProperty("shortName", + std::string()); FOR_EACHP (STD_VECTOR<QuestEffect*>::const_iterator, it, mAllEffects) { const QuestEffect *const effect = *it; |