From d527991b4610dd5b8f8f6cc111ac2ab843fbae48 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Mon, 13 Feb 2017 20:55:37 +0100 Subject: [PATCH] src: Reviewed old files touched by bookmarks commit * Removed some unused changes * Disabled "No IDE connected" message in status bar * Use threaded functor in status bar view --- cmake/publicKey.cmake | 3 +++ src/lib/data/IntermediateStorage.cpp | 7 ----- src/lib/data/IntermediateStorage.h | 2 -- src/lib/data/Storage.h | 1 - src/lib_gui/qt/element/QtStatusBar.cpp | 2 +- src/lib_gui/qt/view/QtStatusBarView.cpp | 34 +++++++++++++------------ src/lib_gui/qt/view/QtStatusBarView.h | 6 +---- 7 files changed, 23 insertions(+), 32 deletions(-) diff --git a/cmake/publicKey.cmake b/cmake/publicKey.cmake index b948d0d6..c5206b01 100644 --- a/cmake/publicKey.cmake +++ b/cmake/publicKey.cmake @@ -4,9 +4,12 @@ string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GIT_VERSION_NUMBER}") message(STATUS "Get Public Key for Coati version: ${VERSION_MAJOR}") +# message(STATUS "${CMAKE_SOURCE_DIR}/setup/RSA_keys/public-${VERSION_MAJOR}.pem") message(STATUS "${CMAKE_SOURCE_DIR}/setup/RSA_keys/public-0.pem") # explain in Readme.md how to get this to work first +# set(pubKeyFile "${CMAKE_SOURCE_DIR}/setup/RSA_keys/public-${VERSION_MAJOR}.pem") set(pubKeyFile "${CMAKE_SOURCE_DIR}/setup/RSA_keys/public-0.pem") # explain in Readme.md how to get this to work first + # message(STATUS "file: ${pubKeyFile}") if(EXISTS ${pubKeyFile}) diff --git a/src/lib/data/IntermediateStorage.cpp b/src/lib/data/IntermediateStorage.cpp index 07cfe2c4..b57e6738 100644 --- a/src/lib/data/IntermediateStorage.cpp +++ b/src/lib/data/IntermediateStorage.cpp @@ -167,13 +167,6 @@ void IntermediateStorage::addError(const std::string& message, const FilePath& f )); } -Id IntermediateStorage::addBookmark(const Bookmark& bookmark) -{ - m_bookmarks.push_back(bookmark); - - return -1; -} - void IntermediateStorage::forEachNode(std::function callback) const { for (std::map>::const_iterator it = m_nodeIdsToData.begin(); it != m_nodeIdsToData.end(); it++) diff --git a/src/lib/data/IntermediateStorage.h b/src/lib/data/IntermediateStorage.h index 25935de5..8f3db55d 100644 --- a/src/lib/data/IntermediateStorage.h +++ b/src/lib/data/IntermediateStorage.h @@ -27,7 +27,6 @@ public: virtual void addComponentAccess(Id nodeId , int type); virtual void addCommentLocation(Id fileNodeId, uint startLine, uint startCol, uint endLine, uint endCol); virtual void addError(const std::string& message, const FilePath& filePath, uint startLine, uint startCol, bool fatal, bool indexed); - virtual Id addBookmark(const Bookmark& bookmark); virtual void forEachNode(std::function callback) const; virtual void forEachFile(std::function callback) const; @@ -66,7 +65,6 @@ private: std::vector m_componentAccesses; std::vector m_commentLocations; std::vector m_errors; - std::vector m_bookmarks; Id m_nextId; }; diff --git a/src/lib/data/Storage.h b/src/lib/data/Storage.h index 475f3e07..517ecad6 100644 --- a/src/lib/data/Storage.h +++ b/src/lib/data/Storage.h @@ -5,7 +5,6 @@ #include #include -#include "data/bookmark/Bookmark.h" #include "data/name/NameHierarchy.h" #include "data/StorageTypes.h" #include "utility/types.h" diff --git a/src/lib_gui/qt/element/QtStatusBar.cpp b/src/lib_gui/qt/element/QtStatusBar.cpp index 2599dd69..6d799c87 100644 --- a/src/lib_gui/qt/element/QtStatusBar.cpp +++ b/src/lib_gui/qt/element/QtStatusBar.cpp @@ -44,7 +44,7 @@ QtStatusBar::QtStatusBar() connect(&m_errorButton, SIGNAL(clicked()), this, SLOT(showErrors())); - m_ideStatusText.setText("No IDE connected"); + // m_ideStatusText.setText("No IDE connected"); // don't display this until all plugins support ping addWidget(&m_ideStatusText); } diff --git a/src/lib_gui/qt/view/QtStatusBarView.cpp b/src/lib_gui/qt/view/QtStatusBarView.cpp index fb7d21f0..f90ca59c 100644 --- a/src/lib_gui/qt/view/QtStatusBarView.cpp +++ b/src/lib_gui/qt/view/QtStatusBarView.cpp @@ -7,9 +7,6 @@ QtStatusBarView::QtStatusBarView(ViewLayout* viewLayout) : StatusBarView(viewLayout) - , m_showMessageFunctor(std::bind( - &QtStatusBarView::doShowMessage, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)) - , m_setErrorCountFunctor(std::bind(&QtStatusBarView::doSetErrorCount, this, std::placeholders::_1)) { m_widget = std::make_shared(); m_widget->show(); @@ -37,25 +34,30 @@ void QtStatusBarView::refreshView() void QtStatusBarView::showMessage(const std::string& message, bool isError, bool showLoader) { - m_showMessageFunctor(message, isError, showLoader); + m_onQtThread( + [=]() + { + m_widget->setText(message, isError, showLoader); + } + ); } void QtStatusBarView::setErrorCount(ErrorCountInfo errorCount) { - m_setErrorCountFunctor(errorCount); + m_onQtThread( + [=]() + { + m_widget->setErrorCount(errorCount); + } + ); } void QtStatusBarView::showIdeStatus(const std::string& message) { - m_widget->setIdeStatus(message); -} - -void QtStatusBarView::doShowMessage(const std::string& message, bool isError, bool showLoader) -{ - m_widget->setText(message, isError, showLoader); -} - -void QtStatusBarView::doSetErrorCount(ErrorCountInfo errorCount) -{ - m_widget->setErrorCount(errorCount); + m_onQtThread( + [=]() + { + m_widget->setIdeStatus(message); + } + ); } diff --git a/src/lib_gui/qt/view/QtStatusBarView.h b/src/lib_gui/qt/view/QtStatusBarView.h index 3a99b592..e146b762 100644 --- a/src/lib_gui/qt/view/QtStatusBarView.h +++ b/src/lib_gui/qt/view/QtStatusBarView.h @@ -28,11 +28,7 @@ public: virtual void showIdeStatus(const std::string& message); private: - void doShowMessage(const std::string& message, bool isError, bool showLoader); - void doSetErrorCount(ErrorCountInfo errorCount); - - QtThreadedFunctor m_showMessageFunctor; - QtThreadedFunctor m_setErrorCountFunctor; + QtThreadedLambdaFunctor m_onQtThread; std::shared_ptr m_widget; };