添加IXWIDGET_OBJECT_NAME宏

DataManage/widgets/IxWidgets/AutoCompleteTagEditWidget.cpp

@@ -34,16 +34,6 @@ void AutoCompleteTagEditWidget::init()
 	installEventFilter(this);
 }
 
-void AutoCompleteTagEditWidget::setObjectName(const QString &name)
-{
-    QObject::setObjectName(name);
-    setName(name);
-
-    QVariant property;
-    property.setValue(static_cast<IxWidget*>(this));
-    setProperty("IxWidget",property);
-}
-
 void AutoCompleteTagEditWidget::setOptions(QVariantMap options)
 {
     QStringListModel *slm = (QStringListModel*)this->completer()->model();

DataManage/widgets/IxWidgets/AutoCompleteTagEditWidget.h

@@ -1,4 +1,4 @@
-#ifndef AUTOCOMPLETETAGEDIT_H
+#ifndef AUTOCOMPLETETAGEDIT_H
 #define AUTOCOMPLETETAGEDIT_H
 
 #include "TagEditWidget.h"
@@ -13,7 +13,7 @@ public:
 public:
 	explicit AutoCompleteTagEditWidget(QWidget *parent = nullptr);
 
-    void setObjectName(const QString &name);
+    IXWIDGET_OBJECT_NAME
 
 	QVariant getValue();
 

DataManage/widgets/IxWidgets/ComboBoxWidget.cpp

@@ -54,14 +54,5 @@ void ComboBoxWidget::setOptions(const QVariantMap &options)
     }
 }
 
-void ComboBoxWidget::setObjectName(const QString &name)
-{
-    QObject::setObjectName(name);
-    setName(name);
-
-    QVariant property;
-    property.setValue(static_cast<IxWidget*>(this));
-    setProperty("IxWidget",property);
-}
 
 

DataManage/widgets/IxWidgets/ComboBoxWidget.h

@@ -1,4 +1,4 @@
-#ifndef COMBOBOXWIDGET_H
+#ifndef COMBOBOXWIDGET_H
 #define COMBOBOXWIDGET_H
 
 #include <QComboBox>
@@ -14,6 +14,8 @@ public:
 public:
     ComboBoxWidget(QWidget *parent);
 
+    IXWIDGET_OBJECT_NAME
+
 public:
      QVariant getValue() const override;
 
@@ -23,8 +25,6 @@ public:
 
      void clearInput() override;
 
-     void setObjectName(const QString &name);
-
 public:
 	void setOptions(const QVariantMap &options);
 

DataManage/widgets/IxWidgets/DateTimeWidget.cpp

@@ -1,4 +1,4 @@
-#include "DateTimeWidget.h"
+#include "DateTimeWidget.h"
 
 const QString DateTimeWidget::type = "DateTime";
 
@@ -27,12 +27,3 @@ void DateTimeWidget::clearInput()
     setDateTime(QDateTime::currentDateTime());
 }
 
-void DateTimeWidget::setObjectName(const QString &name)
-{
-    QObject::setObjectName(name);
-    setName(name);
-
-    QVariant property;
-    property.setValue(static_cast<IxWidget*>(this));
-    setProperty("IxWidget",property);
-}

DataManage/widgets/IxWidgets/DateTimeWidget.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QDateTimeEdit>
 #include "IxWidget.h"
@@ -13,7 +13,7 @@ public:
 public:
 	DateTimeWidget(QWidget *parent);
 
-	~DateTimeWidget() = default;
+    IXWIDGET_OBJECT_NAME
 
 public:
     QVariant getValue() const override;
@@ -23,6 +23,4 @@ public:
     bool isValueNull() const  override;
 
     void clearInput() override;
-
-    void setObjectName(const QString &name);
 };

DataManage/widgets/IxWidgets/IxWidget.h

@@ -27,5 +27,12 @@ protected:
     QString name;
 };
 Q_DECLARE_METATYPE(IxWidget*)
+#define IXWIDGET_OBJECT_NAME void setObjectName(const QString &name)\
+    {\
+        QObject::setObjectName(name);\
+        setName(name); \
+        setProperty("IxWidget",QVariant::fromValue(static_cast<IxWidget*>(this)));\
+    }
+
 #endif // IXWIDGET_H
 

DataManage/widgets/IxWidgets/LineEditWidget.cpp

@@ -1,4 +1,4 @@
-#include "LineEditWidget.h"
+#include "LineEditWidget.h"
 #include <QRegExpValidator>
 
 const QString LineEditWidget::type = "LineEdit";
@@ -8,17 +8,6 @@ LineEditWidget::LineEditWidget(QWidget *parent)
 {
 }
 
-
-void LineEditWidget::setObjectName(const QString &name)
-{
-	QObject::setObjectName(name);
-	setName(name);
-
-    QVariant property;
-    property.setValue(static_cast<IxWidget*>(this));
-    setProperty("IxWidget",property);
-}
-
 QVariant LineEditWidget::getValue() const
 {
     return text().trimmed();

DataManage/widgets/IxWidgets/LineEditWidget.h

@@ -1,4 +1,4 @@
-#ifndef LINEEDITWIDGET_H
+#ifndef LINEEDITWIDGET_H
 #define LINEEDITWIDGET_H
 
 #include <QLineEdit>
@@ -13,7 +13,7 @@ public:
 public:
     LineEditWidget(QWidget *parent);
 
-	void setObjectName(const QString &name);
+    IXWIDGET_OBJECT_NAME
 
 public:
 	QVariant getValue() const override;

DataManage/widgets/IxWidgets/PathSelectorWidget.cpp

@@ -1,11 +1,11 @@
-#include "PathSelectorWidget.h"
+#include "PathSelectorWidget.h"
 
 #include <QFileDialog>
 
 const QString PathSelectorWidget::type = "PathSelector";
 
 PathSelectorWidget::PathSelectorWidget(QWidget *parent)
-: LineEditWidget(parent)
+    : LineEditWidget(parent)
     , btn(new QPushButton(this))
 {
     init();

DataManage/widgets/IxWidgets/PathSelectorWidget.h

@@ -1,4 +1,4 @@
-#ifndef PATHSELECTOR_H
+#ifndef PATHSELECTOR_H
 #define PATHSELECTOR_H
 
 //#include <QLineEdit>
@@ -15,8 +15,6 @@ public:
 public:
 	explicit PathSelectorWidget(QWidget *parent = nullptr);
 
-    void setObjectName(const QString &name);
-
 protected:
     void resizeEvent(QResizeEvent *event) override;
 

DataManage/widgets/IxWidgets/TagEditWidget.cpp

@@ -1,4 +1,4 @@
-#include "TagEditWidget.h"
+#include "TagEditWidget.h"
 
 #include <QMouseEvent>
 #include <QPainter>
@@ -60,16 +60,6 @@ void TagEditWidget::clearInput()
     clear();
 }
 
-void TagEditWidget::setObjectName(const QString &name)
-{
-    QObject::setObjectName(name);
-    setName(name);
-
-    QVariant property;
-    property.setValue(static_cast<IxWidget*>(this));
-    setProperty("IxWidget",property);
-}
-
 bool TagEditWidget::eventFilter(QObject * watched, QEvent * event)
 {    
 	if (event->type() == QEvent::FocusOut) {

DataManage/widgets/IxWidgets/TagEditWidget.h

@@ -1,4 +1,4 @@
-#ifndef TAGEDIT_H
+#ifndef TAGEDIT_H
 #define TAGEDIT_H
 
 #include <QLineEdit>
@@ -18,6 +18,9 @@ public:
 public:
 	TagEditWidget(QWidget *parent = nullptr);
 
+    IXWIDGET_OBJECT_NAME
+
+public:
     QVariant getValue() const override;
 
 	void setValue(const QVariant &value) override;
@@ -26,10 +29,9 @@ public:
 
     void clearInput() override;
 
-    void setObjectName(const QString &name);
-
 protected:
 	bool eventFilter(QObject * watched, QEvent * event) override;
+
     void addTag(const QString &text);
 
 Q_SIGNALS: