Cleanup Qt keywords (paceholder#199)

fredakilla · paceholder · commit 282b439af0be · 2019-02-06T22:05:38.000+01:00
* Qt no keywords

* replace emit with Q_EMIT

* add QT_NO_KEYWORDS definition to CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -102,6 +102,7 @@ target_compile_definitions(nodes
   PRIVATE
     NODE_EDITOR_EXPORTS
     #NODE_DEBUG_DRAWING
+    QT_NO_KEYWORDS
 )
 
 target_compile_options(nodes
diff --git a/examples/calculator/AdditionModel.hpp b/examples/calculator/AdditionModel.hpp
@@ -52,6 +52,6 @@ class AdditionModel : public MathOperationDataModel
       _result.reset();
     }
 
-    emit dataUpdated(outPortIndex);
+    Q_EMIT dataUpdated(outPortIndex);
   }
 };
diff --git a/examples/calculator/DivisionModel.hpp b/examples/calculator/DivisionModel.hpp
@@ -86,6 +86,6 @@ class DivisionModel : public MathOperationDataModel
       _result.reset();
     }
 
-    emit dataUpdated(outPortIndex);
+    Q_EMIT dataUpdated(outPortIndex);
   }
 };
diff --git a/examples/calculator/ModuloModel.cpp b/examples/calculator/ModuloModel.cpp
@@ -97,7 +97,7 @@ setInData(std::shared_ptr<NodeData> data, PortIndex portIndex)
       _result.reset();
     }
 
-    emit dataUpdated(outPortIndex);
+    Q_EMIT dataUpdated(outPortIndex);
   }
 }
 
diff --git a/examples/calculator/MultiplicationModel.hpp b/examples/calculator/MultiplicationModel.hpp
@@ -52,6 +52,6 @@ class MultiplicationModel : public MathOperationDataModel
       _result.reset();
     }
 
-    emit dataUpdated(outPortIndex);
+    Q_EMIT dataUpdated(outPortIndex);
   }
 };
diff --git a/examples/calculator/NumberSourceDataModel.cpp b/examples/calculator/NumberSourceDataModel.cpp
@@ -91,11 +91,11 @@ onTextEdited(QString const &string)
   {
     _number = std::make_shared<DecimalData>(number);
 
-    emit dataUpdated(0);
+    Q_EMIT dataUpdated(0);
   }
   else
   {
-    emit dataInvalidated(0);
+    Q_EMIT dataInvalidated(0);
   }
 }
 
diff --git a/examples/calculator/NumberSourceDataModel.hpp b/examples/calculator/NumberSourceDataModel.hpp
@@ -69,7 +69,7 @@ class NumberSourceDataModel
   QWidget *
   embeddedWidget() override { return _lineEdit; }
 
-private slots:
+private Q_SLOTS:
 
   void
   onTextEdited(QString const &string);
diff --git a/examples/calculator/SubtractionModel.hpp b/examples/calculator/SubtractionModel.hpp
@@ -81,6 +81,6 @@ class SubtractionModel : public MathOperationDataModel
       _result.reset();
     }
 
-    emit dataUpdated(outPortIndex);
+    Q_EMIT dataUpdated(outPortIndex);
   }
 };
diff --git a/examples/example2/TextSourceDataModel.cpp b/examples/example2/TextSourceDataModel.cpp
@@ -38,7 +38,7 @@ onTextEdited(QString const &string)
 {
   Q_UNUSED(string);
 
-  emit dataUpdated(0);
+  Q_EMIT dataUpdated(0);
 }
 
 
diff --git a/examples/example2/TextSourceDataModel.hpp b/examples/example2/TextSourceDataModel.hpp
@@ -61,7 +61,7 @@ class TextSourceDataModel : public NodeDataModel
   QWidget *
   embeddedWidget() override { return _lineEdit; }
 
-private slots:
+private Q_SLOTS:
 
   void
   onTextEdited(QString const &string);
diff --git a/examples/images/ImageLoaderModel.cpp b/examples/images/ImageLoaderModel.cpp
@@ -68,7 +68,7 @@ eventFilter(QObject *object, QEvent *event)
 
       _label->setPixmap(_pixmap.scaled(w, h, Qt::KeepAspectRatio));
 
-      emit dataUpdated(0);
+      Q_EMIT dataUpdated(0);
 
       return true;
     }
diff --git a/examples/images/ImageShowModel.cpp b/examples/images/ImageShowModel.cpp
@@ -108,5 +108,5 @@ setInData(std::shared_ptr<NodeData> nodeData, PortIndex)
     _label->setPixmap(QPixmap());
   }
 
-  emit dataUpdated(0);
+  Q_EMIT dataUpdated(0);
 }
diff --git a/include/nodes/internal/Connection.hpp b/include/nodes/internal/Connection.hpp
@@ -147,7 +147,7 @@ class NODE_EDITOR_PUBLIC Connection
 
   TypeConverter _converter;
 
-signals:
+Q_SIGNALS:
 
   void
   updated(Connection& conn) const;
diff --git a/include/nodes/internal/FlowScene.hpp b/include/nodes/internal/FlowScene.hpp
@@ -97,7 +97,7 @@ class NODE_EDITOR_PUBLIC FlowScene
 
   void loadFromMemory(const QByteArray& data);
 
-signals:
+Q_SIGNALS:
 
   void nodeCreated(Node &n);
 
diff --git a/include/nodes/internal/FlowView.hpp b/include/nodes/internal/FlowView.hpp
@@ -27,7 +27,7 @@ class NODE_EDITOR_PUBLIC FlowView
 
   void setScene(FlowScene *scene);
 
-public slots:
+public Q_SLOTS:
 
   void scaleUp();
 
diff --git a/include/nodes/internal/Node.hpp b/include/nodes/internal/Node.hpp
@@ -85,7 +85,7 @@ class NODE_EDITOR_PUBLIC Node
   NodeDataModel*
   nodeDataModel() const;
 
-public slots: // data propagation
+public Q_SLOTS: // data propagation
 
   /// Propagates incoming data to the underlying model.
   void
diff --git a/include/nodes/internal/NodeDataModel.hpp b/include/nodes/internal/NodeDataModel.hpp
@@ -122,7 +122,7 @@ class NODE_EDITOR_PUBLIC NodeDataModel
   virtual
   NodePainterDelegate* painterDelegate() const { return nullptr; }
 
-signals:
+Q_SIGNALS:
 
   void
   dataUpdated(PortIndex index);

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ target_compile_definitions(nodes`
`102`	`102`	`PRIVATE`
`103`	`103`	`NODE_EDITOR_EXPORTS`
`104`	`104`	`#NODE_DEBUG_DRAWING`
	`105`	`+ QT_NO_KEYWORDS`
`105`	`106`	`)`
`106`	`107`
`107`	`108`	`target_compile_options(nodes`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,6 @@ class AdditionModel : public MathOperationDataModel`
`52`	`52`	`_result.reset();`
`53`	`53`	`}`
`54`	`54`
`55`		`- emit dataUpdated(outPortIndex);`
	`55`	`+ Q_EMIT dataUpdated(outPortIndex);`
`56`	`56`	`}`
`57`	`57`	`};`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,6 @@ class DivisionModel : public MathOperationDataModel`
`86`	`86`	`_result.reset();`
`87`	`87`	`}`
`88`	`88`
`89`		`- emit dataUpdated(outPortIndex);`
	`89`	`+ Q_EMIT dataUpdated(outPortIndex);`
`90`	`90`	`}`
`91`	`91`	`};`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ setInData(std::shared_ptr<NodeData> data, PortIndex portIndex)`
`97`	`97`	`_result.reset();`
`98`	`98`	`}`
`99`	`99`
`100`		`- emit dataUpdated(outPortIndex);`
	`100`	`+ Q_EMIT dataUpdated(outPortIndex);`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,6 @@ class MultiplicationModel : public MathOperationDataModel`
`52`	`52`	`_result.reset();`
`53`	`53`	`}`
`54`	`54`
`55`		`- emit dataUpdated(outPortIndex);`
	`55`	`+ Q_EMIT dataUpdated(outPortIndex);`
`56`	`56`	`}`
`57`	`57`	`};`
Original file line number	Diff line number	Diff line change
`@@ -91,11 +91,11 @@ onTextEdited(QString const &string)`
`91`	`91`	`{`
`92`	`92`	`_number = std::make_shared<DecimalData>(number);`
`93`	`93`
`94`		`- emit dataUpdated(0);`
	`94`	`+ Q_EMIT dataUpdated(0);`
`95`	`95`	`}`
`96`	`96`	`else`
`97`	`97`	`{`
`98`		`- emit dataInvalidated(0);`
	`98`	`+ Q_EMIT dataInvalidated(0);`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,6 @@ class SubtractionModel : public MathOperationDataModel`
`81`	`81`	`_result.reset();`
`82`	`82`	`}`
`83`	`83`
`84`		`- emit dataUpdated(outPortIndex);`
	`84`	`+ Q_EMIT dataUpdated(outPortIndex);`
`85`	`85`	`}`
`86`	`86`	`};`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ onTextEdited(QString const &string)`
`38`	`38`	`{`
`39`	`39`	`Q_UNUSED(string);`
`40`	`40`
`41`		`- emit dataUpdated(0);`
	`41`	`+ Q_EMIT dataUpdated(0);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`