From 7c8070afec0275d58e7e64d62890d44933971071 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 16 Jul 2012 15:58:36 +0200
Subject: [PATCH] Fix warnings about id being construct from 0 or empty string.
Change-Id: I7776b9035a2decc5e840e0d534d05b42c821e9f9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/debugger/debuggerdialogs.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 22d766ac387..8ac8debb4ac 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -914,7 +914,7 @@ bool operator!=(const StartRemoteParameters &p1, const StartRemoteParameters &p2
}
StartRemoteParameters::StartRemoteParameters() :
- useServerStartScript(false), profileId(0)
+ useServerStartScript(false)
{
}
@@ -945,7 +945,12 @@ void StartRemoteParameters::fromSettings(const QSettings *settings)
{
remoteChannel = settings->value(_("LastRemoteChannel")).toString();
localExecutable = settings->value(_("LastLocalExecutable")).toString();
- profileId = Core::Id(settings->value(_("LastProfileId")).toString());
+ const QString profileIdString = settings->value(_("LastProfileId")).toString();
+ if (profileIdString.isEmpty()) {
+ profileId = Core::Id();
+ } else {
+ profileId = Core::Id(profileIdString);
+ }
remoteArchitecture = settings->value(_("LastRemoteArchitecture")).toString();
serverStartScript = settings->value(_("LastServerStartScript")).toString();
useServerStartScript = settings->value(_("LastUseServerStartScript")).toBool();
--
GitLab