diff options
| author | Fabian Schillinger | 2010-11-01 17:35:27 +0100 |
|---|---|---|
| committer | Fabian Schillinger | 2010-11-01 17:35:27 +0100 |
| commit | ea3fb17345e5f82db9f2e98a8062e95797700ace (patch) | |
| tree | 1da0d1a8ec9455364386af78762d0f6fed187824 /src/gui/clientConfigDialog.h | |
| parent | Process start/stop/view functionality (diff) | |
| parent | [PVSGUI] No X required for --help and --version (diff) | |
| download | pvs-ea3fb17345e5f82db9f2e98a8062e95797700ace.tar.gz pvs-ea3fb17345e5f82db9f2e98a8062e95797700ace.tar.xz pvs-ea3fb17345e5f82db9f2e98a8062e95797700ace.zip | |
Merge branch 'master' of openslx.org:pvs
Conflicts:
CMakeLists.txt
src/core/pvsConnectionManager.cpp
src/pvs.cpp
src/pvs.h
Diffstat (limited to 'src/gui/clientConfigDialog.h')
| -rw-r--r-- | src/gui/clientConfigDialog.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/clientConfigDialog.h b/src/gui/clientConfigDialog.h index 98da54f..fd7529e 100644 --- a/src/gui/clientConfigDialog.h +++ b/src/gui/clientConfigDialog.h @@ -18,6 +18,8 @@ #include "pvsinterface.h" #include "ui_clientConfigDialog.h" +class QAbstractItemModel; + class ClientConfigDialog: public QDialog, private Ui::ClientConfigDialogClass { Q_OBJECT @@ -40,6 +42,7 @@ private Q_SLOTS: private: OrgOpenslxPvsInterface *_ifaceDBus; QSettings _settings; + QAbstractItemModel* _interfaceListModel; }; |