diff options
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gui/widgets/browserbox.cpp | 4 | ||||
| -rw-r--r-- | src/utils/browserboxtools.cpp | 34 | ||||
| -rw-r--r-- | src/utils/browserboxtools.h | 33 |
5 files changed, 73 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 79fe1aee5..aa38c3a17 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -843,6 +843,8 @@ SET(SRCS utils/base64.cpp utils/base64.h utils/booleanoptions.h + utils/browserboxtools.cpp + utils/browserboxtools.h utils/buildhex.h utils/chatutils.cpp utils/chatutils.h diff --git a/src/Makefile.am b/src/Makefile.am index dcadc4cc4..82520dc34 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -494,6 +494,8 @@ SRC += events/actionevent.h \ utils/base64.cpp \ utils/base64.h \ utils/booleanoptions.h \ + utils/browserboxtools.cpp \ + utils/browserboxtools.h \ utils/buildhex.h \ utils/checkutils.cpp \ utils/checkutils.h \ diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index c57a9bf4c..13de696e9 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -60,6 +60,7 @@ #include "resources/loaders/imageloader.h" #include "resources/loaders/imagesetloader.h" +#include "utils/browserboxtools.h" #include "utils/stringutils.h" #include "utils/timer.h" #include "utils/translation/podict.h" @@ -217,8 +218,7 @@ void BrowserBox::addRow(const std::string &row, const bool atTop) if (mProcessVars) { - tmp = replaceAll(tmp, "%VER%", SMALL_VERSION); - tmp = replaceAll(tmp, "%SUPPORTURL%", settings.supportUrl); + BrowserBoxTools::replaceVars(tmp); } // Use links and user defined colors diff --git a/src/utils/browserboxtools.cpp b/src/utils/browserboxtools.cpp new file mode 100644 index 000000000..d39e8e280 --- /dev/null +++ b/src/utils/browserboxtools.cpp @@ -0,0 +1,34 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "utils/browserboxtools.h" + +#include "main.h" +#include "settings.h" + +#include "utils/stringutils.h" + +#include "debug.h" + +void BrowserBoxTools::replaceVars(std::string &data) +{ + data = replaceAll(data, "%VER%", SMALL_VERSION); + data = replaceAll(data, "%SUPPORTURL%", settings.supportUrl); +} diff --git a/src/utils/browserboxtools.h b/src/utils/browserboxtools.h new file mode 100644 index 000000000..eba70118a --- /dev/null +++ b/src/utils/browserboxtools.h @@ -0,0 +1,33 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef UTILS_BROWSERBOXTOOLS_H +#define UTILS_BROWSERBOXTOOLS_H + +#include <string> + +#include "localconsts.h" + +namespace BrowserBoxTools +{ + void replaceVars(std::string &data); +} // BrowserBoxTools + +#endif // UTILS_BROWSERBOXTOOLS_H |