diff --git a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.cpp b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.cpp index 7ef0ffed734dd08de3a3dc6a5a3492e9f47173bd..e7feb69849325d2ef7341d80b32bdf93ad46ec80 100644 --- a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.cpp +++ b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.cpp @@ -241,7 +241,7 @@ namespace armarx checksTable->resizeColumnsToContents(); } - void TermNode::timerEvent() + void TermNode::timerEventRun() { bool truthy = false; { diff --git a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.h b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.h index 9640d62b339b3a67138d2a41bc080add061158e4..d7c1b1e85eb4f59f5198af846a03133a1d11f7a8 100644 --- a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.h +++ b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/TermNode.h @@ -111,7 +111,7 @@ namespace armarx ConditionHandlerInterfacePrx handler; // QObject interface protected: - void timerEvent(); + void timerEventRun(); friend class ConditionViewerWidget; }; diff --git a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/widgets/ConditionViewerWidget.cpp b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/widgets/ConditionViewerWidget.cpp index 86137979246404c6742d8518035273a913fac76d..de1a3ceb3a71233f851f4df40e40b3858e8068a6 100644 --- a/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/widgets/ConditionViewerWidget.cpp +++ b/source/ArmarXGui/gui-plugins/ConditionViewerPlugin/widgets/ConditionViewerWidget.cpp @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * @package - * @author - * @date + * @package + * @author + * @date * @copyright http://www.gnu.org/licenses/gpl-2.0.txt * GNU General Public License */ @@ -237,7 +237,7 @@ void ConditionViewerWidget::updateLiterals() if (termNode && term) { emit termNode->newLiteralValue(term->getValue()); - termNode->timerEvent(); + termNode->timerEventRun(); } } }