diff options
| author | Sebastien Braun | 2010-10-05 22:57:48 +0200 |
|---|---|---|
| committer | Sebastien Braun | 2010-10-05 22:57:48 +0200 |
| commit | 0cb19c0a597bfb7a6cac416fb5c0b0a89043081e (patch) | |
| tree | 1c076c798ae6ce960bccde2e0aea675143d961d8 /src/gui/clientConfigDialog.h | |
| parent | Fix SIGSEGV-generating lookup bug when incoming multicast transfers are retried (diff) | |
| parent | [PVSGUI] parsing cmdargs fixed (diff) | |
| download | pvs-0cb19c0a597bfb7a6cac416fb5c0b0a89043081e.tar.gz pvs-0cb19c0a597bfb7a6cac416fb5c0b0a89043081e.tar.xz pvs-0cb19c0a597bfb7a6cac416fb5c0b0a89043081e.zip | |
Merge remote branch 'openslx/master' into mcastft
Conflicts:
CMakeLists.txt
pvsmgr.qrc
src/gui/clientConfigDialog.cpp
src/gui/mainWindow.cpp
src/gui/ui/mainwindow.ui
src/gui/ui/mainwindowtouch.ui
src/pvs.cpp
src/pvs.h
src/pvsDaemon.cpp
src/pvsgui.cpp
Diffstat (limited to 'src/gui/clientConfigDialog.h')
| -rw-r--r-- | src/gui/clientConfigDialog.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/clientConfigDialog.h b/src/gui/clientConfigDialog.h index 5582ec6..fd7529e 100644 --- a/src/gui/clientConfigDialog.h +++ b/src/gui/clientConfigDialog.h @@ -15,6 +15,7 @@ #define CLIENTCONFIGDIALOG_H_ #include <QtGui> +#include "pvsinterface.h" #include "ui_clientConfigDialog.h" class QAbstractItemModel; @@ -39,6 +40,7 @@ private Q_SLOTS: void checkPermissions(); private: + OrgOpenslxPvsInterface *_ifaceDBus; QSettings _settings; QAbstractItemModel* _interfaceListModel; |