[FIX] KTabWidget now used rather than QTabWidget (though this kills Qt Designer interaction :\ )

[FIX] Minor fixes in PokeModr class
[DEL] Ref.{h, cpp}
[FIX] Ref enumerations now in Pokemod class
[FIX] new/delete used for subclasses in pokemod now
[FIX] Inclusion hell in pokemod (should compile faster)
[FIX] Spelling typos

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@82 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 3 insertions, 4 deletions

diff --git a/pokemodr/MapWarpUI.cpp b/pokemodr/MapWarpUI.cpp
index 1518ed1b..846176b8 100644
--- a/pokemodr/MapWarpUI.cpp
+++ b/pokemodr/MapWarpUI.cpp
@@ -25,11 +25,10 @@
 
 #include <BugCatcher.h>
 #include <Exception.h>
-#include <Ref.h>
 
 #include <Dialog.h>
-#include <Map.h>
 #include <Pokemod.h>
+#include <Map.h>
 
 #include "MapWarpUI.h"
 
@@ -42,7 +41,7 @@ MapWarpUI::MapWarpUI(MapWarp* w, QWidget* parent) :
     QMetaObject::connectSlotsByName(this);
     setObjects(mapWarp, mapWarp_mod);
     connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
-    varActivation->addItems(DirectionStr.mid(0, D_End));
+    varActivation->addItems(Pokemod::DirectionStr.mid(0, Pokemod::D_End));
     varType->addItems(MapWarp::TypeStr);
     for (int i = 0; i < mapWarp->getPokemod()->getMapCount(); ++i)
     {
@@ -70,7 +69,7 @@ void MapWarpUI::setGui()
     varName->setText(mapWarp_mod->getName());
     varCoordinateX->setValue(mapWarp_mod->getCoordinate().getX());
     varCoordinateY->setValue(mapWarp_mod->getCoordinate().getY());
-    for (unsigned i = 0; i < D_End; ++i)
+    for (int i = 0; i < varActivation->count(); ++i)
         varActivation->item(i)->setSelected(mapWarp_mod->getFrom(i));
     varDirectionOut->setCurrentIndex(mapWarp_mod->getDirectionOut());
     varType->setCurrentIndex(mapWarp_mod->getWarpType());