Add some missing Q_OBJECT macros

iakov · iakov · commit 832968184cd7 · 2025-01-13T17:45:57.000+03:00
diff --git a/plugins/robots/generators/nxt/nxtGeneratorBase/include/nxtGeneratorBase/nxtMasterGeneratorBase.h b/plugins/robots/generators/nxt/nxtGeneratorBase/include/nxtGeneratorBase/nxtMasterGeneratorBase.h
@@ -23,6 +23,7 @@ namespace nxt {
 /// Master generator base implementation for every generator from NXT kit
 class ROBOTS_NXT_GENERATOR_BASE_EXPORT NxtMasterGeneratorBase : public generatorBase::MasterGeneratorBase
 {
+	Q_OBJECT
 public:
 	NxtMasterGeneratorBase(const qrRepo::RepoApi &repo
 			, qReal::ErrorReporterInterface &errorReporter
diff --git a/plugins/robots/generators/nxt/nxtOsekCGenerator/nxtOsekCMasterGenerator.h b/plugins/robots/generators/nxt/nxtOsekCGenerator/nxtOsekCMasterGenerator.h
@@ -21,6 +21,7 @@ namespace osekC {
 
 class NxtOsekCMasterGenerator : public NxtMasterGeneratorBase
 {
+	Q_OBJECT
 public:
 	NxtOsekCMasterGenerator(const qrRepo::RepoApi &repo
 			, qReal::ErrorReporterInterface &errorReporter
diff --git a/qrgui/controller/commands/doNothingCommand.h b/qrgui/controller/commands/doNothingCommand.h
@@ -23,6 +23,7 @@ namespace commands {
 /// having no actions itself
 class QRGUI_CONTROLLER_EXPORT DoNothingCommand : public AbstractCommand
 {
+	Q_OBJECT
 public:
 	DoNothingCommand();
 
diff --git a/qrgui/controller/undoStack.h b/qrgui/controller/undoStack.h
@@ -22,6 +22,7 @@ namespace qReal {
 
 class UndoStack : public QUndoStack
 {
+	Q_OBJECT
 public:
 	UndoStack(QObject *parent = nullptr);
 
diff --git a/qrgui/editor/commands/arrangeLinksCommand.h b/qrgui/editor/commands/arrangeLinksCommand.h
@@ -24,6 +24,7 @@ namespace commands {
 /// Arranges links of specified node element
 class ArrangeLinksCommand : public ElementCommand
 {
+	Q_OBJECT
 public:
 	ArrangeLinksCommand(const EditorViewScene *scene, const Id &id, bool needAdjusting = false);
 	ArrangeLinksCommand(const EditorView *view, const Id &id, bool needAdjusting = false);
diff --git a/qrgui/editor/commands/createAndUpdatePatternCommand.h b/qrgui/editor/commands/createAndUpdatePatternCommand.h
@@ -26,6 +26,7 @@ namespace commands {
 /// In other words this command adds view part into the CreateGroupCommand.
 class CreateAndUpdatePatternCommand : public qReal::commands::CreatePatternCommand
 {
+	Q_OBJECT
 public:
 	CreateAndUpdatePatternCommand(EditorViewScene &scene
 			, const models::Models &models
diff --git a/qrgui/editor/commands/edgeElementCommand.h b/qrgui/editor/commands/edgeElementCommand.h
@@ -24,6 +24,7 @@ namespace commands {
 /// A base for all commands using concrete edge element instance on some scene
 class EdgeElementCommand : public ElementCommand
 {
+	Q_OBJECT
 public:
 	EdgeElementCommand(const EditorViewScene *scene, const Id &id);
 	EdgeElementCommand(const EditorView *view, const Id &id);
diff --git a/qrgui/editor/commands/expandCommand.h b/qrgui/editor/commands/expandCommand.h
@@ -24,6 +24,7 @@ namespace commands {
 
 class ExpandCommand : public NodeElementCommand
 {
+	Q_OBJECT
 public:
 	ExpandCommand(const NodeElement *node);
 	virtual ~ExpandCommand();
diff --git a/qrgui/editor/commands/foldCommand.h b/qrgui/editor/commands/foldCommand.h
@@ -23,6 +23,7 @@ namespace commands {
 
 class FoldCommand : public NodeElementCommand
 {
+	Q_OBJECT
 public:
 	FoldCommand(const NodeElement *element);
 	virtual ~FoldCommand() {}
diff --git a/qrgui/editor/commands/insertIntoEdgeCommand.h b/qrgui/editor/commands/insertIntoEdgeCommand.h
@@ -27,6 +27,7 @@ namespace commands {
 
 class InsertIntoEdgeCommand : public qReal::commands::AbstractCommand
 {
+	Q_OBJECT
 public:
 	InsertIntoEdgeCommand(EditorViewScene &scene
 			, const models::Models &models
diff --git a/qrgui/editor/commands/nodeElementCommand.h b/qrgui/editor/commands/nodeElementCommand.h
@@ -24,6 +24,7 @@ namespace commands {
 /// A base for all commands using concrete node element instance on some scene
 class NodeElementCommand : public ElementCommand
 {
+	Q_OBJECT
 public:
 	NodeElementCommand(const EditorViewScene *scene, const Id &id);
 	NodeElementCommand(const EditorView *view, const Id &id);
diff --git a/qrgui/editor/commands/removeAndUpdateCommand.h b/qrgui/editor/commands/removeAndUpdateCommand.h
@@ -26,6 +26,7 @@ namespace commands {
 /// In other words this command adds view part into the MulipleRemoveCommand.
 class RemoveAndUpdateCommand : public qReal::commands::RemoveElementsCommand
 {
+	Q_OBJECT
 public:
 	RemoveAndUpdateCommand(EditorViewScene &scene, const models::Models &models);
 
diff --git a/qrgui/editor/commands/replaceByCommand.h b/qrgui/editor/commands/replaceByCommand.h
@@ -27,6 +27,7 @@ namespace commands {
 
 class ReplaceByCommand : public qReal::commands::AbstractCommand
 {
+	Q_OBJECT
 public:
 	ReplaceByCommand(const models::Models &models, gui::editor::EditorViewScene &scene
 			, NodeElement *elementToRemove, const ElementInfo &elementToCreate);
diff --git a/qrgui/editor/commands/reshapeEdgeCommand.h b/qrgui/editor/commands/reshapeEdgeCommand.h
@@ -26,6 +26,7 @@ namespace commands
 
 class ReshapeEdgeCommand : public EdgeElementCommand, public qReal::commands::TrackingEntity
 {
+	Q_OBJECT
 public:
 	ReshapeEdgeCommand(const EdgeElement *edge);
 	ReshapeEdgeCommand(const EditorViewScene *scene, const Id &id);
diff --git a/qrgui/editor/commands/resizeCommand.h b/qrgui/editor/commands/resizeCommand.h
@@ -28,6 +28,7 @@ namespace commands {
 
 class ResizeCommand : public NodeElementCommand, public qReal::commands::TrackingEntity
 {
+	Q_OBJECT
 public:
 	/// Creating new instance of command in tracking-based style
 	ResizeCommand(const EditorViewScene *scene, const Id &id);
diff --git a/qrgui/editor/commands/selectElementCommand.h b/qrgui/editor/commands/selectElementCommand.h
@@ -24,6 +24,7 @@ namespace commands {
 /// This command selects or deselects element on the scene
 class SelectElementCommand : public ElementCommand
 {
+	Q_OBJECT
 public:
 	/// @param shouldSelect A selection state to be setted to our element
 	/// @param forceValueChange Should selection state be setted to opposite
diff --git a/qrgui/editor/commands/updateElementCommand.h b/qrgui/editor/commands/updateElementCommand.h
@@ -23,6 +23,7 @@ namespace commands {
 
 class UpdateElementCommand : public ElementCommand
 {
+	Q_OBJECT
 public:
 	UpdateElementCommand(const EditorViewScene *scene, const Id &id);
 	UpdateElementCommand(const EditorView *view, const Id &id);
diff --git a/qrgui/mainWindow/mainWindow.pro b/qrgui/mainWindow/mainWindow.pro
@@ -57,6 +57,7 @@ HEADERS += \
 	$$PWD/startWidget/startWidget.h \
 	$$PWD/startWidget/circleWidget.h \
 	$$PWD/startWidget/styledButton.h \
+	$$PWD/palette/hackTouchDragThread.h \
 
 SOURCES += \
 	$$PWD/main.cpp \
diff --git a/qrgui/mainWindow/palette/draggableElement.cpp b/qrgui/mainWindow/palette/draggableElement.cpp
@@ -40,6 +40,8 @@
 
 #include <plugins/pluginManager/toolPluginManager.h>
 
+#include "hackTouchDragThread.h"
+
 using namespace qReal;
 using namespace gui;
 
@@ -407,27 +409,27 @@ constexpr auto MOUSEEVENTF_LEFTUP = 0;
 constexpr auto MOUSEEVENTF_MOVE = 0;
 #endif
 
-DraggableElement::HackTouchDragThread::HackTouchDragThread(QObject *parent)
+HackTouchDragThread::HackTouchDragThread(QObject *parent)
 	: QThread(parent)
 {
 }
 
-void DraggableElement::HackTouchDragThread::simulateSystemPress()
+void HackTouchDragThread::simulateSystemPress()
 {
 	mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0);
 }
 
-void DraggableElement::HackTouchDragThread::simulateSystemMove()
+void HackTouchDragThread::simulateSystemMove()
 {
 	mouse_event(MOUSEEVENTF_MOVE, -1, -1, 0, 0);
 }
 
-void DraggableElement::HackTouchDragThread::simulateSystemRelease()
+void HackTouchDragThread::simulateSystemRelease()
 {
 	mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);
 }
 
-void DraggableElement::HackTouchDragThread::run()
+void HackTouchDragThread::run()
 {
 	// Simulating press for windows drag manager not to terminate drag as inconsistent
 	// when it would be unfrozen
diff --git a/qrgui/mainWindow/palette/draggableElement.h b/qrgui/mainWindow/palette/draggableElement.h
@@ -84,22 +84,6 @@ private slots:
 	virtual void mousePressEvent(QMouseEvent *event);
 
 private:
-	/// This class performs win8 drag manager hack for workaround of
-	/// https://github.com/qreal/qreal/issues/1014
-	class HackTouchDragThread : public QThread
-	{
-	public:
-		explicit HackTouchDragThread(QObject *parent = nullptr);
-
-		static void simulateSystemPress();
-		static void simulateSystemMove();
-		static void simulateSystemRelease();
-
-	protected:
-		virtual void run();
-	};
-
-
 	void checkElementForChildren();
 	void hackTouchDrag();
 
diff --git a/qrgui/mainWindow/palette/hackTouchDragThread.h b/qrgui/mainWindow/palette/hackTouchDragThread.h
@@ -0,0 +1,35 @@
+/* Copyright 2007-2015 QReal Research Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. */
+
+#pragma once
+#include <QtCore/QThread>
+
+
+/// This class performs win8 drag manager hack for workaround of
+/// https://github.com/qreal/qreal/issues/1014
+class HackTouchDragThread : public QThread
+{
+	Q_OBJECT
+public:
+	explicit HackTouchDragThread(QObject *parent = nullptr);
+
+	static void simulateSystemPress();
+	static void simulateSystemMove();
+	static void simulateSystemRelease();
+
+protected:
+	virtual void run();
+};
+
+
diff --git a/qrgui/mainWindow/shapeEdit/arch.h b/qrgui/mainWindow/shapeEdit/arch.h
@@ -21,7 +21,7 @@
 
 class Arch : public Item
 {
-	Q_DISABLE_COPY(Arch)
+	Q_OBJECT
 public:
 	Arch(QRectF rect, int startAngle, int spanAngle, Item* parent);
 	int startAngle() const;
diff --git a/qrgui/mainWindow/shapeEdit/curve.h b/qrgui/mainWindow/shapeEdit/curve.h
@@ -21,7 +21,7 @@
 
 class Curve : public Path
 {
-	Q_DISABLE_COPY(Curve)
+	Q_OBJECT
 public:
 	Curve(const QPointF &start, const QPointF &end, const QPointF &c1);
 	void  setCXandCY(qreal x, qreal y);
diff --git a/qrgui/mainWindow/shapeEdit/ellipse.h b/qrgui/mainWindow/shapeEdit/ellipse.h
@@ -22,7 +22,7 @@
 
 class QRealEllipse : public Item
 {
-	Q_DISABLE_COPY(QRealEllipse)
+	Q_OBJECT
 public:
 	QRealEllipse(qreal x1, qreal y1, qreal x2, qreal y2, Item* parent = nullptr);
 	virtual QRectF boundingRect() const;
diff --git a/qrgui/mainWindow/shapeEdit/image.h b/qrgui/mainWindow/shapeEdit/image.h
@@ -20,7 +20,7 @@
 
 class Image : public Item
 {
-	Q_DISABLE_COPY(Image)
+	Q_OBJECT
 public:
 	Image(const QString &fileName, qreal x, qreal y, Item* parent = nullptr);
 	virtual QRectF boundingRect() const;
diff --git a/qrgui/mainWindow/shapeEdit/item.h b/qrgui/mainWindow/shapeEdit/item.h
@@ -26,8 +26,7 @@
 
 class Item : public graphicsUtils::AbstractItem
 {
-	Q_DISABLE_COPY(Item)
-
+	Q_OBJECT
 public:
 	enum DomElementTypes {
 		noneType
diff --git a/qrgui/mainWindow/shapeEdit/line.h b/qrgui/mainWindow/shapeEdit/line.h
@@ -20,8 +20,7 @@
 
 class Line : public Item
 {
-	Q_INTERFACES(AbstractItem)
-	Q_DISABLE_COPY(Line)
+	Q_OBJECT
 public:
 	Line(qreal x1, qreal y1, qreal x2, qreal y2, Item* parent = nullptr);
 	QLineF line() const;
diff --git a/qrgui/mainWindow/shapeEdit/linePort.h b/qrgui/mainWindow/shapeEdit/linePort.h
@@ -19,7 +19,7 @@
 
 class LinePort : public Line
 {
-	Q_DISABLE_COPY(LinePort)
+	Q_OBJECT
 public:
 	LinePort(qreal x1, qreal y1, qreal x2, qreal y2, Line* parent = nullptr);
 
diff --git a/qrgui/mainWindow/shapeEdit/path.h b/qrgui/mainWindow/shapeEdit/path.h
@@ -20,7 +20,7 @@
 
 class Path : public Item
 {
-	Q_DISABLE_COPY(Path)
+	Q_OBJECT
 public:
 	Path(const QPainterPath &path);
 	virtual QRectF boundingRect() const;
diff --git a/qrgui/mainWindow/shapeEdit/pointPort.h b/qrgui/mainWindow/shapeEdit/pointPort.h
@@ -21,7 +21,7 @@
 
 class PointPort : public Item
 {
-	Q_DISABLE_COPY(PointPort)
+	Q_OBJECT
 public:
 	PointPort(qreal x, qreal y, Item *parent = nullptr);
 	virtual QRectF boundingRect() const;
diff --git a/qrgui/mainWindow/shapeEdit/rectangle.h b/qrgui/mainWindow/shapeEdit/rectangle.h
@@ -22,7 +22,7 @@
 
 class QRealRectangle : public Item
 {
-	Q_DISABLE_COPY(QRealRectangle)
+	Q_OBJECT
 public:
 	QRealRectangle(qreal x1, qreal y1, qreal x2, qreal y2, Item* parent = nullptr);
 	virtual QRectF boundingRect() const;
diff --git a/qrgui/mainWindow/shapeEdit/stylus.h b/qrgui/mainWindow/shapeEdit/stylus.h
@@ -23,7 +23,7 @@
 
 class Stylus : public Item
 {
-	Q_DISABLE_COPY(Stylus)
+	Q_OBJECT
 public:
 	QList<Line *> mListLine;
 	Stylus(qreal x1, qreal y1, Item* parent);
diff --git a/qrgui/mainWindow/shapeEdit/text.h b/qrgui/mainWindow/shapeEdit/text.h
@@ -23,7 +23,7 @@
 
 class Text : public Item
 {
-	Q_DISABLE_COPY(Text)
+	Q_OBJECT
 public:
 	Text(bool isDynamic = false);
 	Text(int x, int y, const QString &text = "text", bool isDynamic = false);
diff --git a/qrgui/mainWindow/shapeEdit/textPicture.h b/qrgui/mainWindow/shapeEdit/textPicture.h
@@ -18,7 +18,7 @@
 
 class TextPicture : public Text
 {
-	Q_DISABLE_COPY(TextPicture)
+	Q_OBJECT
 public:
 	TextPicture();
 	TextPicture(int x, int y, const QString &text = "text");
diff --git a/qrgui/models/commands/changePropertyCommand.h b/qrgui/models/commands/changePropertyCommand.h
@@ -27,6 +27,7 @@ namespace commands {
 /// Sets given property to a given value
 class QRGUI_MODELS_EXPORT ChangePropertyCommand : public AbstractCommand
 {
+	Q_OBJECT
 public:
 	/// Use this overload to modify properties via models api with automatic assigning current value as old one.
 	ChangePropertyCommand(models::LogicalModelAssistApi * const model
diff --git a/qrgui/models/commands/createElementsCommand.h b/qrgui/models/commands/createElementsCommand.h
@@ -24,6 +24,7 @@ namespace commands {
 
 class QRGUI_MODELS_EXPORT CreateElementsCommand : public AbstractCommand
 {
+	Q_OBJECT
 public:
 	CreateElementsCommand(const models::Models &models, const QList<ElementInfo> &elements);
 
diff --git a/qrgui/models/commands/removeElementsCommand.h b/qrgui/models/commands/removeElementsCommand.h
@@ -34,6 +34,7 @@ namespace commands {
 /// Accepts a list of graphical or logical ids and removes them from model.
 class QRGUI_MODELS_EXPORT RemoveElementsCommand : public AbstractCommand
 {
+	Q_OBJECT
 public:
 	explicit RemoveElementsCommand(const models::Models &models);
 
diff --git a/qrtranslations/fr/qrgui_mainWindow_fr.ts b/qrtranslations/fr/qrgui_mainWindow_fr.ts
@@ -1006,7 +1006,7 @@ WARNING: The settings will be restored after application restart</source>
 <context>
     <name>qReal::gui::DraggableElement</name>
     <message>
-        <location filename="../../qrgui/mainWindow/palette/draggableElement.cpp" line="+87"/>
+        <location filename="../../qrgui/mainWindow/palette/draggableElement.cpp" line="+89"/>
         <source>Mouse gesture</source>
         <translation>Geste souris</translation>
     </message>
diff --git a/qrtranslations/ru/qrgui_mainWindow_ru.ts b/qrtranslations/ru/qrgui_mainWindow_ru.ts
diff --git a/qrutils/closeButtonVisibilityFilter.h b/qrutils/closeButtonVisibilityFilter.h
diff --git a/qrutils/qrutils.pri b/qrutils/qrutils.pri
diff --git a/qrutils/smartDock.cpp b/qrutils/smartDock.cpp
diff --git a/qrutils/smartDock.h b/qrutils/smartDock.h
diff --git a/thirdparty/qscintilla/Qt4Qt5/Qsci/qscidocument.h b/thirdparty/qscintilla/Qt4Qt5/Qsci/qscidocument.h

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ namespace nxt {`
`23`	`23`	`/// Master generator base implementation for every generator from NXT kit`
`24`	`24`	`class ROBOTS_NXT_GENERATOR_BASE_EXPORT NxtMasterGeneratorBase : public generatorBase::MasterGeneratorBase`
`25`	`25`	`{`
	`26`	`+ Q_OBJECT`
`26`	`27`	`public:`
`27`	`28`	`NxtMasterGeneratorBase(const qrRepo::RepoApi &repo`
`28`	`29`	`, qReal::ErrorReporterInterface &errorReporter`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ namespace osekC {`
`21`	`21`
`22`	`22`	`class NxtOsekCMasterGenerator : public NxtMasterGeneratorBase`
`23`	`23`	`{`
	`24`	`+ Q_OBJECT`
`24`	`25`	`public:`
`25`	`26`	`NxtOsekCMasterGenerator(const qrRepo::RepoApi &repo`
`26`	`27`	`, qReal::ErrorReporterInterface &errorReporter`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ namespace commands {`
`23`	`23`	`/// having no actions itself`
`24`	`24`	`class QRGUI_CONTROLLER_EXPORT DoNothingCommand : public AbstractCommand`
`25`	`25`	`{`
	`26`	`+ Q_OBJECT`
`26`	`27`	`public:`
`27`	`28`	`DoNothingCommand();`
`28`	`29`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ namespace qReal {`
`22`	`22`
`23`	`23`	`class UndoStack : public QUndoStack`
`24`	`24`	`{`
	`25`	`+ Q_OBJECT`
`25`	`26`	`public:`
`26`	`27`	`UndoStack(QObject *parent = nullptr);`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ namespace commands {`
`24`	`24`	`/// Arranges links of specified node element`
`25`	`25`	`class ArrangeLinksCommand : public ElementCommand`
`26`	`26`	`{`
	`27`	`+ Q_OBJECT`
`27`	`28`	`public:`
`28`	`29`	`ArrangeLinksCommand(const EditorViewScene *scene, const Id &id, bool needAdjusting = false);`
`29`	`30`	`ArrangeLinksCommand(const EditorView *view, const Id &id, bool needAdjusting = false);`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ namespace commands {`
`26`	`26`	`/// In other words this command adds view part into the CreateGroupCommand.`
`27`	`27`	`class CreateAndUpdatePatternCommand : public qReal::commands::CreatePatternCommand`
`28`	`28`	`{`
	`29`	`+ Q_OBJECT`
`29`	`30`	`public:`
`30`	`31`	`CreateAndUpdatePatternCommand(EditorViewScene &scene`
`31`	`32`	`, const models::Models &models`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ namespace commands {`
`27`	`27`
`28`	`28`	`class InsertIntoEdgeCommand : public qReal::commands::AbstractCommand`
`29`	`29`	`{`
	`30`	`+ Q_OBJECT`
`30`	`31`	`public:`
`31`	`32`	`InsertIntoEdgeCommand(EditorViewScene &scene`
`32`	`33`	`, const models::Models &models`