Merge branch 'master' into virtual-memory-regionsvirtual-memory-regions

1 files changed, 7 insertions, 4 deletions

diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h
index b676b9df..aa2db34f 100644
--- a/gui/settingsdialog.h
+++ b/gui/settingsdialog.h
@@ -1,5 +1,4 @@
-#ifndef SETTINGSDIALOG_H
-#define SETTINGSDIALOG_H
+#pragma once
 
 #include "trace_api.hpp"
 #include "apitracefilter.h"
@@ -16,16 +15,20 @@ public:
     void accept();
 
     void setFilterModel(ApiTraceFilter *filter);
+
 private slots:
     void changeRegexp(const QString &name);
     void regexpChanged(const QString &pattern);
+    void adbPathChanged(const QString &adbPath);
+    void chooseAdbPathPushed();
+    void stdoutPortChanged(int port);
+    void stderrPortChanged(int port);
 
 private:
     void filtersFromModel(const ApiTraceFilter *model);
     void filtersToModel(ApiTraceFilter *model);
+
 private:
     QMap<QString, QRegExp> m_showFilters;
     ApiTraceFilter *m_filter;
 };
-
-#endif