aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-12-05 23:29:37 -0800
committerThiago Macieira <thiago.macieira@intel.com>2014-01-10 15:40:22 +0100
commit58a4e601ffa1262841534c547bf8bb7cd075c3dd (patch)
treecbac4603f2d8cab1ad050b2525d2cc91a477f20d /src
parent1ff3a8287d7f830de362d49b4042544c6af3a754 (diff)
Fix change-of-sign warning found by ICC
-1 is not a valid unsigned value. registerhandler.cpp(354): warning #68: integer conversion resulted in a change of sign return createIndex(row, col, TopLevelId); ^ Change-Id: I41935255704f19724d6cec16ea470e2f8f8a16a1 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/android/androiddeploystep.cpp2
-rw-r--r--src/plugins/cpptools/includeutils.cpp2
-rw-r--r--src/plugins/debugger/debuggerprotocol.cpp4
-rw-r--r--src/plugins/debugger/qml/qmllivetextpreview.cpp2
-rw-r--r--src/plugins/debugger/registerhandler.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp
index 957df22b41..8916d46b17 100644
--- a/src/plugins/android/androiddeploystep.cpp
+++ b/src/plugins/android/androiddeploystep.cpp
@@ -284,7 +284,7 @@ unsigned int AndroidDeployStep::remoteModificationTime(const QString &fullDestin
process.waitForFinished(-1);
if (process.error() != QProcess::UnknownError
|| process.exitCode() != 0)
- return -1;
+ return 0;
QByteArray output = process.readAll();
output.replace("\r\n", "\n");
QList<QByteArray> lines = output.split('\n');
diff --git a/src/plugins/cpptools/includeutils.cpp b/src/plugins/cpptools/includeutils.cpp
index 3d697974e7..17bbf5c319 100644
--- a/src/plugins/cpptools/includeutils.cpp
+++ b/src/plugins/cpptools/includeutils.cpp
@@ -423,7 +423,7 @@ int IncludeGroup::lineForNewInclude(const QString &newIncludeFileName,
return -1;
if (isSorted()) {
- const Include newInclude(newIncludeFileName, QString(), -1, newIncludeType);
+ const Include newInclude(newIncludeFileName, QString(), 0, newIncludeType);
const QList<Include>::const_iterator it = std::lower_bound(m_includes.begin(),
m_includes.end(), newInclude, includeFileNamelessThen);
if (it == m_includes.end())
diff --git a/src/plugins/debugger/debuggerprotocol.cpp b/src/plugins/debugger/debuggerprotocol.cpp
index 5e5ab73821..086e47fae5 100644
--- a/src/plugins/debugger/debuggerprotocol.cpp
+++ b/src/plugins/debugger/debuggerprotocol.cpp
@@ -50,7 +50,7 @@ uchar fromhex(uchar c)
return 10 + c - 'a';
if (c >= 'A' && c <= 'Z')
return 10 + c - 'A';
- return -1;
+ return UCHAR_MAX;
}
void skipCommas(const char *&from, const char *to)
@@ -141,7 +141,7 @@ QByteArray GdbMi::parseCString(const char *&from, const char *to)
uchar prod = 0;
while (true) {
uchar val = fromhex(c);
- if (val == uchar(-1))
+ if (val == UCHAR_MAX)
break;
prod = prod * 16 + val;
if (++chars == 3 || src == end)
diff --git a/src/plugins/debugger/qml/qmllivetextpreview.cpp b/src/plugins/debugger/qml/qmllivetextpreview.cpp
index f01a04738c..4379aca42b 100644
--- a/src/plugins/debugger/qml/qmllivetextpreview.cpp
+++ b/src/plugins/debugger/qml/qmllivetextpreview.cpp
@@ -642,7 +642,7 @@ void QmlLiveTextPreview::editorContentsChanged()
void QmlLiveTextPreview::onAutomaticUpdateFailed()
{
- showSyncWarning(AutomaticUpdateFailed, QString(), -1, -1);
+ showSyncWarning(AutomaticUpdateFailed, QString(), UINT_MAX, UINT_MAX);
}
QList<int> QmlLiveTextPreview::objectReferencesForOffset(quint32 offset)
diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp
index 71904f1ac4..4b068a9cad 100644
--- a/src/plugins/debugger/registerhandler.cpp
+++ b/src/plugins/debugger/registerhandler.cpp
@@ -293,7 +293,7 @@ static int bitWidthFromType(int type, int subType)
return 0;
}
-static const int TopLevelId = -1;
+static const uint TopLevelId = UINT_MAX;
static bool isTopLevelItem(const QModelIndex &index)
{
return quintptr(index.internalId()) == quintptr(TopLevelId);