summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-08-18 11:41:35 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-08-18 11:42:04 +0200
commit9ef8de40e224054718da2af38e0ca65abbf5305d (patch)
tree2d688f6f72af6cd0985fd45d98fe0cba1922d78d /kcontrol
parent1bfa9332c60381fe0f435c85fc636d575474438e (diff)
downloadtdebase-9ef8de40e224054718da2af38e0ca65abbf5305d.tar.gz
tdebase-9ef8de40e224054718da2af38e0ca65abbf5305d.zip
Fix FTBFS with stricter C++11
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 2bcacaf3312aa854cbe81ba4c33a647f2e79287f)
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/tdefontinst/tdefontinst/Main.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/kcontrol/tdefontinst/tdefontinst/Main.cpp b/kcontrol/tdefontinst/tdefontinst/Main.cpp
index 6db9b83c8..1b58d1a2f 100644
--- a/kcontrol/tdefontinst/tdefontinst/Main.cpp
+++ b/kcontrol/tdefontinst/tdefontinst/Main.cpp
@@ -69,22 +69,22 @@ static const char * getFile(const char *entry, const char **posibilities)
static const char * constXConfigFiles[]=
{
- "/etc/X11/"KFI_XORGCFG,
- "/etc/X11/"KFI_XORGCFG"-4",
- "/etc/"KFI_XORGCFG,
- "/usr/X11R6/etc/X11/"KFI_XORGCFG,
- "/usr/X11R6/etc/X11/"KFI_XORGCFG"-4",
- "/usr/X11R6/lib/X11/"KFI_XORGCFG,
- "/usr/X11R6/lib/X11/"KFI_XORGCFG"-4",
-
- "/etc/X11/"KFI_XF86CFG"-4",
- "/etc/X11/"KFI_XF86CFG,
- "/etc/"KFI_XF86CFG"-4",
- "/etc/"KFI_XF86CFG,
- "/usr/X11R6/etc/X11/"KFI_XF86CFG"-4",
- "/usr/X11R6/etc/X11/"KFI_XF86CFG,
- "/usr/X11R6/lib/X11/"KFI_XF86CFG"-4",
- "/usr/X11R6/lib/X11/"KFI_XF86CFG,
+ "/etc/X11/" KFI_XORGCFG,
+ "/etc/X11/" KFI_XORGCFG "-4",
+ "/etc/" KFI_XORGCFG,
+ "/usr/X11R6/etc/X11/" KFI_XORGCFG,
+ "/usr/X11R6/etc/X11/" KFI_XORGCFG "-4",
+ "/usr/X11R6/lib/X11/" KFI_XORGCFG,
+ "/usr/X11R6/lib/X11/" KFI_XORGCFG "-4",
+
+ "/etc/X11/" KFI_XF86CFG "-4",
+ "/etc/X11/" KFI_XF86CFG,
+ "/etc/" KFI_XF86CFG "-4",
+ "/etc/" KFI_XF86CFG,
+ "/usr/X11R6/etc/X11/" KFI_XF86CFG "-4",
+ "/usr/X11R6/etc/X11/" KFI_XF86CFG,
+ "/usr/X11R6/lib/X11/" KFI_XF86CFG "-4",
+ "/usr/X11R6/lib/X11/" KFI_XF86CFG,
NULL
};