From 3ca5d72455b8832beabd56e3f454f89596ed4081 Mon Sep 17 00:00:00 2001
From: Salvatore Larosa <lrssvtml@gmail.com>
Date: Sun, 28 Jan 2018 16:43:59 +0100
Subject: [PATCH] apply enableAutoGeometryRestore to config shortcut dialog

---
 python/gui/qgsconfigureshortcutsdialog.sip.in |  2 --
 src/gui/qgsconfigureshortcutsdialog.cpp       | 20 +------------------
 src/gui/qgsconfigureshortcutsdialog.h         |  8 --------
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/python/gui/qgsconfigureshortcutsdialog.sip.in b/python/gui/qgsconfigureshortcutsdialog.sip.in
index fcbb937bd34..f5669cf6a9d 100644
--- a/python/gui/qgsconfigureshortcutsdialog.sip.in
+++ b/python/gui/qgsconfigureshortcutsdialog.sip.in
@@ -33,8 +33,6 @@ Constructor for QgsConfigureShortcutsDialog.
 singleton QgsShortcutsManager instance.
 %End
 
-    ~QgsConfigureShortcutsDialog();
-
   protected:
     virtual void keyPressEvent( QKeyEvent *event );
 
diff --git a/src/gui/qgsconfigureshortcutsdialog.cpp b/src/gui/qgsconfigureshortcutsdialog.cpp
index 20bf1e552e0..dbcb2437cc5 100644
--- a/src/gui/qgsconfigureshortcutsdialog.cpp
+++ b/src/gui/qgsconfigureshortcutsdialog.cpp
@@ -34,6 +34,7 @@ QgsConfigureShortcutsDialog::QgsConfigureShortcutsDialog( QWidget *parent, QgsSh
   , mManager( manager )
 {
   setupUi( this );
+  QgsGui::enableAutoGeometryRestore( this );
   connect( mLeFilter, &QgsFilterLineEdit::textChanged, this, &QgsConfigureShortcutsDialog::mLeFilter_textChanged );
 
   if ( !mManager )
@@ -50,25 +51,6 @@ QgsConfigureShortcutsDialog::QgsConfigureShortcutsDialog( QWidget *parent, QgsSh
            this, &QgsConfigureShortcutsDialog::actionChanged );
 
   populateActions();
-
-  restoreState();
-}
-
-QgsConfigureShortcutsDialog::~QgsConfigureShortcutsDialog()
-{
-  saveState();
-}
-
-void QgsConfigureShortcutsDialog::saveState()
-{
-  QgsSettings settings;
-  settings.setValue( QStringLiteral( "Windows/ShortcutsDialog/geometry" ), saveGeometry() );
-}
-
-void QgsConfigureShortcutsDialog::restoreState()
-{
-  QgsSettings settings;
-  restoreGeometry( settings.value( QStringLiteral( "Windows/ShortcutsDialog/geometry" ) ).toByteArray() );
 }
 
 void QgsConfigureShortcutsDialog::populateActions()
diff --git a/src/gui/qgsconfigureshortcutsdialog.h b/src/gui/qgsconfigureshortcutsdialog.h
index e412d05c024..ade73a2a4c6 100644
--- a/src/gui/qgsconfigureshortcutsdialog.h
+++ b/src/gui/qgsconfigureshortcutsdialog.h
@@ -47,8 +47,6 @@ class GUI_EXPORT QgsConfigureShortcutsDialog : public QDialog, private Ui::QgsCo
      */
     QgsConfigureShortcutsDialog( QWidget *parent SIP_TRANSFERTHIS = nullptr, QgsShortcutsManager *manager = nullptr );
 
-    ~QgsConfigureShortcutsDialog() override;
-
   protected:
     void keyPressEvent( QKeyEvent *event ) override;
     void keyReleaseEvent( QKeyEvent *event ) override;
@@ -68,12 +66,6 @@ class GUI_EXPORT QgsConfigureShortcutsDialog : public QDialog, private Ui::QgsCo
 
   private:
 
-    //! Saves the dialog window state
-    void saveState();
-
-    //! Restores the dialog window state
-    void restoreState();
-
     //! Populates the dialog with all actions from the manager
     void populateActions();