From add9f350e827f234add57c6e6fa36a069febea45 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 19 Dec 2016 12:52:14 +0100
Subject: [PATCH] Update includes for qt5.
---
Applications/DataExplorer/DataView/DiagramView/DetailWindow.h | 3 ++-
.../DataExplorer/DataView/DiagramView/DiagramPrefsDialog.h | 3 ++-
Applications/DataExplorer/DataView/DiagramView/DiagramView.h | 3 ++-
Applications/DataExplorer/DataView/StratView/StratView.h | 3 ++-
Applications/DataExplorer/main.cpp | 3 ++-
Applications/Utils/OGSFileConverter/main.cpp | 3 ++-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Applications/DataExplorer/DataView/DiagramView/DetailWindow.h b/Applications/DataExplorer/DataView/DiagramView/DetailWindow.h
index e4a0f209a9f..b4737737488 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DetailWindow.h
+++ b/Applications/DataExplorer/DataView/DiagramView/DetailWindow.h
@@ -16,7 +16,8 @@
#define DETAILWINDOW_H
#include "ui_DetailWindow.h"
-#include <QtGui/QWidget>
+#include <QWidget>
+
/**
* \brief Creates a window containing a diagram.
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.h b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.h
index 7f15039f78b..cc8c4804fab 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.h
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.h
@@ -16,7 +16,8 @@
#define DIAGRAMPREFSDIALOG_H
#include "ui_DiagramPrefs.h"
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
+
class DetailWindow;
class DiagramList;
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramView.h b/Applications/DataExplorer/DataView/DiagramView/DiagramView.h
index 6cd385ca78c..7b3412b1af4 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramView.h
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramView.h
@@ -17,7 +17,8 @@
#include "DiagramScene.h"
#include <QGraphicsView>
-#include <QtGui/QWidget>
+#include <QWidget>
+
/**
* \brief A view in which to display a DiagramScene.
diff --git a/Applications/DataExplorer/DataView/StratView/StratView.h b/Applications/DataExplorer/DataView/StratView/StratView.h
index f54d5f01bfc..88771d54b1a 100644
--- a/Applications/DataExplorer/DataView/StratView/StratView.h
+++ b/Applications/DataExplorer/DataView/StratView/StratView.h
@@ -17,7 +17,8 @@
#include "StratScene.h"
#include <QGraphicsView>
-#include <QtGui/QWidget>
+#include <QWidget>
+
namespace GeoLib
{
diff --git a/Applications/DataExplorer/main.cpp b/Applications/DataExplorer/main.cpp
index 8e71f5aaed1..6c0d9aa1112 100644
--- a/Applications/DataExplorer/main.cpp
+++ b/Applications/DataExplorer/main.cpp
@@ -1,7 +1,8 @@
#include "mainwindow.h"
#include <memory>
-#include <QtGui/QApplication>
+#include <QApplication>
+
#include <logog/include/logog.hpp>
#include "LogogSimpleFormatter.h"
#ifdef VTKFBXCONVERTER_FOUND
diff --git a/Applications/Utils/OGSFileConverter/main.cpp b/Applications/Utils/OGSFileConverter/main.cpp
index f04d37c7abc..5a19d03f383 100644
--- a/Applications/Utils/OGSFileConverter/main.cpp
+++ b/Applications/Utils/OGSFileConverter/main.cpp
@@ -13,7 +13,8 @@
#include "Applications/ApplicationsLib/LogogSetup.h"
-#include <QtGui/QApplication>
+#include <QApplication>
+
int main(int argc, char* argv[])
{
--
GitLab