TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix FTBFS with stricter C++11

Browse Source 
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/2/head
Slávek Banko 6 years ago
parent 42974b5ab6
commit 2bcacaf331
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

32
kcontrol/tdefontinst/tdefontinst/Main.cpp
Unescape View File

@ -69,22 +69,22 @@ static const char * getFile(const char *entry, const char **posibilities)
static const char * constXConfigFiles[]= static const char * constXConfigFiles[]=
{ {
"/etc/X11/"KFI_XORGCFG, "/etc/X11/" KFI_XORGCFG,
"/etc/X11/"KFI_XORGCFG"-4", "/etc/X11/" KFI_XORGCFG "-4",
"/etc/"KFI_XORGCFG, "/etc/" KFI_XORGCFG,
"/usr/X11R6/etc/X11/"KFI_XORGCFG, "/usr/X11R6/etc/X11/" KFI_XORGCFG,
"/usr/X11R6/etc/X11/"KFI_XORGCFG"-4", "/usr/X11R6/etc/X11/" KFI_XORGCFG "-4",
"/usr/X11R6/lib/X11/"KFI_XORGCFG, "/usr/X11R6/lib/X11/" KFI_XORGCFG,
"/usr/X11R6/lib/X11/"KFI_XORGCFG"-4", "/usr/X11R6/lib/X11/" KFI_XORGCFG "-4",
"/etc/X11/"KFI_XF86CFG"-4", "/etc/X11/" KFI_XF86CFG "-4",
"/etc/X11/"KFI_XF86CFG, "/etc/X11/" KFI_XF86CFG,
"/etc/"KFI_XF86CFG"-4", "/etc/" KFI_XF86CFG "-4",
"/etc/"KFI_XF86CFG, "/etc/" KFI_XF86CFG,
"/usr/X11R6/etc/X11/"KFI_XF86CFG"-4", "/usr/X11R6/etc/X11/" KFI_XF86CFG "-4",
"/usr/X11R6/etc/X11/"KFI_XF86CFG, "/usr/X11R6/etc/X11/" KFI_XF86CFG,
"/usr/X11R6/lib/X11/"KFI_XF86CFG"-4", "/usr/X11R6/lib/X11/" KFI_XF86CFG "-4",
"/usr/X11R6/lib/X11/"KFI_XF86CFG, "/usr/X11R6/lib/X11/" KFI_XF86CFG,
NULL NULL
}; };

8
tdeioslave/man/man2html.cpp
Unescape View File

@ -656,7 +656,7 @@ static void fill_old_character_definitions( void )
for (size_t i = 0; i < sizeof(standardchar)/sizeof(CSTRDEF); i++) for (size_t i = 0; i < sizeof(standardchar)/sizeof(CSTRDEF); i++)
{ {
const int nr = standardchar[i].nr; const int nr = standardchar[i].nr;
const char temp[3] = { nr / 256, nr % 256, 0 }; const char temp[3] = { (char)(nr / 256), (char)(nr % 256), 0 };
TQCString name( temp ); TQCString name( temp );
s_characterDefinitionMap.insert( name, StringDefinition( standardchar[i].slen, standardchar[i].st ) ); s_characterDefinitionMap.insert( name, StringDefinition( standardchar[i].slen, standardchar[i].st ) );
} }
@ -3713,7 +3713,7 @@ static char *scan_request(char *c)
} }
case REQ_Fo: // mdoc(7) "Function definition Opening" case REQ_Fo: // mdoc(7) "Function definition Opening"
{ {
char* font[2] = { "B", "R" }; const char* font[2] = { "B", "R" };
c+=j; c+=j;
if (*c=='\n') c++; if (*c=='\n') c++;
char *eol=strchr(c,'\n'); char *eol=strchr(c,'\n');
@ -3748,7 +3748,7 @@ static char *scan_request(char *c)
// .Fc has no parameter // .Fc has no parameter
c+=j; c+=j;
c=skip_till_newline(c); c=skip_till_newline(c);
char* font[2] = { "B", "R" }; const char* font[2] = { "B", "R" };
out_html(set_font(font[i&1])); out_html(set_font(font[i&1]));
out_html(")"); out_html(")");
out_html(set_font("R")); out_html(set_font("R"));
@ -3764,7 +3764,7 @@ static char *scan_request(char *c)
} }
case REQ_Fa: // mdoc(7) "Function definition argument" case REQ_Fa: // mdoc(7) "Function definition argument"
{ {
char* font[2] = { "B", "R" }; const char* font[2] = { "B", "R" };
c+=j; c+=j;
if (*c=='\n') c++; if (*c=='\n') c++;
sl=fill_words(c, wordlist, &words, true, &c); sl=fill_words(c, wordlist, &words, true, &c);

2
tdeioslave/media/mediamanager/halbackend.cpp
Unescape View File

@ -1670,7 +1670,7 @@ TQString HALBackend::unmount(const TQString &_udi)
if (dbus_error_is_set(&error)) if (dbus_error_is_set(&error))
{ {
dbus_error_free(&error); dbus_error_free(&error);
return false; return TQString();
} }
if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi.latin1(), if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi.latin1(),

Write Preview
Loading…
Cancel
Save