From 17c0189a8345a8b88e7ddb95c291bab56ec4aa10 Mon Sep 17 00:00:00 2001 From: Andreas Stallinger Date: Mon, 10 Apr 2017 15:51:26 +0200 Subject: [PATCH] build: get rid of some compiler warnings --- src/lib/data/SqliteStorage.cpp | 6 +++--- src/lib/data/indexer/IndexerCommandList.cpp | 2 +- src/lib/data/indexer/IndexerCommandList.h | 2 +- src/lib/settings/SourceGroupSettings.cpp | 4 ++-- src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp | 6 ++---- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/lib/data/SqliteStorage.cpp b/src/lib/data/SqliteStorage.cpp index cfae03a3..5f755eeb 100644 --- a/src/lib/data/SqliteStorage.cpp +++ b/src/lib/data/SqliteStorage.cpp @@ -766,7 +766,7 @@ bool SqliteStorage::checkNodeExistsByName(const std::string& serializedName) con { const Id id = q.getIntField(0, 0); - if (id != -1) + if (id != (Id)-1) { return true; } @@ -1003,7 +1003,7 @@ void SqliteStorage::editNodeBookmark(const NodeBookmark& bookmark) std::string statement = "UPDATE nodeBookmark SET name=?, comment=?, category=? WHERE id=" + std::to_string(bookmark.getId()) + ";"; BookmarkCategory category = getBookmarkCategoryByName(bookmark.getCategory().getName()); - if (category.getId() == -1) + if (category.getId() == (Id)-1) { category.setId(addBookmarkCategory(bookmark.getCategory().getName())); category.setName(bookmark.getCategory().getName()); @@ -1095,7 +1095,7 @@ void SqliteStorage::editEdgeBookmark(const EdgeBookmark& bookmark) std::string statement = "UPDATE edgeBookmark SET name=?, comment=?, category=? WHERE id=" + std::to_string(bookmark.getId()) + ";"; BookmarkCategory category = getBookmarkCategoryByName(bookmark.getCategory().getName()); - if (category.getId() == -1) + if (category.getId() == (Id)-1) { category.setId(addBookmarkCategory(bookmark.getCategory().getName())); category.setName(bookmark.getCategory().getName()); diff --git a/src/lib/data/indexer/IndexerCommandList.cpp b/src/lib/data/indexer/IndexerCommandList.cpp index d184efe3..74f35c23 100644 --- a/src/lib/data/indexer/IndexerCommandList.cpp +++ b/src/lib/data/indexer/IndexerCommandList.cpp @@ -9,7 +9,7 @@ void IndexerCommandList::addCommand(std::shared_ptr command) m_commands.push_back(command); } -int IndexerCommandList::size() const +size_t IndexerCommandList::size() const { return m_commands.size(); } diff --git a/src/lib/data/indexer/IndexerCommandList.h b/src/lib/data/indexer/IndexerCommandList.h index ca242095..91b771e0 100644 --- a/src/lib/data/indexer/IndexerCommandList.h +++ b/src/lib/data/indexer/IndexerCommandList.h @@ -12,7 +12,7 @@ class IndexerCommandList public: void addCommand(std::shared_ptr command); - int size() const; + size_t size() const; void shuffle(); diff --git a/src/lib/settings/SourceGroupSettings.cpp b/src/lib/settings/SourceGroupSettings.cpp index a1dbfe43..acccc39f 100644 --- a/src/lib/settings/SourceGroupSettings.cpp +++ b/src/lib/settings/SourceGroupSettings.cpp @@ -3,9 +3,9 @@ #include "utility/utility.h" SourceGroupSettings::SourceGroupSettings(const std::string& id, SourceGroupType type, const ProjectSettings* projectSettings) - : m_id(id) + : m_projectSettings(projectSettings) + , m_id(id) , m_type(type) - , m_projectSettings(projectSettings) { } diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp index 97cf4ac5..4d433fdd 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp @@ -89,7 +89,6 @@ void QtProjectWizzard::newProject() void QtProjectWizzard::newProjectFromSolution(const std::string& ideId, const FilePath& solutionPath) { - int i = 0; } void QtProjectWizzard::newProjectFromCDB(const FilePath& filePath, const std::vector& headerPaths) @@ -108,7 +107,6 @@ void QtProjectWizzard::newProjectFromCDB(const FilePath& filePath, const std::ve void QtProjectWizzard::refreshProjectFromSolution(const std::string& ideId, const std::string& solutionPath) { - int i = 0; } void QtProjectWizzard::editProject(const FilePath& settingsPath) @@ -330,7 +328,7 @@ void QtProjectWizzard::emptyProject() void QtProjectWizzard::emptyProjectCDBVS() { - QtProjectWizzardWindow* window = window = createWindowWithContent( + QtProjectWizzardWindow* window = createWindowWithContent( [this](QtProjectWizzardWindow* window) { return new QtProjectWizzardContentDataCDBVS(m_projectSettings, m_sourceGroupSettings, window); @@ -354,7 +352,7 @@ void QtProjectWizzard::emptyProjectCDB() void QtProjectWizzard::emptyProjectJavaMaven() { - QtProjectWizzardWindow* window = window = createWindowWithContent( + QtProjectWizzardWindow* window = createWindowWithContent( [this](QtProjectWizzardWindow* window) { return new QtProjectWizzardContentData(m_projectSettings, m_sourceGroupSettings, window);