From 99776f0242620b78e02bb9f36c905964340f3a77 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Wed, 13 Jan 2016 12:16:17 +0100 Subject: [PATCH] logic: Defaults for C and C++ standard in dropdowns and fixed main to be first active symbol --- src/lib/data/Storage.cpp | 10 +++++++++- src/lib_gui/qt/window/QtProjectSetupScreen.cpp | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/lib/data/Storage.cpp b/src/lib/data/Storage.cpp index 6834acc8..84735816 100644 --- a/src/lib/data/Storage.cpp +++ b/src/lib/data/Storage.cpp @@ -761,7 +761,15 @@ Id Storage::onCommentParsed(const ParseLocation& location) Id Storage::getIdForNodeWithNameHierarchy(const NameHierarchy& nameHierarchy) const { - return m_sqliteStorage.getNodeBySerializedName(NameHierarchy::serialize(nameHierarchy)).id; + // return m_sqliteStorage.getNodeBySerializedName(NameHierarchy::serialize(nameHierarchy)).id; + + const SearchNode* node = m_tokenIndex.getNode(nameHierarchy); + if (node) + { + return node->getFirstTokenId(); + } + + return 0; } Id Storage::getIdForEdge( diff --git a/src/lib_gui/qt/window/QtProjectSetupScreen.cpp b/src/lib_gui/qt/window/QtProjectSetupScreen.cpp index 8bb5148e..968bdd0c 100644 --- a/src/lib_gui/qt/window/QtProjectSetupScreen.cpp +++ b/src/lib_gui/qt/window/QtProjectSetupScreen.cpp @@ -94,6 +94,9 @@ void QtProjectSetupScreen::loadEmpty() { updateTitle("NEW PROJECT"); updateDoneButton("Create"); + + m_cppStandard->setCurrentIndex(5); + m_cStandard->setCurrentIndex(4); } void QtProjectSetupScreen::loadProjectSettings()