|
 |
13463d4 |
From 3d54ab8b5326e4b29167f45c98908fcd1e4325f2 Mon Sep 17 00:00:00 2001
|
|
|
13463d4 |
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
|
|
13463d4 |
Date: Sat, 22 May 2010 16:40:54 +0200
|
|
|
13463d4 |
Subject: [PATCH 23/23] update for tinyxml 2.6
|
|
|
13463d4 |
|
|
|
13463d4 |
---
|
|
|
13463d4 |
src/tools/cb_share_config/mainframe.cpp | 14 +++++++-------
|
|
|
13463d4 |
1 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
13463d4 |
|
|
|
13463d4 |
diff --git a/src/tools/cb_share_config/mainframe.cpp b/src/tools/cb_share_config/mainframe.cpp
|
|
|
13463d4 |
index f43b15c..9e3225c 100644
|
|
|
13463d4 |
--- a/src/tools/cb_share_config/mainframe.cpp
|
|
|
13463d4 |
+++ b/src/tools/cb_share_config/mainframe.cpp
|
|
|
13463d4 |
@@ -505,7 +505,7 @@ void MainFrame::OfferConfig(TiXmlDocument* config, wxListBox* listbox,
|
|
|
13463d4 |
TiXmlNode* child = NULL;
|
|
|
13463d4 |
for (child = cfgroot->FirstChild(); child; child = child->NextSibling())
|
|
|
13463d4 |
{
|
|
|
13463d4 |
- if (child->Type()==TiXmlNode::ELEMENT)
|
|
|
13463d4 |
+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT)
|
|
|
13463d4 |
{
|
|
|
13463d4 |
OfferNode(&child, listbox, nodes);
|
|
|
13463d4 |
}
|
|
|
13463d4 |
@@ -524,7 +524,7 @@ void MainFrame::OfferNode(TiXmlNode** node, wxListBox* listbox,
|
|
|
13463d4 |
TiXmlNode* child = NULL;
|
|
|
13463d4 |
for (child = (*node)->FirstChild(); child; child = child->NextSibling())
|
|
|
13463d4 |
{
|
|
|
13463d4 |
- if (child->Type()==TiXmlNode::ELEMENT)
|
|
|
13463d4 |
+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT)
|
|
|
13463d4 |
OfferNode(&child, listbox, nodes, wxT("<code_completion>")); // recursive call
|
|
|
13463d4 |
}
|
|
|
13463d4 |
}
|
|
|
13463d4 |
@@ -553,7 +553,7 @@ void MainFrame::OfferNode(TiXmlNode** node, wxListBox* listbox,
|
|
|
13463d4 |
TiXmlNode* child = NULL;
|
|
|
13463d4 |
for (child = (*node)->FirstChild(); child; child = child->NextSibling())
|
|
|
13463d4 |
{
|
|
|
13463d4 |
- if (child->Type()==TiXmlNode::ELEMENT)
|
|
|
13463d4 |
+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT)
|
|
|
13463d4 |
OfferNode(&child, listbox, nodes, wxT("<compiler>")); // recursive call
|
|
|
13463d4 |
}
|
|
|
13463d4 |
}
|
|
|
13463d4 |
@@ -562,7 +562,7 @@ void MainFrame::OfferNode(TiXmlNode** node, wxListBox* listbox,
|
|
|
13463d4 |
TiXmlNode* child = NULL;
|
|
|
13463d4 |
for (child = (*node)->FirstChild(); child; child = child->NextSibling())
|
|
|
13463d4 |
{
|
|
|
13463d4 |
- if (child->Type()==TiXmlNode::ELEMENT)
|
|
|
13463d4 |
+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT)
|
|
|
13463d4 |
OfferNode(&child, listbox, nodes, wxT("<editor>")); // recursive call
|
|
|
13463d4 |
}
|
|
|
13463d4 |
}
|
|
|
13463d4 |
@@ -571,7 +571,7 @@ void MainFrame::OfferNode(TiXmlNode** node, wxListBox* listbox,
|
|
|
13463d4 |
TiXmlNode* child = NULL;
|
|
|
13463d4 |
for (child = (*node)->FirstChild(); child; child = child->NextSibling())
|
|
|
13463d4 |
{
|
|
|
13463d4 |
- if (child->Type()==TiXmlNode::ELEMENT)
|
|
|
13463d4 |
+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT)
|
|
|
13463d4 |
OfferNode(&child, listbox, nodes, wxT("<project_manager>")); // recursive call
|
|
|
13463d4 |
}
|
|
|
13463d4 |
}
|
|
|
13463d4 |
@@ -595,7 +595,7 @@ void MainFrame::OfferNode(TiXmlNode** node, wxListBox* listbox,
|
|
|
13463d4 |
TiXmlNode* child = NULL;
|
|
|
13463d4 |
for (child = (*node)->FirstChild(); child; child = child->NextSibling())
|
|
|
13463d4 |
{
|
|
|
13463d4 |
- if (child->Type()==TiXmlNode::ELEMENT)
|
|
|
13463d4 |
+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT)
|
|
|
13463d4 |
OfferNode(&child, listbox, nodes, wxT("<compiler><sets>")); // recursive call
|
|
|
13463d4 |
}
|
|
|
13463d4 |
}
|
|
|
13463d4 |
@@ -605,7 +605,7 @@ void MainFrame::OfferNode(TiXmlNode** node, wxListBox* listbox,
|
|
|
13463d4 |
TiXmlNode* child = NULL;
|
|
|
13463d4 |
for (child = (*node)->FirstChild(); child; child = child->NextSibling())
|
|
|
13463d4 |
{
|
|
|
13463d4 |
- if (child->Type()==TiXmlNode::ELEMENT)
|
|
|
13463d4 |
+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT)
|
|
|
13463d4 |
OfferNode(&child, listbox, nodes, wxT("<compiler><user_sets>")); // recursive call
|
|
|
13463d4 |
}
|
|
|
13463d4 |
}
|
|
|
13463d4 |
--
|
|
|
13463d4 |
1.6.6.1
|
|
|
13463d4 |
|