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
|
Author: Pino Toscano <pino@kde.org>
Description: remove extra bool parameter for KConfigGroup::deleteEntry()
unneeded, and it does not match any of the actual signatures of the
function
Bug-Debian: https://bugs.debian.org/811679
Applied-Upstream: commit:1452683
--- a/src/kvpncconfig.cpp
+++ b/src/kvpncconfig.cpp
@@ -4305,7 +4305,7 @@
appPointer->processEvents();
if (useKwallet && KWallet::Wallet::isEnabled())
- configgroup.deleteEntry("First use of Kwallet", false);
+ configgroup.deleteEntry("First use of Kwallet");
/* = user data = */
Author: Pino Toscano <pino@kde.org>
Description: do not return bool for QString
GCC 6 cannot convert them
Bug-Debian: https://bugs.debian.org/811679
Applied-Upstream: commit:1452682
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -914,7 +914,7 @@
NameAndPidOfProgramListenProcess->start(proc, args);
if (!NameAndPidOfProgramListenProcess->waitForStarted()) {
kError() << "netstat fails!" << endl;
- return false;
+ return "";
} else {
NameAndPidOfProgramListenProcess->waitForFinished();
@@ -946,7 +946,7 @@
GetEmailAddressOfCertProcess->start(proc, args);
if (!GetEmailAddressOfCertProcess->waitForStarted()) {
kError() << "GetEmailAddressOfCertProcess" << endl;
- return false;
+ return "";
} else {
GetEmailAddressOfCertProcess->waitForFinished();
disconnect(GetEmailAddressOfCertProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(readOutGetEmailAddressOfCert()));
@@ -1159,7 +1159,7 @@
GetHostnameProcess->start(proc, args);
if (!GetHostnameProcess->waitForStarted()) {
kError() << "Unable to start getHostname process!" << endl;
- return false;
+ return "";
} else {
GetHostnameProcess->waitForFinished();
return Hostname;
|
GitWeb
