ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

utility: Fixed name collision of log macros in clang

Browse Source 
This change removes the local std::string variable in the log macros due to possible name collisions with macro callers
in clang. Responsibility of this change is held by Malte.
This commit is contained in:
Eberhard Graether
2014-07-07 13:43:29 +02:00
parent addd86288f
commit e38914887d
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/qt/view/QtSearchView.cpp
+3 -3
View File
@@ -36,7 +36,7 @@ void QtSearchView::initGui()
m_searchBox = new QtEditBox(widget);
m_searchBox->setPlaceholderText("Please enter your search string.");
m_searchBox->setCallbackOnReturnPressed(std::bind(&QtSearchView::onSeachButtonClick, this));
m_searchBox->setCallbackOnReturnPressed(std::bind(&QtSearchView::onSearchButtonClick, this));
std::vector<std::string> autocompletionList;
autocompletionList.push_back("tralala");
@@ -45,7 +45,7 @@ void QtSearchView::initGui()
m_searchButton = new QtButton(widget);
m_searchButton->setText("Search");
m_searchButton->setCallbackOnClick(std::bind(&QtSearchView::onSeachButtonClick, this));
m_searchButton->setCallbackOnClick(std::bind(&QtSearchView::onSearchButtonClick, this));
widget->layout()->addWidget(m_searchBox);
widget->layout()->addWidget(m_searchButton);
@@ -61,7 +61,7 @@ void QtSearchView::setAutocompletionList(const std::vector<std::string>& autocom
m_setAutocompletionListFunctor(autocompletionList);
}
void QtSearchView::onSeachButtonClick()
void QtSearchView::onSearchButtonClick()
{
SearchController* controller = getController();
if (controller)