From 9235839cc3921ff2af84157228c92badcf435bfe Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Tue, 27 Jun 2017 10:38:09 -0600 Subject: [PATCH] Address comments. Silence warning. --- CMakeLists.txt | 2 +- browse_lineedit.cpp | 6 +----- info_message.cpp | 10 +++++----- mainwindow.cpp | 1 + parameter_delegate.cpp | 6 ------ prm_parameter_writer.cpp | 6 ------ settings_dialog.cpp | 9 ++++----- xml_parameter_reader.cpp | 6 ------ xml_parameter_writer.cpp | 6 ------ 9 files changed, 12 insertions(+), 40 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f291d9a..25f661b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ IF("${DEAL_II_EXECUTABLE_RELDIR}" STREQUAL "") SET(DEAL_II_EXECUTABLE_RELDIR "bin") ENDIF() -FIND_PACKAGE(Qt5 COMPONENTS Core Gui Xml Widgets) +FIND_PACKAGE(Qt5 QUIET COMPONENTS Core Gui Xml Widgets) IF(${Qt5_FOUND}) ELSE() diff --git a/browse_lineedit.cpp b/browse_lineedit.cpp index 26eb2c9..62aaa5b 100644 --- a/browse_lineedit.cpp +++ b/browse_lineedit.cpp @@ -15,11 +15,7 @@ #include "browse_lineedit.h" -#if QT_VERSION >= 0x050000 -#include -#else -#include -#endif +#include namespace dealii { diff --git a/info_message.cpp b/info_message.cpp index 028a99a..cbda66d 100644 --- a/info_message.cpp +++ b/info_message.cpp @@ -16,11 +16,11 @@ #include "info_message.h" -#if QT_VERSION >= 0x050000 -#include -#else -#include -#endif +#include +#include +#include +#include +#include namespace dealii { diff --git a/mainwindow.cpp b/mainwindow.cpp index fe8686c..a09eb1e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -20,6 +20,7 @@ #include "xml_parameter_writer.h" #include "prm_parameter_writer.h" +#include #if QT_VERSION >= 0x050000 #include #else diff --git a/parameter_delegate.cpp b/parameter_delegate.cpp index 1b68c0b..b7b7a70 100644 --- a/parameter_delegate.cpp +++ b/parameter_delegate.cpp @@ -18,12 +18,6 @@ #include -#if QT_VERSION >= 0x050000 -#include -#else -#include -#endif - namespace dealii { namespace ParameterGui diff --git a/prm_parameter_writer.cpp b/prm_parameter_writer.cpp index 4ef1ef9..04c7f7c 100644 --- a/prm_parameter_writer.cpp +++ b/prm_parameter_writer.cpp @@ -16,12 +16,6 @@ #include "prm_parameter_writer.h" -#if QT_VERSION >= 0x050000 -#include -#else -#include -#endif - namespace dealii { namespace ParameterGui diff --git a/settings_dialog.cpp b/settings_dialog.cpp index 095cb52..c370fe0 100644 --- a/settings_dialog.cpp +++ b/settings_dialog.cpp @@ -16,11 +16,10 @@ #include "settings_dialog.h" -#if QT_VERSION >= 0x050000 -#include -#else -#include -#endif +#include +#include +#include +#include namespace dealii { diff --git a/xml_parameter_reader.cpp b/xml_parameter_reader.cpp index dac8d5d..a5b6b6d 100644 --- a/xml_parameter_reader.cpp +++ b/xml_parameter_reader.cpp @@ -16,12 +16,6 @@ #include "xml_parameter_reader.h" -#if QT_VERSION >= 0x050000 -#include -#else -#include -#endif - namespace dealii { namespace ParameterGui diff --git a/xml_parameter_writer.cpp b/xml_parameter_writer.cpp index fccd1af..ec96690 100644 --- a/xml_parameter_writer.cpp +++ b/xml_parameter_writer.cpp @@ -16,12 +16,6 @@ #include "xml_parameter_writer.h" -#if QT_VERSION >= 0x050000 -#include -#else -#include -#endif - namespace dealii { namespace ParameterGui -- 2.39.5