test: Fixed tests and removed test_log.txt

* Deleted PlainFileLogger
* Fixed clang warnings
This commit is contained in:
Eberhard Graether
2018-01-09 15:53:18 +01:00
parent 63590fc92d
commit c479493e02
13 changed files with 20 additions and 633 deletions
+3 -3
View File
@@ -56,7 +56,7 @@ void QtDialogView::hideUnknownProgressDialog()
setParentWindow(nullptr);
}
void QtDialogView::showProgressDialog(const std::string& title, const std::string& message, int progress)
void QtDialogView::showProgressDialog(const std::string& title, const std::string& message, size_t progress)
{
m_onQtThread(
[=]()
@@ -73,8 +73,8 @@ void QtDialogView::showProgressDialog(const std::string& title, const std::strin
else
{
sendStatusMessage = (
window->getTitle() != title ||
window->getMessage() != message ||
window->getTitle() != title ||
window->getMessage() != message ||
window->getProgress() != progress
);
}
+1 -1
View File
@@ -32,7 +32,7 @@ public:
virtual void showUnknownProgressDialog(const std::string& title, const std::string& message) override;
virtual void hideUnknownProgressDialog() override;
virtual void showProgressDialog(const std::string& title, const std::string& message, int progress) override;
virtual void showProgressDialog(const std::string& title, const std::string& message, size_t progress) override;
virtual void hideProgressDialog() override;
virtual void startIndexingDialog(
@@ -429,10 +429,10 @@ QtProjectWizzardContentPathsHeaderSearch::QtProjectWizzardContentPathsHeaderSear
std::shared_ptr<SourceGroupSettings> settings, QtProjectWizzardWindow* window, bool isCDB
)
: QtProjectWizzardContentPaths(settings, window)
, m_showValidationResultFunctor(std::bind(
&QtProjectWizzardContentPathsHeaderSearch::showValidationResult, this, std::placeholders::_1))
, m_showDetectedIncludesResultFunctor(std::bind(
&QtProjectWizzardContentPathsHeaderSearch::showDetectedIncludesResult, this, std::placeholders::_1))
, m_showValidationResultFunctor(std::bind(
&QtProjectWizzardContentPathsHeaderSearch::showValidationResult, this, std::placeholders::_1))
, m_isCdb(isCDB)
{
setTitleString(m_isCdb ? "Additional Include Paths" : "Include Paths");
@@ -707,7 +707,7 @@ void QtProjectWizzardContentPathsHeaderSearch::showDetectedIncludesResult(const
"Detected Include Paths",
(
"<p>The following <b>" + std::to_string(additionalHeaderSearchPaths.size()) + "</b> include paths have been "
"detected and will be added to the include paths that are already defined by this Source Group.<b>"
"detected and will be added to the include paths that are already defined by this Source Group.<b>"
).c_str()
);
@@ -131,6 +131,7 @@ private slots:
private:
void showDetectedIncludesResult(const std::set<FilePath>& detectedHeaderSearchPaths);
void showValidationResult(const std::vector<IncludeDirective>& unresolvedIncludes);
QtThreadedFunctor<std::set<FilePath>> m_showDetectedIncludesResultFunctor;
QtThreadedFunctor<std::vector<IncludeDirective>> m_showValidationResultFunctor;