mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed C++11 from the code.

Browse source 
Make Dirk ungrumpy

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-11-08 22:01:05 -02:00 • committed by Dirk Hohndel
parent 761c3e4718
commit 4ddf4f6d83
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -54,14 +54,11 @@ execute_process(
message(STATUS "Creating build files for Subsurface ${SSRF_VERSION_STRING}") message(STATUS "Creating build files for Subsurface ${SSRF_VERSION_STRING}")
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11 ") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11 ") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
# using Intel C++ # using Intel C++
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")

2
desktop-widgets/mainwindow.cpp
View file

@ -245,7 +245,7 @@ MainWindow::MainWindow() : QMainWindow(),
if(PluginManager::instance().socialNetworkIntegrationPlugins().count()) { if(PluginManager::instance().socialNetworkIntegrationPlugins().count()) {
QMenu *connections = new QMenu(tr("Connect to")); QMenu *connections = new QMenu(tr("Connect to"));
for(ISocialNetworkIntegration *plugin : PluginManager::instance().socialNetworkIntegrationPlugins()){ Q_FOREACH(ISocialNetworkIntegration *plugin, PluginManager::instance().socialNetworkIntegrationPlugins()){
QAction *toggle_connection = new QAction(this); QAction *toggle_connection = new QAction(this);
toggle_connection->setText(plugin->socialNetworkName()); toggle_connection->setText(plugin->socialNetworkName());
toggle_connection->setIcon(QIcon(plugin->socialNetworkIcon())); toggle_connection->setIcon(QIcon(plugin->socialNetworkIcon()));

4
subsurface-core/pluginmanager.h
View file

@ -12,8 +12,8 @@ public:
QList<ISocialNetworkIntegration*> socialNetworkIntegrationPlugins() const; QList<ISocialNetworkIntegration*> socialNetworkIntegrationPlugins() const;
private: private:
PluginManager(); PluginManager();
PluginManager(const PluginManager&) = delete; PluginManager(const PluginManager&){};
PluginManager& operator=(const PluginManager&) = delete; PluginManager& operator=(const PluginManager&){};
}; };
#endif #endif