[FIX] Using cmake now (still is rough)

[FIX] Some SVN flags were incorrect [FIX] Qt includes now use the module path as well [FIX] Models now have drag/drop actions methods as const [FIX] Library classes now exported [FIX] qmake files removed git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@213 6ecfd1a5-f3ed-3746-8530-beee90d26b22
author: Ben Boeckel <MathStuf@gmail.com> 2008-06-21 01:22:14 +0000
committer: Ben Boeckel <MathStuf@gmail.com> 2008-06-21 01:22:14 +0000
commit: 2d045c571308af33c93bdc9766a627ef1db6abaf (patch)
tree: 15cd0d3734ed93bf81cabc418f1c428b3def3d79
parent: 6dd3d36c4552565756dcedab2ddd44e90a553252 (diff)
187 files changed, 880 insertions, 856 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 00000000..aff3946b
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,23 @@
+PROJECT(pokegen)
+
+SET(BUILT_FROM_ROOT TRUE)
+
+FIND_PACKAGE(Qt4 REQUIRED)
+INCLUDE(${QT_USE_FILE})
+INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
+
+FIND_PACKAGE(KDE4 REQUIRED)
+INCLUDE_DIRECTORIES(${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE)
+
+SET(BUILD_SHARED_LIBS ON)
+SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
+SET(DOCUMENTATION_OUTPUT_PATH ${PROJECT_BINARY_DIR}/doc)
+LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH})
+
+ADD_SUBDIRECTORY(pokemod)
+ADD_SUBDIRECTORY(pokebattle)
+ADD_SUBDIRECTORY(pokemodr)
+
+# ADD_DEPENDENCIES(pokebattle pokemod)
+ADD_DEPENDENCIES(pokemodr pokemod)
diff --git a/Changelog b/Changelog
index b332b11c..2912ac12 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,25 @@
 -----------------
+Rev:  214
+Date: 20 June 2008
+User: MathStuf
+-----------------
+[FIX] Using cmake now (still is rough)
+[FIX] Some SVN flags were incorrect
+[FIX] Qt includes now use the module path as well
+[FIX] Models now have drag/drop actions methods as const
+[FIX] Library classes now exported
+[FIX] qmake files removed
+
+-----------------
+Rev:  213
+Date: 19 June 2008
+User: MathStuf
+-----------------
+[FIX] LaTeX compiler modeled after those in Qt
+[FIX] Readme installer is more correct now
+[FIX] Header installation corrected (no longer flatened)
+
+-----------------
 Rev:  212
 Date: 18 June 2008
 User: MathStuf
diff --git a/cross-mingw32-pokegen.sh b/cross-mingw32-pokegen.sh
deleted file mode 100755
index baa5bae4..00000000
--- a/cross-mingw32-pokegen.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# This script sets up variables for cross-compilation of KDE 4 programs to MinGW.
-# It assumes a KDE 4+ development environment installation.
-export CC=i386-mingw32-gcc
-export CXX=i386-mingw32-g++
-export RC=i386-mingw32-windres
-export KDEPREFIX=~/.wine/c/kde4
-export PKG_CONFIG_PATH=/usr/local/i386-mingw32/lib/pkgconfig:$KDEPREFIX/lib/pkgconfig:/target/lib/pkgconfig
-export QMAKESPEC=win32-cross-g++
diff --git a/cross-mingw32.cmake b/cross-mingw32.cmake
new file mode 100644
index 00000000..b5e0c066
--- /dev/null
+++ b/cross-mingw32.cmake
@@ -0,0 +1,11 @@
+SET(CMAKE_SYSTEM_NAME Windows)
+
+SET(CMAKE_C_COMPILER i386-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER i386-mingw32-g++)
+
+SET(CMAKE_FIND_ROOT_PATH ~/.wine/c/kde4)
+SET(CMAKE_INSTALL_PREFIX ${CMAKE_FIND_ROOT_PATH})
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)\
diff --git a/headers.pri b/headers.pri
deleted file mode 100644
index 153ca06e..00000000
--- a/headers.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-headers.path = $$PREFIX/include/pokegen-$${VERSION}/$${TARGET}
-headers.files = $${HEADERS}
-INSTALLS += headers
diff --git a/install.pri b/install.pri
deleted file mode 100644
index b2d1e626..00000000
--- a/install.pri
+++ /dev/null
@@ -1,8 +0,0 @@
-isEmpty(PREFIX) {
-    PREFIX = $$(PREFIX)
-}
-isEmpty(PREFIX) {
-    PREFIX = /usr
-}
-target.path = $$PREFIX/$${INSTALLDIR}
-INSTALLS += target
diff --git a/kde4.pri b/kde4.pri
deleted file mode 100644
index b1f56d31..00000000
--- a/kde4.pri
+++ /dev/null
@@ -1,39 +0,0 @@
-# Following is reformatted from the KTIGCC .pro file
-win32 {
-    KDEPREFIX = $$(KDEPREFIX)
-    isEmpty(KDEPREFIX) {
-        # Try running kde4-config, however chances are it's not in the path or it was compiled with a bad prefix.
-        KDEPREFIX = $$system(kde4-config --prefix)
-        isEmpty(KDEPREFIX):error("KDE 4 kdelibs not found, set KDEPREFIX.")
-        !exists($$KDEPREFIX):error("KDE 4 kdelibs not found, set KDEPREFIX.")
-    }
-    KDEINCDIR = $$KDEPREFIX/include
-    # $$KDEINCDIR/mingw contains the kdewin32 headers, defining stuff like mkdtemp.
-    INCLUDEPATH += $$KDEINCDIR/mingw $$KDEINCDIR $$KDEINCDIR/KDE
-    LIBS += -lkdewin32
-    QMAKE_LIBDIR = $$KDEPREFIX/lib $$QMAKE_LIBDIR
-} else {
-    KDEPREFIX = $$system(kde4-config --prefix)
-    isEmpty(KDEPREFIX) : error("KDE 4 kdelibs required.")
-    exists($$KDEPREFIX/include/kde4/KDE) {
-        KDEINCDIR = $$KDEPREFIX/include/kde4
-    } else : exists($$KDEPREFIX/include/kde/KDE) {
-        KDEINCDIR = $$KDEPREFIX/include/kde
-    } else {
-        KDEINCDIR = $$KDEPREFIX/include
-    }
-    INCLUDEPATH += $$KDEINCDIR $$KDEINCDIR/KDE
-    KDELIBDIR = $$KDEPREFIX/lib$$system(kde4-config --libsuffix)
-    KDEDEVELLIBDIR = $$KDELIBDIR
-    exists($$KDEDEVELLIBDIR/kde4/devel) {
-        KDEDEVELLIBDIR = $$KDEDEVELLIBDIR/kde4/devel
-    }
-    !equals(KDEDEVELLIBDIR,/usr/lib) : !equals(KDEDEVELLIBDIR,/usr/lib64) {
-        QMAKE_LIBDIR = $$KDEDEVELLIBDIR $$QMAKE_LIBDIR
-    }
-    !equals(KDELIBDIR,/usr/lib) : !equals(KDELIBDIR,/usr/lib64) {
-        !darwin-* : !macx-* {
-            LIBS += -Wl,--rpath,"$$KDELIBDIR"
-        }
-    }
-}
diff --git a/latex.cmake b/latex.cmake
new file mode 100644
index 00000000..60be8bc1
--- /dev/null
+++ b/latex.cmake
@@ -0,0 +1,25 @@
+FIND_PACKAGE(LATEX REQUIRED)
+
+ADD_CUSTOM_COMMAND( 
+    OUTPUT    ${DOCUMENTATION_OUTPUT_PATH}/${PROJECT_NAME}.aux
+    COMMAND   ${PDFLATEX_COMPILER}
+    ARGS      ${PROJECT_NAME}.tex
+    DEPENDS   ${PROJECT_NAME}.tex
+    COMMENT   "PDFLaTeX"
+)
+
+ADD_CUSTOM_COMMAND( 
+    OUTPUT    ${DOCUMENTATION_OUTPUT_PATH}/${PROJECT_NAME}.pdf
+    COMMAND   ${PDFLATEX_COMPILER}
+    ARGS      ${PROJECT_NAME}.tex
+    DEPENDS   ${DOCUMENTATION_OUTPUT_PATH}/${PROJECT_NAME}.aux
+    COMMENT   "PDFLaTeX (second pass)"
+)
+
+ADD_CUSTOM_TARGET(documentation ALL echo
+    DEPENDS   ${DOCUMENTATION_OUTPUT_PATH}/${PROJECT_NAME}.pdf
+)
+
+SET(doc_file
+    ${DOCUMENTATION_OUTPUT_PATH}/${PROJECT_NAME}.pdf
+)
diff --git a/latex.pri b/latex.pri
deleted file mode 100644
index a9dbea20..00000000
--- a/latex.pri
+++ /dev/null
@@ -1,12 +0,0 @@
-QMAKE_FILETAGS += LATEX
-
-latex.output = $${DOC_DIR}/${QMAKE_FILE_BASE}.pdf
-latex.input = LATEX
-latex.commands = mkdir -p $${DOC_DIR} && \
-  pdflatex -output-directory $${DOC_DIR} ${QMAKE_FILE_NAME} && \
-  pdflatex -output-directory $${DOC_DIR} ${QMAKE_FILE_NAME}
-latex.clean = $${DOC_DIR}/${QMAKE_FILE_BASE}.aux $${DOC_DIR}/${QMAKE_FILE_BASE}.log $${DOC_DIR}/${QMAKE_FILE_BASE}.out $${DOC_DIR}/${QMAKE_FILE_BASE}.toc $${DOC_DIR}/${QMAKE_FILE_BASE}.pdf
-latex.name = LaTeX
-latex.CONFIG = no_dependencies no_link
-
-QMAKE_EXTRA_COMPILERS += latex
diff --git a/menus/menus.pro b/menus/menus.pro
deleted file mode 100644
index 31799577..00000000
--- a/menus/menus.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-OBJECTS_DIR = .obj
-DESTDIR = ../../lib
-TEMPLATE = lib
-LIBS += -L../../lib -lgeneral -lpokemod
-
-CONFIG += qt \
-warn_on \
-dll \
-exceptions
-INCLUDEPATH += ../pokemod \
-../general
-TARGETDEPS += ../../lib/libpokemod.so \
-../../lib/libgeneral.so
diff --git a/overworld/overworld.pro b/overworld/overworld.pro
deleted file mode 100644
index 98fbc111..00000000
--- a/overworld/overworld.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-include(../version.pri)
-TEMPLATE = lib
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
-DOC_DIR = ../doc
-DESTDIR = ../bin
-INSTALLDIR = lib$$system(kde4-config --libsuffix)
-LIBS += -L../../lib \
- -lpokemod
-
-CONFIG += qt \
- warn_on \
- dll
-
-include(../install.pri)
-include(../kde4.pri)
-
-include(../headers.pri)
diff --git a/pokebattle/Arena.cpp b/pokebattle/Arena.cpp
index feda840d..a2ece8fa 100644
--- a/pokebattle/Arena.cpp
+++ b/pokebattle/Arena.cpp
@@ -48,8 +48,6 @@ Pokebattle::Arena::~Arena()
 
 void Pokebattle::Arena::registerScript(const QString& name, const Pokemod::Script& script)
 {
-    if (!m_actions)
-        remakeCollection();
     Kross::Action* action = new Kross::Action(m_actions, name);
     action->setInterpreter(script.interpreter());
     action->setCode(script.script().toUtf8());
@@ -68,3 +66,8 @@ void Pokebattle::Arena::unregisterAllScripts()
     delete m_actions;
     m_actions = new Kross::ActionCollection(QString("arena-%1").arg(m_count), Kross::Manager::self().actionCollection());
 }
+
+void Pokebattle::Arena::cleanUp()
+{
+    // TODO: clean up everything
+}
diff --git a/pokebattle/Arena.h b/pokebattle/Arena.h
index 36c7e427..17eeee2c 100644
--- a/pokebattle/Arena.h
+++ b/pokebattle/Arena.h
@@ -19,11 +19,12 @@
 #define __POKEBATTLE_ARENA__
 
 // Pokebattle includes
+#include "Global.h"
 #include "Team.h"
 
 // Qt includes
-#include <QList>
-#include <QObject>
+#include <QtCore/QList>
+#include <QtCore/QObject>
 
 // KDE includes
 #include <kross/core/actioncollection.h>
@@ -39,7 +40,7 @@ namespace Pokebattle
 {
 class Player;
 
-class Arena : public QObject
+class POKEBATTLE_EXPORT Arena : public QObject
 {
     Q_OBJECT
     
@@ -71,7 +72,6 @@ class Arena : public QObject
         void registerScript(const QString& name, const Pokemod::Script& script);
         void unregisterScript(const QString& name);
     protected slots:
-        void remakeCollection();
         void unregisterAllScripts();
         
         void cleanUp();
diff --git a/pokebattle/Bot.h b/pokebattle/Bot.h
index fd3dc53b..fef5d449 100644
--- a/pokebattle/Bot.h
+++ b/pokebattle/Bot.h
@@ -35,7 +35,7 @@ namespace Pokebattle
 class Arena;
 class GhostBot;
 
-class Bot : public Player
+class POKEBATTLE_EXPORT Bot : public Player
 {
     Q_OBJECT
     
diff --git a/pokebattle/CMakeLists.txt b/pokebattle/CMakeLists.txt
new file mode 100644
index 00000000..3f41c781
--- /dev/null
+++ b/pokebattle/CMakeLists.txt
@@ -0,0 +1,39 @@
+PROJECT(pokebattle)
+
+SET(pokebattle_MOC_HEADERS
+    Arena.h
+    Bot.h
+    GhostBot.h
+    Ghost.h
+    Player.h
+    Team.h
+    TeamMember.h
+)
+QT4_WRAP_CPP(pokebattle_MOC_SRCS ${pokebattle_MOC_HEADERS})
+SET(pokebattle_HEADERS
+    ${pokebattle_MOC_HEADERS}
+)
+SET(pokebattle_DEVEL
+    ${pokebattle_HEADERS}
+)
+SET(pokebattle_SRCS
+    Arena.cpp
+    Ghost.cpp
+    Team.cpp
+    TeamMember.cpp
+)
+
+ADD_LIBRARY(pokebattle ${pokebattle_SRCS} ${pokebattle_MOC_SRCS})
+TARGET_LINK_LIBRARIES(pokebattle ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${KDE4_KROSSCORE_LIBS} pokemod)
+
+INSTALL(
+    TARGETS pokebattle
+    DESTINATION ${LIB_INSTALL_DIR}
+    COMPONENT runtime
+)
+
+INSTALL(
+    FILES ${pokebattle_DEVEL}
+    DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}
+    COMPONENT development
+)
diff --git a/pokebattle/Ghost.h b/pokebattle/Ghost.h
index 67018680..325f7108 100644
--- a/pokebattle/Ghost.h
+++ b/pokebattle/Ghost.h
@@ -23,7 +23,7 @@
 
 namespace Pokebattle
 {
-class Ghost : public TeamMember
+class POKEBATTLE_EXPORT Ghost : public TeamMember
 {
     Q_OBJECT
     
diff --git a/pokebattle/GhostBot.h b/pokebattle/GhostBot.h
index 3e4ef5f1..459f2ccf 100644
--- a/pokebattle/GhostBot.h
+++ b/pokebattle/GhostBot.h
@@ -23,7 +23,7 @@
 
 namespace Pokebattle
 {
-class GhostBot : public Player
+class POKEBATTLE_EXPORT GhostBot : public Player
 {
     Q_OBJECT
 };
diff --git a/pokebattle/Global.h b/pokebattle/Global.h
new file mode 100644
index 00000000..dee50446
--- /dev/null
+++ b/pokebattle/Global.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __POKEBATTLE_GLOBAL__
+#define __POKEBATTLE_GLOBAL__
+
+// KDE includes
+#include <kdemacros.h>
+
+#ifndef POKEBATTLE_EXPORT
+# if defined(MAKE_POKEBATTLE_LIB)
+   /* We are building this library */
+#  define POKEBATTLE_EXPORT KDE_EXPORT
+# else
+   /* We are using this library */
+#  define POKEBATTLE_EXPORT KDE_IMPORT
+# endif
+#endif
+
+# ifndef POKEBATTLE_EXPORT_DEPRECATED
+#  define POKEBATTLE_EXPORT_DEPRECATED KDE_DEPRECATED POKEBATTLE_EXPORT
+# endif
+
+#endif
diff --git a/pokebattle/Player.h b/pokebattle/Player.h
index 761fec02..928c1770 100644
--- a/pokebattle/Player.h
+++ b/pokebattle/Player.h
@@ -18,8 +18,11 @@
 #ifndef __POKEBATTLE_PLAYER__
 #define __POKEBATTLE_PLAYER__
 
+// Pokebattle includes
+#include "Global.h"
+
 // Qt includes
-#include <QObject>
+#include <QtCore/QObject>
 
 // Forward declarations
 namespace Pokemod
@@ -31,7 +34,7 @@ namespace Pokebattle
 {
 class Team;
 
-class Player : public QObject
+class POKEBATTLE_EXPORT Player : public QObject
 {
     Q_OBJECT
 
diff --git a/pokebattle/Team.h b/pokebattle/Team.h
index 10645b87..cf4f04d4 100644
--- a/pokebattle/Team.h
+++ b/pokebattle/Team.h
@@ -18,8 +18,11 @@
 #ifndef __POKEBATTLE_TEAM__
 #define __POKEBATTLE_TEAM__
 
+// Pokebattle includes
+#include "Global.h"
+
 // Qt includes
-#include <QObject>
+#include <QtCore/QObject>
 
 // Forward declarations
 namespace Pokemod
@@ -32,7 +35,7 @@ namespace Pokebattle
 class Player;
 class TeamMember;
 
-class Team : public QObject
+class POKEBATTLE_EXPORT Team : public QObject
 {
     Q_OBJECT
     
diff --git a/pokebattle/TeamMember.cpp b/pokebattle/TeamMember.cpp
index 3d747b0e..8b2d59c9 100644
--- a/pokebattle/TeamMember.cpp
+++ b/pokebattle/TeamMember.cpp
@@ -281,7 +281,8 @@ void Pokebattle::TeamMember::teachMove(const int move)
 
 const Pokemod::Pokemod* Pokebattle::TeamMember::pokemod() const
 {
-    return m_team->pokemod();
+    // TODO: get pokemod
+//     return m_team->pokemod();
 }
 
 void Pokebattle::TeamMember::setSpecies(const int species)
diff --git a/pokebattle/TeamMember.h b/pokebattle/TeamMember.h
index 8e745c19..db08cb59 100644
--- a/pokebattle/TeamMember.h
+++ b/pokebattle/TeamMember.h
@@ -18,13 +18,16 @@
 #ifndef __POKEBATTLE_TEAMMEMBER__
 #define __POKEBATTLE_TEAMMEMBER__
 
+// Pokebattle includes
+#include "Global.h"
+
 // Pokemod includes
 #include "../pokemod/Global.h"
 
 // Qt includes
-#include <QList>
-#include <QObject>
-#include <QString>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 
 // Forward declarations
 namespace Pokemod
@@ -37,7 +40,7 @@ namespace Pokebattle
 {
 class Team;
 
-class TeamMember : public QObject
+class POKEBATTLE_EXPORT TeamMember : public QObject
 {
     Q_OBJECT
     
diff --git a/pokebattle/pokebattle.pro b/pokebattle/pokebattle.pro
deleted file mode 100644
index f4a890f1..00000000
--- a/pokebattle/pokebattle.pro
+++ /dev/null
@@ -1,33 +0,0 @@
-include(../version.pri)
-TEMPLATE = lib
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
-DOC_DIR = ../doc
-DESTDIR = ../bin
-INSTALLDIR = lib$$system(kde4-config --libsuffix)
-LIBS += -L../bin \
- -lpokemod \
- -lkrosscore
-
-CONFIG += qt \
- warn_on \
- dll
-QT += xml
-
-include(../install.pri)
-include(../kde4.pri)
-
-SOURCES += Arena.cpp \
- Ghost.cpp \
- Team.cpp \
- TeamMember.cpp
-
-HEADERS += Arena.h \
- Bot.h \
- GhostBot.h \
- Ghost.h \
- Player.h \
- Team.h \
- TeamMember.h
-
-include(../headers.pri)
diff --git a/pokegen.pro b/pokegen.pro
deleted file mode 100755
index d8b10edf..00000000
--- a/pokegen.pro
+++ /dev/null
@@ -1,32 +0,0 @@
-include(version.pri)
-TEMPLATE = subdirs
-CONFIG += ordered
-
-SUBDIRS = pokemod \
- pokebattle \
- pokemodr
-
-pokemodr.depends = pokemod
-pokebattle.depends = pokemod
-
-distsrc.target = distsrc
-win32 {
-    distsrc.commands = make-tarball.bat $${VERSION}
-} else {
-    distsrc.commands = ./make-tarball.sh $${VERSION}
-}
-QMAKE_EXTRA_TARGETS += distsrc
-
-documentation.path = $$PREFIX/share/doc/pokegen-$${VERSION}
-documentation.files = DISCLAIMER \
- LICENSE
-INSTALLS += documentation
-
-unix {
-    rpm.target = rpm
-    rpm.commands = su -c \"rpmbuild -ta releases/pokegen-$${VERSION}.tar.bz2\"
-    rpm.depends = distsrc
-    QMAKE_EXTRA_TARGETS += rpm
-} win32 {
-} mac {
-}
diff --git a/pokegen.spec b/pokegen.spec
index 366200ee..3057636b 100644
--- a/pokegen.spec
+++ b/pokegen.spec
@@ -1,6 +1,6 @@
 Name:           pokegen
 Version:        0.0.2
-Release:        0.3%{?dist}.20080617svn210
+Release:        0.4%{?dist}.20080618svn215
 Summary:        Pokégen is a game aiming to be a customizable Pokémon-like game
 
 Group:          Amusements/Games
@@ -12,10 +12,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  kdelibs4-devel tetex-latex desktop-file-utils
 
 %description
-Pokégen is a game engine that is meant to be a customizable
-Pokémon-like game. The following is provided:
+Pokégen is an RPG/Strategy game engine that is modeled after the 
+Pokémon games. The following is provided:
 Pokémod - library for interfacing with Pokémod files
-Pokémodr - modding program
+Pokémodr - modding program for Pokémod files
+Pokébattle - library for handling battles
 
 %package devel
 Summary: Files needed to develop programs which use PokéGen
@@ -33,7 +34,7 @@ library, Pokémodr modding program, or the Pokégen game engine.
 
 
 %build
-qmake-qt4 PREFIX="%{_prefix}" CXXFLAGS="$RPM_OPT_FLAGS"
+%{cmake_kde4} -DINCLUDE_INSTALL_DIR=%{_includedir}/pokegen
 make %{?_smp_mflags}
 
 
@@ -49,7 +50,7 @@ cat > %{buildroot}%{_datadir}/mime/packages/pokemodr.xml << EOF1
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
   <mime-type type="application/x-pokemod+xml">
     <sub-class-of type="application/xml" />
-    <comment>PokéMod</comment>
+    <comment>Pokémod</comment>
     <glob pattern="*.[pP][mM][oO][dD]" />
   </mime-type>
 </mime-info>
@@ -63,7 +64,7 @@ Type=MimeType
 MimeType=application/x-pokemod+xml
 Icon=application-x-pokemod+xml
 Patterns=*.pmod;*.PMOD;
-Comment=PokéMod
+Comment=Pokémod
 [Property::X-KDE-text]
 Type=bool
 Value=true
@@ -73,8 +74,8 @@ mkdir -p %{buildroot}%{_datadir}/applications
 cat > %{buildroot}%{_datadir}/applications/pokemodr.desktop << EOF3
 [Desktop Entry]
 Name=PokéModr
-Comment=Program to edit PokéMods
-GenericName=Program to edit PokéMods
+Comment=Program to edit Pokémods
+GenericName=Program to edit Pokémods
 Encoding=UTF-8
 Type=Application
 Exec=%{_bindir}/pokemodr %U
@@ -97,6 +98,7 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/pokemodr
@@ -113,18 +115,23 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_docdir}/pokegen-%{version}/LICENSE
-%doc %{_docdir}/pokegen-%{version}/DISCLAIMER
-%doc %{_docdir}/pokegen-%{version}/pokemodr.pdf
+%doc %{_docdir}/%{name}-%{version}/LICENSE
+%doc %{_docdir}/%{name}-%{version}/DISCLAIMER
+%doc %{_docdir}/%{name}-%{version}/pokemodr.pdf
 %{_libdir}/libpokemod.so
 %{_libdir}/libpokebattle.so
-%{_includedir}/pokegen-%{version}/pokemod/*.h
-%{_includedir}/pokegen-%{version}/pokemodr/*.h
-%{_includedir}/pokegen-%{version}/pokebattle/*.h
+%{_includedir}/%{name}/pokemod/*.h
+%{_includedir}/%{name}/pokemodr/*.h
+%{_includedir}/%{name}/pokemodr/models/*.h
+%{_includedir}/%{name}/pokebattle/*.h
 
 
 %changelog
-* Sun Jun 17 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.2-0.3
+* Fri Jun 20 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.2-0.4
+- Using cmake now
+- Fixed up the -devel package
+
+* Tue Jun 17 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.2-0.3
 - New SVN revision
 - Fixes for release versioning
 - clean section fixed
diff --git a/pokegen/pokegen.pro b/pokegen/pokegen.pro
deleted file mode 100644
index 3fd503fd..00000000
--- a/pokegen/pokegen.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-include(../version.pri)
-TEMPLATE = app
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
-DOC_DIR = ../doc
-DESTDIR = ../bin
-INSTALLDIR = bin
-LIBS += -L../bin \
- -lpokemod \
- -lpokebattle \
- -lpokeworld
-
-CONFIG += qt \
- gui \
- warn_on
-
-include(../install.pri)
-include(../latex.pri)
-include(../kde4.pri)
-include(../readme.pri)
-
-LATEX += pokegen.tex
-
-include(../headers.pri)
diff --git a/pokemod/Ability.h b/pokemod/Ability.h
index 6cf5517f..413d6783 100644
--- a/pokemod/Ability.h
+++ b/pokemod/Ability.h
@@ -27,7 +27,7 @@ namespace Pokemod
 // Forward declarations
 class Pokemod;
 
-class Ability : public Object
+class POKEMOD_EXPORT Ability : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Author.cpp b/pokemod/Author.cpp
index dac4ef33..44ce70b7 100644
--- a/pokemod/Author.cpp
+++ b/pokemod/Author.cpp
@@ -23,7 +23,7 @@
 #include "Pokemod.h"
 
 // Qt includes
-#include <QRegExp>
+#include <QtCore/QRegExp>
 
 Pokemod::Author::Author(const Author& author) :
         Object("Author", author.parent(), author.id())
diff --git a/pokemod/Author.h b/pokemod/Author.h
index 738fe694..65e25dda 100644
--- a/pokemod/Author.h
+++ b/pokemod/Author.h
@@ -26,7 +26,7 @@ namespace Pokemod
 // Forward declarations
 class Pokemod;
 
-class Author : public Object
+class POKEMOD_EXPORT Author : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Badge.h b/pokemod/Badge.h
index a370ac1a..cd0ee089 100644
--- a/pokemod/Badge.h
+++ b/pokemod/Badge.h
@@ -20,11 +20,10 @@
 
 // Pokemod includes
 #include "Fraction.h"
-#include "Global.h"
 #include "Object.h"
 
 // Qt includes
-#include <QPixmap>
+#include <QtGui/QPixmap>
 
 namespace Pokemod
 {
@@ -32,7 +31,7 @@ namespace Pokemod
 class Pokemod;
 
 
-class Badge : public Object
+class POKEMOD_EXPORT Badge : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/CMakeLists.txt b/pokemod/CMakeLists.txt
new file mode 100644
index 00000000..9a51b648
--- /dev/null
+++ b/pokemod/CMakeLists.txt
@@ -0,0 +1,108 @@
+PROJECT(pokemod)
+
+IF(NOT BUILT_FROM_ROOT)
+    MESSAGE(FATAL_ERROR "Not built from source root")
+ENDIF(NOT BUILT_FROM_ROOT)
+
+SET(pokemod_MOC_HEADERS
+    Ability.h
+    Author.h
+    Badge.h
+    CoinList.h
+    CoinListObject.h
+    EggGroup.h
+    GlobalScript.h
+    Item.h
+    ItemType.h
+    MapEffect.h
+    Map.h
+    MapTrainer.h
+    MapTrainerTeamMember.h
+    MapWarp.h
+    MapWildListEncounter.h
+    MapWildList.h
+    Move.h
+    Nature.h
+    Object.h
+    Pokemod.h
+    Rules.h
+    Sound.h
+    Species.h
+    SpeciesAbility.h
+    SpeciesItem.h
+    SpeciesMove.h
+    Sprite.h
+    Status.h
+    Store.h
+    Tile.h
+    Time.h
+    Trainer.h
+    Type.h
+    Weather.h
+)
+QT4_WRAP_CPP(pokemod_MOC_SRCS ${pokemod_MOC_HEADERS})
+SET(pokemod_HEADERS
+    Fraction.h
+    Global.h
+    Hat.h
+    Macros.h
+    Matrix.h
+    Point.h
+    Script.h
+)
+SET(pokemod_DEVEL
+    ${pokemod_HEADERS}
+    ${pokemod_MOC_HEADERS}
+)
+SET(pokemod_SRCS
+    Ability.cpp
+    Author.cpp
+    Badge.cpp
+    CoinList.cpp
+    CoinListObject.cpp
+    EggGroup.cpp
+    Fraction.cpp
+    GlobalScript.cpp
+    Item.cpp
+    ItemType.cpp
+    Map.cpp
+    MapEffect.cpp
+    MapTrainer.cpp
+    MapTrainerTeamMember.cpp
+    MapWarp.cpp
+    MapWildList.cpp
+    MapWildListEncounter.cpp
+    Move.cpp
+    Nature.cpp
+    Object.cpp
+    Pokemod.cpp
+    Rules.cpp
+    Sound.cpp
+    Species.cpp
+    SpeciesAbility.cpp
+    SpeciesItem.cpp
+    SpeciesMove.cpp
+    Sprite.cpp
+    Status.cpp
+    Store.cpp
+    Tile.cpp
+    Time.cpp
+    Trainer.cpp
+    Type.cpp
+    Weather.cpp
+)
+
+ADD_LIBRARY(pokemod ${pokemod_SRCS} ${pokemod_MOC_SRCS})
+TARGET_LINK_LIBRARIES(pokemod ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY})
+
+INSTALL(
+    TARGETS pokemod
+    DESTINATION ${LIB_INSTALL_DIR}
+    COMPONENT runtime
+)
+
+INSTALL(
+    FILES ${pokemod_DEVEL}
+    DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}
+    COMPONENT development
+)
diff --git a/pokemod/CoinList.cpp b/pokemod/CoinList.cpp
index 04ae14b9..c15a1585 100644
--- a/pokemod/CoinList.cpp
+++ b/pokemod/CoinList.cpp
@@ -24,7 +24,7 @@
 #include "Pokemod.h"
 
 // Qt includes
-#include <QSet>
+#include <QtCore/QSet>
 
 Pokemod::CoinList::CoinList(const CoinList& coinList) :
         Object("CoinList", coinList.parent(), coinList.id())
diff --git a/pokemod/CoinList.h b/pokemod/CoinList.h
index 1bf13393..79b532fb 100644
--- a/pokemod/CoinList.h
+++ b/pokemod/CoinList.h
@@ -23,7 +23,7 @@
 #include "Script.h"
 
 // Qt includes
-#include <QList>
+#include <QtCore/QList>
 
 namespace Pokemod
 {
@@ -31,7 +31,7 @@ namespace Pokemod
 class CoinListObject;
 class Pokemod;
 
-class CoinList : public Object
+class POKEMOD_EXPORT CoinList : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/CoinListObject.h b/pokemod/CoinListObject.h
index 36fe39cf..98093f9d 100644
--- a/pokemod/CoinListObject.h
+++ b/pokemod/CoinListObject.h
@@ -26,7 +26,7 @@ namespace Pokemod
 // Forward declarations
 class CoinList;
 
-class CoinListObject : public Object
+class POKEMOD_EXPORT CoinListObject : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/EggGroup.h b/pokemod/EggGroup.h
index 606dabe0..e31804e2 100644
--- a/pokemod/EggGroup.h
+++ b/pokemod/EggGroup.h
@@ -26,7 +26,7 @@ namespace Pokemod
 // Forward declarations
 class Pokemod;
 
-class EggGroup : public Object
+class POKEMOD_EXPORT EggGroup : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Fraction.h b/pokemod/Fraction.h
index 6a50f5ac..612cfaf7 100644
--- a/pokemod/Fraction.h
+++ b/pokemod/Fraction.h
@@ -18,12 +18,15 @@
 #ifndef __POKEMOD_FRACTION__
 #define __POKEMOD_FRACTION__
 
+// Pokemod includes
+#include "Global.h"
+
 // Qt includes
-#include <QMetaType>
+#include <QtCore/QMetaType>
 
 namespace Pokemod
 {
-class Fraction
+class POKEMOD_EXPORT Fraction
 {
     public:
         Fraction();
diff --git a/pokemod/Global.h b/pokemod/Global.h
index ffd40a9c..9573cfeb 100644
--- a/pokemod/Global.h
+++ b/pokemod/Global.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,24 @@
 #define __POKEMOD_GLOBAL__
 
 // Qt includes
-#include <QStringList>
+#include <QtCore/QStringList>
+
+// KDE includes
+#include <kdemacros.h>
+
+#ifndef POKEMOD_EXPORT
+# if defined(MAKE_POKEMOD_LIB)
+   /* We are building this library */
+#  define POKEMOD_EXPORT KDE_EXPORT
+# else
+   /* We are using this library */
+#  define POKEMOD_EXPORT KDE_IMPORT
+# endif
+#endif
+
+# ifndef POKEMOD_EXPORT_DEPRECATED
+#  define POKEMOD_EXPORT_DEPRECATED KDE_DEPRECATED POKEMOD_EXPORT
+# endif
 
 namespace Pokemod
 {
diff --git a/pokemod/GlobalScript.h b/pokemod/GlobalScript.h
index 35a59b9b..e8409390 100644
--- a/pokemod/GlobalScript.h
+++ b/pokemod/GlobalScript.h
@@ -27,7 +27,7 @@ namespace Pokemod
 // Forward declarations
 class Pokemod;
 
-class GlobalScript : public Object
+class POKEMOD_EXPORT GlobalScript : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Hat.h b/pokemod/Hat.h
index 09974dd3..519bb5de 100644
--- a/pokemod/Hat.h
+++ b/pokemod/Hat.h
@@ -18,9 +18,12 @@
 #ifndef __POKEMOD_HAT__
 #define __POKEMOD_HAT__
 
+// Pokemod includes
+#include "Global.h"
+
 // Qt includes
-#include <QtGlobal>
-#include <QMap>
+#include <QtCore/QtGlobal>
+#include <QtCore/QMap>
 
 namespace Pokemod
 {
diff --git a/pokemod/Item.cpp b/pokemod/Item.cpp
index 67c28fc2..faaa1bd7 100644
--- a/pokemod/Item.cpp
+++ b/pokemod/Item.cpp
@@ -24,7 +24,7 @@
 #include "Rules.h"
 
 // Qt includes
-#include <QSet>
+#include <QtCore/QSet>
 
 Pokemod::Item::Item(const Item& item) :
         Object("Item", item.parent(), item.id())
diff --git a/pokemod/Item.h b/pokemod/Item.h
index 9af8dc1a..8404d896 100644
--- a/pokemod/Item.h
+++ b/pokemod/Item.h
@@ -27,7 +27,7 @@ namespace Pokemod
 // Forward declarations
 class Pokemod;
 
-class Item : public Object
+class POKEMOD_EXPORT Item : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/ItemType.h b/pokemod/ItemType.h
index a1322811..91f2fcf1 100644
--- a/pokemod/ItemType.h
+++ b/pokemod/ItemType.h
@@ -26,7 +26,7 @@ namespace Pokemod
 // Forward declarations
 class Pokemod;
 
-class ItemType : public Object
+class POKEMOD_EXPORT ItemType : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Macros.h b/pokemod/Macros.h
index fb9fde21..0ab9704e 100644
--- a/pokemod/Macros.h
+++ b/pokemod/Macros.h
@@ -19,7 +19,7 @@
 #define __POKEMOD_MACROS__
 
 // Qt includes
-#include <QBuffer>
+#include <QtCore/QBuffer>
 
 #define LOAD_NODE(variable) xml.firstChildElement(variable)
 #define LOAD_DATA(node) node.firstChild().toText().data()
diff --git a/pokemod/Map.cpp b/pokemod/Map.cpp
index 11a69fe7..b2ba980c 100644
--- a/pokemod/Map.cpp
+++ b/pokemod/Map.cpp
@@ -27,7 +27,7 @@
 #include "Pokemod.h"
 
 // Qt includes
-#include <QSet>
+#include <QtCore/QSet>
 
 const QStringList Pokemod::Map::TypeStr = QStringList() << "Outdoor" << "Dungeon" << "Building";
 
diff --git a/pokemod/Map.h b/pokemod/Map.h
index dac525ea..9d0ac910 100644
--- a/pokemod/Map.h
+++ b/pokemod/Map.h
@@ -23,7 +23,7 @@
 #include "Object.h"
 
 // Qt includes
-#include <QList>
+#include <QtCore/QList>
 
 namespace Pokemod
 {
@@ -34,7 +34,7 @@ class MapWarp;
 class MapWildList;
 class Pokemod;
 
-class Map : public Object
+class POKEMOD_EXPORT Map : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/MapEffect.h b/pokemod/MapEffect.h
index bb5bc5e6..6c8a988c 100644
--- a/pokemod/MapEffect.h
+++ b/pokemod/MapEffect.h
@@ -24,14 +24,14 @@
 #include "Script.h"
 
 // Qt includes
-#include <QPixmap>
+#include <QtGui/QPixmap>
 
 namespace Pokemod
 {
 // Forward declarations
 class Map;
 
-class MapEffect : public Object
+class POKEMOD_EXPORT MapEffect : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp
index 5c5e665d..8aef8595 100644
--- a/pokemod/MapTrainer.cpp
+++ b/pokemod/MapTrainer.cpp
@@ -26,7 +26,7 @@
 #include "Rules.h"
 
 // Qt includes
-#include <QSet>
+#include <QtCore/QSet>
 
 Pokemod::MapTrainer::MapTrainer(const MapTrainer& trainer) :
         Object("MapTrainer", trainer.parent(), trainer.id())
diff --git a/pokemod/MapTrainer.h b/pokemod/MapTrainer.h
index 6d3bda87..425e91c3 100644
--- a/pokemod/MapTrainer.h
+++ b/pokemod/MapTrainer.h
@@ -24,7 +24,7 @@
 #include "Script.h"
 
 // Qt includes
-#include <QList>
+#include <QtCore/QList>
 
 namespace Pokemod
 {
@@ -32,7 +32,7 @@ namespace Pokemod
 class Map;
 class MapTrainerTeamMember;
 
-class MapTrainer : public Object
+class POKEMOD_EXPORT MapTrainer : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/MapTrainerTeamMember.cpp b/pokemod/MapTrainerTeamMember.cpp
index 921de3c8..ad1945cb 100644
--- a/pokemod/MapTrainerTeamMember.cpp
+++ b/pokemod/MapTrainerTeamMember.cpp
@@ -28,7 +28,7 @@
 #include "SpeciesMove.h"
 
 // Qt includes
-#include <QSet>
+#include <QtCore/QSet>
 
 Pokemod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember) :
         Object("MapTrainerTeamMember", teamMember.parent(), teamMember.id())
diff --git a/pokemod/MapTrainerTeamMember.h b/pokemod/MapTrainerTeamMember.h
index 1e78c9ac..67065d53 100644
--- a/pokemod/MapTrainerTeamMember.h
+++ b/pokemod/MapTrainerTeamMember.h
@@ -22,14 +22,14 @@
 #include "Object.h"
 
 // Qt includes
-#include <QList>
+#include <QtCore/QList>
 
 namespace Pokemod
 {
 // Forward dclarations
 class MapTrainer;
 
-class MapTrainerTeamMember : public Object
+class POKEMOD_EXPORT MapTrainerTeamMember : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/MapWarp.h b/pokemod/MapWarp.h
index e9c89919..84e133be 100644
--- a/pokemod/MapWarp.h
+++ b/pokemod/MapWarp.h
@@ -26,7 +26,7 @@
 
 namespace Pokemod
 {
-class MapWarp : public Object
+class POKEMOD_EXPORT MapWarp : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/MapWildList.cpp b/pokemod/MapWildList.cpp
index 1a05b1b4..30613ede 100644
--- a/pokemod/MapWildList.cpp
+++ b/pokemod/MapWildList.cpp
@@ -24,7 +24,7 @@
 #include "MapWildListEncounter.h"
 
 // Qt includes
-#include <QSet>
+#include <QtCore/QSet>
 
 Pokemod::MapWildList::MapWildList(const MapWildList& wildList) :
         Object("MapWildList", wildList.parent(), wildList.id())
diff --git a/pokemod/MapWildList.h b/pokemod/MapWildList.h
index 4ce5d256..1e6ef54d 100644
--- a/pokemod/MapWildList.h
+++ b/pokemod/MapWildList.h
@@ -22,7 +22,7 @@
 #include "Object.h"
 
 // Qt includes
-#include <QList>
+#include <QtCore/QList>
 
 namespace Pokemod
 {
@@ -30,7 +30,7 @@ namespace Pokemod
 class Map;
 class MapWildListEncounter;
 
-class MapWildList : public Object
+class POKEMOD_EXPORT MapWildList : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/MapWildListEncounter.h b/pokemod/MapWildListEncounter.h
index 8c87247a..e8b49839 100644
--- a/pokemod/MapWildListEncounter.h
+++ b/pokemod/MapWildListEncounter.h
@@ -26,7 +26,7 @@ namespace Pokemod
 // Forward declarations
 class MapWildList;
 
-class MapWildListEncounter: public Object
+class POKEMOD_EXPORT MapWildListEncounter: public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Matrix.h b/pokemod/Matrix.h
index 9e60a5f4..77cf3595 100644
--- a/pokemod/Matrix.h
+++ b/pokemod/Matrix.h
@@ -18,15 +18,16 @@
 #ifndef __POKEMOD_MATRIX__
 #define __POKEMOD_MATRIX__
 
-// General includes
+// Pokemod includes
+#include "Global.h"
 #include "Point.h"
 
 // Qt includes
-#include <QVector>
+#include <QtCore/QVector>
 
 namespace Pokemod
 {
-template<class T> class Matrix
+template<class T> class POKEMOD_EXPORT Matrix
 {
     public:
         Matrix();
diff --git a/pokemod/Move.cpp b/pokemod/Move.cpp
index 16802dcd..84c29e7a 100644
--- a/pokemod/Move.cpp
+++ b/pokemod/Move.cpp
@@ -23,7 +23,7 @@
 #include "Pokemod.h"
 
 // Qt includes
-#include <QSet>
+#include <QtCore/QSet>
 
 Pokemod::Move::Move(const Move& move) :
         Object("Move", move.parent(), move.id())
diff --git a/pokemod/Move.h b/pokemod/Move.h
index 3a764366..6c4992a4 100644
--- a/pokemod/Move.h
+++ b/pokemod/Move.h
@@ -28,7 +28,7 @@ namespace Pokemod
 // Forward declarations
 class Pokemod;
 
-class Move : public Object
+class POKEMOD_EXPORT Move : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Nature.h b/pokemod/Nature.h
index 8f628936..38aa874d 100644
--- a/pokemod/Nature.h
+++ b/pokemod/Nature.h
@@ -20,7 +20,6 @@
 
 // Pokemod includes
 #include "Fraction.h"
-#include "Global.h"
 #include "Object.h"
 
 namespace Pokemod
@@ -28,7 +27,7 @@ namespace Pokemod
 // Forward declarations
 class Pokemod;
 
-class Nature : public Object
+class POKEMOD_EXPORT Nature : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Object.h b/pokemod/Object.h
index e4542a85..bc0e2850 100644
--- a/pokemod/Object.h
+++ b/pokemod/Object.h
@@ -18,17 +18,20 @@
 #ifndef __POKEMOD_OBJECT__
 #define __POKEMOD_OBJECT__
 
+// Pokemod includes
+#include "Global.h"
+
 // Qt includes
-#include <QDomElement>
-#include <QObject>
-#include <QTextStream>
+#include <QtCore/QObject>
+#include <QtCore/QTextStream>
+#include <QtXml/QDomElement>
 
 // C includes
 #include <climits>
 
 namespace Pokemod
 {
-class Object : public QObject
+class POKEMOD_EXPORT Object : public QObject
 {
     Q_OBJECT
     
diff --git a/pokemod/Point.h b/pokemod/Point.h
index 130f1c4c..f5b0c890 100644
--- a/pokemod/Point.h
+++ b/pokemod/Point.h
@@ -18,9 +18,12 @@
 #ifndef __POKEMOD_POINT__
 #define __POKEMOD_POINT__
 
+// Pokemod includes
+#include "Global.h"
+
 namespace Pokemod
 {
-class Point
+class POKEMOD_EXPORT Point
 {
     public:
         Point(const int x = 0, const int y = 0);
diff --git a/pokemod/Pokemod.cpp b/pokemod/Pokemod.cpp
index c5e2599c..c1ee1daa 100644
--- a/pokemod/Pokemod.cpp
+++ b/pokemod/Pokemod.cpp
@@ -44,8 +44,8 @@
 #include "Weather.h"
 
 // Qt includes
-#include <QBuffer>
-#include <QSet>
+#include <QtCore/QBuffer>
+#include <QtCore/QSet>
 
 Pokemod::Pokemod::Pokemod() :
         Object("Pokemod", NULL, 0),
diff --git a/pokemod/Pokemod.h b/pokemod/Pokemod.h
index 18c8b80a..7de585f2 100644
--- a/pokemod/Pokemod.h
+++ b/pokemod/Pokemod.h
@@ -25,8 +25,8 @@
 #include "Point.h"
 
 // Qt includes
-#include <QList>
-#include <QPixmap>
+#include <QtCore/QList>
+#include <QtGui/QPixmap>
 
 namespace Pokemod
 {
@@ -54,7 +54,7 @@ class Trainer;
 class Type;
 class Weather;
 
-class Pokemod : public Object
+class POKEMOD_EXPORT Pokemod : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Rules.h b/pokemod/Rules.h
index 3c77ca50..efd621a4 100644
--- a/pokemod/Rules.h
+++ b/pokemod/Rules.h
@@ -27,7 +27,7 @@ namespace Pokemod
 // Forward declarations
 class Pokemod;
 
-class Rules : public Object
+class POKEMOD_EXPORT Rules : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Script.h b/pokemod/Script.h
index 8ba96d9b..d8e1a625 100644
--- a/pokemod/Script.h
+++ b/pokemod/Script.h
@@ -18,12 +18,15 @@
 #ifndef __POKEMOD_SCRIPT__
 #define __POKEMOD_SCRIPT__
 
+// Pokemod includes
+#include "Global.h"
+
 // Qt includes
-#include <QString>
+#include <QtCore/QString>
 
 namespace Pokemod
 {
-class Script
+class POKEMOD_EXPORT Script
 {
     public:
         Script(const QString& interpreter = "", const QString& script = "");
diff --git a/pokemod/Sound.h b/pokemod/Sound.h
index f35eac41..ef77cb85 100644
--- a/pokemod/Sound.h
+++ b/pokemod/Sound.h
@@ -22,15 +22,15 @@
 #include "Object.h"
 
 // Qt includes
-#include <QByteArray>
-#include <QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
 
 namespace Pokemod
 {
 // Forward declarations
 class Pokemod;
 
-class Sound : public Object
+class POKEMOD_EXPORT Sound : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Species.cpp b/pokemod/Species.cpp
index 95912f61..01914e40 100644
--- a/pokemod/Species.cpp
+++ b/pokemod/Species.cpp
@@ -27,7 +27,7 @@
 #include "SpeciesMove.h"
 
 // Qt includes
-#include <QSet>
+#include <QtCore/QSet>
 
 const QStringList Pokemod::Species::StyleStr = QStringList() << "Fluctuating" << "Fading" << "Slow" << "Normal" << "Fast" << "Erratic";
 
diff --git a/pokemod/Species.h b/pokemod/Species.h
index 8bbb96d9..d72708a7 100644
--- a/pokemod/Species.h
+++ b/pokemod/Species.h
@@ -20,13 +20,12 @@
 
 // Pokemod includes
 #include "Fraction.h"
-#include "Global.h"
 #include "Object.h"
 #include "Script.h"
 
 // Qt includes
-#include <QList>
-#include <QPixmap>
+#include <QtCore/QList>
+#include <QtGui/QPixmap>
 
 namespace Pokemod
 {
@@ -36,7 +35,7 @@ class SpeciesAbility;
 class SpeciesItem;
 class SpeciesMove;
 
-class Species : public Object
+class POKEMOD_EXPORT Species : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/SpeciesAbility.h b/pokemod/SpeciesAbility.h
index 5098ba64..9ea2c47e 100644
--- a/pokemod/SpeciesAbility.h
+++ b/pokemod/SpeciesAbility.h
@@ -26,7 +26,7 @@ namespace Pokemod
 // Forward declarations
 class Species;
 
-class SpeciesAbility : public Object
+class POKEMOD_EXPORT SpeciesAbility : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/SpeciesItem.h b/pokemod/SpeciesItem.h
index b5b7e00c..6da0af05 100644
--- a/pokemod/SpeciesItem.h
+++ b/pokemod/SpeciesItem.h
@@ -26,7 +26,7 @@ namespace Pokemod
 // Forward declarations
 class Species;
 
-class SpeciesItem : public Object
+class POKEMOD_EXPORT SpeciesItem : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/SpeciesMove.h b/pokemod/SpeciesMove.h
index 774e3763..9f9d6b87 100644
--- a/pokemod/SpeciesMove.h
+++ b/pokemod/SpeciesMove.h
@@ -26,7 +26,7 @@ namespace Pokemod
 // Forward declarations
 class Species;
 
-class SpeciesMove : public Object
+class POKEMOD_EXPORT SpeciesMove : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Sprite.h b/pokemod/Sprite.h
index 4bea1293..7558c2bc 100644
--- a/pokemod/Sprite.h
+++ b/pokemod/Sprite.h
@@ -22,14 +22,14 @@
 #include "Object.h"
 
 // Qt includes
-#include <QPixmap>
+#include <QtGui/QPixmap>
 
 namespace Pokemod
 {
 // Forward declarations
 class Pokemod;
 
-class Sprite : public Object
+class POKEMOD_EXPORT Sprite : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Status.h b/pokemod/Status.h
index 2288486a..47bd6baf 100644
--- a/pokemod/Status.h
+++ b/pokemod/Status.h
@@ -27,7 +27,7 @@ namespace Pokemod
 // Forward declarations
 class Pokemod;
 
-class Status : public Object
+class POKEMOD_EXPORT Status : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Store.h b/pokemod/Store.h
index 9255247c..cc991b5f 100644
--- a/pokemod/Store.h
+++ b/pokemod/Store.h
@@ -22,14 +22,14 @@
 #include "Object.h"
 
 // Qt includes
-#include <QList>
+#include <QtCore/QList>
 
 namespace Pokemod
 {
 // Forward declarations
 class Pokemod;
 
-class Store : public Object
+class POKEMOD_EXPORT Store : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Tile.h b/pokemod/Tile.h
index 779952de..d0b9ca6c 100644
--- a/pokemod/Tile.h
+++ b/pokemod/Tile.h
@@ -19,19 +19,18 @@
 #define __POKEMOD_TILE__
 
 // Pokemod includes
-#include "Global.h"
 #include "Object.h"
 #include "Script.h"
 
 // Qt includes
-#include <QPixmap>
+#include <QtGui/QPixmap>
 
 namespace Pokemod
 {
 // Forward declarations
 class Pokemod;
 
-class Tile : public Object
+class POKEMOD_EXPORT Tile : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Time.h b/pokemod/Time.h
index 91a15a0e..39f0e7ae 100644
--- a/pokemod/Time.h
+++ b/pokemod/Time.h
@@ -26,7 +26,7 @@ namespace Pokemod
 // Forward declarations
 class Pokemod;
 
-class Time : public Object
+class POKEMOD_EXPORT Time : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Trainer.h b/pokemod/Trainer.h
index 7da08bdc..d77364b4 100644
--- a/pokemod/Trainer.h
+++ b/pokemod/Trainer.h
@@ -22,15 +22,15 @@
 #include "Object.h"
 
 // Qt includes
-#include <QPixmap>
-#include <QStringList>
+#include <QtCore/QStringList>
+#include <QtGui/QPixmap>
 
 namespace Pokemod
 {
 // Forward declarations
 class Pokemod;
 
-class Trainer : public Object
+class POKEMOD_EXPORT Trainer : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Type.h b/pokemod/Type.h
index 5596f6e7..b851fad4 100644
--- a/pokemod/Type.h
+++ b/pokemod/Type.h
@@ -27,7 +27,7 @@ namespace Pokemod
 // Forward declarations
 class Pokemod;
 
-class Type : public Object
+class POKEMOD_EXPORT Type : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/Weather.h b/pokemod/Weather.h
index 3a1e6734..b17a0b09 100644
--- a/pokemod/Weather.h
+++ b/pokemod/Weather.h
@@ -27,7 +27,7 @@ namespace Pokemod
 // Forward declarations
 class Pokemod;
 
-class Weather : public Object
+class POKEMOD_EXPORT Weather : public Object
 {
     Q_OBJECT
     
diff --git a/pokemod/pokemod.pro b/pokemod/pokemod.pro
deleted file mode 100644
index ba4421e5..00000000
--- a/pokemod/pokemod.pro
+++ /dev/null
@@ -1,98 +0,0 @@
-include(../version.pri)
-TEMPLATE = lib
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
-DOC_DIR = ../doc
-DESTDIR = ../bin
-INSTALLDIR = lib$$system(kde4-config --libsuffix)
-
-CONFIG += qt \
- warn_on \
- dll
-QT += xml
-
-!win32 {
-    CONFIG += debug
-}
-
-include(../install.pri)
-
-SOURCES += Ability.cpp \
- Author.cpp \
- Badge.cpp \
- CoinList.cpp \
- CoinListObject.cpp \
- EggGroup.cpp \
- Fraction.cpp \
- GlobalScript.cpp \
- Item.cpp \
- ItemType.cpp \
- Map.cpp \
- MapEffect.cpp \
- MapTrainer.cpp \
- MapTrainerTeamMember.cpp \
- MapWarp.cpp \
- MapWildList.cpp \
- MapWildListEncounter.cpp \
- Move.cpp \
- Nature.cpp \
- Object.cpp \
- Pokemod.cpp \
- Rules.cpp \
- Sound.cpp \
- Species.cpp \
- SpeciesAbility.cpp \
- SpeciesItem.cpp \
- SpeciesMove.cpp \
- Sprite.cpp \
- Status.cpp \
- Store.cpp \
- Tile.cpp \
- Time.cpp \
- Trainer.cpp \
- Type.cpp \
- Weather.cpp
-
-HEADERS += Ability.h \
- Author.h \
- Badge.h \
- CoinList.h \
- CoinListObject.h \
- EggGroup.h \
- Fraction.h \
- Global.h \
- GlobalScript.h \
- Hat.h \
- Item.h \
- ItemType.h \
- Macros.h \
- MapEffect.h \
- Map.h \
- MapTrainer.h \
- MapTrainerTeamMember.h \
- MapWarp.h \
- MapWildListEncounter.h \
- MapWildList.h \
- Matrix.h \
- Move.h \
- Nature.h \
- Object.h \
- Point.h \
- Pokemod.h \
- Rules.h \
- Script.h \
- Sound.h \
- Species.h \
- SpeciesAbility.h \
- SpeciesItem.h \
- SpeciesMove.h \
- Sprite.h \
- Status.h \
- Store.h \
- Tile.h \
- Time.h \
- Trainer.h \
- Type.h \
- Weather.h
-
-include(../headers.pri)
diff --git a/pokemodr/CMakeLists.txt b/pokemodr/CMakeLists.txt
new file mode 100644
index 00000000..9edccbbe
--- /dev/null
+++ b/pokemodr/CMakeLists.txt
@@ -0,0 +1,314 @@
+PROJECT(pokemodr)
+
+IF(NOT BUILT_FROM_ROOT)
+    MESSAGE(FATAL_ERROR "Not built from source root")
+ENDIF(NOT BUILT_FROM_ROOT)
+
+INCLUDE(../latex.cmake)
+
+SET(pokemodr_RESOURCES
+    overlays/overlays.qrc
+)
+QT4_ADD_RESOURCES(pokemodr_RESOURCE_SRCS ${pokemodr_RESOURCES})
+SET(pokemodr_FORMS
+    gui/ability.ui
+    gui/author.ui
+    gui/badge.ui
+    gui/coinlist.ui
+    gui/coinlistobject.ui
+    gui/egggroup.ui
+    gui/fraction.ui
+    gui/globalscript.ui
+    gui/item.ui
+    gui/itemtype.ui
+    gui/map.ui
+    gui/mapeffect.ui
+    gui/maptrainer.ui
+    gui/maptrainerteammember.ui
+    gui/mapwarp.ui
+    gui/mapwildlist.ui
+    gui/mapwildlistencounter.ui
+    gui/move.ui
+    gui/nature.ui
+    gui/point.ui
+    gui/pokemod.ui
+    gui/pokemodr.ui
+    gui/rules.ui
+    gui/script.ui
+    gui/sound.ui
+    gui/species.ui
+    gui/speciesability.ui
+    gui/speciesitem.ui
+    gui/speciesmove.ui
+    gui/sprite.ui
+    gui/status.ui
+    gui/store.ui
+    gui/tile.ui
+    gui/time.ui
+    gui/trainer.ui
+    gui/type.ui
+    gui/weather.ui
+)
+QT4_WRAP_UI(pokemodr_UI_HEADERS ${pokemodr_FORMS})
+SET(pokemodr_WIDGET_HEADERS
+    AbilityUI.h
+    AuthorUI.h
+    BadgeUI.h
+    CoinListUI.h
+    CoinListObjectUI.h
+    EggGroupUI.h
+    GlobalScriptUI.h
+    ItemUI.h
+    ItemTypeUI.h
+    MapUI.h
+    MapEffectUI.h
+    MapTrainerUI.h
+    MapTrainerTeamMemberUI.h
+    MapWarpUI.h
+    MapWildListUI.h
+    MapWildListEncounterUI.h
+    MoveUI.h
+    NatureUI.h
+    ObjectUI.h
+    PokemodUI.h
+    RulesUI.h
+    SoundUI.h
+    SpeciesUI.h
+    SpeciesAbilityUI.h
+    SpeciesItemUI.h
+    SpeciesMoveUI.h
+    SpriteUI.h
+    StatusUI.h
+    StoreUI.h
+    TileUI.h
+    TimeUI.h
+    TrainerUI.h
+    TypeUI.h
+    WeatherUI.h
+)
+SET(pokemodr_MODEL_HEADERS
+    models/AbilityGroupModel.h
+    models/AbilityModel.h
+    models/AuthorGroupModel.h
+    models/AuthorModel.h
+    models/BadgeGroupModel.h
+    models/BadgeModel.h
+    models/BaseModel.h
+    models/BaseObjectModel.h
+    models/CoinListGroupModel.h
+    models/CoinListModel.h
+    models/CoinListObjectModel.h
+    models/EggGroupGroupModel.h
+    models/EggGroupModel.h
+    models/GlobalScriptGroupModel.h
+    models/GlobalScriptModel.h
+    models/GroupModel.h
+    models/GroupObjectModel.h
+    models/ItemGroupModel.h
+    models/ItemModel.h
+    models/ItemTypeGroupModel.h
+    models/ItemTypeModel.h
+    models/MapGroupModel.h
+    models/MapModel.h
+    models/MapEffectGroupModel.h
+    models/MapEffectModel.h
+    models/MapTrainerGroupModel.h
+    models/MapTrainerModel.h
+    models/MapTrainerTeamMemberModel.h
+    models/MapWarpGroupModel.h
+    models/MapWarpModel.h
+    models/MapWildListGroupModel.h
+    models/MapWildListModel.h
+    models/MapWildListEncounterModel.h
+    models/MoveGroupModel.h
+    models/MoveModel.h
+    models/NatureGroupModel.h
+    models/NatureModel.h
+    models/ObjectModel.h
+    models/PokemodModel.h
+    models/RootModel.h
+    models/RulesModel.h
+    models/SoundGroupModel.h
+    models/SoundModel.h
+    models/SpeciesGroupModel.h
+    models/SpeciesModel.h
+    models/SpeciesAbilityGroupModel.h
+    models/SpeciesAbilityModel.h
+    models/SpeciesItemGroupModel.h
+    models/SpeciesItemModel.h
+    models/SpeciesMoveGroupModel.h
+    models/SpeciesMoveModel.h
+    models/SpriteGroupModel.h
+    models/SpriteModel.h
+    models/StatusGroupModel.h
+    models/StatusModel.h
+    models/StoreGroupModel.h
+    models/StoreModel.h
+    models/TileGroupModel.h
+    models/TileModel.h
+    models/TimeGroupModel.h
+    models/TimeModel.h
+    models/TrainerGroupModel.h
+    models/TrainerModel.h
+    models/TypeGroupModel.h
+    models/TypeModel.h
+    models/WeatherGroupModel.h
+    models/WeatherModel.h
+)
+SET(pokemodr_MOC_HEADERS
+    ${pokemodr_WIDGET_HEADERS}
+    ${pokemodr_MODEL_HEADERS}
+    FileDialog.h
+    FractionWidget.h
+    PointWidget.h
+    PokemodTree.h
+    PokemodTreeModel.h
+    PokemodrPreferences.h
+    PokemodrUI.h
+    ScriptWidget.h
+    TilemapModel.h
+    TypechartModel.h
+)
+QT4_WRAP_CPP(pokemodr_MOC_SRCS ${pokemodr_MOC_HEADERS})
+SET(pokemodr_HEADERS
+    ${pokemodr_WIDGET_HEADERS}
+    ${pokemodr_MODEL_HEADERS}
+    Pokemodr.h
+)
+SET(pokemodr_DEVEL
+    ${pokemodr_HEADERS}
+    ${pokemodr_UI_HEADERS}
+)
+SET(pokemodr_WIDGET_SRCS
+    AbilityUI.cpp
+    AuthorUI.cpp
+    BadgeUI.cpp
+    CoinListUI.cpp
+    CoinListObjectUI.cpp
+    EggGroupUI.cpp
+    GlobalScriptUI.cpp
+    ItemUI.cpp
+    ItemTypeUI.cpp
+    MapUI.cpp
+    MapEffectUI.cpp
+    MapTrainerUI.cpp
+    MapTrainerTeamMemberUI.cpp
+    MapWarpUI.cpp
+    MapWildListUI.cpp
+    MapWildListEncounterUI.cpp
+    MoveUI.cpp
+    NatureUI.cpp
+    ObjectUI.cpp
+    PokemodUI.cpp
+    RulesUI.cpp
+    SoundUI.cpp
+    SpeciesUI.cpp
+    SpeciesAbilityUI.cpp
+    SpeciesItemUI.cpp
+    SpeciesMoveUI.cpp
+    SpriteUI.cpp
+    StatusUI.cpp
+    StoreUI.cpp
+    TileUI.cpp
+    TimeUI.cpp
+    TrainerUI.cpp
+    TypeUI.cpp
+    WeatherUI.cpp
+)
+SET(pokemodr_MODEL_SRCS
+    models/AbilityGroupModel.cpp
+    models/AbilityModel.cpp
+    models/AuthorGroupModel.cpp
+    models/AuthorModel.cpp
+    models/BadgeGroupModel.cpp
+    models/BadgeModel.cpp
+    models/BaseModel.cpp
+    models/BaseObjectModel.cpp
+    models/CoinListGroupModel.cpp
+    models/CoinListModel.cpp
+    models/CoinListObjectModel.cpp
+    models/EggGroupGroupModel.cpp
+    models/EggGroupModel.cpp
+    models/GlobalScriptGroupModel.cpp
+    models/GlobalScriptModel.cpp
+    models/GroupModel.cpp
+    models/GroupObjectModel.cpp
+    models/ItemGroupModel.cpp
+    models/ItemModel.cpp
+    models/ItemTypeGroupModel.cpp
+    models/ItemTypeModel.cpp
+    models/MapGroupModel.cpp
+    models/MapModel.cpp
+    models/MapEffectGroupModel.cpp
+    models/MapEffectModel.cpp
+    models/MapTrainerGroupModel.cpp
+    models/MapTrainerModel.cpp
+    models/MapTrainerTeamMemberModel.cpp
+    models/MapWarpGroupModel.cpp
+    models/MapWarpModel.cpp
+    models/MapWildListGroupModel.cpp
+    models/MapWildListModel.cpp
+    models/MapWildListEncounterModel.cpp
+    models/MoveGroupModel.cpp
+    models/MoveModel.cpp
+    models/NatureGroupModel.cpp
+    models/NatureModel.cpp
+    models/ObjectModel.cpp
+    models/PokemodModel.cpp
+    models/RootModel.cpp
+    models/RulesModel.cpp
+    models/SoundGroupModel.cpp
+    models/SoundModel.cpp
+    models/SpeciesGroupModel.cpp
+    models/SpeciesModel.cpp
+    models/SpeciesAbilityGroupModel.cpp
+    models/SpeciesAbilityModel.cpp
+    models/SpeciesItemGroupModel.cpp
+    models/SpeciesItemModel.cpp
+    models/SpeciesMoveGroupModel.cpp
+    models/SpeciesMoveModel.cpp
+    models/SpriteGroupModel.cpp
+    models/SpriteModel.cpp
+    models/StatusGroupModel.cpp
+    models/StatusModel.cpp
+    models/StoreGroupModel.cpp
+    models/StoreModel.cpp
+    models/TileGroupModel.cpp
+    models/TileModel.cpp
+    models/TimeGroupModel.cpp
+    models/TimeModel.cpp
+    models/TrainerGroupModel.cpp
+    models/TrainerModel.cpp
+    models/TypeGroupModel.cpp
+    models/TypeModel.cpp
+    models/WeatherGroupModel.cpp
+    models/WeatherModel.cpp
+)
+SET(pokemodr_SRCS
+    ${pokemodr_WIDGET_SRCS}
+    ${pokemodr_MODEL_SRCS}
+    FileDialog.cpp
+    FractionWidget.cpp
+    PointWidget.cpp
+    PokemodTree.cpp
+    PokemodTreeModel.cpp
+    Pokemodr.cpp
+    PokemodrPreferences.cpp
+    PokemodrUI.cpp
+    ScriptWidget.cpp
+)
+
+ADD_EXECUTABLE(pokemodr ${pokemodr_SRCS} ${pokemodr_MOC_SRCS} ${pokemodr_RESOURCE_SRCS} ${pokemodr_UI_HEADERS})
+TARGET_LINK_LIBRARIES(pokemodr ${QT_QTCORE_LIBRARY} ${QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} pokemod)
+
+INSTALL(
+    TARGETS pokemodr
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+    COMPONENT runtime
+)
+
+INSTALL(
+    FILES ${pokemodr_DEVEL}
+    DESTINATION ${INCLUDE_INSTALL_DIR}//${PROJECT_NAME}
+    COMPONENT development
+)
diff --git a/pokemodr/FileDialog.cpp b/pokemodr/FileDialog.cpp
index d588c541..75288c36 100644
--- a/pokemodr/FileDialog.cpp
+++ b/pokemodr/FileDialog.cpp
@@ -19,9 +19,9 @@
 #include "FileDialog.h"
 
 // Qt includes
-#include <QDir>
-#include <QPixmap>
-#include <QStringList>
+#include <QtCore/QDir>
+#include <QtCore/QStringList>
+#include <QtGui/QPixmap>
 
 // KDE includes
 #include <KDirOperator>
diff --git a/pokemodr/FileDialog.h b/pokemodr/FileDialog.h
index 320abff6..c00b5fac 100644
--- a/pokemodr/FileDialog.h
+++ b/pokemodr/FileDialog.h
@@ -19,7 +19,7 @@
 #define __POKEMODR_FILEDIALOG__
 
 // Qt includes
-#include <QSize>
+#include <QtCore/QSize>
 
 // KDE includes
 #include <KFileDialog>
diff --git a/pokemodr/FractionWidget.h b/pokemodr/FractionWidget.h
index d839f41e..c77a36e6 100644
--- a/pokemodr/FractionWidget.h
+++ b/pokemodr/FractionWidget.h
@@ -22,7 +22,7 @@
 #include "../pokemod/Fraction.h"
 
 // Qt includes
-#include <QWidget>
+#include <QtGui/QWidget>
 
 // Form include
 #include "ui_fraction.h"
diff --git a/pokemodr/MapUI.cpp b/pokemodr/MapUI.cpp
index 1d09bce0..cd132cbf 100644
--- a/pokemodr/MapUI.cpp
+++ b/pokemodr/MapUI.cpp
@@ -28,7 +28,7 @@
 #include "../pokemod/Tile.h"
 
 // Qt includes
-#include <QHeaderView>
+#include <QtGui/QHeaderView>
 
 Pokemodr::MapUI::MapUI(Pokemod::Map* map, QWidget* parent) :
         ObjectUI(parent)
diff --git a/pokemodr/ObjectUI.cpp b/pokemodr/ObjectUI.cpp
index 8e96c79e..ef744f86 100644
--- a/pokemodr/ObjectUI.cpp
+++ b/pokemodr/ObjectUI.cpp
@@ -23,9 +23,9 @@
 #include "../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QLabel>
-#include <QTreeWidget>
-#include <QVBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QVBoxLayout>
 
 // KDE includes
 #include <KAction>
diff --git a/pokemodr/ObjectUI.h b/pokemodr/ObjectUI.h
index 60ae5160..cacfbd39 100644
--- a/pokemodr/ObjectUI.h
+++ b/pokemodr/ObjectUI.h
@@ -19,8 +19,8 @@
 #define __POKEMODR_OBJECTUI__
 
 // Qt includes
-#include <QStack>
-#include <QWidget>
+#include <QtCore/QStack>
+#include <QtGui/QWidget>
 
 // Forward declarations
 class QCloseEvent;
diff --git a/pokemodr/PointWidget.h b/pokemodr/PointWidget.h
index 7706a9b7..4300dbb1 100644
--- a/pokemodr/PointWidget.h
+++ b/pokemodr/PointWidget.h
@@ -22,7 +22,7 @@
 #include "../pokemod/Point.h"
 
 // Qt includes
-#include <QWidget>
+#include <QtGui/QWidget>
 
 // Form include
 #include "ui_point.h"
diff --git a/pokemodr/PokemodTree.cpp b/pokemodr/PokemodTree.cpp
index 2ccf5fdd..727e7688 100644
--- a/pokemodr/PokemodTree.cpp
+++ b/pokemodr/PokemodTree.cpp
@@ -30,7 +30,7 @@
 #include "../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QHeaderView>
+#include <QtGui/QHeaderView>
 
 Pokemodr::PokemodTree::PokemodTree(QWidget* parent) :
         QTreeView(parent)
diff --git a/pokemodr/PokemodTree.h b/pokemodr/PokemodTree.h
index 9c3fdc18..2de1fea9 100644
--- a/pokemodr/PokemodTree.h
+++ b/pokemodr/PokemodTree.h
@@ -19,9 +19,9 @@
 #define __POKEMODR_POKEMODTREE__
 
 // Qt includes
-#include <QDomDocument>
-#include <QMap>
-#include <QTreeView>
+#include <QtCore/QMap>
+#include <QtGui/QTreeView>
+#include <QtXml/QDomDocument>
 
 // KDE includes
 #include <KUrl>
diff --git a/pokemodr/PokemodTreeModel.cpp b/pokemodr/PokemodTreeModel.cpp
index 2fa0467a..17d2af93 100644
--- a/pokemodr/PokemodTreeModel.cpp
+++ b/pokemodr/PokemodTreeModel.cpp
@@ -22,9 +22,9 @@
 #include "models/RootModel.h"
 
 // Qt includes
-#include <QDomDocument>
-#include <QMimeData>
-#include <QStringList>
+#include <QtCore/QMimeData>
+#include <QtCore/QStringList>
+#include <QtXml/QDomDocument>
 
 Pokemodr::PokemodTreeModel::PokemodTreeModel(QObject* parent) :
         QAbstractItemModel(parent),
diff --git a/pokemodr/PokemodTreeModel.h b/pokemodr/PokemodTreeModel.h
index 8f44aa97..213e945a 100644
--- a/pokemodr/PokemodTreeModel.h
+++ b/pokemodr/PokemodTreeModel.h
@@ -22,11 +22,11 @@
 #include "models/RootModel.h"
 
 // Qt includes
-#include <QAbstractItemModel>
-#include <QModelIndex>
-#include <QString>
-#include <QStringList>
-#include <QVariant>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QModelIndex>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
 
 namespace Pokemodr
 {
@@ -50,8 +50,6 @@ class PokemodTreeModel : public QAbstractItemModel
         Qt::ItemFlags flags(const QModelIndex& index) const;
         bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
         
-        Qt::DropActions supportedDragActions();
-        Qt::DropActions supportedDropActions();
         QStringList mimeTypes() const;
         QMimeData* mimeData(const QModelIndexList& indexes) const;
         bool dropMimeData(const QMimeData* data, Qt::DropAction action, int /*row*/, int /*column*/, const QModelIndex& parent);
diff --git a/pokemodr/Pokemodr.cpp b/pokemodr/Pokemodr.cpp
index 0c5aabfc..02794a85 100644
--- a/pokemodr/Pokemodr.cpp
+++ b/pokemodr/Pokemodr.cpp
@@ -23,7 +23,7 @@
 #include "PokemodrUI.h"
 
 // Qt includes
-#include <QTextCodec>
+#include <QtCore/QTextCodec>
 
 // KDE includes
 #include <KAboutData>
diff --git a/pokemodr/PokemodrPreferences.cpp b/pokemodr/PokemodrPreferences.cpp
index 4a5e04c7..c7b3e6e7 100644
--- a/pokemodr/PokemodrPreferences.cpp
+++ b/pokemodr/PokemodrPreferences.cpp
@@ -19,7 +19,7 @@
 #include "PokemodrPreferences.h"
 
 // Qt includes
-#include <QCheckBox>
+#include <QtGui/QCheckBox>
 
 // KDE includes
 #include <KConfigGroup>
diff --git a/pokemodr/PokemodrUI.cpp b/pokemodr/PokemodrUI.cpp
index 606392b1..5eb88c02 100644
--- a/pokemodr/PokemodrUI.cpp
+++ b/pokemodr/PokemodrUI.cpp
@@ -28,8 +28,8 @@
 #include "../pokemod/Rules.h"
 
 // Qt includes
-#include <QCloseEvent>
-#include <QString>
+#include <QtCore/QString>
+#include <QtGui/QCloseEvent>
 
 // KDE includes
 #include <KAction>
diff --git a/pokemodr/PokemodrUI.h b/pokemodr/PokemodrUI.h
index 5339b141..eb790562 100644
--- a/pokemodr/PokemodrUI.h
+++ b/pokemodr/PokemodrUI.h
@@ -23,7 +23,7 @@
 #include <KMainWindow>
 
 // Qt includes
-#include <QDomDocument>
+#include <QtXml/QDomDocument>
 
 // Form include
 #include "ui_pokemodr.h"
diff --git a/pokemodr/ScriptWidget.h b/pokemodr/ScriptWidget.h
index 3d23d97a..d90eca57 100644
--- a/pokemodr/ScriptWidget.h
+++ b/pokemodr/ScriptWidget.h
@@ -22,7 +22,7 @@
 #include "../pokemod/Script.h"
 
 // Qt includes
-#include <QWidget>
+#include <QtGui/QWidget>
 
 // Form include
 #include "ui_script.h"
diff --git a/pokemodr/SoundUI.cpp b/pokemodr/SoundUI.cpp
index 96ba12e0..8fee862f 100644
--- a/pokemodr/SoundUI.cpp
+++ b/pokemodr/SoundUI.cpp
@@ -24,8 +24,8 @@
 
 // Qt includes
 // #include <Phonon>
-#include <QBuffer>
-#include <QFile>
+#include <QtCore/QBuffer>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KFileDialog>
diff --git a/pokemodr/TilemapModel.h b/pokemodr/TilemapModel.h
index 2e6a21c0..cb0b3ae9 100644
--- a/pokemodr/TilemapModel.h
+++ b/pokemodr/TilemapModel.h
@@ -24,8 +24,8 @@
 #include "../pokemod/Tile.h"
 
 // Qt includes
-#include <QAbstractTableModel>
-#include <QVariant>
+#include <QtCore/QAbstractTableModel>
+#include <QtCore/QVariant>
 
 namespace Pokemodr
 {
diff --git a/pokemodr/TypechartModel.h b/pokemodr/TypechartModel.h
index a322ab1d..e9703150 100644
--- a/pokemodr/TypechartModel.h
+++ b/pokemodr/TypechartModel.h
@@ -23,9 +23,9 @@
 #include "../pokemod/Matrix.h"
 
 // Qt includes
-#include <QAbstractTableModel>
-#include <QStringList>
-#include <QVariant>
+#include <QtCore/QAbstractTableModel>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
 
 namespace Pokemodr
 {
diff --git a/pokemodr/gui/ability.ui b/pokemodr/gui/ability.ui
index bd3912e5..90f23107 100644
--- a/pokemodr/gui/ability.ui
+++ b/pokemodr/gui/ability.ui
@@ -69,7 +69,7 @@
   <customwidget>
    <class>Pokemodr::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>../ScriptWidget.h</header>
+   <header>ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/badge.ui b/pokemodr/gui/badge.ui
index cc66dcc7..b4fd9954 100644
--- a/pokemodr/gui/badge.ui
+++ b/pokemodr/gui/badge.ui
@@ -182,7 +182,7 @@
   <customwidget>
    <class>Pokemodr::FractionWidget</class>
    <extends>QWidget</extends>
-   <header>../FractionWidget.h</header>
+   <header>FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/coinlist.ui b/pokemodr/gui/coinlist.ui
index 5b34f107..e4d1b584 100644
--- a/pokemodr/gui/coinlist.ui
+++ b/pokemodr/gui/coinlist.ui
@@ -57,7 +57,7 @@
   <customwidget>
    <class>Pokemodr::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>../ScriptWidget.h</header>
+   <header>ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/globalscript.ui b/pokemodr/gui/globalscript.ui
index 53ddf12f..e299d86d 100644
--- a/pokemodr/gui/globalscript.ui
+++ b/pokemodr/gui/globalscript.ui
@@ -54,7 +54,7 @@
   <customwidget>
    <class>Pokemodr::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>../ScriptWidget.h</header>
+   <header>ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/item.ui b/pokemodr/gui/item.ui
index f183abe3..39ac1e98 100644
--- a/pokemodr/gui/item.ui
+++ b/pokemodr/gui/item.ui
@@ -131,7 +131,7 @@
   <customwidget>
    <class>Pokemodr::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>../ScriptWidget.h</header>
+   <header>ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/mapeffect.ui b/pokemodr/gui/mapeffect.ui
index ec5eccf7..3995c025 100644
--- a/pokemodr/gui/mapeffect.ui
+++ b/pokemodr/gui/mapeffect.ui
@@ -143,12 +143,12 @@
   <customwidget>
    <class>Pokemodr::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>../ScriptWidget.h</header>
+   <header>ScriptWidget.h</header>
   </customwidget>
   <customwidget>
    <class>Pokemodr::PointWidget</class>
    <extends>QWidget</extends>
-   <header>../PointWidget.h</header>
+   <header>PointWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/maptrainer.ui b/pokemodr/gui/maptrainer.ui
index e14ef25d..4c42ff74 100644
--- a/pokemodr/gui/maptrainer.ui
+++ b/pokemodr/gui/maptrainer.ui
@@ -130,12 +130,12 @@
   <customwidget>
    <class>Pokemodr::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>../ScriptWidget.h</header>
+   <header>ScriptWidget.h</header>
   </customwidget>
   <customwidget>
    <class>Pokemodr::PointWidget</class>
    <extends>QWidget</extends>
-   <header>../PointWidget.h</header>
+   <header>PointWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/mapwarp.ui b/pokemodr/gui/mapwarp.ui
index 0fd28b35..3d13ee52 100644
--- a/pokemodr/gui/mapwarp.ui
+++ b/pokemodr/gui/mapwarp.ui
@@ -126,12 +126,12 @@
   <customwidget>
    <class>Pokemodr::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>../ScriptWidget.h</header>
+   <header>ScriptWidget.h</header>
   </customwidget>
   <customwidget>
    <class>Pokemodr::PointWidget</class>
    <extends>QWidget</extends>
-   <header>../PointWidget.h</header>
+   <header>PointWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/move.ui b/pokemodr/gui/move.ui
index 331edfcc..ca2f7ab7 100644
--- a/pokemodr/gui/move.ui
+++ b/pokemodr/gui/move.ui
@@ -182,12 +182,12 @@
   <customwidget>
    <class>Pokemodr::FractionWidget</class>
    <extends>QWidget</extends>
-   <header>../FractionWidget.h</header>
+   <header>FractionWidget.h</header>
   </customwidget>
   <customwidget>
    <class>Pokemodr::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>../ScriptWidget.h</header>
+   <header>ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/nature.ui b/pokemodr/gui/nature.ui
index a658d604..6db1231e 100644
--- a/pokemodr/gui/nature.ui
+++ b/pokemodr/gui/nature.ui
@@ -106,7 +106,7 @@
   <customwidget>
    <class>Pokemodr::FractionWidget</class>
    <extends>QWidget</extends>
-   <header>../FractionWidget.h</header>
+   <header>FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/pokemod.ui b/pokemodr/gui/pokemod.ui
index ada84380..fa1f0225 100644
--- a/pokemodr/gui/pokemod.ui
+++ b/pokemodr/gui/pokemod.ui
@@ -459,7 +459,7 @@
   <customwidget>
    <class>Pokemodr::FractionWidget</class>
    <extends>QWidget</extends>
-   <header>../FractionWidget.h</header>
+   <header>FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/pokemodr.ui b/pokemodr/gui/pokemodr.ui
index c49b55ea..c8dca325 100644
--- a/pokemodr/gui/pokemodr.ui
+++ b/pokemodr/gui/pokemodr.ui
@@ -94,7 +94,7 @@
   <customwidget>
    <class>Pokemodr::PokemodTree</class>
    <extends>QTreeView</extends>
-   <header>../PokemodTree.h</header>
+   <header>PokemodTree.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/rules.ui b/pokemodr/gui/rules.ui
index f02201e7..bfac7a4a 100644
--- a/pokemodr/gui/rules.ui
+++ b/pokemodr/gui/rules.ui
@@ -451,7 +451,7 @@
   <customwidget>
    <class>Pokemodr::FractionWidget</class>
    <extends>QWidget</extends>
-   <header>../FractionWidget.h</header>
+   <header>FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/species.ui b/pokemodr/gui/species.ui
index 1e670181..f107d213 100644
--- a/pokemodr/gui/species.ui
+++ b/pokemodr/gui/species.ui
@@ -665,7 +665,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="4" margin="4" />
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
@@ -701,12 +700,12 @@
   <customwidget>
    <class>Pokemodr::FractionWidget</class>
    <extends>QWidget</extends>
-   <header>../FractionWidget.h</header>
+   <header>FractionWidget.h</header>
   </customwidget>
   <customwidget>
    <class>Pokemodr::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>../ScriptWidget.h</header>
+   <header>ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/status.ui b/pokemodr/gui/status.ui
index 28c082f8..0a34cb10 100644
--- a/pokemodr/gui/status.ui
+++ b/pokemodr/gui/status.ui
@@ -57,7 +57,7 @@
   <customwidget>
    <class>Pokemodr::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>../ScriptWidget.h</header>
+   <header>ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/tile.ui b/pokemodr/gui/tile.ui
index 86c98107..fb34a2ac 100644
--- a/pokemodr/gui/tile.ui
+++ b/pokemodr/gui/tile.ui
@@ -134,7 +134,7 @@
   <customwidget>
    <class>Pokemodr::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>../ScriptWidget.h</header>
+   <header>ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/type.ui b/pokemodr/gui/type.ui
index 5ed55a3c..cb018631 100644
--- a/pokemodr/gui/type.ui
+++ b/pokemodr/gui/type.ui
@@ -64,7 +64,7 @@
   <customwidget>
    <class>Pokemodr::FractionWidget</class>
    <extends>QWidget</extends>
-   <header>../FractionWidget.h</header>
+   <header>FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/gui/weather.ui b/pokemodr/gui/weather.ui
index 175cff6b..484cba7e 100644
--- a/pokemodr/gui/weather.ui
+++ b/pokemodr/gui/weather.ui
@@ -57,7 +57,7 @@
   <customwidget>
    <class>Pokemodr::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>../ScriptWidget.h</header>
+   <header>ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pokemodr/models/AbilityGroupModel.cpp b/pokemodr/models/AbilityGroupModel.cpp
index becea9d4..072c130f 100644
--- a/pokemodr/models/AbilityGroupModel.cpp
+++ b/pokemodr/models/AbilityGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/AbilityModel.cpp b/pokemodr/models/AbilityModel.cpp
index 71bd11d8..09621ae1 100644
--- a/pokemodr/models/AbilityModel.cpp
+++ b/pokemodr/models/AbilityModel.cpp
@@ -28,7 +28,7 @@
 #include "../../pokemod/Ability.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/AuthorGroupModel.cpp b/pokemodr/models/AuthorGroupModel.cpp
index ca465f4e..131ee546 100644
--- a/pokemodr/models/AuthorGroupModel.cpp
+++ b/pokemodr/models/AuthorGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/AuthorModel.cpp b/pokemodr/models/AuthorModel.cpp
index a80bf81b..ab6209a1 100644
--- a/pokemodr/models/AuthorModel.cpp
+++ b/pokemodr/models/AuthorModel.cpp
@@ -28,7 +28,7 @@
 #include "../../pokemod/Author.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/BadgeGroupModel.cpp b/pokemodr/models/BadgeGroupModel.cpp
index 5f5cc010..9fe123ee 100644
--- a/pokemodr/models/BadgeGroupModel.cpp
+++ b/pokemodr/models/BadgeGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/BadgeModel.cpp b/pokemodr/models/BadgeModel.cpp
index 39bc8d7b..95ab2eb2 100644
--- a/pokemodr/models/BadgeModel.cpp
+++ b/pokemodr/models/BadgeModel.cpp
@@ -28,7 +28,7 @@
 #include "../../pokemod/Badge.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/BaseModel.h b/pokemodr/models/BaseModel.h
index eb972e3a..fe19f6d4 100644
--- a/pokemodr/models/BaseModel.h
+++ b/pokemodr/models/BaseModel.h
@@ -19,8 +19,8 @@
 #define __POKEMODR_BASEMODEL__
 
 // Qt includes
-#include <QString>
-#include <QVariant>
+#include <QtCore/QString>
+#include <QtCore/QVariant>
 
 // Forward declarations
 namespace Pokemod
@@ -49,8 +49,8 @@ class BaseModel : public QObject
         virtual BaseModel* childItem(const int row) = 0;
         int indexNumber() const;
         
-        virtual Qt::DropActions supportedDragActions() = 0;
-        virtual Qt::DropActions supportedDropActions() = 0;
+        virtual Qt::DropActions supportedDragActions() const = 0;
+        virtual Qt::DropActions supportedDropActions() const = 0;
         
         virtual QString type() const;
         
diff --git a/pokemodr/models/BaseObjectModel.cpp b/pokemodr/models/BaseObjectModel.cpp
index 8282a7f5..4cb2c985 100644
--- a/pokemodr/models/BaseObjectModel.cpp
+++ b/pokemodr/models/BaseObjectModel.cpp
@@ -40,12 +40,12 @@ Qt::ItemFlags Pokemodr::BaseObjectModel::flags() const
     return Qt::ItemIsDragEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled;
 }
 
-Qt::DropActions Pokemodr::BaseObjectModel::supportedDragActions()
+Qt::DropActions Pokemodr::BaseObjectModel::supportedDragActions() const
 {
     return Qt::CopyAction | Qt::MoveAction;
 }
 
-Qt::DropActions Pokemodr::BaseObjectModel::supportedDropActions()
+Qt::DropActions Pokemodr::BaseObjectModel::supportedDropActions() const
 {
     return Qt::CopyAction | Qt::MoveAction;
 }
diff --git a/pokemodr/models/BaseObjectModel.h b/pokemodr/models/BaseObjectModel.h
index e840fee4..9d7b727c 100644
--- a/pokemodr/models/BaseObjectModel.h
+++ b/pokemodr/models/BaseObjectModel.h
@@ -39,8 +39,8 @@ class BaseObjectModel : public BaseModel
         
         virtual BaseModel* childItem(const int row) = 0;
         
-        Qt::DropActions supportedDragActions();
-        Qt::DropActions supportedDropActions();
+        Qt::DropActions supportedDragActions() const;
+        Qt::DropActions supportedDropActions() const;
         
         QString type() const;
     protected:
diff --git a/pokemodr/models/CoinListGroupModel.cpp b/pokemodr/models/CoinListGroupModel.cpp
index 3e944fba..fd09e2e6 100644
--- a/pokemodr/models/CoinListGroupModel.cpp
+++ b/pokemodr/models/CoinListGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/CoinListModel.cpp b/pokemodr/models/CoinListModel.cpp
index bd874c10..248760c1 100644
--- a/pokemodr/models/CoinListModel.cpp
+++ b/pokemodr/models/CoinListModel.cpp
@@ -29,7 +29,7 @@
 #include "../../pokemod/CoinListObject.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/CoinListObjectModel.cpp b/pokemodr/models/CoinListObjectModel.cpp
index c2391819..373c77c4 100644
--- a/pokemodr/models/CoinListObjectModel.cpp
+++ b/pokemodr/models/CoinListObjectModel.cpp
@@ -32,7 +32,7 @@
 #include "../../pokemod/Species.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/EggGroupGroupModel.cpp b/pokemodr/models/EggGroupGroupModel.cpp
index a98472fa..0d984cd3 100644
--- a/pokemodr/models/EggGroupGroupModel.cpp
+++ b/pokemodr/models/EggGroupGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/EggGroupModel.cpp b/pokemodr/models/EggGroupModel.cpp
index 51541042..c87c3b6f 100644
--- a/pokemodr/models/EggGroupModel.cpp
+++ b/pokemodr/models/EggGroupModel.cpp
@@ -28,7 +28,7 @@
 #include "../../pokemod/EggGroup.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/GlobalScriptGroupModel.cpp b/pokemodr/models/GlobalScriptGroupModel.cpp
index 1fa93b2d..4387e987 100644
--- a/pokemodr/models/GlobalScriptGroupModel.cpp
+++ b/pokemodr/models/GlobalScriptGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/GlobalScriptModel.cpp b/pokemodr/models/GlobalScriptModel.cpp
index 3e80aee2..c1de5980 100644
--- a/pokemodr/models/GlobalScriptModel.cpp
+++ b/pokemodr/models/GlobalScriptModel.cpp
@@ -28,7 +28,7 @@
 #include "../../pokemod/GlobalScript.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/GroupModel.cpp b/pokemodr/models/GroupModel.cpp
index 9ceaef09..7e12844b 100644
--- a/pokemodr/models/GroupModel.cpp
+++ b/pokemodr/models/GroupModel.cpp
@@ -55,12 +55,12 @@ Pokemodr::BaseModel* Pokemodr::GroupModel::childItem(const int row)
     return NULL;
 }
 
-Qt::DropActions Pokemodr::GroupModel::supportedDragActions()
+Qt::DropActions Pokemodr::GroupModel::supportedDragActions() const
 {
     return 0;
 }
 
-Qt::DropActions Pokemodr::GroupModel::supportedDropActions()
+Qt::DropActions Pokemodr::GroupModel::supportedDropActions() const
 {
     return Qt::CopyAction | Qt::MoveAction;
 }
diff --git a/pokemodr/models/GroupModel.h b/pokemodr/models/GroupModel.h
index 6f254af6..b53e5daa 100644
--- a/pokemodr/models/GroupModel.h
+++ b/pokemodr/models/GroupModel.h
@@ -22,7 +22,7 @@
 #include "BaseModel.h"
 
 // Qt includes
-#include <QList>
+#include <QtCore/QList>
 
 // Forward declarations
 namespace Pokemod
@@ -49,8 +49,8 @@ class GroupModel : public BaseModel
         
         BaseModel* childItem(const int row);
         
-        Qt::DropActions supportedDragActions();
-        Qt::DropActions supportedDropActions();
+        Qt::DropActions supportedDragActions() const;
+        Qt::DropActions supportedDropActions() const;
     public slots:
         virtual void addObject(Pokemod::Object* object = NULL) = 0;
         virtual void deleteObject(BaseObjectModel* model) = 0;
diff --git a/pokemodr/models/ItemGroupModel.cpp b/pokemodr/models/ItemGroupModel.cpp
index 69477a4f..de68934d 100644
--- a/pokemodr/models/ItemGroupModel.cpp
+++ b/pokemodr/models/ItemGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/ItemModel.cpp b/pokemodr/models/ItemModel.cpp
index d2e25de0..e712398a 100644
--- a/pokemodr/models/ItemModel.cpp
+++ b/pokemodr/models/ItemModel.cpp
@@ -28,7 +28,7 @@
 #include "../../pokemod/Item.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/ItemTypeGroupModel.cpp b/pokemodr/models/ItemTypeGroupModel.cpp
index c66c975a..b442bc89 100644
--- a/pokemodr/models/ItemTypeGroupModel.cpp
+++ b/pokemodr/models/ItemTypeGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/ItemTypeModel.cpp b/pokemodr/models/ItemTypeModel.cpp
index 5dca8937..09fa214b 100644
--- a/pokemodr/models/ItemTypeModel.cpp
+++ b/pokemodr/models/ItemTypeModel.cpp
@@ -28,7 +28,7 @@
 #include "../../pokemod/ItemType.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MapEffectGroupModel.cpp b/pokemodr/models/MapEffectGroupModel.cpp
index 48bee0ae..06a8b8eb 100644
--- a/pokemodr/models/MapEffectGroupModel.cpp
+++ b/pokemodr/models/MapEffectGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/MapEffect.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MapEffectModel.cpp b/pokemodr/models/MapEffectModel.cpp
index 7e30640b..6370336a 100644
--- a/pokemodr/models/MapEffectModel.cpp
+++ b/pokemodr/models/MapEffectModel.cpp
@@ -29,7 +29,7 @@
 #include "../../pokemod/MapEffect.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MapGroupModel.cpp b/pokemodr/models/MapGroupModel.cpp
index 291c1fa9..21866608 100644
--- a/pokemodr/models/MapGroupModel.cpp
+++ b/pokemodr/models/MapGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MapModel.cpp b/pokemodr/models/MapModel.cpp
index 15fe2699..7770f48c 100644
--- a/pokemodr/models/MapModel.cpp
+++ b/pokemodr/models/MapModel.cpp
@@ -31,7 +31,7 @@
 #include "../../pokemod/Map.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MapTrainerGroupModel.cpp b/pokemodr/models/MapTrainerGroupModel.cpp
index b6f706a3..e1c1d475 100644
--- a/pokemodr/models/MapTrainerGroupModel.cpp
+++ b/pokemodr/models/MapTrainerGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/MapTrainer.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MapTrainerModel.cpp b/pokemodr/models/MapTrainerModel.cpp
index 2cf9a2c9..c3100eff 100644
--- a/pokemodr/models/MapTrainerModel.cpp
+++ b/pokemodr/models/MapTrainerModel.cpp
@@ -30,7 +30,7 @@
 #include "../../pokemod/MapTrainerTeamMember.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MapTrainerTeamMemberModel.cpp b/pokemodr/models/MapTrainerTeamMemberModel.cpp
index c4b595f1..2b3b759a 100644
--- a/pokemodr/models/MapTrainerTeamMemberModel.cpp
+++ b/pokemodr/models/MapTrainerTeamMemberModel.cpp
@@ -31,7 +31,7 @@
 #include "../../pokemod/Species.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MapWarpGroupModel.cpp b/pokemodr/models/MapWarpGroupModel.cpp
index 5d61736c..dc588c7a 100644
--- a/pokemodr/models/MapWarpGroupModel.cpp
+++ b/pokemodr/models/MapWarpGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/MapWarp.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MapWarpModel.cpp b/pokemodr/models/MapWarpModel.cpp
index d4c4acb6..c79e6d1c 100644
--- a/pokemodr/models/MapWarpModel.cpp
+++ b/pokemodr/models/MapWarpModel.cpp
@@ -29,7 +29,7 @@
 #include "../../pokemod/MapWarp.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MapWildListEncounterModel.cpp b/pokemodr/models/MapWildListEncounterModel.cpp
index a84af06a..1fe9492b 100644
--- a/pokemodr/models/MapWildListEncounterModel.cpp
+++ b/pokemodr/models/MapWildListEncounterModel.cpp
@@ -31,7 +31,7 @@
 #include "../../pokemod/Species.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MapWildListGroupModel.cpp b/pokemodr/models/MapWildListGroupModel.cpp
index 86a84ec8..cbab28f1 100644
--- a/pokemodr/models/MapWildListGroupModel.cpp
+++ b/pokemodr/models/MapWildListGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/MapWildList.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MapWildListModel.cpp b/pokemodr/models/MapWildListModel.cpp
index 30fcf6b3..eb1628c8 100644
--- a/pokemodr/models/MapWildListModel.cpp
+++ b/pokemodr/models/MapWildListModel.cpp
@@ -30,7 +30,7 @@
 #include "../../pokemod/MapWildListEncounter.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MoveGroupModel.cpp b/pokemodr/models/MoveGroupModel.cpp
index 118fc781..a768d9c8 100644
--- a/pokemodr/models/MoveGroupModel.cpp
+++ b/pokemodr/models/MoveGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/MoveModel.cpp b/pokemodr/models/MoveModel.cpp
index b15ef760..69d38f99 100644
--- a/pokemodr/models/MoveModel.cpp
+++ b/pokemodr/models/MoveModel.cpp
@@ -28,7 +28,7 @@
 #include "../../pokemod/Move.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/NatureGroupModel.cpp b/pokemodr/models/NatureGroupModel.cpp
index 0507ad82..3ca47b7c 100644
--- a/pokemodr/models/NatureGroupModel.cpp
+++ b/pokemodr/models/NatureGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/NatureModel.cpp b/pokemodr/models/NatureModel.cpp
index d287bc76..1a8eb523 100644
--- a/pokemodr/models/NatureModel.cpp
+++ b/pokemodr/models/NatureModel.cpp
@@ -29,7 +29,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/PokemodModel.cpp b/pokemodr/models/PokemodModel.cpp
index 1e035db9..30660e26 100644
--- a/pokemodr/models/PokemodModel.cpp
+++ b/pokemodr/models/PokemodModel.cpp
@@ -49,7 +49,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/RootModel.cpp b/pokemodr/models/RootModel.cpp
index 40ebc886..78c9c113 100644
--- a/pokemodr/models/RootModel.cpp
+++ b/pokemodr/models/RootModel.cpp
@@ -25,7 +25,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Test code includes
-#include <QFile>
+#include <QtCore/QFile>
 
 Pokemodr::RootModel::RootModel() :
         GroupModel(NULL, NULL)
diff --git a/pokemodr/models/RulesModel.cpp b/pokemodr/models/RulesModel.cpp
index 5ad732df..991187bd 100644
--- a/pokemodr/models/RulesModel.cpp
+++ b/pokemodr/models/RulesModel.cpp
@@ -25,7 +25,7 @@
 #include "../../pokemod/Rules.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/SoundGroupModel.cpp b/pokemodr/models/SoundGroupModel.cpp
index 8603fc72..fed2817d 100644
--- a/pokemodr/models/SoundGroupModel.cpp
+++ b/pokemodr/models/SoundGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Sound.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/SoundModel.cpp b/pokemodr/models/SoundModel.cpp
index 3fdd8ec2..b4172a48 100644
--- a/pokemodr/models/SoundModel.cpp
+++ b/pokemodr/models/SoundModel.cpp
@@ -29,7 +29,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/SpeciesAbilityGroupModel.cpp b/pokemodr/models/SpeciesAbilityGroupModel.cpp
index 12411940..23628a7f 100644
--- a/pokemodr/models/SpeciesAbilityGroupModel.cpp
+++ b/pokemodr/models/SpeciesAbilityGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/SpeciesAbility.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/SpeciesAbilityModel.cpp b/pokemodr/models/SpeciesAbilityModel.cpp
index b3d84a7d..ff6e2db5 100644
--- a/pokemodr/models/SpeciesAbilityModel.cpp
+++ b/pokemodr/models/SpeciesAbilityModel.cpp
@@ -31,7 +31,7 @@
 #include "../../pokemod/SpeciesAbility.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/SpeciesGroupModel.cpp b/pokemodr/models/SpeciesGroupModel.cpp
index d44314ba..a6f6fa07 100644
--- a/pokemodr/models/SpeciesGroupModel.cpp
+++ b/pokemodr/models/SpeciesGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Species.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/SpeciesItemGroupModel.cpp b/pokemodr/models/SpeciesItemGroupModel.cpp
index b1be67a4..784f9766 100644
--- a/pokemodr/models/SpeciesItemGroupModel.cpp
+++ b/pokemodr/models/SpeciesItemGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/SpeciesItem.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/SpeciesItemModel.cpp b/pokemodr/models/SpeciesItemModel.cpp
index 70473b05..78ba6733 100644
--- a/pokemodr/models/SpeciesItemModel.cpp
+++ b/pokemodr/models/SpeciesItemModel.cpp
@@ -31,7 +31,7 @@
 #include "../../pokemod/SpeciesItem.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/SpeciesModel.cpp b/pokemodr/models/SpeciesModel.cpp
index 1b5fbe2d..35279827 100644
--- a/pokemodr/models/SpeciesModel.cpp
+++ b/pokemodr/models/SpeciesModel.cpp
@@ -31,7 +31,7 @@
 #include "../../pokemod/Species.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/SpeciesMoveGroupModel.cpp b/pokemodr/models/SpeciesMoveGroupModel.cpp
index a7031459..f9c5fa46 100644
--- a/pokemodr/models/SpeciesMoveGroupModel.cpp
+++ b/pokemodr/models/SpeciesMoveGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/SpeciesMove.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/SpeciesMoveModel.cpp b/pokemodr/models/SpeciesMoveModel.cpp
index 32081518..624174c2 100644
--- a/pokemodr/models/SpeciesMoveModel.cpp
+++ b/pokemodr/models/SpeciesMoveModel.cpp
@@ -31,7 +31,7 @@
 #include "../../pokemod/SpeciesMove.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/SpriteGroupModel.cpp b/pokemodr/models/SpriteGroupModel.cpp
index 45285432..15a895ca 100644
--- a/pokemodr/models/SpriteGroupModel.cpp
+++ b/pokemodr/models/SpriteGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/SpriteModel.cpp b/pokemodr/models/SpriteModel.cpp
index 8b0c4431..274d8bff 100644
--- a/pokemodr/models/SpriteModel.cpp
+++ b/pokemodr/models/SpriteModel.cpp
@@ -28,7 +28,7 @@
 #include "../../pokemod/Sprite.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/StatusGroupModel.cpp b/pokemodr/models/StatusGroupModel.cpp
index b65ba89c..5c0bad79 100644
--- a/pokemodr/models/StatusGroupModel.cpp
+++ b/pokemodr/models/StatusGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/StatusModel.cpp b/pokemodr/models/StatusModel.cpp
index a0a7090a..a67c276e 100644
--- a/pokemodr/models/StatusModel.cpp
+++ b/pokemodr/models/StatusModel.cpp
@@ -28,7 +28,7 @@
 #include "../../pokemod/Status.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/StoreGroupModel.cpp b/pokemodr/models/StoreGroupModel.cpp
index 3884633b..b7cdb873 100644
--- a/pokemodr/models/StoreGroupModel.cpp
+++ b/pokemodr/models/StoreGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Store.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/StoreModel.cpp b/pokemodr/models/StoreModel.cpp
index 282eb7b5..ce20bab5 100644
--- a/pokemodr/models/StoreModel.cpp
+++ b/pokemodr/models/StoreModel.cpp
@@ -29,7 +29,7 @@
 #include "../../pokemod/Store.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/TileGroupModel.cpp b/pokemodr/models/TileGroupModel.cpp
index a323c5c2..f27b0caa 100644
--- a/pokemodr/models/TileGroupModel.cpp
+++ b/pokemodr/models/TileGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Tile.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/TileModel.cpp b/pokemodr/models/TileModel.cpp
index f1ec8d8d..52c601af 100644
--- a/pokemodr/models/TileModel.cpp
+++ b/pokemodr/models/TileModel.cpp
@@ -29,7 +29,7 @@
 #include "../../pokemod/Tile.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/TimeGroupModel.cpp b/pokemodr/models/TimeGroupModel.cpp
index 26a87e3e..0046c9ef 100644
--- a/pokemodr/models/TimeGroupModel.cpp
+++ b/pokemodr/models/TimeGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Time.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/TimeModel.cpp b/pokemodr/models/TimeModel.cpp
index 25db9644..c54e6363 100644
--- a/pokemodr/models/TimeModel.cpp
+++ b/pokemodr/models/TimeModel.cpp
@@ -29,7 +29,7 @@
 #include "../../pokemod/Time.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/TrainerGroupModel.cpp b/pokemodr/models/TrainerGroupModel.cpp
index 7d67d4ac..f205de3d 100644
--- a/pokemodr/models/TrainerGroupModel.cpp
+++ b/pokemodr/models/TrainerGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Trainer.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/TrainerModel.cpp b/pokemodr/models/TrainerModel.cpp
index 23bb129d..f0abf8d7 100644
--- a/pokemodr/models/TrainerModel.cpp
+++ b/pokemodr/models/TrainerModel.cpp
@@ -29,7 +29,7 @@
 #include "../../pokemod/Trainer.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/TypeGroupModel.cpp b/pokemodr/models/TypeGroupModel.cpp
index eee1c80d..5b240b8c 100644
--- a/pokemodr/models/TypeGroupModel.cpp
+++ b/pokemodr/models/TypeGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Type.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/TypeModel.cpp b/pokemodr/models/TypeModel.cpp
index 425fe8f7..8d85d6aa 100644
--- a/pokemodr/models/TypeModel.cpp
+++ b/pokemodr/models/TypeModel.cpp
@@ -29,7 +29,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/WeatherGroupModel.cpp b/pokemodr/models/WeatherGroupModel.cpp
index 42a29f37..51b81f6a 100644
--- a/pokemodr/models/WeatherGroupModel.cpp
+++ b/pokemodr/models/WeatherGroupModel.cpp
@@ -26,7 +26,7 @@
 #include "../../pokemod/Pokemod.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/models/WeatherModel.cpp b/pokemodr/models/WeatherModel.cpp
index c0470c9e..b72c4ed3 100644
--- a/pokemodr/models/WeatherModel.cpp
+++ b/pokemodr/models/WeatherModel.cpp
@@ -28,7 +28,7 @@
 #include "../../pokemod/Weather.h"
 
 // Qt includes
-#include <QFile>
+#include <QtCore/QFile>
 
 // KDE includes
 #include <KMenu>
diff --git a/pokemodr/pokemodr.pro b/pokemodr/pokemodr.pro
deleted file mode 100644
index 4f093b3d..00000000
--- a/pokemodr/pokemodr.pro
+++ /dev/null
@@ -1,303 +0,0 @@
-include(../version.pri)
-TEMPLATE = app
-OBJECTS_DIR = .obj
-UI_DIR = .ui
-MOC_DIR = .moc
-DOC_DIR = ../doc
-DESTDIR = ../bin
-INSTALLDIR = bin
-LIBS += -L../bin \
- -lpokemod \
- -lphonon \
- -lkdecore \
- -lkdeui \
- -lkio \
- -lkfile
-
-CONFIG += qt \
- warn_on \
- gui
-QT += xml
-
-!win32 {
-    CONFIG += debug
-}
-
-win32 {
-    TARGETDEPS += $${DESTDIR}/pokemod0.dll
-} else {
-    TARGETDEPS += $${DESTDIR}/libpokemod.so
-}
-
-include(../install.pri)
-include(../kde4.pri)
-include(../latex.pri)
-include(../readme.pri)
-
-SOURCES += AbilityUI.cpp \
- AuthorUI.cpp \
- BadgeUI.cpp \
- CoinListUI.cpp \
- CoinListObjectUI.cpp \
- EggGroupUI.cpp \
- FileDialog.cpp \
- FractionWidget.cpp \
- GlobalScriptUI.cpp \
- ItemUI.cpp \
- ItemTypeUI.cpp \
- MapUI.cpp \
- MapEffectUI.cpp \
- MapTrainerUI.cpp \
- MapTrainerTeamMemberUI.cpp \
- MapWarpUI.cpp \
- MapWildListUI.cpp \
- MapWildListEncounterUI.cpp \
- MoveUI.cpp \
- NatureUI.cpp \
- ObjectUI.cpp \
- PointWidget.cpp \
- PokemodTree.cpp \
- PokemodTreeModel.cpp \
- PokemodUI.cpp \
- Pokemodr.cpp \
- PokemodrPreferences.cpp \
- PokemodrUI.cpp \
- RulesUI.cpp \
- ScriptWidget.cpp \
- SoundUI.cpp \
- SpeciesUI.cpp \
- SpeciesAbilityUI.cpp \
- SpeciesItemUI.cpp \
- SpeciesMoveUI.cpp \
- SpriteUI.cpp \
- StatusUI.cpp \
- StoreUI.cpp \
- TileUI.cpp \
- TimeUI.cpp \
- TrainerUI.cpp \
- TypeUI.cpp \
- WeatherUI.cpp \
- models/AbilityGroupModel.cpp \
- models/AbilityModel.cpp \
- models/AuthorGroupModel.cpp \
- models/AuthorModel.cpp \
- models/BadgeGroupModel.cpp \
- models/BadgeModel.cpp \
- models/BaseModel.cpp \
- models/BaseObjectModel.cpp \
- models/CoinListGroupModel.cpp \
- models/CoinListModel.cpp \
- models/CoinListObjectModel.cpp \
- models/EggGroupGroupModel.cpp \
- models/EggGroupModel.cpp \
- models/GlobalScriptGroupModel.cpp \
- models/GlobalScriptModel.cpp \
- models/GroupModel.cpp \
- models/GroupObjectModel.cpp \
- models/ItemGroupModel.cpp \
- models/ItemModel.cpp \
- models/ItemTypeGroupModel.cpp \
- models/ItemTypeModel.cpp \
- models/MapGroupModel.cpp \
- models/MapModel.cpp \
- models/MapEffectGroupModel.cpp \
- models/MapEffectModel.cpp \
- models/MapTrainerGroupModel.cpp \
- models/MapTrainerModel.cpp \
- models/MapTrainerTeamMemberModel.cpp \
- models/MapWarpGroupModel.cpp \
- models/MapWarpModel.cpp \
- models/MapWildListGroupModel.cpp \
- models/MapWildListModel.cpp \
- models/MapWildListEncounterModel.cpp \
- models/MoveGroupModel.cpp \
- models/MoveModel.cpp \
- models/NatureGroupModel.cpp \
- models/NatureModel.cpp \
- models/ObjectModel.cpp \
- models/PokemodModel.cpp \
- models/RootModel.cpp \
- models/RulesModel.cpp \
- models/SoundGroupModel.cpp \
- models/SoundModel.cpp \
- models/SpeciesGroupModel.cpp \
- models/SpeciesModel.cpp \
- models/SpeciesAbilityGroupModel.cpp \
- models/SpeciesAbilityModel.cpp \
- models/SpeciesItemGroupModel.cpp \
- models/SpeciesItemModel.cpp \
- models/SpeciesMoveGroupModel.cpp \
- models/SpeciesMoveModel.cpp \
- models/SpriteGroupModel.cpp \
- models/SpriteModel.cpp \
- models/StatusGroupModel.cpp \
- models/StatusModel.cpp \
- models/StoreGroupModel.cpp \
- models/StoreModel.cpp \
- models/TileGroupModel.cpp \
- models/TileModel.cpp \
- models/TimeGroupModel.cpp \
- models/TimeModel.cpp \
- models/TrainerGroupModel.cpp \
- models/TrainerModel.cpp \
- models/TypeGroupModel.cpp \
- models/TypeModel.cpp \
- models/WeatherGroupModel.cpp \
- models/WeatherModel.cpp
-
-HEADERS += AbilityUI.h \
- AuthorUI.h \
- BadgeUI.h \
- CoinListUI.h \
- CoinListObjectUI.h \
- EggGroupUI.h \
- FileDialog.h \
- FractionWidget.h \
- GlobalScriptUI.h \
- ItemUI.h \
- ItemTypeUI.h \
- MapUI.h \
- MapEffectUI.h \
- MapTrainerUI.h \
- MapTrainerTeamMemberUI.h \
- MapWarpUI.h \
- MapWildListUI.h \
- MapWildListEncounterUI.h \
- MoveUI.h \
- NatureUI.h \
- ObjectUI.h \
- PointWidget.h \
- PokemodTree.h \
- PokemodTreeModel.h \
- PokemodUI.h \
- Pokemodr.h \
- PokemodrPreferences.h \
- PokemodrUI.h \
- RulesUI.h \
- ScriptWidget.h \
- SoundUI.h \
- SpeciesUI.h \
- SpeciesAbilityUI.h \
- SpeciesItemUI.h \
- SpeciesMoveUI.h \
- SpriteUI.h \
- StatusUI.h \
- StoreUI.h \
- TilemapModel.h \
- TileUI.h \
- TimeUI.h \
- TypechartModel.h \
- TrainerUI.h \
- TypeUI.h \
- WeatherUI.h \
- models/AbilityGroupModel.h \
- models/AbilityModel.h \
- models/AuthorGroupModel.h \
- models/AuthorModel.h \
- models/BadgeGroupModel.h \
- models/BadgeModel.h \
- models/BaseModel.h \
- models/BaseObjectModel.h \
- models/CoinListGroupModel.h \
- models/CoinListModel.h \
- models/CoinListObjectModel.h \
- models/EggGroupGroupModel.h \
- models/EggGroupModel.h \
- models/GlobalScriptGroupModel.h \
- models/GlobalScriptModel.h \
- models/GroupModel.h \
- models/GroupObjectModel.h \
- models/ItemGroupModel.h \
- models/ItemModel.h \
- models/ItemTypeGroupModel.h \
- models/ItemTypeModel.h \
- models/MapGroupModel.h \
- models/MapModel.h \
- models/MapEffectGroupModel.h \
- models/MapEffectModel.h \
- models/MapTrainerGroupModel.h \
- models/MapTrainerModel.h \
- models/MapTrainerTeamMemberModel.h \
- models/MapWarpGroupModel.h \
- models/MapWarpModel.h \
- models/MapWildListGroupModel.h \
- models/MapWildListModel.h \
- models/MapWildListEncounterModel.h \
- models/MoveGroupModel.h \
- models/MoveModel.h \
- models/NatureGroupModel.h \
- models/NatureModel.h \
- models/ObjectModel.h \
- models/PokemodModel.h \
- models/RootModel.h \
- models/RulesModel.h \
- models/SoundGroupModel.h \
- models/SoundModel.h \
- models/SpeciesGroupModel.h \
- models/SpeciesModel.h \
- models/SpeciesAbilityGroupModel.h \
- models/SpeciesAbilityModel.h \
- models/SpeciesItemGroupModel.h \
- models/SpeciesItemModel.h \
- models/SpeciesMoveGroupModel.h \
- models/SpeciesMoveModel.h \
- models/SpriteGroupModel.h \
- models/SpriteModel.h \
- models/StatusGroupModel.h \
- models/StatusModel.h \
- models/StoreGroupModel.h \
- models/StoreModel.h \
- models/TileGroupModel.h \
- models/TileModel.h \
- models/TimeGroupModel.h \
- models/TimeModel.h \
- models/TrainerGroupModel.h \
- models/TrainerModel.h \
- models/TypeGroupModel.h \
- models/TypeModel.h \
- models/WeatherGroupModel.h \
- models/WeatherModel.h
-
-FORMS += gui/ability.ui \
- gui/author.ui \
- gui/badge.ui \
- gui/coinlist.ui \
- gui/coinlistobject.ui \
- gui/egggroup.ui \
- gui/fraction.ui \
- gui/globalscript.ui \
- gui/item.ui \
- gui/itemtype.ui \
- gui/map.ui \
- gui/mapeffect.ui \
- gui/maptrainer.ui \
- gui/maptrainerteammember.ui \
- gui/mapwarp.ui \
- gui/mapwildlist.ui \
- gui/mapwildlistencounter.ui \
- gui/move.ui \
- gui/nature.ui \
- gui/point.ui \
- gui/pokemod.ui \
- gui/pokemodr.ui \
- gui/rules.ui \
- gui/script.ui \
- gui/sound.ui \
- gui/species.ui \
- gui/speciesability.ui \
- gui/speciesitem.ui \
- gui/speciesmove.ui \
- gui/sprite.ui \
- gui/status.ui \
- gui/store.ui \
- gui/tile.ui \
- gui/time.ui \
- gui/trainer.ui \
- gui/type.ui \
- gui/weather.ui
-
-LATEX += pokemodr.tex
-
-RESOURCES += overlays/overlays.qrc
-
-include(../headers.pri)
diff --git a/readme.pri b/readme.pri
deleted file mode 100644
index 01d90782..00000000
--- a/readme.pri
+++ /dev/null
@@ -1,9 +0,0 @@
-doc.depends = $${DOC_DIR}/$${TARGET}.pdf
-QMAKE_EXTRA_TARGETS += doc
-
-readme.path = $$PREFIX/share/doc/pokegen-$${VERSION}
-readme.depends = doc
-readme.files = $${DOC_DIR}/$${TARGET}.pdf
-readme.extra = -$(INSTALL_FILE) $${DOC_DIR}/$${TARGET}.pdf $(INSTALL_ROOT)$$PREFIX/share/doc/pokegen-$${VERSION}
-readme.uninstall = -$(DEL_FILE) $(INSTALL_ROOT)$$PREFIX/share/doc/pokegen-$${VERSION}/$${TARGET}.pdf
-INSTALLS += readme
diff --git a/version.pri b/version.pri
deleted file mode 100644
index 71190b6d..00000000
--- a/version.pri
+++ /dev/null
@@ -1 +0,0 @@
-VERSION = 0.0.2
author	Ben Boeckel <MathStuf@gmail.com>	2008-06-21 01:22:14 +0000
committer	Ben Boeckel <MathStuf@gmail.com>	2008-06-21 01:22:14 +0000
commit	2d045c571308af33c93bdc9766a627ef1db6abaf (patch)
tree	15cd0d3734ed93bf81cabc418f1c428b3def3d79
parent	6dd3d36c4552565756dcedab2ddd44e90a553252 (diff)