Adding upstream version 4.4.0.upstream/4.4.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 1 deletions

diff --git a/ui/qt/preferences_dialog.h b/ui/qt/preferences_dialog.h
index 51760699..b295aeaa 100644
--- a/ui/qt/preferences_dialog.h
+++ b/ui/qt/preferences_dialog.h
@@ -20,6 +20,7 @@
 #include "geometry_state_dialog.h"
 
 class QComboBox;
+class QAbstractButton;
 
 namespace Ui {
 class PreferencesDialog;
@@ -44,6 +45,8 @@ protected:
     void showEvent(QShowEvent *evt);
 
 private:
+    void apply();
+
     Ui::PreferencesDialog *pd_ui_;
 
     QHash<QString, QWidget*> prefs_pane_to_item_;
@@ -52,7 +55,7 @@ private:
     AdvancedPrefsModel advancedPrefsModel_;
     AdvancedPrefDelegate advancedPrefsDelegate_;
     ModulePrefsModel modulePrefsModel_;
-    gboolean saved_capture_no_extcap_;
+    bool saved_capture_no_extcap_;
 
     QTimer *searchLineEditTimer;
     QString searchLineEditText;
@@ -65,6 +68,7 @@ private slots:
     void on_buttonBox_accepted();
     void on_buttonBox_rejected();
     void on_buttonBox_helpRequested();
+    void on_buttonBox_clicked(QAbstractButton *button);
 
     /**
      * Update search results from the advancedSearchLineEdit field