Commit 8d3b63f0 authored 8 years ago by Raphael Grimm

Merge branch 'master' into FixForWerror

parents ec8124f9 7afab705

No related branches found

No related tags found

1 merge request!16fixes for warnings from Wpedantic Wall Wextra

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp 35 additions, 7 deletions

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h 6 additions, 3 deletions

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h
source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp 37 additions, 0 deletions

...ugins/ScenarioManager/ScenarioManagerWidgetController.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.h 8 additions, 2 deletions

...plugins/ScenarioManager/ScenarioManagerWidgetController.h
source/ArmarXGui/gui-plugins/ScenarioManager/gui/applicationdatabaseview.cpp 0 additions, 6 deletions

...i-plugins/ScenarioManager/gui/applicationdatabaseview.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/gui/applicationdatabaseview.h 0 additions, 2 deletions

...gui-plugins/ScenarioManager/gui/applicationdatabaseview.h
source/ArmarXGui/gui-plugins/ScenarioManager/gui/applicationdatabaseview.ui 0 additions, 14 deletions

...ui-plugins/ScenarioManager/gui/applicationdatabaseview.ui
source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateTreeController.cpp 4 additions, 74 deletions

...ui-plugins/StatechartEditorPlugin/StateTreeController.cpp
source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateTreeController.h 4 additions, 12 deletions

.../gui-plugins/StatechartEditorPlugin/StateTreeController.h
source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StatechartEditorController.h 4 additions, 0 deletions

...ugins/StatechartEditorPlugin/StatechartEditorController.h
source/ArmarXGui/gui-plugins/StatechartViewerPlugin/view/StateItem.cpp 8 additions, 4 deletions

...Gui/gui-plugins/StatechartViewerPlugin/view/StateItem.cpp
source/ArmarXGui/gui-plugins/StatechartViewerPlugin/view/StateItem.h 5 additions, 4 deletions

...rXGui/gui-plugins/StatechartViewerPlugin/view/StateItem.h
source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp 29 additions, 1 deletion

...ins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp
source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.h 3 additions, 1 deletion

...ugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.h
source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.ui 49 additions, 46 deletions

...gins/SystemStateMonitorPlugin/SystemStateMonitorWidget.ui
source/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt 6 additions, 0 deletions

source/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt
source/ArmarXGui/libraries/ArmarXGuiBase/widgets/InfixCompleter.cpp 44 additions, 0 deletions

...arXGui/libraries/ArmarXGuiBase/widgets/InfixCompleter.cpp
source/ArmarXGui/libraries/ArmarXGuiBase/widgets/InfixCompleter.h 36 additions, 0 deletions

...rmarXGui/libraries/ArmarXGuiBase/widgets/InfixCompleter.h
source/ArmarXGui/libraries/ArmarXGuiBase/widgets/InfixFilterModel.cpp 117 additions, 0 deletions

...XGui/libraries/ArmarXGuiBase/widgets/InfixFilterModel.cpp
source/ArmarXGui/libraries/ArmarXGuiBase/widgets/InfixFilterModel.h 60 additions, 0 deletions

...arXGui/libraries/ArmarXGuiBase/widgets/InfixFilterModel.h

with 455 additions and 176 deletions

Please register or to comment