From c54a225467c6e7753dac8bafe6da26b04a8646d5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 13 Jun 2015 23:49:29 +0200
Subject: [PATCH] Revert "Allow space characters in front of comments."
This reverts commit 4902c6679210dee8b5158d05d99b072c2f06a494.
---
components/config/gamesettings.cpp | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp
index c17a5c4f73..c0a3b82d1c 100644
--- a/components/config/gamesettings.cpp
+++ b/components/config/gamesettings.cpp
@@ -180,7 +180,7 @@ bool Config::GameSettings::writeFile(QTextStream &stream)
//
// - If a line in file exists with matching key and first part of value (before ',',
// '\n', etc) also matches, then replace the line with that of mUserSettings.
-// - else remove line (TODO: maybe replace the line with '#' in front instead?)
+// - else remove line (maybe replace the line with '#' in front instead?)
//
// - If there is no corresponding line in file, add at the end
//
@@ -224,10 +224,10 @@ bool Config::GameSettings::writeFileWithComments(QFile &file)
}
QString keyVal;
- for (std::vector<QString>::iterator iter = fileCopy.begin(); iter != fileCopy.end(); ++iter)
+ for (std::vector<QString>::iterator iter = fileCopy.begin(); iter != fileCopy.end(); ++iter)
{
// skip empty or comment lines
- if ((*iter).isEmpty() || (*iter).contains(QRegExp("^\\s*#")))
+ if ((*iter).isEmpty() || (*iter).startsWith("#"))
continue;
// look for a key in the line
@@ -257,14 +257,12 @@ bool Config::GameSettings::writeFileWithComments(QFile &file)
// write the new config file
QString key;
QString value;
- for (std::vector<QString>::iterator iter = fileCopy.begin(); iter != fileCopy.end(); ++iter)
+ for (std::vector<QString>::iterator iter = fileCopy.begin(); iter != fileCopy.end(); ++iter)
{
if ((*iter).isNull())
continue;
- // Below is based on readFile() code, if that changes corresponding change may be
- // required (for example duplicates may be inserted if the rules don't match)
- if ((*iter).isEmpty() || (*iter).contains(QRegExp("^\\s*#")))
+ if ((*iter).isEmpty() || (*iter).startsWith("#"))
stream << *iter << "\n";
if (settingRegex.indexIn(*iter) == -1 || settingRegex.captureCount() < 2)