Skip to content
Snippets Groups Projects
Commit a0bbee48 authored by Mirko Wächter's avatar Mirko Wächter
Browse files

fixed function shadowing in condition viewer

parent 28780fdb
No related branches found
No related tags found
No related merge requests found
...@@ -241,7 +241,7 @@ namespace armarx ...@@ -241,7 +241,7 @@ namespace armarx
checksTable->resizeColumnsToContents(); checksTable->resizeColumnsToContents();
} }
void TermNode::timerEvent() void TermNode::timerEventRun()
{ {
bool truthy = false; bool truthy = false;
{ {
......
...@@ -111,7 +111,7 @@ namespace armarx ...@@ -111,7 +111,7 @@ namespace armarx
ConditionHandlerInterfacePrx handler; ConditionHandlerInterfacePrx handler;
// QObject interface // QObject interface
protected: protected:
void timerEvent(); void timerEventRun();
friend class ConditionViewerWidget; friend class ConditionViewerWidget;
}; };
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* @package * @package
* @author * @author
* @date * @date
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt * @copyright http://www.gnu.org/licenses/gpl-2.0.txt
* GNU General Public License * GNU General Public License
*/ */
...@@ -237,7 +237,7 @@ void ConditionViewerWidget::updateLiterals() ...@@ -237,7 +237,7 @@ void ConditionViewerWidget::updateLiterals()
if (termNode && term) if (termNode && term)
{ {
emit termNode->newLiteralValue(term->getValue()); emit termNode->newLiteralValue(term->getValue());
termNode->timerEvent(); termNode->timerEventRun();
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment