kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-22 01:10:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Qt 6 definition of macro ‘Q_DECLARE_MOVABLE_CONTAINER’

Browse Source 
adding #include <QHash>

+ code fail to compile if it uses deprecated APIs.
=> see .pro file
This commit is contained in:
Simon De Backer
2020-09-21 21:19:50 +02:00
parent c958d54d01
commit 2a69e540d6
25 changed files with 207 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sources/undocommand/addelementtextcommand.h
View File

@@ -1,17 +1,17 @@
/*
Copyright 2006-2020 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
QElectroTech is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -21,6 +21,7 @@
#include <QUndoCommand>
#include <QPointer>
#include <QDomElement>
#include <QHash>
class Element;
class DynamicElementTextItem;
@@ -37,10 +38,10 @@ class AddElementTextCommand : public QUndoCommand
DynamicElementTextItem *deti,
QUndoCommand *parent = nullptr);
~AddElementTextCommand() override;
void undo() override;
void redo() override;
private:
Element *m_element = nullptr;
DynamicElementTextItem *m_text = nullptr;
@@ -64,10 +65,10 @@ class AddTextsGroupCommand : public QUndoCommand
QList<DynamicElementTextItem *> texts_list,
QUndoCommand *parent = nullptr);
~AddTextsGroupCommand() override;
void undo() override;
void redo() override;
private:
QPointer<Element> m_element;
QPointer<ElementTextItemGroup> m_group;
@@ -88,10 +89,10 @@ class RemoveTextsGroupCommand : public QUndoCommand
ElementTextItemGroup *group,
QUndoCommand *parent = nullptr);
~RemoveTextsGroupCommand() override;
void undo() override;
void redo() override;
private:
QPointer<Element> m_element;
QPointer<ElementTextItemGroup> m_group;
@@ -108,10 +109,10 @@ class AddTextToGroupCommand : public QUndoCommand
ElementTextItemGroup *group,
QUndoCommand *parent = nullptr);
~AddTextToGroupCommand() override;
void undo() override;
void redo() override;
private:
QPointer<DynamicElementTextItem> m_text;
QPointer<ElementTextItemGroup> m_group;
@@ -128,10 +129,10 @@ class RemoveTextFromGroupCommand : public QUndoCommand
ElementTextItemGroup *group,
QUndoCommand *parent = nullptr);
~RemoveTextFromGroupCommand() override;
void undo() override;
void redo() override;
private:
QPointer<DynamicElementTextItem> m_text;
QPointer<ElementTextItemGroup> m_group;
@@ -148,12 +149,12 @@ class AlignmentTextsGroupCommand : public QUndoCommand
Qt::Alignment new_alignment,
QUndoCommand *parent = nullptr);
~AlignmentTextsGroupCommand() override;
int id() const override{return 6;}
bool mergeWith(const QUndoCommand *other) override;
void undo() override;
void redo() override;
private:
QPointer<ElementTextItemGroup> m_group;
Qt::Alignment m_previous_alignment,