diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-11-08 22:01:05 -0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-11-08 16:33:34 -0800 |
| commit | 4ddf4f6d83709880a5a421182ae5cc85bf03fcd0 (patch) | |
| tree | 9d3d4d1f265578b7d5d32d73765bb97370e10e92 | |
| parent | 761c3e4718e953a7c018990fccf7709ba8febf07 (diff) | |
| download | subsurface-4ddf4f6d83709880a5a421182ae5cc85bf03fcd0.tar.gz | |
Removed C++11 from the code.
Make Dirk ungrumpy
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | subsurface-core/pluginmanager.h | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 135672321..bbf7eb7e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,14 +54,11 @@ execute_process( message(STATUS "Creating build files for Subsurface ${SSRF_VERSION_STRING}") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11 ") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 ") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11 ") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 ") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") # using Intel C++ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 32f0d8d07..b532b8501 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -245,7 +245,7 @@ MainWindow::MainWindow() : QMainWindow(), if(PluginManager::instance().socialNetworkIntegrationPlugins().count()) { 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); toggle_connection->setText(plugin->socialNetworkName()); toggle_connection->setIcon(QIcon(plugin->socialNetworkIcon())); diff --git a/subsurface-core/pluginmanager.h b/subsurface-core/pluginmanager.h index c4943895c..19e88b8c2 100644 --- a/subsurface-core/pluginmanager.h +++ b/subsurface-core/pluginmanager.h @@ -12,8 +12,8 @@ public: QList<ISocialNetworkIntegration*> socialNetworkIntegrationPlugins() const; private: PluginManager(); - PluginManager(const PluginManager&) = delete; - PluginManager& operator=(const PluginManager&) = delete; + PluginManager(const PluginManager&){}; + PluginManager& operator=(const PluginManager&){}; }; #endif
\ No newline at end of file |