From 1f19ddf6945e92260cae9501e54f2f9051594bd4 Mon Sep 17 00:00:00 2001
From: Rodrigo Torres <torres.dark@gmail.com>
Date: Wed, 26 Oct 2022 21:31:46 -0300
Subject: [PATCH] Refactor

---
 app/application.cpp                     | 2 +-
 app/arduino/codegenerator.cpp           | 2 +-
 app/bewaveddolphin.cpp                  | 8 ++++----
 app/element/and.cpp                     | 2 +-
 app/element/buzzer.cpp                  | 2 +-
 app/element/clock.cpp                   | 2 +-
 app/element/demux.cpp                   | 2 +-
 app/element/dflipflop.cpp               | 2 +-
 app/element/display_14.cpp              | 2 +-
 app/element/display_7.cpp               | 2 +-
 app/element/dlatch.cpp                  | 2 +-
 app/element/element.pri                 | 1 -
 app/element/inputbutton.cpp             | 2 +-
 app/element/inputgnd.cpp                | 2 +-
 app/element/inputrotary.cpp             | 2 +-
 app/element/inputswitch.cpp             | 2 +-
 app/element/inputvcc.cpp                | 2 +-
 app/element/jkflipflop.cpp              | 2 +-
 app/element/led.cpp                     | 2 +-
 app/element/line.cpp                    | 2 +-
 app/element/mux.cpp                     | 2 +-
 app/element/nand.cpp                    | 2 +-
 app/element/node.cpp                    | 2 +-
 app/element/nor.cpp                     | 2 +-
 app/element/not.cpp                     | 2 +-
 app/element/or.cpp                      | 2 +-
 app/element/srflipflop.cpp              | 2 +-
 app/element/text.cpp                    | 2 +-
 app/element/tflipflop.cpp               | 2 +-
 app/element/xnor.cpp                    | 2 +-
 app/element/xor.cpp                     | 2 +-
 app/elementlabel.cpp                    | 4 ++--
 app/graphicelement.cpp                  | 4 ++--
 app/{element => }/graphicelementinput.h | 0
 app/ic.cpp                              | 2 +-
 app/nodes/qneconnection.cpp             | 2 +-
 app/nodes/qneport.cpp                   | 4 ++--
 config.pri                              | 4 +++-
 38 files changed, 44 insertions(+), 43 deletions(-)
 rename app/{element => }/graphicelementinput.h (100%)

diff --git a/app/application.cpp b/app/application.cpp
index 4faafd73c..b1db0b774 100644
--- a/app/application.cpp
+++ b/app/application.cpp
@@ -9,7 +9,7 @@ Application::Application(int &argc, char **argv)
 
 bool Application::notify(QObject *receiver, QEvent *event)
 {
-    bool done;
+    bool done = false;
 
     try {
         done = QApplication::notify(receiver, event);
diff --git a/app/arduino/codegenerator.cpp b/app/arduino/codegenerator.cpp
index 202d10501..7f49e6cf0 100644
--- a/app/arduino/codegenerator.cpp
+++ b/app/arduino/codegenerator.cpp
@@ -12,7 +12,7 @@
 #include <QRegularExpression>
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-using Qt::endl;
+#define endl Qt::endl
 #endif
 
 CodeGenerator::CodeGenerator(const QString &fileName, const QVector<GraphicElement *> &elements)
diff --git a/app/bewaveddolphin.cpp b/app/bewaveddolphin.cpp
index e1bdc7d7c..4620ed1c2 100644
--- a/app/bewaveddolphin.cpp
+++ b/app/bewaveddolphin.cpp
@@ -876,10 +876,10 @@ void BewavedDolphin::copy(const QItemSelection &ranges, QDataStream &stream)
     for (const auto &item : itemList) {
         const int row = item.row();
         const int col = item.column();
-        const int data = m_model->index(row, col).data().toInt();
+        const int data_ = m_model->index(row, col).data().toInt();
         stream << static_cast<qint64>(row - firstRow);
         stream << static_cast<qint64>(col - firstCol);
-        stream << static_cast<qint64>(data);
+        stream << static_cast<qint64>(data_);
     }
 }
 
@@ -940,12 +940,12 @@ void BewavedDolphin::paste(const QItemSelection &ranges, QDataStream &stream)
     for (int i = 0; i < static_cast<int>(itemListSize); ++i) {
         quint64 row;  stream >> row;
         quint64 col;  stream >> col;
-        quint64 data; stream >> data;
+        quint64 data_; stream >> data_;
         const int newRow = static_cast<int>(firstRow + row);
         const int newCol = static_cast<int>(firstCol + col);
 
         if ((newRow < m_inputPorts) && (newCol < m_model->columnCount())) {
-            createElement(newRow, newCol, static_cast<int>(data));
+            createElement(newRow, newCol, static_cast<int>(data_));
         }
     }
 
diff --git a/app/element/and.cpp b/app/element/and.cpp
index 00245664c..28503c1a9 100644
--- a/app/element/and.cpp
+++ b/app/element/and.cpp
@@ -7,7 +7,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<And>();
+    int id = qRegisterMetaType<And>();
 }
 
 And::And(QGraphicsItem *parent)
diff --git a/app/element/buzzer.cpp b/app/element/buzzer.cpp
index dac3abbdc..448f03747 100644
--- a/app/element/buzzer.cpp
+++ b/app/element/buzzer.cpp
@@ -17,7 +17,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Buzzer>();
+    int id = qRegisterMetaType<Buzzer>();
 }
 
 Buzzer::Buzzer(QGraphicsItem *parent)
diff --git a/app/element/clock.cpp b/app/element/clock.cpp
index 2ee5723b0..6c0e7d370 100644
--- a/app/element/clock.cpp
+++ b/app/element/clock.cpp
@@ -12,7 +12,7 @@ using namespace std::chrono_literals;
 
 namespace
 {
-int id = qRegisterMetaType<Clock>();
+    int id = qRegisterMetaType<Clock>();
 }
 
 Clock::Clock(QGraphicsItem *parent)
diff --git a/app/element/demux.cpp b/app/element/demux.cpp
index 3004425a8..cf0975b83 100644
--- a/app/element/demux.cpp
+++ b/app/element/demux.cpp
@@ -8,7 +8,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Demux>();
+    int id = qRegisterMetaType<Demux>();
 }
 
 Demux::Demux(QGraphicsItem *parent)
diff --git a/app/element/dflipflop.cpp b/app/element/dflipflop.cpp
index 3f3aaa40d..e0a7982d6 100644
--- a/app/element/dflipflop.cpp
+++ b/app/element/dflipflop.cpp
@@ -8,7 +8,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<DFlipFlop>();
+    int id = qRegisterMetaType<DFlipFlop>();
 }
 
 DFlipFlop::DFlipFlop(QGraphicsItem *parent)
diff --git a/app/element/display_14.cpp b/app/element/display_14.cpp
index 7e09aceaa..89fc8722d 100644
--- a/app/element/display_14.cpp
+++ b/app/element/display_14.cpp
@@ -11,7 +11,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Display14>();
+    int id = qRegisterMetaType<Display14>();
 }
 
 Display14::Display14(QGraphicsItem *parent)
diff --git a/app/element/display_7.cpp b/app/element/display_7.cpp
index 112bffd7d..d58928338 100644
--- a/app/element/display_7.cpp
+++ b/app/element/display_7.cpp
@@ -12,7 +12,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Display7>();
+    int id = qRegisterMetaType<Display7>();
 }
 
 Display7::Display7(QGraphicsItem *parent)
diff --git a/app/element/dlatch.cpp b/app/element/dlatch.cpp
index 2e6b7044d..2b5a2f06c 100644
--- a/app/element/dlatch.cpp
+++ b/app/element/dlatch.cpp
@@ -8,7 +8,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<DLatch>();
+    int id = qRegisterMetaType<DLatch>();
 }
 
 DLatch::DLatch(QGraphicsItem *parent)
diff --git a/app/element/element.pri b/app/element/element.pri
index a08c6b0a1..a6e6d7738 100644
--- a/app/element/element.pri
+++ b/app/element/element.pri
@@ -36,7 +36,6 @@ HEADERS += \
     $$PWD/display_14.h \
     $$PWD/display_7.h \
     $$PWD/dlatch.h \
-    $$PWD/graphicelementinput.h \
     $$PWD/inputbutton.h \
     $$PWD/inputgnd.h \
     $$PWD/inputrotary.h \
diff --git a/app/element/inputbutton.cpp b/app/element/inputbutton.cpp
index 57ecb8193..6b13cf019 100644
--- a/app/element/inputbutton.cpp
+++ b/app/element/inputbutton.cpp
@@ -10,7 +10,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<InputButton>();
+    int id = qRegisterMetaType<InputButton>();
 }
 
 InputButton::InputButton(QGraphicsItem *parent)
diff --git a/app/element/inputgnd.cpp b/app/element/inputgnd.cpp
index 6c96322cf..1c557d510 100644
--- a/app/element/inputgnd.cpp
+++ b/app/element/inputgnd.cpp
@@ -7,7 +7,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<InputGnd>();
+    int id = qRegisterMetaType<InputGnd>();
 }
 
 InputGnd::InputGnd(QGraphicsItem *parent)
diff --git a/app/element/inputrotary.cpp b/app/element/inputrotary.cpp
index 16600d210..35e947b9a 100644
--- a/app/element/inputrotary.cpp
+++ b/app/element/inputrotary.cpp
@@ -11,7 +11,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<InputRotary>();
+    int id = qRegisterMetaType<InputRotary>();
 }
 
 InputRotary::InputRotary(QGraphicsItem *parent)
diff --git a/app/element/inputswitch.cpp b/app/element/inputswitch.cpp
index 4a0a7b205..ee81780ba 100644
--- a/app/element/inputswitch.cpp
+++ b/app/element/inputswitch.cpp
@@ -10,7 +10,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<InputSwitch>();
+    int id = qRegisterMetaType<InputSwitch>();
 }
 
 InputSwitch::InputSwitch(QGraphicsItem *parent)
diff --git a/app/element/inputvcc.cpp b/app/element/inputvcc.cpp
index 4c53c80e8..b9c6a42f4 100644
--- a/app/element/inputvcc.cpp
+++ b/app/element/inputvcc.cpp
@@ -8,7 +8,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<InputVcc>();
+    int id = qRegisterMetaType<InputVcc>();
 }
 
 InputVcc::InputVcc(QGraphicsItem *parent)
diff --git a/app/element/jkflipflop.cpp b/app/element/jkflipflop.cpp
index 2ebfacf6d..6008f6975 100644
--- a/app/element/jkflipflop.cpp
+++ b/app/element/jkflipflop.cpp
@@ -8,7 +8,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<JKFlipFlop>();
+    int id = qRegisterMetaType<JKFlipFlop>();
 }
 
 JKFlipFlop::JKFlipFlop(QGraphicsItem *parent)
diff --git a/app/element/led.cpp b/app/element/led.cpp
index 675605fbc..122f88807 100644
--- a/app/element/led.cpp
+++ b/app/element/led.cpp
@@ -10,7 +10,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Led>();
+    int id = qRegisterMetaType<Led>();
 }
 
 Led::Led(QGraphicsItem *parent)
diff --git a/app/element/line.cpp b/app/element/line.cpp
index fb9c7f2af..b74e30cff 100644
--- a/app/element/line.cpp
+++ b/app/element/line.cpp
@@ -7,7 +7,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Line>();
+    int id = qRegisterMetaType<Line>();
 }
 
 Line::Line(QGraphicsItem *parent)
diff --git a/app/element/mux.cpp b/app/element/mux.cpp
index 31c9e8bf2..272899244 100644
--- a/app/element/mux.cpp
+++ b/app/element/mux.cpp
@@ -8,7 +8,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Mux>();
+    int id = qRegisterMetaType<Mux>();
 }
 
 Mux::Mux(QGraphicsItem *parent)
diff --git a/app/element/nand.cpp b/app/element/nand.cpp
index 708cab6f8..30e862593 100644
--- a/app/element/nand.cpp
+++ b/app/element/nand.cpp
@@ -7,7 +7,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Nand>();
+    int id = qRegisterMetaType<Nand>();
 }
 
 Nand::Nand(QGraphicsItem *parent)
diff --git a/app/element/node.cpp b/app/element/node.cpp
index 6e1cd09c0..25d158153 100644
--- a/app/element/node.cpp
+++ b/app/element/node.cpp
@@ -8,7 +8,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Node>();
+    int id = qRegisterMetaType<Node>();
 }
 
 Node::Node(QGraphicsItem *parent)
diff --git a/app/element/nor.cpp b/app/element/nor.cpp
index 1d656dd4a..4333b2307 100644
--- a/app/element/nor.cpp
+++ b/app/element/nor.cpp
@@ -7,7 +7,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Nor>();
+    int id = qRegisterMetaType<Nor>();
 }
 
 Nor::Nor(QGraphicsItem *parent)
diff --git a/app/element/not.cpp b/app/element/not.cpp
index 4a9392954..ff94cc68c 100644
--- a/app/element/not.cpp
+++ b/app/element/not.cpp
@@ -7,7 +7,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Not>();
+    int id = qRegisterMetaType<Not>();
 }
 
 Not::Not(QGraphicsItem *parent)
diff --git a/app/element/or.cpp b/app/element/or.cpp
index f32ac151c..c56b3c55a 100644
--- a/app/element/or.cpp
+++ b/app/element/or.cpp
@@ -7,7 +7,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Or>();
+    int id = qRegisterMetaType<Or>();
 }
 
 Or::Or(QGraphicsItem *parent)
diff --git a/app/element/srflipflop.cpp b/app/element/srflipflop.cpp
index 7e1d5e5be..59ebfa2cd 100644
--- a/app/element/srflipflop.cpp
+++ b/app/element/srflipflop.cpp
@@ -8,7 +8,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<SRFlipFlop>();
+    int id = qRegisterMetaType<SRFlipFlop>();
 }
 
 SRFlipFlop::SRFlipFlop(QGraphicsItem *parent)
diff --git a/app/element/text.cpp b/app/element/text.cpp
index 91647ce90..65bef3589 100644
--- a/app/element/text.cpp
+++ b/app/element/text.cpp
@@ -7,7 +7,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Text>();
+    int id = qRegisterMetaType<Text>();
 }
 
 Text::Text(QGraphicsItem *parent)
diff --git a/app/element/tflipflop.cpp b/app/element/tflipflop.cpp
index c97505331..2a8beec96 100644
--- a/app/element/tflipflop.cpp
+++ b/app/element/tflipflop.cpp
@@ -8,7 +8,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<TFlipFlop>();
+    int id = qRegisterMetaType<TFlipFlop>();
 }
 
 TFlipFlop::TFlipFlop(QGraphicsItem *parent)
diff --git a/app/element/xnor.cpp b/app/element/xnor.cpp
index 310b8b6ec..487ec2bf0 100644
--- a/app/element/xnor.cpp
+++ b/app/element/xnor.cpp
@@ -7,7 +7,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Xnor>();
+    int id = qRegisterMetaType<Xnor>();
 }
 
 Xnor::Xnor(QGraphicsItem *parent)
diff --git a/app/element/xor.cpp b/app/element/xor.cpp
index 738c2d56a..5cec935d6 100644
--- a/app/element/xor.cpp
+++ b/app/element/xor.cpp
@@ -7,7 +7,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<Xor>();
+    int id = qRegisterMetaType<Xor>();
 }
 
 Xor::Xor(QGraphicsItem *parent)
diff --git a/app/elementlabel.cpp b/app/elementlabel.cpp
index ce973bad7..b12eb5b9a 100644
--- a/app/elementlabel.cpp
+++ b/app/elementlabel.cpp
@@ -81,7 +81,7 @@ void ElementLabel::startDrag()
 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
     QPoint offset = m_iconLabel.pixmap()->rect().center();
 #else
-    QPoint offset = m_iconLabel.pixmap().rect().center();
+    QPoint offset = m_iconLabel.pixmap(Qt::ReturnByValue).rect().center();
 #endif
     QByteArray itemData;
     QDataStream stream(&itemData, QIODevice::WriteOnly);
@@ -103,7 +103,7 @@ QMimeData *ElementLabel::mimeData()
 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
     QPoint offset = m_iconLabel.pixmap()->rect().center();
 #else
-    QPoint offset = m_iconLabel.pixmap().rect().center();
+    QPoint offset = m_iconLabel.pixmap(Qt::ReturnByValue).rect().center();
 #endif
     QByteArray itemData;
     QDataStream stream(&itemData, QIODevice::WriteOnly);
diff --git a/app/graphicelement.cpp b/app/graphicelement.cpp
index 0fb9baa51..8dfbe6930 100644
--- a/app/graphicelement.cpp
+++ b/app/graphicelement.cpp
@@ -22,7 +22,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<GraphicElement>();
+    int id = qRegisterMetaType<GraphicElement>();
 }
 
 const int maximumValidInputSize = 256;
@@ -302,7 +302,7 @@ void GraphicElement::loadNewFormat(QDataStream &stream, QMap<quint64, QNEPort *>
         if (port < m_inputPorts.size()) {
             m_inputPorts.value(port)->setPtr(ptr);
 
-            if (ElementType() == ElementType::IC) {
+            if (elementType() == ElementType::IC) {
                 m_inputPorts.value(port)->setName(name);
             }
         } else {
diff --git a/app/element/graphicelementinput.h b/app/graphicelementinput.h
similarity index 100%
rename from app/element/graphicelementinput.h
rename to app/graphicelementinput.h
diff --git a/app/ic.cpp b/app/ic.cpp
index f0d4792d5..8c4a05bd2 100644
--- a/app/ic.cpp
+++ b/app/ic.cpp
@@ -18,7 +18,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<IC>();
+    int id = qRegisterMetaType<IC>();
 }
 
 IC::IC(QGraphicsItem *parent)
diff --git a/app/nodes/qneconnection.cpp b/app/nodes/qneconnection.cpp
index f4fa70400..7bcaec7e6 100644
--- a/app/nodes/qneconnection.cpp
+++ b/app/nodes/qneconnection.cpp
@@ -39,7 +39,7 @@
 
 namespace
 {
-int id = qRegisterMetaType<QNEConnection>();
+    int id = qRegisterMetaType<QNEConnection>();
 }
 
 QNEConnection::QNEConnection(QGraphicsItem *parent)
diff --git a/app/nodes/qneport.cpp b/app/nodes/qneport.cpp
index 34e5c6c75..eaac1c6aa 100644
--- a/app/nodes/qneport.cpp
+++ b/app/nodes/qneport.cpp
@@ -38,8 +38,8 @@
 
 namespace
 {
-int id = qRegisterMetaType<QNEInputPort>();
-int id2 = qRegisterMetaType<QNEOutputPort>();
+    int id = qRegisterMetaType<QNEInputPort>();
+    int id2 = qRegisterMetaType<QNEOutputPort>();
 }
 
 QNEPort::QNEPort(QGraphicsItem *parent)
diff --git a/config.pri b/config.pri
index 4ff662146..3739caafa 100644
--- a/config.pri
+++ b/config.pri
@@ -78,7 +78,8 @@ linux {
 }
 
 msvc {
-    QMAKE_CXXFLAGS += /permissive-
+    QMAKE_CXXFLAGS_WARN_ON ~= s/-W3/-W4
+    QMAKE_CXXFLAGS += /permissive- /external:I $$[QT_INSTALL_PREFIX] /external:W0
     QMAKE_CXXFLAGS_DEBUG += /Ob1
     QMAKE_CXXFLAGS_RELEASE += /GL
     QMAKE_LFLAGS_RELEASE += /LTCG
@@ -151,6 +152,7 @@ HEADERS += \
     $$PWD/app/enums.h \
     $$PWD/app/globalproperties.h \
     $$PWD/app/graphicelement.h \
+    $$PWD/app/graphicelementinput.h \
     $$PWD/app/graphicsview.h \
     $$PWD/app/ic.h \
     $$PWD/app/itemwithid.h \