| [qet] [3745] Start port to Qt5 |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 3745
Author: blacksun
Date: 2015-02-21 18:41:47 +0100 (Sat, 21 Feb 2015)
Log Message:
-----------
Start port to Qt5
Modified Paths:
--------------
branches/Qt5/qelectrotech.pro
branches/Qt5/sources/aboutqet.cpp
branches/Qt5/sources/conductorproperties.h
branches/Qt5/sources/configdialog.cpp
branches/Qt5/sources/configpages.h
branches/Qt5/sources/createdxf.h
branches/Qt5/sources/diagram.h
branches/Qt5/sources/diagramcommands.h
branches/Qt5/sources/diagramprintdialog.cpp
branches/Qt5/sources/diagramprintdialog.h
branches/Qt5/sources/diagramschooser.h
branches/Qt5/sources/diagramview.cpp
branches/Qt5/sources/diagramview.h
branches/Qt5/sources/editor/arceditor.h
branches/Qt5/sources/editor/editorcommands.h
branches/Qt5/sources/editor/elementitemeditor.h
branches/Qt5/sources/editor/elementscene.cpp
branches/Qt5/sources/editor/elementscene.h
branches/Qt5/sources/editor/ellipseeditor.h
branches/Qt5/sources/editor/graphicspart/customelementpart.h
branches/Qt5/sources/editor/graphicspart/parttext.h
branches/Qt5/sources/editor/graphicspart/parttextfield.h
branches/Qt5/sources/editor/lineeditor.h
branches/Qt5/sources/editor/qetelementeditor.cpp
branches/Qt5/sources/editor/qetelementeditor.h
branches/Qt5/sources/editor/rectangleeditor.h
branches/Qt5/sources/editor/styleeditor.h
branches/Qt5/sources/editor/terminaleditor.h
branches/Qt5/sources/editor/texteditor.h
branches/Qt5/sources/editor/textfieldeditor.h
branches/Qt5/sources/elementdeleter.h
branches/Qt5/sources/elementdialog.cpp
branches/Qt5/sources/elementscategorieslist.h
branches/Qt5/sources/elementscategorieswidget.h
branches/Qt5/sources/elementscategorydeleter.h
branches/Qt5/sources/elementscategoryeditor.h
branches/Qt5/sources/elementspanel.h
branches/Qt5/sources/elementspanelwidget.h
branches/Qt5/sources/elementtextsmover.h
branches/Qt5/sources/exportdialog.h
branches/Qt5/sources/exportpropertieswidget.h
branches/Qt5/sources/integrationmoveelementshandler.cpp
branches/Qt5/sources/integrationmoveelementshandler.h
branches/Qt5/sources/interactivemoveelementshandler.cpp
branches/Qt5/sources/nameslistwidget.h
branches/Qt5/sources/newelementwizard.cpp
branches/Qt5/sources/newelementwizard.h
branches/Qt5/sources/nomenclature.h
branches/Qt5/sources/projectconfigpages.cpp
branches/Qt5/sources/projectview.cpp
branches/Qt5/sources/projectview.h
branches/Qt5/sources/qet.cpp
branches/Qt5/sources/qetapp.cpp
branches/Qt5/sources/qetapp.h
branches/Qt5/sources/qetdiagrameditor.cpp
branches/Qt5/sources/qetdiagrameditor.h
branches/Qt5/sources/qetgraphicsitem/element.cpp
branches/Qt5/sources/qetgraphicsitem/terminal.cpp
branches/Qt5/sources/qetgraphicsitem/terminal.h
branches/Qt5/sources/qetmessagebox.cpp
branches/Qt5/sources/qetprintpreviewdialog.h
branches/Qt5/sources/qettabbar.h
branches/Qt5/sources/qtextorientationspinboxwidget.h
branches/Qt5/sources/qtextorientationwidget.h
branches/Qt5/sources/titleblock/dimensionwidget.h
branches/Qt5/sources/titleblock/gridlayoutanimation.h
branches/Qt5/sources/titleblock/helpercell.h
branches/Qt5/sources/titleblock/integrationmovetemplateshandler.h
branches/Qt5/sources/titleblock/qettemplateeditor.cpp
branches/Qt5/sources/titleblock/qettemplateeditor.h
branches/Qt5/sources/titleblock/templatecellsset.h
branches/Qt5/sources/titleblock/templatecellwidget.h
branches/Qt5/sources/titleblock/templatedeleter.h
branches/Qt5/sources/titleblock/templatelocationchooser.h
branches/Qt5/sources/titleblock/templatelocationsaver.h
branches/Qt5/sources/titleblock/templatelogomanager.h
branches/Qt5/sources/titleblock/templatevisualcell.h
branches/Qt5/sources/treecoloranimation.h
branches/Qt5/sources/ui/diagrampropertiesdialog.cpp
Modified: branches/Qt5/qelectrotech.pro
===================================================================
--- branches/Qt5/qelectrotech.pro 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/qelectrotech.pro 2015-02-21 17:41:47 UTC (rev 3745)
@@ -103,7 +103,7 @@
TRANSLATIONS += lang/qet_en.ts lang/qet_es.ts lang/qet_fr.ts lang/qet_ru.ts lang/qet_pt.ts lang/qet_cs.ts lang/qet_pl.ts lang/qet_de.ts lang/qet_ro.ts lang/qet_it.ts lang/qet_el.ts lang/qet_nl.ts lang/qet_be.ts
# Modules Qt utilises par l'application
-QT += xml svg network sql
+QT += xml svg network sql widgets
# UI DESIGNER FILES AND GENERATION SOURCES FILES
FORMS += $$files(sources/richtext/*.ui) \
Modified: branches/Qt5/sources/aboutqet.cpp
===================================================================
--- branches/Qt5/sources/aboutqet.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/aboutqet.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <QtGui>
+#include <QtWidgets>
#include "qettabwidget.h"
#include "aboutqet.h"
#include "qet.h"
Modified: branches/Qt5/sources/conductorproperties.h
===================================================================
--- branches/Qt5/sources/conductorproperties.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/conductorproperties.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -18,7 +18,7 @@
#ifndef CONDUCTOR_PROPERTIES_H
#define CONDUCTOR_PROPERTIES_H
#include "qet.h"
-#include <QtGui>
+#include <QtWidgets>
#include <QtXml>
/**
This class represents the properties of a singleline conductor.
Modified: branches/Qt5/sources/configdialog.cpp
===================================================================
--- branches/Qt5/sources/configdialog.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/configdialog.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -54,7 +54,7 @@
connect(buttons, SIGNAL(rejected()), this, SLOT(reject()));
connect(pages_list, SIGNAL(currentRowChanged(int)), pages_widget, SLOT(setCurrentIndex(int)));
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
if (parent) {
setWindowFlags(Qt::Sheet);
}
Modified: branches/Qt5/sources/configpages.h
===================================================================
--- branches/Qt5/sources/configpages.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/configpages.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef CONFIG_PAGES_H
#define CONFIG_PAGES_H
-#include <QtGui>
+#include <QtWidgets>
#include "configpage.h"
class BorderPropertiesWidget;
class ConductorPropertiesWidget;
Modified: branches/Qt5/sources/createdxf.h
===================================================================
--- branches/Qt5/sources/createdxf.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/createdxf.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -19,7 +19,7 @@
#define CREATEDXF_H
#include <QString>
#include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
/* This class exports the project to DXF Format */
Modified: branches/Qt5/sources/diagram.h
===================================================================
--- branches/Qt5/sources/diagram.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/diagram.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef DIAGRAM_H
#define DIAGRAM_H
-#include <QtGui>
+#include <QtWidgets>
#include <QtXml>
#include <QHash>
#include "bordertitleblock.h"
Modified: branches/Qt5/sources/diagramcommands.h
===================================================================
--- branches/Qt5/sources/diagramcommands.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/diagramcommands.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef DIAGRAM_COMMANDS_H
#define DIAGRAM_COMMANDS_H
-#include <QtGui>
+#include <QtWidgets>
#include "borderproperties.h"
#include "qetgraphicsitem/conductor.h"
#include "conductorproperties.h"
Modified: branches/Qt5/sources/diagramprintdialog.cpp
===================================================================
--- branches/Qt5/sources/diagramprintdialog.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/diagramprintdialog.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -119,7 +119,7 @@
if (printer_choice_ -> isChecked()) {
// affichage du dialogue d'impression standard pour parametrer l'imprimante
QPrintDialog print_dialog(printer_, parentWidget());
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
print_dialog.setWindowFlags(Qt::Sheet);
#endif
print_dialog.setWindowTitle(tr("Options d'impression", "window title"));
@@ -135,7 +135,7 @@
loadPageSetupForCurrentPrinter();
// Apercu avant impression
-#if defined Q_WS_X11
+#if defined Q_OS_X11
// suite a quelques soucis avec xfwm, on se contente d'une fenetre sous X11
QETPrintPreviewDialog preview_dialog(project_, printer_, parentWidget(), Qt::Window);
#else
@@ -211,7 +211,7 @@
void DiagramPrintDialog::buildPrintTypeDialog() {
// initialisation des widgets
dialog_ = new QDialog(parentWidget());
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
dialog_ -> setWindowFlags(Qt::Sheet);
#endif
Modified: branches/Qt5/sources/diagramprintdialog.h
===================================================================
--- branches/Qt5/sources/diagramprintdialog.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/diagramprintdialog.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef DIAGRAM_PRINT_DIALOG_H
#define DIAGRAM_PRINT_DIALOG_H
-#include <QtGui>
+#include <QtWidgets>
#include "qetproject.h"
#include "diagram.h"
#include "exportproperties.h"
Modified: branches/Qt5/sources/diagramschooser.h
===================================================================
--- branches/Qt5/sources/diagramschooser.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/diagramschooser.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef DIAGRAMS_CHOOSER_H
#define DIAGRAMS_CHOOSER_H
-#include <QtGui>
+#include <QtWidgets>
class QETProject;
class Diagram;
/**
Modified: branches/Qt5/sources/diagramview.cpp
===================================================================
--- branches/Qt5/sources/diagramview.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/diagramview.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -194,7 +194,7 @@
// demande un angle a l'utilisateur
QDialog ori_text_dialog(diagramEditor());
ori_text_dialog.setSizeGripEnabled(false);
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
ori_text_dialog.setWindowFlags(Qt::Sheet);
#endif
ori_text_dialog.setWindowTitle(tr("Orienter les textes s\351lectionn\351s", "window title"));
@@ -952,7 +952,7 @@
// prepare a color dialog showing the initial conductor color
QColorDialog *color_dialog = new QColorDialog(this);
color_dialog -> setWindowTitle(tr("Choisir la nouvelle couleur de ce conducteur"));
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
color_dialog -> setWindowFlags(Qt::Sheet);
#endif
color_dialog -> setCurrentColor(initial_properties.color);
Modified: branches/Qt5/sources/diagramview.h
===================================================================
--- branches/Qt5/sources/diagramview.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/diagramview.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef DIAGRAMVIEW_H
#define DIAGRAMVIEW_H
-#include <QtGui>
+#include <QtWidgets>
#include "elementslocation.h"
#include "templatelocation.h"
Modified: branches/Qt5/sources/editor/arceditor.h
===================================================================
--- branches/Qt5/sources/editor/arceditor.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/arceditor.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef ARC_EDITOR_H
#define ARC_EDITOR_H
-#include <QtGui>
+#include <QtWidgets>
#include "elementitemeditor.h"
class PartArc;
class StyleEditor;
Modified: branches/Qt5/sources/editor/editorcommands.h
===================================================================
--- branches/Qt5/sources/editor/editorcommands.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/editorcommands.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -23,7 +23,7 @@
#include "elementscene.h"
#include "elementcontent.h"
#include "qgimanager.h"
-#include <QtGui>
+#include <QtWidgets>
/**
* @brief The ElementEditionCommand class
Modified: branches/Qt5/sources/editor/elementitemeditor.h
===================================================================
--- branches/Qt5/sources/editor/elementitemeditor.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/elementitemeditor.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef ELEMENT_ITEM_EDITOR_H
#define ELEMENT_ITEM_EDITOR_H
-#include <QtGui>
+#include <QtWidgets>
class QETElementEditor;
class ElementScene;
class CustomElementPart;
Modified: branches/Qt5/sources/editor/elementscene.cpp
===================================================================
--- branches/Qt5/sources/editor/elementscene.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/elementscene.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -530,7 +530,7 @@
// cree un dialogue
QDialog dialog_author(element_editor);
dialog_author.setModal(true);
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
dialog_author.setWindowFlags(Qt::Sheet);
#endif
dialog_author.setMinimumSize(400, 260);
@@ -586,7 +586,7 @@
// cree un dialogue
QDialog dialog(element_editor);
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
dialog.setWindowFlags(Qt::Sheet);
#endif
dialog.setModal(true);
Modified: branches/Qt5/sources/editor/elementscene.h
===================================================================
--- branches/Qt5/sources/editor/elementscene.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/elementscene.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef ELEMENT_SCENE_H
#define ELEMENT_SCENE_H
-#include <QtGui>
+#include <QtWidgets>
#include <QtXml>
#include "nameslistwidget.h"
#include "qgimanager.h"
Modified: branches/Qt5/sources/editor/ellipseeditor.h
===================================================================
--- branches/Qt5/sources/editor/ellipseeditor.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/ellipseeditor.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef ELLIPSE_EDITOR_H
#define ELLIPSE_EDITOR_H
-#include <QtGui>
+#include <QtWidgets>
#include "elementitemeditor.h"
class PartEllipse;
class StyleEditor;
Modified: branches/Qt5/sources/editor/graphicspart/customelementpart.h
===================================================================
--- branches/Qt5/sources/editor/graphicspart/customelementpart.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/graphicspart/customelementpart.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef CUSTOM_ELEMENT_PART_H
#define CUSTOM_ELEMENT_PART_H
-#include <QtGui>
+#include <QtWidgets>
#include <QtXml>
#include <QImage>
#include "qet.h"
Modified: branches/Qt5/sources/editor/graphicspart/parttext.h
===================================================================
--- branches/Qt5/sources/editor/graphicspart/parttext.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/graphicspart/parttext.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef PART_TEXT_H
#define PART_TEXT_H
-#include <QtGui>
+#include <QtWidgets>
#include "customelementpart.h"
#include "qetapp.h"
class TextEditor;
Modified: branches/Qt5/sources/editor/graphicspart/parttextfield.h
===================================================================
--- branches/Qt5/sources/editor/graphicspart/parttextfield.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/graphicspart/parttextfield.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef PART_TEXTFIELD_H
#define PART_TEXTFIELD_H
-#include <QtGui>
+#include <QtWidgets>
#include "customelementpart.h"
#include "qetapp.h"
class TextFieldEditor;
Modified: branches/Qt5/sources/editor/lineeditor.h
===================================================================
--- branches/Qt5/sources/editor/lineeditor.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/lineeditor.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef LINE_EDITOR_H
#define LINE_EDITOR_H
-#include <QtGui>
+#include <QtWidgets>
#include "elementitemeditor.h"
class PartLine;
class StyleEditor;
Modified: branches/Qt5/sources/editor/qetelementeditor.cpp
===================================================================
--- branches/Qt5/sources/editor/qetelementeditor.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/qetelementeditor.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -178,7 +178,7 @@
copy -> setShortcut(QKeySequence::Copy);
paste -> setShortcut(QKeySequence::Paste);
paste_in_area -> setShortcut(tr("Ctrl+Shift+V"));
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
edit_delete -> setShortcut(QKeySequence(Qt::Key_Delete));
#else
edit_delete -> setShortcut(QKeySequence(tr("Backspace")));
Modified: branches/Qt5/sources/editor/qetelementeditor.h
===================================================================
--- branches/Qt5/sources/editor/qetelementeditor.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/qetelementeditor.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef CUSTOM_ELEMENT_EDITOR_H
#define CUSTOM_ELEMENT_EDITOR_H
-#include <QtGui>
+#include <QtWidgets>
#include "qetmainwindow.h"
#include "qet.h"
#include "elementscene.h"
Modified: branches/Qt5/sources/editor/rectangleeditor.h
===================================================================
--- branches/Qt5/sources/editor/rectangleeditor.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/rectangleeditor.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef RECTANGLE_EDITOR_H
#define RECTANGLE_EDITOR_H
-#include <QtGui>
+#include <QtWidgets>
#include "elementitemeditor.h"
class PartRectangle;
class StyleEditor;
Modified: branches/Qt5/sources/editor/styleeditor.h
===================================================================
--- branches/Qt5/sources/editor/styleeditor.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/styleeditor.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef STYLE_EDITOR_H
#define STYLE_EDITOR_H
-#include <QtGui>
+#include <QtWidgets>
#include "elementitemeditor.h"
class CustomElementGraphicPart;
/**
Modified: branches/Qt5/sources/editor/terminaleditor.h
===================================================================
--- branches/Qt5/sources/editor/terminaleditor.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/terminaleditor.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TERMINAL_EDITOR_H
#define TERMINAL_EDITOR_H
-#include <QtGui>
+#include <QtWidgets>
#include "elementitemeditor.h"
class PartTerminal;
/**
Modified: branches/Qt5/sources/editor/texteditor.h
===================================================================
--- branches/Qt5/sources/editor/texteditor.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/texteditor.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TEXT_EDITOR_H
#define TEXT_EDITOR_H
-#include <QtGui>
+#include <QtWidgets>
#include "elementitemeditor.h"
class PartText;
class QTextOrientationSpinBoxWidget;
Modified: branches/Qt5/sources/editor/textfieldeditor.h
===================================================================
--- branches/Qt5/sources/editor/textfieldeditor.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/editor/textfieldeditor.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TEXTFIELD_EDITOR_H
#define TEXTFIELD_EDITOR_H
-#include <QtGui>
+#include <QtWidgets>
#include "elementitemeditor.h"
class PartTextField;
class QTextOrientationSpinBoxWidget;
Modified: branches/Qt5/sources/elementdeleter.h
===================================================================
--- branches/Qt5/sources/elementdeleter.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/elementdeleter.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -19,7 +19,7 @@
#define ELEMENT_DELETER_H
#include "elementscategory.h"
#include "elementslocation.h"
-#include <QtGui>
+#include <QtWidgets>
/**
This class provides an abstract way to delete an element from its parent
collection. Especially, it requires a confirmation from users.
Modified: branches/Qt5/sources/elementdialog.cpp
===================================================================
--- branches/Qt5/sources/elementdialog.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/elementdialog.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -16,7 +16,7 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "elementdialog.h"
-#include <QtGui>
+#include <QtWidgets>
#include "qetapp.h"
#include "elementscategorieslist.h"
#include "elementscollectionitem.h"
@@ -41,7 +41,7 @@
{
dialog_ = new QDialog(parentWidget);
dialog_ -> setWindowModality(Qt::WindowModal);
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
dialog_ -> setWindowFlags(Qt::Sheet);
#endif
buttons_ = new QDialogButtonBox();
Modified: branches/Qt5/sources/elementscategorieslist.h
===================================================================
--- branches/Qt5/sources/elementscategorieslist.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/elementscategorieslist.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef ELEMENTS_CATEGORIES_LIST_H
#define ELEMENTS_CATEGORIES_LIST_H
-#include <QtGui>
+#include <QtWidgets>
#include "qet.h"
#include "elementslocation.h"
#include "genericpanel.h"
Modified: branches/Qt5/sources/elementscategorieswidget.h
===================================================================
--- branches/Qt5/sources/elementscategorieswidget.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/elementscategorieswidget.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef ELEMENTS_CATEGORIES_WIDGET_H
#define ELEMENTS_CATEGORIES_WIDGET_H
-#include <QtGui>
+#include <QtWidgets>
class ElementsCategoriesList;
/**
This class provides a widget listing available elements categories along
Modified: branches/Qt5/sources/elementscategorydeleter.h
===================================================================
--- branches/Qt5/sources/elementscategorydeleter.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/elementscategorydeleter.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -19,7 +19,7 @@
#define ELEMENTS_CATEGORY_DELETER_H
#include "fileelementscategory.h"
#include "elementslocation.h"
-#include <QtGui>
+#include <QtWidgets>
/**
This class provide an abstract way to delete an elements category along with
its child elements and subcategories. It always requires a double confirmation
Modified: branches/Qt5/sources/elementscategoryeditor.h
===================================================================
--- branches/Qt5/sources/elementscategoryeditor.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/elementscategoryeditor.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef ELEMENTS_CATEGORY_EDITOR_H
#define ELEMENTS_CATEGORY_EDITOR_H
-#include <QtGui>
+#include <QtWidgets>
#include "elementslocation.h"
class ElementsCategory;
class NamesListWidget;
Modified: branches/Qt5/sources/elementspanel.h
===================================================================
--- branches/Qt5/sources/elementspanel.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/elementspanel.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef PANELAPPAREILS_H
#define PANELAPPAREILS_H
-#include <QtGui>
+#include <QtWidgets>
#include "genericpanel.h"
#include "elementslocation.h"
#include "templatelocation.h"
Modified: branches/Qt5/sources/elementspanelwidget.h
===================================================================
--- branches/Qt5/sources/elementspanelwidget.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/elementspanelwidget.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef ELEMENTS_PANEL_WIDGET_H
#define ELEMENTS_PANEL_WIDGET_H
-#include <QtGui>
+#include <QtWidgets>
#include "elementspanel.h"
/**
This class embeds an elements panel under a toolbar providing various actions
Modified: branches/Qt5/sources/elementtextsmover.h
===================================================================
--- branches/Qt5/sources/elementtextsmover.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/elementtextsmover.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef ELEMENT_TEXTS_MOVER_H
#define ELEMENT_TEXTS_MOVER_H
-#include <QtGui>
+#include <QtWidgets>
#include "diagramcontent.h"
class ElementTextItem;
class Diagram;
Modified: branches/Qt5/sources/exportdialog.h
===================================================================
--- branches/Qt5/sources/exportdialog.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/exportdialog.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef EXPORTDIALOG_H
#define EXPORTDIALOG_H
-#include <QtGui>
+#include <QtWidgets>
#include "diagram.h"
#include "qetproject.h"
class QSvgGenerator;
Modified: branches/Qt5/sources/exportpropertieswidget.h
===================================================================
--- branches/Qt5/sources/exportpropertieswidget.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/exportpropertieswidget.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef EXPORT_PROPERTIES_WIDGET_H
#define EXPORT_PROPERTIES_WIDGET_H
-#include <QtGui>
+#include <QtWidgets>
#include "exportproperties.h"
/**
Modified: branches/Qt5/sources/integrationmoveelementshandler.cpp
===================================================================
--- branches/Qt5/sources/integrationmoveelementshandler.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/integrationmoveelementshandler.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -16,7 +16,7 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "integrationmoveelementshandler.h"
-#include <QtGui>
+#include <QtWidgets>
#include "elementscategory.h"
#include "elementdefinition.h"
#include "qfilenameedit.h"
Modified: branches/Qt5/sources/integrationmoveelementshandler.h
===================================================================
--- branches/Qt5/sources/integrationmoveelementshandler.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/integrationmoveelementshandler.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -18,7 +18,7 @@
#ifndef INTEGRATION_MOVE_ELEMENTS_HANDLER_H
#define INTEGRATION_MOVE_ELEMENTS_HANDLER_H
#include "basicmoveelementshandler.h"
-#include <QtGui>
+#include <QtWidgets>
/**
This class implements the MoveElementsHandler Strategy class.
It acts like a BasiMoveElementsHandler configured to answer QET::Abort to any question.
Modified: branches/Qt5/sources/interactivemoveelementshandler.cpp
===================================================================
--- branches/Qt5/sources/interactivemoveelementshandler.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/interactivemoveelementshandler.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -16,7 +16,7 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "interactivemoveelementshandler.h"
-#include <QtGui>
+#include <QtWidgets>
#include "elementscategory.h"
#include "elementdefinition.h"
#include "qfilenameedit.h"
Modified: branches/Qt5/sources/nameslistwidget.h
===================================================================
--- branches/Qt5/sources/nameslistwidget.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/nameslistwidget.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef NAMES_LIST_WIDGET_H
#define NAMES_LIST_WIDGET_H
-#include <QtGui>
+#include <QtWidgets>
#include "nameslist.h"
/**
This class provides a widget enabling users to enter localized names for
Modified: branches/Qt5/sources/newelementwizard.cpp
===================================================================
--- branches/Qt5/sources/newelementwizard.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/newelementwizard.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -39,9 +39,9 @@
{
setOptions(options() & ~QWizard::NoCancelButton);
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
setWizardStyle(QWizard::AeroStyle);
-#elif defined(Q_WS_MAC)
+#elif defined(Q_OS_MAC)
setWizardStyle(QWizard::MacStyle);
#endif
Modified: branches/Qt5/sources/newelementwizard.h
===================================================================
--- branches/Qt5/sources/newelementwizard.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/newelementwizard.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef NEW_ELEMENT_WIZARD_H
#define NEW_ELEMENT_WIZARD_H
-#include <QtGui>
+#include <QtWidgets>
class ElementsCategoriesWidget;
class ElementsCategory;
class NamesListWidget;
Modified: branches/Qt5/sources/nomenclature.h
===================================================================
--- branches/Qt5/sources/nomenclature.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/nomenclature.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -18,7 +18,7 @@
#ifndef NOMENCLATURE_H
#define NOMENCLATURE_H
-#include <QtGui>
+#include <QtWidgets>
#include "qetproject.h"
#include "diagram.h"
Modified: branches/Qt5/sources/projectconfigpages.cpp
===================================================================
--- branches/Qt5/sources/projectconfigpages.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/projectconfigpages.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -22,7 +22,7 @@
#include "conductorpropertieswidget.h"
#include "diagramcontextwidget.h"
#include "titleblockpropertieswidget.h"
-#include <QtGui>
+#include <QtWidgets>
#include "ui/reportpropertiewidget.h"
#include "ui/xrefpropertieswidget.h"
#include "selectautonumw.h"
Modified: branches/Qt5/sources/projectview.cpp
===================================================================
--- branches/Qt5/sources/projectview.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/projectview.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -581,7 +581,7 @@
if (!project_) return;
ExportDialog ed(project_, parentWidget());
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
ed.setWindowFlags(Qt::Sheet);
#endif
ed.exec();
@@ -687,7 +687,7 @@
clean_categories -> setChecked(true);
QDialog clean_dialog(parentWidget());
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
clean_dialog.setWindowFlags(Qt::Sheet);
#endif
@@ -775,7 +775,7 @@
fallback_widget_layout_ -> addWidget(fallback_label_);
layout_ = new QVBoxLayout(this);
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
layout_ -> setContentsMargins(0, 8, 0, 0);
#else
layout_ -> setContentsMargins(0, 0, 0, 0);
Modified: branches/Qt5/sources/projectview.h
===================================================================
--- branches/Qt5/sources/projectview.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/projectview.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef PROJECT_VIEW_H
#define PROJECT_VIEW_H
-#include <QtGui>
+#include <QtWidgets>
#include "templatelocation.h"
#include "qetresult.h"
class QETProject;
Modified: branches/Qt5/sources/qet.cpp
===================================================================
--- branches/Qt5/sources/qet.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/qet.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -602,7 +602,7 @@
QString second_canonical_path = QFileInfo(second).canonicalFilePath();
if (second_canonical_path.isEmpty()) return(false);
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
// sous Windows, on ramene les chemins en minuscules
first_canonical_path = first_canonical_path.toLower();
second_canonical_path = second_canonical_path.toLower();
Modified: branches/Qt5/sources/qetapp.cpp
===================================================================
--- branches/Qt5/sources/qetapp.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/qetapp.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -943,9 +943,9 @@
Autodetec Windows style
@param Windows style
*/
-#if defined(Q_WS_WIN) && defined(Q_WS_WINCE)
+#if defined(Q_OS_WIN) && defined(Q_OS_WINCE)
-if defined(Q_WS_WIN)
+if defined(Q_OS_WIN)
if ((QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA
&& QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
style = QLatin1String("WindowsVista");
@@ -1255,7 +1255,7 @@
// associe le dialogue a un eventuel widget parent
if (parent_widget) {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
about_dialog_ -> setWindowFlags(Qt::Sheet);
#endif
about_dialog_ -> setParent(parent_widget, about_dialog_ -> windowFlags());
Modified: branches/Qt5/sources/qetapp.h
===================================================================
--- branches/Qt5/sources/qetapp.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/qetapp.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -19,7 +19,7 @@
#define QET_APP_H
#include "qetsingleapplication.h"
#include <QTranslator>
-#include <QtGui>
+#include <QtWidgets>
#include "elementslocation.h"
#include "templatelocation.h"
#include "qetarguments.h"
Modified: branches/Qt5/sources/qetdiagrameditor.cpp
===================================================================
--- branches/Qt5/sources/qetdiagrameditor.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/qetdiagrameditor.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -258,7 +258,7 @@
find_element = m_selection_actions_group.addAction( tr("Retrouver dans le panel") );
edit_selection = m_selection_actions_group.addAction( QET::Icons::ElementEdit, tr("\311diter l'item s\351lectionn\351") );
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
delete_selection -> setShortcut( QKeySequence( Qt::Key_Delete) );
#else
delete_selection -> setShortcut( QKeySequence( tr("Backspace") ) );
Modified: branches/Qt5/sources/qetdiagrameditor.h
===================================================================
--- branches/Qt5/sources/qetdiagrameditor.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/qetdiagrameditor.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef QET_DIAGRAM_EDITOR_H
#define QET_DIAGRAM_EDITOR_H
-#include <QtGui>
+#include <QtWidgets>
#include "qetmainwindow.h"
class QETProject;
Modified: branches/Qt5/sources/qetgraphicsitem/element.cpp
===================================================================
--- branches/Qt5/sources/qetgraphicsitem/element.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/qetgraphicsitem/element.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -83,7 +83,7 @@
*/
void Element::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, QWidget *widget) {
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
// corrige un bug de rendu ne se produisant que lors du rendu sur QGraphicsScene sous X11 au zoom par defaut
static bool must_correct_rendering_bug = QETApp::settings().value("correct-rendering", false).toBool();
if (must_correct_rendering_bug) {
Modified: branches/Qt5/sources/qetgraphicsitem/terminal.cpp
===================================================================
--- branches/Qt5/sources/qetgraphicsitem/terminal.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/qetgraphicsitem/terminal.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -228,7 +228,7 @@
p -> save();
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
// corrige un bug de rendu ne se produisant que lors du rendu sur QGraphicsScene sous X11 au zoom par defaut
static bool must_correct_rendering_bug = QETApp::settings().value("correct-rendering", false).toBool();
if (must_correct_rendering_bug) {
Modified: branches/Qt5/sources/qetgraphicsitem/terminal.h
===================================================================
--- branches/Qt5/sources/qetgraphicsitem/terminal.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/qetgraphicsitem/terminal.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TERMINAL_H
#define TERMINAL_H
-#include <QtGui>
+#include <QtWidgets>
#include <QtXml>
#include "qet.h"
class Conductor;
Modified: branches/Qt5/sources/qetmessagebox.cpp
===================================================================
--- branches/Qt5/sources/qetmessagebox.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/qetmessagebox.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -21,7 +21,7 @@
@see Documentation Qt pour QMessageBox::critical
*/
QMessageBox::StandardButton QET::MessageBox::critical (QWidget *parent, const QString &title, const QString &text, QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
QMessageBox message_box(QMessageBox::Critical, title, text, buttons, parent, Qt::Sheet);
message_box.setWindowModality(Qt::WindowModal);
#else
@@ -36,7 +36,7 @@
@see Documentation Qt pour QMessageBox::information
*/
QMessageBox::StandardButton QET::MessageBox::information(QWidget *parent, const QString &title, const QString &text, QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
QMessageBox message_box(QMessageBox::Information, title, text, buttons, parent, Qt::Sheet);
message_box.setWindowModality(Qt::WindowModal);
#else
@@ -51,7 +51,7 @@
@see Documentation Qt pour QMessageBox::question
*/
QMessageBox::StandardButton QET::MessageBox::question (QWidget *parent, const QString &title, const QString &text, QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
QMessageBox message_box(QMessageBox::Question, title, text, buttons, parent, Qt::Sheet);
message_box.setWindowModality(Qt::WindowModal);
#else
@@ -66,7 +66,7 @@
@see Documentation Qt pour QMessageBox::warning
*/
QMessageBox::StandardButton QET::MessageBox::warning (QWidget *parent, const QString &title, const QString &text, QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
QMessageBox message_box(QMessageBox::Warning, title, text, buttons, parent, Qt::Sheet);
message_box.setWindowModality(Qt::WindowModal);
#else
Modified: branches/Qt5/sources/qetprintpreviewdialog.h
===================================================================
--- branches/Qt5/sources/qetprintpreviewdialog.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/qetprintpreviewdialog.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef QET_PRINT_PREVIEW_DIALOG
#define QET_PRINT_PREVIEW_DIALOG
-#include <QtGui>
+#include <QtWidgets>
#include "exportproperties.h"
class Diagram;
class DiagramsChooser;
Modified: branches/Qt5/sources/qettabbar.h
===================================================================
--- branches/Qt5/sources/qettabbar.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/qettabbar.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef QET_TAB_BAR_H
#define QET_TAB_BAR_H
-#include <QtGui>
+#include <QtWidgets>
#include <QTabBar>
/**
This class provides a tab bar.
Modified: branches/Qt5/sources/qtextorientationspinboxwidget.h
===================================================================
--- branches/Qt5/sources/qtextorientationspinboxwidget.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/qtextorientationspinboxwidget.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef Q_TEXT_ORIENTATION_SPINBOX_WIDGET_H
#define Q_TEXT_ORIENTATION_SPINBOX_WIDGET_H
-#include <QtGui>
+#include <QtWidgets>
#include "qtextorientationwidget.h"
/**
This class provides a widget grouping a QTextOrientationWidget and QSpinBox
Modified: branches/Qt5/sources/qtextorientationwidget.h
===================================================================
--- branches/Qt5/sources/qtextorientationwidget.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/qtextorientationwidget.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef Q_TEXT_ORIENTATION_WIDGET_H
#define Q_TEXT_ORIENTATION_WIDGET_H
-#include <QtGui>
+#include <QtWidgets>
/**
This class provides a visual representation of a text orientation.
*/
Modified: branches/Qt5/sources/titleblock/dimensionwidget.h
===================================================================
--- branches/Qt5/sources/titleblock/dimensionwidget.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/titleblock/dimensionwidget.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TITLEBLOCK_SLASH_DIMENSION_WIDGET_H
#define TITLEBLOCK_SLASH_DIMENSION_WIDGET_H
-#include <QtGui>
+#include <QtWidgets>
#include "dimension.h"
/**
Modified: branches/Qt5/sources/titleblock/gridlayoutanimation.h
===================================================================
--- branches/Qt5/sources/titleblock/gridlayoutanimation.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/titleblock/gridlayoutanimation.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TITLEBLOCK_SLASH_GRID_LAYOUT_ANIMATION_H
#define TITLEBLOCK_SLASH_GRID_LAYOUT_ANIMATION_H
-#include <QtGui>
+#include <QtWidgets>
/**
This class allows animating a dimension change for a QGraphicsGridLayout
Modified: branches/Qt5/sources/titleblock/helpercell.h
===================================================================
--- branches/Qt5/sources/titleblock/helpercell.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/titleblock/helpercell.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TITLEBLOCK_SLASH_HELPER_CELL_H
#define TITLEBLOCK_SLASH_HELPER_CELL_H
-#include <QtGui>
+#include <QtWidgets>
#include "qet.h"
/**
Modified: branches/Qt5/sources/titleblock/integrationmovetemplateshandler.h
===================================================================
--- branches/Qt5/sources/titleblock/integrationmovetemplateshandler.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/titleblock/integrationmovetemplateshandler.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -18,7 +18,7 @@
#ifndef TITLEBLOCK_SLASH_INTEGRATION_MOVE_TEMPLATES_HANDLER_H
#define TITLEBLOCK_SLASH_INTEGRATION_MOVE_TEMPLATES_HANDLER_H
#include "movetemplateshandler.h"
-#include <QtGui>
+#include <QtWidgets>
/**
This class implements the interface defined by
MoveTitleBlockTemplatesHandler to ease the integration of title block
Modified: branches/Qt5/sources/titleblock/qettemplateeditor.cpp
===================================================================
--- branches/Qt5/sources/titleblock/qettemplateeditor.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/titleblock/qettemplateeditor.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -915,7 +915,7 @@
QDialog dialog_author(this);
dialog_author.setModal(true);
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
dialog_author.setWindowFlags(Qt::Sheet);
#endif
dialog_author.setMinimumSize(400, 260);
Modified: branches/Qt5/sources/titleblock/qettemplateeditor.h
===================================================================
--- branches/Qt5/sources/titleblock/qettemplateeditor.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/titleblock/qettemplateeditor.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TITLEBLOCK_SLASH_QET_TEMPLATE_EDITOR_H
#define TITLEBLOCK_SLASH_QET_TEMPLATE_EDITOR_H
-#include <QtGui>
+#include <QtWidgets>
#include "qetmainwindow.h"
#include "qet.h"
#include "templateview.h"
Modified: branches/Qt5/sources/titleblock/templatecellsset.h
===================================================================
--- branches/Qt5/sources/titleblock/templatecellsset.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/titleblock/templatecellsset.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TITLEBLOCK_SLASH_TEMPLATE_CELLS_SET_H
#define TITLEBLOCK_SLASH_TEMPLATE_CELLS_SET_H
-#include <QtGui>
+#include <QtWidgets>
class TitleBlockCell;
class TitleBlockTemplateVisualCell;
class TitleBlockTemplateView;
Modified: branches/Qt5/sources/titleblock/templatecellwidget.h
===================================================================
--- branches/Qt5/sources/titleblock/templatecellwidget.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/titleblock/templatecellwidget.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TITLEBLOCK_SLASH_TEMPLATE_CELL_WIDGET_H
#define TITLEBLOCK_SLASH_TEMPLATE_CELL_WIDGET_H
-#include <QtGui>
+#include <QtWidgets>
#include "qet.h"
class ModifyTitleBlockCellCommand;
class TitleBlockTemplate;
Modified: branches/Qt5/sources/titleblock/templatedeleter.h
===================================================================
--- branches/Qt5/sources/titleblock/templatedeleter.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/titleblock/templatedeleter.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -18,7 +18,7 @@
#ifndef TITLEBLOCK_SLASH_TEMPLATE_DELETER_H
#define TITLEBLOCK_SLASH_TEMPLATE_DELETER_H
#include "templatelocation.h"
-#include <QtGui>
+#include <QtWidgets>
/**
This class is an abstraction layer to delete an existing title block
template.
Modified: branches/Qt5/sources/titleblock/templatelocationchooser.h
===================================================================
--- branches/Qt5/sources/titleblock/templatelocationchooser.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/titleblock/templatelocationchooser.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TITLEBLOCK_SLASH_LOCATION_CHOOSER_H
#define TITLEBLOCK_SLASH_LOCATION_CHOOSER_H
-#include <QtGui>
+#include <QtWidgets>
#include "templatelocation.h"
class TitleBlockTemplateCollection;
Modified: branches/Qt5/sources/titleblock/templatelocationsaver.h
===================================================================
--- branches/Qt5/sources/titleblock/templatelocationsaver.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/titleblock/templatelocationsaver.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TITLEBLOCK_SLASH_LOCATION_SAVER_H
#define TITLEBLOCK_SLASH_LOCATION_SAVER_H
-#include <QtGui>
+#include <QtWidgets>
#include "templatelocationchooser.h"
class TitleBlockTemplateCollection;
Modified: branches/Qt5/sources/titleblock/templatelogomanager.h
===================================================================
--- branches/Qt5/sources/titleblock/templatelogomanager.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/titleblock/templatelogomanager.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TITLEBLOCK_SLASH_TEMPLATE_LOGO_MANAGER
#define TITLEBLOCK_SLASH_TEMPLATE_LOGO_MANAGER
-#include <QtGui>
+#include <QtWidgets>
class TitleBlockTemplate;
/**
Modified: branches/Qt5/sources/titleblock/templatevisualcell.h
===================================================================
--- branches/Qt5/sources/titleblock/templatevisualcell.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/titleblock/templatevisualcell.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TITLEBLOCK_SLASH_QET_TEMPLATE_VISUAL_CELL_H
#define TITLEBLOCK_SLASH_QET_TEMPLATE_VISUAL_CELL_H
-#include <QtGui>
+#include <QtWidgets>
#include "qet.h"
class TitleBlockTemplate;
#include "titleblockcell.h"
Modified: branches/Qt5/sources/treecoloranimation.h
===================================================================
--- branches/Qt5/sources/treecoloranimation.h 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/treecoloranimation.h 2015-02-21 17:41:47 UTC (rev 3745)
@@ -17,7 +17,7 @@
*/
#ifndef TREE_COLOR_ANIMATION_H
#define TREE_COLOR_ANIMATION_H
-#include <QtGui>
+#include <QtWidgets>
/**
This class allows animating a background color change for a
Modified: branches/Qt5/sources/ui/diagrampropertiesdialog.cpp
===================================================================
--- branches/Qt5/sources/ui/diagrampropertiesdialog.cpp 2015-02-21 15:32:26 UTC (rev 3744)
+++ branches/Qt5/sources/ui/diagrampropertiesdialog.cpp 2015-02-21 17:41:47 UTC (rev 3745)
@@ -42,7 +42,7 @@
ConductorProperties conductors = diagram -> defaultConductorProperties;
setWindowModality(Qt::WindowModal);
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
setWindowFlags(Qt::Sheet);
#endif