X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FGUI%2Fdialog.cxx;h=449979e7ede5775f2cb92dd3a0f428ec4fb5b8fe;hb=fc71333bdd0217a9ff4880305daf6d4d10fb0b40;hp=9c82d8813668dad04774798505954b2da011bee4;hpb=219be77f1e329b03a7dcf1d697ea2fdbf7f1a81a;p=flightgear.git
diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx
index 9c82d8813..449979e7e 100644
--- a/src/GUI/dialog.cxx
+++ b/src/GUI/dialog.cxx
@@ -4,7 +4,7 @@
# include "config.h"
#endif
-#include
+#include
#include
#include
@@ -390,6 +390,7 @@ action_callback (puObject *object)
static void
copy_to_pui (SGPropertyNode *node, puObject *object)
{
+ using namespace simgear;
GUIInfo *info = (GUIInfo *)object->getUserData();
if (!info) {
SG_LOG(SG_GENERAL, SG_ALERT, "dialog: widget without GUIInfo!");
@@ -409,13 +410,13 @@ copy_to_pui (SGPropertyNode *node, puObject *object)
}
switch (node->getType()) {
- case SGPropertyNode::BOOL:
- case SGPropertyNode::INT:
- case SGPropertyNode::LONG:
+ case props::BOOL:
+ case props::INT:
+ case props::LONG:
object->setValue(node->getIntValue());
break;
- case SGPropertyNode::FLOAT:
- case SGPropertyNode::DOUBLE:
+ case props::FLOAT:
+ case props::DOUBLE:
object->setValue(node->getFloatValue());
break;
default:
@@ -429,18 +430,19 @@ copy_to_pui (SGPropertyNode *node, puObject *object)
static void
copy_from_pui (puObject *object, SGPropertyNode *node)
{
+ using namespace simgear;
// puText objects are immutable, so should not be copied out
if (object->getType() & PUCLASS_TEXT)
return;
switch (node->getType()) {
- case SGPropertyNode::BOOL:
- case SGPropertyNode::INT:
- case SGPropertyNode::LONG:
+ case props::BOOL:
+ case props::INT:
+ case props::LONG:
node->setIntValue(object->getIntegerValue());
break;
- case SGPropertyNode::FLOAT:
- case SGPropertyNode::DOUBLE:
+ case props::FLOAT:
+ case props::DOUBLE:
node->setFloatValue(object->getFloatValue());
break;
default: