summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2016-08-24 14:00:59 +0200
committerDavid Schulz <david.schulz@qt.io>2016-08-24 12:55:02 +0000
commit525317d5a49866da62df9c4e4216676a873084c7 (patch)
treeb78ccb0a99bc5e6ba3dedcd2e1c9c80450a53146 /src
parent8c80a8626674563cf17add41deaa522417e63d95 (diff)
downloadqt-creator-525317d5a49866da62df9c4e4216676a873084c7.tar.gz
Clang: Fix compile warnings
Change-Id: Ie8f3f2a8c08855b555d59dbf4ac6ac8b18fe70f6 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp2
-rw-r--r--src/tools/clangbackend/ipcsource/projectpart.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp
index 58f59218fb..77eccac70d 100644
--- a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp
+++ b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp
@@ -302,7 +302,7 @@ QString CompletionChunksToTextConverter::inDesiredTextFormat(const Utf8String &t
bool CompletionChunksToTextConverter::emphasizeCurrentPlaceHolder() const
{
if (m_addPlaceHolderPositions) {
- const uint currentPlaceHolderPosition = m_placeholderPositions.size() + 1;
+ const uint currentPlaceHolderPosition = uint(m_placeholderPositions.size() + 1);
return uint(m_placeHolderPositionToEmphasize) == currentPlaceHolderPosition;
}
diff --git a/src/tools/clangbackend/ipcsource/projectpart.cpp b/src/tools/clangbackend/ipcsource/projectpart.cpp
index 2fbd9ddc03..dc08514f31 100644
--- a/src/tools/clangbackend/ipcsource/projectpart.cpp
+++ b/src/tools/clangbackend/ipcsource/projectpart.cpp
@@ -135,7 +135,7 @@ const std::vector<const char*> &ProjectPart::arguments() const
int ProjectPart::argumentCount() const
{
- return d->arguments.size();
+ return int(d->arguments.size());
}
const char * const *ProjectPart::cxArguments() const