diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-06-15 16:43:44 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-06-15 16:46:34 +0200 |
| commit | a541bd310728d99677aa2f9ba89cd448be3d0945 (patch) | |
| tree | da32141ab4c7ab2e596608e9d38d492c228159c5 /common/config_file.c | |
| parent | ecd0b13f8f4d7a17ed31e5e3277a56828210d4e0 (diff) | |
| download | tde-style-qtcurve-a541bd310728d99677aa2f9ba89cd448be3d0945.tar.gz tde-style-qtcurve-a541bd310728d99677aa2f9ba89cd448be3d0945.zip | |
Fix FTBFS with stricter C++11.
This also fixes the inability to translate the description
of file types used in KFileDialog calls.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 0e4dbeb2ed74ecace9cfa664315e89bfead41b34)
Diffstat (limited to 'common/config_file.c')
| -rw-r--r-- | common/config_file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/config_file.c b/common/config_file.c index 91a9108..95e31ef 100644 --- a/common/config_file.c +++ b/common/config_file.c @@ -1608,7 +1608,7 @@ static bool readConfig(const char *file, Options *opts, Options *defOpts) TQString filename(TQFile::decodeName(cfgDir)+CONFIG_FILE); if(!TQFile::exists(filename)) - filename=TQFile::decodeName(cfgDir)+"../"OLD_CONFIG_FILE; + filename=TQFile::decodeName(cfgDir)+"../"+OLD_CONFIG_FILE; return readConfig(filename, opts, defOpts); } } @@ -1631,7 +1631,7 @@ static bool readConfig(const char *file, Options *opts, Options *defOpts) sprintf(filename, "%s"CONFIG_FILE, cfgDir); if(!qtcFileExists(filename)) - sprintf(filename, "%s../"OLD_CONFIG_FILE, cfgDir); + sprintf(filename, "%s../" OLD_CONFIG_FILE, cfgDir); rv=readConfig(filename, opts, defOpts); free(filename); return rv; @@ -2300,7 +2300,7 @@ static bool fileExists(const char *path) static const char * getSystemConfigFile() { - static const char * constFiles[]={ /*"/etc/qt4/"OLD_CONFIG_FILE, "/etc/qt3/"OLD_CONFIG_FILE, "/etc/qt/"OLD_CONFIG_FILE,*/ "/etc/"OLD_CONFIG_FILE, NULL }; + static const char * constFiles[]={ /*"/etc/qt4/" OLD_CONFIG_FILE, "/etc/qt3/" OLD_CONFIG_FILE, "/etc/qt/" OLD_CONFIG_FILE,*/ "/etc/" OLD_CONFIG_FILE, NULL }; int i; |