utility: Fixed name collision of log macros in clang
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:
@@ -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)
|
||||
|
||||
@@ -24,7 +24,7 @@ public:
|
||||
virtual void setAutocompletionList(const std::vector<std::string>& autocompletionList);
|
||||
|
||||
private:
|
||||
void onSeachButtonClick();
|
||||
void onSearchButtonClick();
|
||||
|
||||
void doSetText(const std::string& s);
|
||||
void doSetAutocompletionList(const std::vector<std::string>& autocompletionList);
|
||||
|
||||
@@ -9,24 +9,21 @@
|
||||
#define LOG_INFO(str) \
|
||||
do \
|
||||
{ \
|
||||
std::string s((str)); \
|
||||
LogManager::getInstance()->logInfo(s, __FILE__, __FUNCTION__, __LINE__); \
|
||||
LogManager::getInstance()->logInfo(str, __FILE__, __FUNCTION__, __LINE__); \
|
||||
} \
|
||||
while(0) \
|
||||
|
||||
#define LOG_WARNING(str) \
|
||||
do \
|
||||
{ \
|
||||
std::string s((str)); \
|
||||
LogManager::getInstance()->logWarning(s, __FILE__, __FUNCTION__, __LINE__); \
|
||||
LogManager::getInstance()->logWarning(str, __FILE__, __FUNCTION__, __LINE__); \
|
||||
} \
|
||||
while(0) \
|
||||
|
||||
#define LOG_ERROR(str) \
|
||||
do \
|
||||
{ \
|
||||
std::string s((str)); \
|
||||
LogManager::getInstance()->logError(s, __FILE__, __FUNCTION__, __LINE__); \
|
||||
LogManager::getInstance()->logError(str, __FILE__, __FUNCTION__, __LINE__); \
|
||||
} \
|
||||
while(0) \
|
||||
|
||||
|
||||
Reference in New Issue
Block a user