From d041a79a181497a580e9eaefab0d92d1bae0c923 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@theqtcompany.com>
Date: Tue, 1 Sep 2015 12:00:21 +0200
Subject: [PATCH] Clang: Fix some warnings
Change-Id: I73c432e5fe834ce199204c49b1e0afe43ae605ac
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
---
src/tools/clangbackend/ipcsource/translationunit.cpp | 2 +-
src/tools/clangbackend/ipcsource/translationunit.h | 2 +-
src/tools/clangbackend/ipcsource/unsavedfiles.cpp | 4 ++--
src/tools/clangbackend/ipcsource/unsavedfiles.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/tools/clangbackend/ipcsource/translationunit.cpp b/src/tools/clangbackend/ipcsource/translationunit.cpp
index da99082c18c..be837e60fe7 100644
--- a/src/tools/clangbackend/ipcsource/translationunit.cpp
+++ b/src/tools/clangbackend/ipcsource/translationunit.cpp
@@ -324,7 +324,7 @@ void TranslationUnit::updateIncludeFilePaths() const
d->translationUnits.addWatchedFiles(d->dependedFilePaths);
}
-int TranslationUnit::defaultOptions()
+uint TranslationUnit::defaultOptions()
{
return CXTranslationUnit_CacheCompletionResults
| CXTranslationUnit_PrecompiledPreamble
diff --git a/src/tools/clangbackend/ipcsource/translationunit.h b/src/tools/clangbackend/ipcsource/translationunit.h
index 6f19ba9ebd9..1717988e2fc 100644
--- a/src/tools/clangbackend/ipcsource/translationunit.h
+++ b/src/tools/clangbackend/ipcsource/translationunit.h
@@ -116,7 +116,7 @@ private:
void reparseTranslationUnit() const;
void reparseTranslationUnitIfFilesAreChanged() const;
void updateIncludeFilePaths() const;
- static int defaultOptions();
+ static uint defaultOptions();
static void includeCallback(CXFile included_file,
CXSourceLocation * /*inclusion_stack*/,
unsigned /*include_len*/,
diff --git a/src/tools/clangbackend/ipcsource/unsavedfiles.cpp b/src/tools/clangbackend/ipcsource/unsavedfiles.cpp
index 9e9a522d52a..40e4925fe12 100644
--- a/src/tools/clangbackend/ipcsource/unsavedfiles.cpp
+++ b/src/tools/clangbackend/ipcsource/unsavedfiles.cpp
@@ -106,9 +106,9 @@ void UnsavedFiles::clear()
updateLastChangeTimePoint();
}
-int UnsavedFiles::count() const
+uint UnsavedFiles::count() const
{
- return d->cxUnsavedFiles.size();
+ return uint(d->cxUnsavedFiles.size());
}
CXUnsavedFile *UnsavedFiles::cxUnsavedFiles() const
diff --git a/src/tools/clangbackend/ipcsource/unsavedfiles.h b/src/tools/clangbackend/ipcsource/unsavedfiles.h
index 9104bc87b33..5df4920b333 100644
--- a/src/tools/clangbackend/ipcsource/unsavedfiles.h
+++ b/src/tools/clangbackend/ipcsource/unsavedfiles.h
@@ -64,7 +64,7 @@ public:
void remove(const QVector<FileContainer> &fileContainers);
void clear();
- int count() const;
+ uint count() const;
CXUnsavedFile *cxUnsavedFiles() const;
const std::vector<CXUnsavedFile> &cxUnsavedFileVector() const;
--
GitLab