QAction objects as pointer

qgis · May 28, 2021 · cff65e8 · cff65e8
1 parent 64e686d
commit cff65e8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/python/gui/auto_generated/editorwidgets/qgsjsoneditwidget.sip.in b/python/gui/auto_generated/editorwidgets/qgsjsoneditwidget.sip.in
@@ -9,7 +9,6 @@
 
 
 
-
 class QgsJsonEditWidget : QWidget
 {
 %Docstring(signature="appended")

diff --git a/src/gui/editorwidgets/qgsjsoneditwidget.cpp b/src/gui/editorwidgets/qgsjsoneditwidget.cpp
@@ -15,6 +15,7 @@
 
 #include "qgsjsoneditwidget.h"
 
+#include <QAction>
 #include <QClipboard>
 #include <QDesktopServices>
 #include <QJsonArray>
@@ -25,8 +26,8 @@
 
 QgsJsonEditWidget::QgsJsonEditWidget( QWidget *parent )
   : QWidget( parent )
-  , mCopyValueAction( tr( "Copy value" ) )
-  , mCopyKeyAction( tr( "Copy key" ) )
+  , mCopyValueAction( new QAction( tr( "Copy value" ), this ) )
+  , mCopyKeyAction( new QAction( tr( "Copy key" ), this ) )
 {
   setupUi( this );
 
@@ -42,14 +43,14 @@ QgsJsonEditWidget::QgsJsonEditWidget( QWidget *parent )
   mTreeWidget->setStyleSheet( QStringLiteral( "font-family: %1;" ).arg( QgsCodeEditor::getMonospaceFont().family() ) );
 
   mTreeWidget->setContextMenuPolicy( Qt::ActionsContextMenu );
-  mTreeWidget->addAction( &mCopyValueAction );
-  mTreeWidget->addAction( &mCopyKeyAction );
+  mTreeWidget->addAction( mCopyValueAction );
+  mTreeWidget->addAction( mCopyKeyAction );
 
   connect( mTextToolButton, &QToolButton::clicked, this, &QgsJsonEditWidget::textToolButtonClicked );
   connect( mTreeToolButton, &QToolButton::clicked, this, &QgsJsonEditWidget::treeToolButtonClicked );
 
-  connect( &mCopyValueAction, &QAction::triggered, this, &QgsJsonEditWidget::copyValueActionTriggered );
-  connect( &mCopyKeyAction, &QAction::triggered, this, &QgsJsonEditWidget::copyKeyActionTriggered );
+  connect( mCopyValueAction, &QAction::triggered, this, &QgsJsonEditWidget::copyValueActionTriggered );
+  connect( mCopyKeyAction, &QAction::triggered, this, &QgsJsonEditWidget::copyKeyActionTriggered );
 
   connect( mCodeEditorJson, &QgsCodeEditorJson::textChanged, this, &QgsJsonEditWidget::codeEditorJsonTextChanged );
   // Signal indicatorClicked is used because indicatorReleased has a bug in Scintilla and the keyboard modifier state

diff --git a/src/gui/editorwidgets/qgsjsoneditwidget.h b/src/gui/editorwidgets/qgsjsoneditwidget.h
@@ -22,8 +22,6 @@
 #include "qgis_sip.h"
 #include "qgis_gui.h"
 
-#include <QAction>
-
 /**
  * \ingroup gui
  * \class QgsJsonEditWidget
@@ -117,8 +115,8 @@ class GUI_EXPORT QgsJsonEditWidget : public QWidget, private Ui::QgsJsonEditWidg
 
     QStringList mClickableLinkList;
 
-    QAction mCopyValueAction;
-    QAction mCopyKeyAction;
+    QAction *mCopyValueAction;
+    QAction *mCopyKeyAction;
 };
 
 #endif // QGSJSONEDITWIDGET_H