Refactor

GIBIS-UNIFESP · Oct 27, 2022 · 1f19ddf · 1f19ddf
1 parent 6dbff2b
commit 1f19ddf
Show file tree

Hide file tree

Showing 38 changed files with 44 additions and 43 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → app/graphicelementinput.h b/app/element/graphicelementinput.h → app/graphicelementinput.h
diff --git 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
@@ -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
@@ -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
@@ -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 \