1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
diff --git a/kcontrol/tdefontinst/tdefontinst/Main.cpp b/kcontrol/tdefontinst/tdefontinst/Main.cpp
index 6db9b83c..1b58d1a2 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
};
diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index eee3ac80..8dd23dc6 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -656,7 +656,7 @@ static void fill_old_character_definitions( void )
for (size_t i = 0; i < sizeof(standardchar)/sizeof(CSTRDEF); i++)
{
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 );
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"
{
- char* font[2] = { "B", "R" };
+ const char* font[2] = { "B", "R" };
c+=j;
if (*c=='\n') c++;
char *eol=strchr(c,'\n');
@@ -3748,7 +3748,7 @@ static char *scan_request(char *c)
// .Fc has no parameter
c+=j;
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(")");
out_html(set_font("R"));
@@ -3764,7 +3764,7 @@ static char *scan_request(char *c)
}
case REQ_Fa: // mdoc(7) "Function definition argument"
{
- char* font[2] = { "B", "R" };
+ const char* font[2] = { "B", "R" };
c+=j;
if (*c=='\n') c++;
sl=fill_words(c, wordlist, &words, true, &c);
diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp
index 80d44339..637b16bf 100644
--- a/tdeioslave/media/mediamanager/halbackend.cpp
+++ b/tdeioslave/media/mediamanager/halbackend.cpp
@@ -1670,7 +1670,7 @@ TQString HALBackend::unmount(const TQString &_udi)
if (dbus_error_is_set(&error))
{
dbus_error_free(&error);
- return false;
+ return TQString();
}
if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi.latin1(),
|
