From ce5b305b108adaacd265a12e86f3269fc983b324 Mon Sep 17 00:00:00 2001
From: Antoine Lorence <antoine.lorence@insa-rennes.fr>
Date: Wed, 5 Nov 2014 15:23:39 +0100
Subject: [PATCH] Update code to Qt5 standard

---
 app/Operations/ClassAnalysisOp.cpp |  6 +++---
 app/Widgets/FilterChoice.cpp       | 28 ++++++++++++++--------------
 app/Widgets/FilterEditor.cpp       | 14 +++++++-------
 app/Widgets/FilterEditor.h         |  2 +-
 app/Widgets/FilterEditorItem.cpp   | 14 +++++++-------
 app/Widgets/FilterEditorItem.h     |  2 +-
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/app/Operations/ClassAnalysisOp.cpp b/app/Operations/ClassAnalysisOp.cpp
index f19a6d5..4a56b3e 100644
--- a/app/Operations/ClassAnalysisOp.cpp
+++ b/app/Operations/ClassAnalysisOp.cpp
@@ -49,7 +49,7 @@ void ClassAnalysisOp::operator()(const imagein::Image* img, const std::map<const
 
 
     if(dialog->isLearningStep()) {
-        FILE* f = fopen(dialog->getFileName().toAscii(), "wt" );
+        FILE* f = fopen(dialog->getFileName().toLatin1(), "wt" );
         if(f == NULL) {
             QMessageBox::critical(NULL, "Error", "Could not open file for write access");
             return;
@@ -67,7 +67,7 @@ void ClassAnalysisOp::operator()(const imagein::Image* img, const std::map<const
         fclose(f);
     }
     else if(dialog->isClassificationStep()) {
-        FILE* f = fopen(dialog->getFileName().toAscii(), "rt" );
+        FILE* f = fopen(dialog->getFileName().toLatin1(), "rt" );
         if(f == NULL) {
             QMessageBox::critical(NULL, "Error", "Could not open file for read access");
             return;
@@ -86,7 +86,7 @@ void ClassAnalysisOp::operator()(const imagein::Image* img, const std::map<const
         fclose(f);
     }
     else {
-        FILE* f = fopen(dialog->getFileName().toAscii(), "rt" );
+        FILE* f = fopen(dialog->getFileName().toLatin1(), "rt" );
         if(f == NULL) {
             QMessageBox::critical(NULL, "Error", "Could not open file for read access");
             return;
diff --git a/app/Widgets/FilterChoice.cpp b/app/Widgets/FilterChoice.cpp
index cde0dfb..dd12b6f 100644
--- a/app/Widgets/FilterChoice.cpp
+++ b/app/Widgets/FilterChoice.cpp
@@ -28,22 +28,22 @@
 #include <QTableWidgetItem>
 #include <QHeaderView>
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QComboBox>
-#include <QtGui/QDialog>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpinBox>
-#include <QtGui/QTableView>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QComboBox>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QHeaderView>
+#include <QLabel>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QTableView>
 
 #include <QFile>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomImplementation>
-#include <QtXml/QDomElement>
+#include <QDomDocument>
+#include <QDomImplementation>
+#include <QDomElement>
 #include <QTextStream>
 
 #include <QGroupBox>
diff --git a/app/Widgets/FilterEditor.cpp b/app/Widgets/FilterEditor.cpp
index 8be74a4..c856ffa 100644
--- a/app/Widgets/FilterEditor.cpp
+++ b/app/Widgets/FilterEditor.cpp
@@ -24,13 +24,13 @@
 #include <QScrollArea>
 #include <QLineEdit>
 #include <QHBoxLayout>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QDialog>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QLabel>
-#include <QtGui/QSpinBox>
-#include <QtGui/QMdiArea>
-#include <QtGui/QPushButton>
+#include <QButtonGroup>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QSpinBox>
+#include <QMdiArea>
+#include <QPushButton>
 
 #include <QTimer>
 #include <QFile>
diff --git a/app/Widgets/FilterEditor.h b/app/Widgets/FilterEditor.h
index 78a9893..3be4281 100644
--- a/app/Widgets/FilterEditor.h
+++ b/app/Widgets/FilterEditor.h
@@ -30,7 +30,7 @@
 #include <QVBoxLayout>
 #include <QString>
 #include <QList>
-#include <QtGui/QTableWidget>
+#include <QTableWidget>
 #include <QMessageBox>
 
 class QLineEdit;
diff --git a/app/Widgets/FilterEditorItem.cpp b/app/Widgets/FilterEditorItem.cpp
index 6dfcba7..1e8f18f 100644
--- a/app/Widgets/FilterEditorItem.cpp
+++ b/app/Widgets/FilterEditorItem.cpp
@@ -20,13 +20,13 @@
 #include "FilterEditorItem.h"
 
 #include <QLineEdit>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QDialog>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QLabel>
-#include <QtGui/QSpinBox>
-#include <QtGui/QMdiArea>
-#include <QtGui/QPushButton>
+#include <QButtonGroup>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QSpinBox>
+#include <QMdiArea>
+#include <QPushButton>
 
 #include <QTimer>
 #include <QFile>
diff --git a/app/Widgets/FilterEditorItem.h b/app/Widgets/FilterEditorItem.h
index d653b7f..ba0f9b7 100644
--- a/app/Widgets/FilterEditorItem.h
+++ b/app/Widgets/FilterEditorItem.h
@@ -29,7 +29,7 @@
 #include <QVBoxLayout>
 #include <QString>
 #include <QList>
-#include <QtGui/QTableWidget>
+#include <QTableWidget>
 #include <QMessageBox>
 
 class QLineEdit;
-- 
GitLab