Mercurial > hg > forks > UniversalIndentGUI
changeset 755:302411a51c00
[fix] Bug ID 3006513: Calling the default constructor out of another constructor is forbidden and does not compile with recent GCC versions. Fixed this by introducing an init function.
git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@1032 59b1889a-e5ac-428c-b0c7-476e01d41282
| author | thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282> |
|---|---|
| date | Mon, 11 Apr 2011 20:27:30 +0000 |
| parents | 4ec2ac09969d |
| children | 5a0ece4b81b4 |
| files | src/UiGuiIniFileParser.cpp src/UiGuiIniFileParser.h |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/UiGuiIniFileParser.cpp Tue Dec 21 23:07:50 2010 +0000 +++ b/src/UiGuiIniFileParser.cpp Mon Apr 11 20:27:30 2011 +0000 @@ -44,9 +44,7 @@ \brief Init and empty all needed lists and strings. */ UiGuiIniFileParser::UiGuiIniFileParser(void) { - _sections.clear(); - _keyValueMap.clear(); - _iniFileName = ""; + init(); } @@ -54,12 +52,19 @@ \brief Directly loads and parses the file with name \a iniFileName. */ UiGuiIniFileParser::UiGuiIniFileParser(const QString &iniFileName) { - UiGuiIniFileParser(); + init(); _iniFileName = iniFileName; parseIniFile(); } +void UiGuiIniFileParser::init() { + _sections.clear(); + _keyValueMap.clear(); + _iniFileName = ""; +} + + UiGuiIniFileParser::~UiGuiIniFileParser(void) { }
--- a/src/UiGuiIniFileParser.h Tue Dec 21 23:07:50 2010 +0000 +++ b/src/UiGuiIniFileParser.h Mon Apr 11 20:27:30 2011 +0000 @@ -38,6 +38,9 @@ QVariant value(const QString &keyName, const QString &defaultValue = ""); QStringList childGroups(); +protected: + void init(); + private: void parseIniFile();