First: Iterator class was used where ConstIterator is required
Second: Make hard-coded filenames match actual filenames in CVS for PAWS GUI widgets
Index: src/server/progressionmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/progressionmanager.cpp,v
retrieving revision 1.204
diff -d -u -p -r1.204 progressionmanager.cpp
--- src/server/progressionmanager.cpp 1 Mar 2006 18:27:50 -0000 1.204
+++ src/server/progressionmanager.cpp 5 Mar 2006 18:53:24 -0000
@@ -2922,7 +2922,7 @@ csString ProgressionEvent::ToString(bool
{
csString xml;
if (topLevel) xml.Append(\"
\");
- csArray::Iterator seq = sequence.GetIterator();
+ csArray::ConstIterator seq = sequence.GetIterator();
while (seq.HasNext())
{
ProgressionOperation * po = seq.Next();
Index: src/tools/pawseditor/pawseditorapp.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/tools/pawseditor/pawseditorapp.cpp,v
retrieving revision 1.18
diff -d -u -p -r1.18 pawseditorapp.cpp
--- src/tools/pawseditor/pawseditorapp.cpp 3 Feb 2006 23:00:59 -0000 1.18
+++ src/tools/pawseditor/pawseditorapp.cpp 5 Mar 2006 18:53:24 -0000
@@ -450,9 +450,9 @@ bool PawsEditorApp::LoadWidgets()
{
bool succeeded = true;
- succeeded &= LoadWidget(\"data/pawseditor/peWidgetTree.xml\");
- succeeded &= LoadWidget(\"data/pawseditor/peMenu.xml\");
- succeeded &= LoadWidget(\"data/pawseditor/peSkinSelector.xml\");
+ succeeded &= LoadWidget(\"data/pawseditor/pewidgettree.xml\");
+ succeeded &= LoadWidget(\"data/pawseditor/pemenu.xml\");
+ succeeded &= LoadWidget(\"data/pawseditor/peskinselector.xml\");
return succeeded;
}