Some fixes for predefined filters

variar · Mar 31, 2021 · 7ad885f · 7ad885f
1 parent 1c8ad2b
commit 7ad885f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/src/ui/include/mainwindow.h b/src/ui/include/mainwindow.h
@@ -113,7 +113,7 @@ class MainWindow : public QMainWindow {
     void openClipboard();
     void openUrl();
     void editHighlighters();
-    void editPredefinedFilters( QString newFilter = "" );
+    void editPredefinedFilters( const QString& newFilter = {} );
     void options();
     void about();
     void aboutQt();

diff --git a/src/ui/include/predefinedfiltersdialog.h b/src/ui/include/predefinedfiltersdialog.h
@@ -50,7 +50,8 @@ class PredefinedFiltersDialog : public QDialog, public Ui::PredefinedFiltersDial
     Q_OBJECT
 
   public:
-    explicit PredefinedFiltersDialog( QWidget* parent = nullptr, QString newFilter = "" );
+    PredefinedFiltersDialog( QWidget* parent = nullptr );
+    PredefinedFiltersDialog( const QString& newFilter, QWidget* parent = nullptr );
 
   private slots:
     void addFilter() const;
@@ -64,7 +65,7 @@ class PredefinedFiltersDialog : public QDialog, public Ui::PredefinedFiltersDial
     void optionsChanged();
 
   private:
-    void addFilterFromSearchLine( QString newFilter ) const;
+    void addFilterFromSearchLine( const QString& newFilter ) const;
     void populateFiltersTable() const;
     void saveSettings();
     void readFiltersTable();

diff --git a/src/ui/src/mainwindow.cpp b/src/ui/src/mainwindow.cpp
@@ -895,9 +895,9 @@ void MainWindow::editHighlighters()
 }
 
 // Opens dialog to configure predefined filters
-void MainWindow::editPredefinedFilters( QString newFilter )
+void MainWindow::editPredefinedFilters( const QString& newFilter )
 {
-    PredefinedFiltersDialog dialog( this, newFilter );
+    PredefinedFiltersDialog dialog( newFilter, this );
 
     signalMux_.connect( &dialog, SIGNAL( optionsChanged() ), SLOT( applyConfiguration() ) );
 

diff --git a/src/ui/src/predefinedfiltersdialog.cpp b/src/ui/src/predefinedfiltersdialog.cpp
@@ -47,7 +47,7 @@
 #include "log.h"
 #include "predefinedfilters.h"
 
-PredefinedFiltersDialog::PredefinedFiltersDialog( QWidget* parent, QString newFilter )
+PredefinedFiltersDialog::PredefinedFiltersDialog( QWidget* parent )
     : QDialog( parent )
 {
     setupUi( this );
@@ -73,7 +73,11 @@ PredefinedFiltersDialog::PredefinedFiltersDialog( QWidget* parent, QString newFi
         addFilterButton->setIcon( iconLoader.load( "icons8-plus-16" ) );
         removeFilterButton->setIcon( iconLoader.load( "icons8-minus-16" ) );
     } );
+}
 
+PredefinedFiltersDialog::PredefinedFiltersDialog( const QString& newFilter, QWidget* parent )
+    : PredefinedFiltersDialog( parent )
+{
     if ( newFilter != "" ) {
         addFilterFromSearchLine( newFilter );
     }
@@ -133,7 +137,7 @@ void PredefinedFiltersDialog::addFilter() const
     filtersTableWidget->setRowCount( filtersTableWidget->rowCount() + 1 );
 }
 
-void PredefinedFiltersDialog::addFilterFromSearchLine( QString newFilter ) const
+void PredefinedFiltersDialog::addFilterFromSearchLine( const QString& newFilter ) const
 {
     addFilter();