From 94e429b04cbd45b86e0584d046f6ba330b99b4c9 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Fri, 27 Mar 2015 11:21:46 +0100
Subject: [PATCH] Fix GUI compilation error with unnamed namespace at some
compilers.
---
CMakeLists.txt | 2 +-
.../extensions/threelevelsitempicker.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d826505717a..27ac0c547d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(BornAgain)
# --- The version number ---
set(BornAgain_VERSION_MAJOR 1)
set(BornAgain_VERSION_MINOR 0)
-set(BornAgain_VERSION_PATCH 0)
+set(BornAgain_VERSION_PATCH 1)
# --- General project settings ---
option(BORNAGAIN_PYTHON "Build with python support" ON)
diff --git a/GUI/externals/qt-manhattan-style/extensions/threelevelsitempicker.cpp b/GUI/externals/qt-manhattan-style/extensions/threelevelsitempicker.cpp
index 3144b042061..ca0b4403f22 100644
--- a/GUI/externals/qt-manhattan-style/extensions/threelevelsitempicker.cpp
+++ b/GUI/externals/qt-manhattan-style/extensions/threelevelsitempicker.cpp
@@ -168,7 +168,7 @@ QString ThreeLevelsItemPicker::level3() const
return item ? item->text() : QString();
}
-namespace
+namespace helper_namespace
{
QListWidgetItem* find(const ListWidget* list, const QString& name)
@@ -187,21 +187,21 @@ QListWidgetItem* find(const ListWidget* list, const QString& name)
void ThreeLevelsItemPicker::setLevel1Item(const QString& name)
{
- QListWidgetItem* item = ::find(m_level1Items, name);
+ QListWidgetItem* item = helper_namespace::find(m_level1Items, name);
if (item)
m_level1Items->setCurrentItem(item);
}
void ThreeLevelsItemPicker::setLevel2Item(const QString& name)
{
- QListWidgetItem* item = ::find(m_level2Items, name);
+ QListWidgetItem* item = helper_namespace::find(m_level2Items, name);
if (item)
m_level2Items->setCurrentItem(item);
}
void ThreeLevelsItemPicker::setLevel3Item(const QString& name)
{
- QListWidgetItem* item = ::find(m_level3Items, name);
+ QListWidgetItem* item = helper_namespace::find(m_level3Items, name);
if (item)
m_level3Items->setCurrentItem(item);
}
--
GitLab