summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-10 18:58:54 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-10 18:58:54 +0300
commit793a119a7a36f9680dad108e75075c8c4bd4a0d0 (patch)
treef995b989135dda75bcd45d8214571b4b4ed4e871 /src/gui
parentbad730dd0de24b2b17b91922c0c7f2b31b7b4d9b (diff)
downloadmanaplus-793a119a7a36f9680dad108e75075c8c4bd4a0d0.tar.gz
manaplus-793a119a7a36f9680dad108e75075c8c4bd4a0d0.tar.bz2
manaplus-793a119a7a36f9680dad108e75075c8c4bd4a0d0.tar.xz
manaplus-793a119a7a36f9680dad108e75075c8c4bd4a0d0.zip
Replace all xmlNodePtr to XmlNodePtr.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/equipmentwindow.cpp8
-rw-r--r--src/gui/equipmentwindow.h6
-rw-r--r--src/gui/serverdialog.cpp2
-rw-r--r--src/gui/skilldialog.cpp2
-rw-r--r--src/gui/theme.cpp4
-rw-r--r--src/gui/updaterwindow.cpp2
6 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 483e2da94..4bfc477a0 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -355,7 +355,7 @@ void EquipmentWindow::resetBeing(Being *being)
void EquipmentWindow::fillBoxes()
{
XML::Document *doc = new XML::Document("equipmentwindow.xml");
- xmlNodePtr root = doc->rootNode();
+ XmlNodePtr root = doc->rootNode();
if (!root)
{
delete doc;
@@ -381,13 +381,13 @@ void EquipmentWindow::fillBoxes()
delete doc;
}
-void EquipmentWindow::loadWindow(xmlNodePtr windowNode)
+void EquipmentWindow::loadWindow(XmlNodePtr windowNode)
{
setDefaultSize(XML::getProperty(windowNode, "width", 180),
XML::getProperty(windowNode, "height", 345), ImageRect::CENTER);
}
-void EquipmentWindow::loadPlayerBox(xmlNodePtr playerBoxNode)
+void EquipmentWindow::loadPlayerBox(XmlNodePtr playerBoxNode)
{
mPlayerBox->setDimension(gcn::Rectangle(
XML::getProperty(playerBoxNode, "x", 50),
@@ -396,7 +396,7 @@ void EquipmentWindow::loadPlayerBox(xmlNodePtr playerBoxNode)
XML::getProperty(playerBoxNode, "height", 168)));
}
-void EquipmentWindow::loadSlot(xmlNodePtr slotNode, ImageSet *imageset)
+void EquipmentWindow::loadSlot(XmlNodePtr slotNode, ImageSet *imageset)
{
int slot = parseSlotName(XML::getProperty(slotNode, "name", ""));
if (slot < 0)
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index b06333b2f..c8cf095f8 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -108,11 +108,11 @@ class EquipmentWindow : public Window, public gcn::ActionListener
void addBox(int idx, int x, int y, int imageIndex);
- void loadWindow(xmlNodePtr windowNode);
+ void loadWindow(XmlNodePtr windowNode);
- void loadPlayerBox(xmlNodePtr playerBoxNode);
+ void loadPlayerBox(XmlNodePtr playerBoxNode);
- void loadSlot(xmlNodePtr slotNode, ImageSet *imageset);
+ void loadSlot(XmlNodePtr slotNode, ImageSet *imageset);
int parseSlotName(std::string name);
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 65421abd3..a4a477527 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -628,7 +628,7 @@ void ServerDialog::downloadServerList()
void ServerDialog::loadServers(bool addNew)
{
XML::Document doc(mDir + "/serverlist.xml", false);
- xmlNodePtr rootNode = doc.rootNode();
+ XmlNodePtr rootNode = doc.rootNode();
if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "serverlist"))
{
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 833a2bbe7..72f5a8ca1 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -362,7 +362,7 @@ void SkillDialog::loadSkills(const std::string &file)
return;
XML::Document doc(file);
- xmlNodePtr root = doc.rootNode();
+ XmlNodePtr root = doc.rootNode();
int setCount = 0;
std::string setName;
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index ecc491191..2d3b0beea 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -315,7 +315,7 @@ Skin *Theme::readSkin(const std::string &filename)
// filename = resman->mapPathToSkin(filename0);
XML::Document doc(resolveThemePath(filename));
- xmlNodePtr rootNode = doc.rootNode();
+ XmlNodePtr rootNode = doc.rootNode();
if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skinset"))
return nullptr;
@@ -818,7 +818,7 @@ void Theme::loadColors(std::string file)
file += "/colors.xml";
XML::Document doc(resolveThemePath(file));
- xmlNodePtr root = doc.rootNode();
+ XmlNodePtr root = doc.rootNode();
if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
{
diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp
index 4e641b5ca..5e8e51464 100644
--- a/src/gui/updaterwindow.cpp
+++ b/src/gui/updaterwindow.cpp
@@ -67,7 +67,7 @@ std::vector<updateFile> loadXMLFile(const std::string &fileName)
{
std::vector<updateFile> files;
XML::Document doc(fileName, false);
- xmlNodePtr rootNode = doc.rootNode();
+ XmlNodePtr rootNode = doc.rootNode();
if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "updates"))
{