From: Rene Gassmoeller <rene.gassmoeller@mailbox.org>
Date: Tue, 27 Jun 2017 16:38:09 +0000 (-0600)
Subject: Address comments. Silence warning.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F19%2Fhead;p=parameter_gui.git

Address comments. Silence warning.
---

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 <QtWidgets>
-#else
-#include <QtGui>
-#endif
+#include <QHBoxLayout>
 
 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 <QtWidgets>
-#else
-#include <QtGui>
-#endif
+#include <QErrorMessage>
+#include <QDir>
+#include <QPushButton>
+#include <QGridLayout>
+#include <QMessageBox>
 
 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 <QtGlobal>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets>
 #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 <limits>
 
-#if QT_VERSION >= 0x050000
-#include <QtWidgets>
-#else
-#include <QtGui>
-#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 <QtWidgets>
-#else
-#include <QtGui>
-#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 <QtWidgets>
-#else
-#include <QtGui>
-#endif
+#include <QErrorMessage>
+#include <QFontDialog>
+#include <QPushButton>
+#include <QFormLayout>
 
 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 <QtWidgets>
-#else
-#include <QtGui>
-#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 <QtWidgets>
-#else
-#include <QtGui>
-#endif
-
 namespace dealii
 {
   namespace ParameterGui