rename QgsDiscoverRelationsDlg to QgsDiscoverRelationsDialog

qgis · Aug 7, 2019 · 86eb09f · 86eb09f
1 parent 4e56eaf
commit 86eb09f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -34,7 +34,7 @@ SET(QGIS_APP_SRCS
   qgscustomization.cpp
   qgscustomprojectiondialog.cpp
   qgsdatumtransformtablewidget.cpp
-  qgsdiscoverrelationsdlg.cpp
+  qgsdiscoverrelationsdialog.cpp
   qgsdxfexportdialog.cpp
   qgsformannotationdialog.cpp
   qgsguivectorlayertools.cpp
@@ -277,7 +277,7 @@ SET (QGIS_APP_MOC_HDRS
   qgsdatumtransformtablewidget.h
   qgsdelattrdialog.h
   qgsdiagramproperties.h
-  qgsdiscoverrelationsdlg.h
+  qgsdiscoverrelationsdialog.h
   qgsdisplayangle.h
   qgsdxfexportdialog.h
   qgsfeatureaction.h

diff --git a/src/app/qgsdiscoverrelationsdlg.cpp → src/app/qgsdiscoverrelationsdialog.cpp b/src/app/qgsdiscoverrelationsdlg.cpp → src/app/qgsdiscoverrelationsdialog.cpp
@@ -12,20 +12,20 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include "qgsdiscoverrelationsdlg.h"
+#include "qgsdiscoverrelationsdialog.h"
 #include "qgsvectorlayer.h"
 #include "qgsrelationmanager.h"
 
 #include <QPushButton>
 
-QgsDiscoverRelationsDlg::QgsDiscoverRelationsDlg( const QList<QgsRelation> &existingRelations, const QList<QgsVectorLayer *> &layers, QWidget *parent )
+QgsDiscoverRelationsDialog::QgsDiscoverRelationsDialog( const QList<QgsRelation> &existingRelations, const QList<QgsVectorLayer *> &layers, QWidget *parent )
   : QDialog( parent )
   , mLayers( layers )
 {
   setupUi( this );
 
   mButtonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
-  connect( mRelationsTable->selectionModel(), &QItemSelectionModel::selectionChanged, this, &QgsDiscoverRelationsDlg::onSelectionChanged );
+  connect( mRelationsTable->selectionModel(), &QItemSelectionModel::selectionChanged, this, &QgsDiscoverRelationsDialog::onSelectionChanged );
 
   mFoundRelations = QgsRelationManager::discoverRelations( existingRelations, layers );
   for ( const QgsRelation &relation : qgis::as_const( mFoundRelations ) )
@@ -34,7 +34,7 @@ QgsDiscoverRelationsDlg::QgsDiscoverRelationsDlg( const QList<QgsRelation> &exis
   mRelationsTable->resizeColumnsToContents();
 }
 
-void QgsDiscoverRelationsDlg::addRelation( const QgsRelation &rel )
+void QgsDiscoverRelationsDialog::addRelation( const QgsRelation &rel )
 {
   const int row = mRelationsTable->rowCount();
   mRelationsTable->insertRow( row );
@@ -55,7 +55,7 @@ void QgsDiscoverRelationsDlg::addRelation( const QgsRelation &rel )
   mRelationsTable->item( row, 5 )->setToolTip( QStringLiteral( "Composition (child features will be copied too) or Association" ) );
 }
 
-QList<QgsRelation> QgsDiscoverRelationsDlg::relations() const
+QList<QgsRelation> QgsDiscoverRelationsDialog::relations() const
 {
   QList<QgsRelation> result;
   const auto constSelectedRows = mRelationsTable->selectionModel()->selectedRows();
@@ -66,7 +66,7 @@ QList<QgsRelation> QgsDiscoverRelationsDlg::relations() const
   return result;
 }
 
-void QgsDiscoverRelationsDlg::onSelectionChanged()
+void QgsDiscoverRelationsDialog::onSelectionChanged()
 {
   mButtonBox->button( QDialogButtonBox::Ok )->setEnabled( mRelationsTable->selectionModel()->hasSelection() );
 }
diff --git a/src/app/qgsdiscoverrelationsdlg.h → src/app/qgsdiscoverrelationsdialog.h b/src/app/qgsdiscoverrelationsdlg.h → src/app/qgsdiscoverrelationsdialog.h
@@ -28,12 +28,12 @@ class QgsVectorLayer;
  *
  * The user can select some of them to add them to his project.
  */
-class APP_EXPORT QgsDiscoverRelationsDlg : public QDialog, private Ui::QgsDiscoverRelationsDlgBase
+class APP_EXPORT QgsDiscoverRelationsDialog : public QDialog, private Ui::QgsDiscoverRelationsDlgBase
 {
     Q_OBJECT
 
   public:
-    explicit QgsDiscoverRelationsDlg( const QList<QgsRelation> &existingRelations, const QList<QgsVectorLayer *> &layers, QWidget *parent = nullptr );
+    explicit QgsDiscoverRelationsDialog( const QList<QgsRelation> &existingRelations, const QList<QgsVectorLayer *> &layers, QWidget *parent = nullptr );
 
     /**
      * Gets the selected relations.

diff --git a/src/app/qgsrelationmanagerdialog.cpp b/src/app/qgsrelationmanagerdialog.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgsdiscoverrelationsdlg.h"
+#include "qgsdiscoverrelationsdialog.h"
 #include "qgsrelationadddlg.h"
 #include "qgsrelationmanagerdialog.h"
 #include "qgsrelationmanager.h"
@@ -140,7 +140,7 @@ void QgsRelationManagerDialog::mBtnAddRelation_clicked()
 
 void QgsRelationManagerDialog::mBtnDiscoverRelations_clicked()
 {
-  QgsDiscoverRelationsDlg discoverDlg( relations(), mLayers, this );
+  QgsDiscoverRelationsDialog discoverDlg( relations(), mLayers, this );
   if ( discoverDlg.exec() )
   {
     const auto constRelations = discoverDlg.relations();

diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -73,7 +73,7 @@ QgsDualView::QgsDualView( QWidget *parent )
   auto createShortcuts = [ = ]( const QString & objectName, void ( QgsFeatureListView::* slot )() )
   {
     QShortcut *sc = QgsGui::shortcutsManager()->shortcutByName( objectName );
-    Q_ASSERT( sc ); // the shortcut must have been registered in the shortcuts manager
+    //Q_ASSERT( sc ); // the shortcut must have been registered in the shortcuts manager
     connect( sc, &QShortcut::activated, mFeatureListView, slot );
   };
   createShortcuts( QStringLiteral( "mAttributeTableFirstEditedFeature" ), &QgsFeatureListView::editFirstFeature );

diff --git a/src/ui/qgsdiscoverrelationsdlgbase.ui → src/ui/qgsdiscoverrelationsdialogbase.ui b/src/ui/qgsdiscoverrelationsdlgbase.ui → src/ui/qgsdiscoverrelationsdialogbase.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QgsDiscoverRelationsDlgBase</class>
- <widget class="QDialog" name="QgsDiscoverRelationsDlgBase">
+ <class>QgsDiscoverRelationsDialogBase</class>
+ <widget class="QDialog" name="QgsDiscoverRelationsDialogBase">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -89,7 +89,7 @@
   <connection>
    <sender>mButtonBox</sender>
    <signal>accepted()</signal>
-   <receiver>QgsDiscoverRelationsDlgBase</receiver>
+   <receiver>QgsDiscoverRelationsDialogBase</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -105,7 +105,7 @@
   <connection>
    <sender>mButtonBox</sender>
    <signal>rejected()</signal>
-   <receiver>QgsDiscoverRelationsDlgBase</receiver>
+   <receiver>QgsDiscoverRelationsDialogBase</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">