diff --git a/script/setup.sh b/script/setup.sh index 4c012a8c..e0c1a349 100755 --- a/script/setup.sh +++ b/script/setup.sh @@ -48,27 +48,27 @@ if [ $PLATFORM == "Windows" ]; then { mkdir -p build/win$1/$2/$3/platforms mkdir -p build/win$1/$2/$3/imageformats - + local QT_DIR=${QT_WIN32_DIR} - + if [[ "$1" == "64" ]] then QT_DIR=${QT_WIN64_DIR} fi - + local SUFFIX="" if [[ "$2" == "Debug" ]] then SUFFIX="d" fi - + echo -e $INFO "copy dynamic libraries for Win$1 $2 $3" - + if [[ "$3" == "app" ]] then cp -u -r setup/dynamic_libraries/win$1/$3/$2/* build/win$1/$2/$3 fi - + cp -u -r ${QT_DIR}/bin/Qt5Core$SUFFIX.dll build/win$1/$2/$3 cp -u -r ${QT_DIR}/bin/Qt5Gui$SUFFIX.dll build/win$1/$2/$3 cp -u -r ${QT_DIR}/bin/Qt5Network$SUFFIX.dll build/win$1/$2/$3 @@ -85,7 +85,7 @@ if [ $PLATFORM == "Windows" ]; then cp -u -r ${QT_DIR}/plugins/imageformats/qwbmp$SUFFIX.dll build/win$1/$2/$3/imageformats cp -u -r ${QT_DIR}/plugins/imageformats/qwebp$SUFFIX.dll build/win$1/$2/$3/imageformats } - + copy_dynamic_libraries "32" "Debug" "app" copy_dynamic_libraries "32" "Debug" "test" copy_dynamic_libraries "32" "Release" "app" @@ -115,7 +115,7 @@ if [ $PLATFORM == "Windows" ]; then cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win32\Debug\app\user '$BACKSLASHED_ROOT_DIR'\bin\app\user' & cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win32\Release\app\data '$BACKSLASHED_ROOT_DIR'\bin\app\data' & cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win32\Release\app\user '$BACKSLASHED_ROOT_DIR'\bin\app\user' & - + cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win64\Debug\app\data '$BACKSLASHED_ROOT_DIR'\bin\app\data' & cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win64\Debug\app\user '$BACKSLASHED_ROOT_DIR'\bin\app\user' & cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\build\win64\Release\app\data '$BACKSLASHED_ROOT_DIR'\bin\app\data' & @@ -130,14 +130,16 @@ if [ $PLATFORM == "Linux" ] || [ $PLATFORM == "MacOS" ]; then echo -e $INFO "run cmake with Debug configuration" cd build/Debug && cmake -G Ninja -DCMAKE_BUILD_TYPE="Debug" ../.. + cd .. + echo -e $INFO "run cmake with Release configuration" - cd ../Release && cmake -G Ninja -DCMAKE_BUILD_TYPE="Release" ../.. + cd build/Release && cmake -G Ninja -DCMAKE_BUILD_TYPE="Release" ../.. else echo -e $INFO "run cmake with 32 bit configuration" - + cd build/win32 cmake -G "Visual Studio 14 2015" ../.. - + cd ../win64 cmake -G "Visual Studio 14 2015 Win64" ../.. fi diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp index c74cec0c..01a2d7ae 100644 --- a/src/lib/component/controller/GraphController.cpp +++ b/src/lib/component/controller/GraphController.cpp @@ -631,7 +631,7 @@ std::vector> GraphController::createDummyNodeTopDown( } node->forEachChildNode( - [node, &result, &ancestorId, this](Node* child) + [&result, &ancestorId, this](Node* child) { DummyNode* parent = nullptr; AccessKind accessKind = ACCESS_NONE; diff --git a/src/lib/data/fulltextsearch/SuffixArray.cpp b/src/lib/data/fulltextsearch/SuffixArray.cpp index a16924ab..33786ece 100644 --- a/src/lib/data/fulltextsearch/SuffixArray.cpp +++ b/src/lib/data/fulltextsearch/SuffixArray.cpp @@ -80,8 +80,9 @@ std::vector SuffixArray::searchForTerm(const std::wstring& searchTerm) cons std::transform(term.begin(), term.end(), term.begin(), ::tolower); int termLength = term.length(); + int textLength = m_text.length(); int l = -1; - int r = m_text.length(); + int r = textLength; int m; std::vector matches; @@ -105,7 +106,7 @@ std::vector SuffixArray::searchForTerm(const std::wstring& searchTerm) cons { matches.push_back(m_array[lower]); } - for (int higher = m+1; higher < m_text.length() && m_lcp[higher-1] >= termLength; higher++) + for (int higher = m+1; higher < textLength && m_lcp[higher-1] >= termLength; higher++) { matches.push_back(m_array[higher]); } diff --git a/src/lib_gui/qt/network/QtUpdateChecker.cpp b/src/lib_gui/qt/network/QtUpdateChecker.cpp index dc9c56ee..85f7a8a9 100644 --- a/src/lib_gui/qt/network/QtUpdateChecker.cpp +++ b/src/lib_gui/qt/network/QtUpdateChecker.cpp @@ -175,7 +175,7 @@ void QtUpdateChecker::check(bool force, std::function callback) void QtUpdateChecker::checkUpdate() { m_onQtThread( - [this]() + []() { check(false, [](Result){}); } diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.cpp index bd1180be..3b963e35 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.cpp @@ -74,6 +74,8 @@ bool QtGraphNodeQualifier::setPosition(const Vec2i& pos) void QtGraphNodeQualifier::onClick() { + hide(); + MessageActivateNodes msg; msg.addNode(0, m_qualifierName); msg.dispatch(); diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp index 4d754db9..c5724b10 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp @@ -647,7 +647,7 @@ void QtProjectWizzard::newSourceGroup() } QtProjectWizzardWindow* window = createWindowWithContent( - [this](QtProjectWizzardWindow* window) + [](QtProjectWizzardWindow* window) { window->setPreferredSize(QSize(570, 380)); return new QtProjectWizzardContentSelect(window);