summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-17 23:22:30 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-17 23:22:30 +0300
commit1d4cd150413526a998eb29e50c61ac8ef4d95f0e (patch)
treea80d1173982413da65202cc1218cb1813f96dfa9
parente6e139910e6773f68b8a2818a0529cd5ca37f31a (diff)
downloadmanaverse-1d4cd150413526a998eb29e50c61ac8ef4d95f0e.tar.gz
manaverse-1d4cd150413526a998eb29e50c61ac8ef4d95f0e.tar.bz2
manaverse-1d4cd150413526a998eb29e50c61ac8ef4d95f0e.tar.xz
manaverse-1d4cd150413526a998eb29e50c61ac8ef4d95f0e.zip
add restrict into updaterwindow.
-rw-r--r--src/gui/windows/updaterwindow.cpp16
-rw-r--r--src/gui/windows/updaterwindow.h16
2 files changed, 16 insertions, 16 deletions
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index f185c1ed5..003529fbc 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -144,8 +144,8 @@ static std::vector<UpdateFile> loadTxtFile(const std::string &fileName)
return files;
}
-UpdaterWindow::UpdaterWindow(const std::string &updateHost,
- const std::string &updatesDir,
+UpdaterWindow::UpdaterWindow(const std::string &restrict updateHost,
+ const std::string &restrict updatesDir,
const bool applyUpdates,
const int updateType):
// TRANSLATORS: updater window name
@@ -670,9 +670,9 @@ void UpdaterWindow::unloadManaPlusUpdates(const std::string &dir,
}
void UpdaterWindow::addUpdateFile(const ResourceManager *const resman,
- const std::string &path,
- const std::string &fixPath,
- const std::string &file,
+ const std::string &restrict path,
+ const std::string &restrict fixPath,
+ const std::string &restrict file,
const bool append)
{
const std::string tmpPath = std::string(path).append("/").append(file);
@@ -689,9 +689,9 @@ void UpdaterWindow::addUpdateFile(const ResourceManager *const resman,
}
void UpdaterWindow::removeUpdateFile(const ResourceManager *const resman,
- const std::string &path,
- const std::string &fixPath,
- const std::string &file)
+ const std::string &restrict path,
+ const std::string &restrict fixPath,
+ const std::string &restrict file)
{
resman->removeFromSearchPath(std::string(path).append("/").append(file));
const std::string fixFile = std::string(fixPath).append("/").append(file);
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index 6003cf976..210b01bda 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -81,8 +81,8 @@ class UpdaterWindow final : public Window,
* @param applyUpdates If true, the update window will pass the updates to teh
* resource manager
*/
- UpdaterWindow(const std::string &updateHost,
- const std::string &updatesDir,
+ UpdaterWindow(const std::string &restrict updateHost,
+ const std::string &restrict updatesDir,
const bool applyUpdates, const int updateType);
A_DELETE_COPY(UpdaterWindow)
@@ -133,15 +133,15 @@ class UpdaterWindow final : public Window,
static void unloadUpdates(const std::string &dir);
static void addUpdateFile(const ResourceManager *const resman,
- const std::string &path,
- const std::string &fixPath,
- const std::string &file,
+ const std::string &restrict path,
+ const std::string &restrict fixPath,
+ const std::string &restrict file,
const bool append);
static void removeUpdateFile(const ResourceManager *const resman,
- const std::string &path,
- const std::string &fixPath,
- const std::string &file);
+ const std::string &restrict path,
+ const std::string &restrict fixPath,
+ const std::string &filerestrict );
static void loadManaPlusUpdates(const std::string &dir,
const ResourceManager *const resman);