diff options
author | Ben Boeckel <MathStuf@gmail.com> | 2008-09-15 19:33:43 +0000 |
---|---|---|
committer | Ben Boeckel <MathStuf@gmail.com> | 2008-09-15 19:33:43 +0000 |
commit | de1e4dc34ab030b468f5ce7cf567bacc5d749423 (patch) | |
tree | a7981e5fc1cc08de5bd329d7dbd4d0a216600462 /sigmodr | |
parent | 95be1a395576b8126fa91cb2ae4339247cb27b08 (diff) | |
download | sigen-de1e4dc34ab030b468f5ce7cf567bacc5d749423.tar.gz sigen-de1e4dc34ab030b468f5ce7cf567bacc5d749423.tar.xz sigen-de1e4dc34ab030b468f5ce7cf567bacc5d749423.zip |
[FIX] Include guard stripped of __
[FIX] KDE includes put before Qt includes
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@263 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'sigmodr')
182 files changed, 443 insertions, 444 deletions
diff --git a/sigmodr/AbilityUI.h b/sigmodr/AbilityUI.h index 0f8fc97f..bcbb0220 100644 --- a/sigmodr/AbilityUI.h +++ b/sigmodr/AbilityUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_ABILITYUI__ -#define __SIGMODR_ABILITYUI__ +#ifndef SIGMODR_ABILITYUI +#define SIGMODR_ABILITYUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/AuthorUI.h b/sigmodr/AuthorUI.h index c64fd477..bccd6d2f 100644 --- a/sigmodr/AuthorUI.h +++ b/sigmodr/AuthorUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_AUTHORUI__ -#define __SIGMODR_AUTHORUI__ +#ifndef SIGMODR_AUTHORUI +#define SIGMODR_AUTHORUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/BadgeUI.h b/sigmodr/BadgeUI.h index 64d60b96..50a3f05b 100644 --- a/sigmodr/BadgeUI.h +++ b/sigmodr/BadgeUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_BADGEUI__ -#define __SIGMODR_BADGEUI__ +#ifndef SIGMODR_BADGEUI +#define SIGMODR_BADGEUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/CoinListObjectUI.h b/sigmodr/CoinListObjectUI.h index 2031cbbe..d4bb2007 100644 --- a/sigmodr/CoinListObjectUI.h +++ b/sigmodr/CoinListObjectUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_COINLISTOBJECTUI__ -#define __SIGMODR_COINLISTOBJECTUI__ +#ifndef SIGMODR_COINLISTOBJECTUI +#define SIGMODR_COINLISTOBJECTUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/CoinListUI.h b/sigmodr/CoinListUI.h index 937e566b..67b81a54 100644 --- a/sigmodr/CoinListUI.h +++ b/sigmodr/CoinListUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_COINLISTUI__ -#define __SIGMODR_COINLISTUI__ +#ifndef SIGMODR_COINLISTUI +#define SIGMODR_COINLISTUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/EggGroupUI.h b/sigmodr/EggGroupUI.h index 1acbd36e..4ac1de6c 100644 --- a/sigmodr/EggGroupUI.h +++ b/sigmodr/EggGroupUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_EGGGROUPUI__ -#define __SIGMODR_EGGGROUPUI__ +#ifndef SIGMODR_EGGGROUPUI +#define SIGMODR_EGGGROUPUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/FractionWidget.h b/sigmodr/FractionWidget.h index 11aafaaa..05a39adf 100644 --- a/sigmodr/FractionWidget.h +++ b/sigmodr/FractionWidget.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_FRACTIONWIDGET__ -#define __SIGMODR_FRACTIONWIDGET__ +#ifndef SIGMODR_FRACTIONWIDGET +#define SIGMODR_FRACTIONWIDGET // Sigmod includes #include "../sigmod/Fraction.h" diff --git a/sigmodr/GlobalScriptUI.h b/sigmodr/GlobalScriptUI.h index e1ea09c6..9c3410aa 100644 --- a/sigmodr/GlobalScriptUI.h +++ b/sigmodr/GlobalScriptUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_GLOBALSCRIPTUI__ -#define __SIGMODR_GLOBALSCRIPTUI__ +#ifndef SIGMODR_GLOBALSCRIPTUI +#define SIGMODR_GLOBALSCRIPTUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/ItemTypeUI.h b/sigmodr/ItemTypeUI.h index cf5f0448..7ab0d2da 100644 --- a/sigmodr/ItemTypeUI.h +++ b/sigmodr/ItemTypeUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_ITEMTYPEUI__ -#define __SIGMODR_ITEMTYPEUI__ +#ifndef SIGMODR_ITEMTYPEUI +#define SIGMODR_ITEMTYPEUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/ItemUI.h b/sigmodr/ItemUI.h index 2adc2568..08cdb55f 100644 --- a/sigmodr/ItemUI.h +++ b/sigmodr/ItemUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_ITEMUI__ -#define __SIGMODR_ITEMUI__ +#ifndef SIGMODR_ITEMUI +#define SIGMODR_ITEMUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/MapEffectUI.h b/sigmodr/MapEffectUI.h index 213c1315..ef7ac54f 100644 --- a/sigmodr/MapEffectUI.h +++ b/sigmodr/MapEffectUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPEFFECTUI__ -#define __SIGMODR_MAPEFFECTUI__ +#ifndef SIGMODR_MAPEFFECTUI +#define SIGMODR_MAPEFFECTUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/MapTrainerTeamMemberUI.h b/sigmodr/MapTrainerTeamMemberUI.h index 98169c60..de6c5cbf 100644 --- a/sigmodr/MapTrainerTeamMemberUI.h +++ b/sigmodr/MapTrainerTeamMemberUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPTRAINERTEAMMEMBERUI__ -#define __SIGMODR_MAPTRAINERTEAMMEMBERUI__ +#ifndef SIGMODR_MAPTRAINERTEAMMEMBERUI +#define SIGMODR_MAPTRAINERTEAMMEMBERUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/MapTrainerUI.h b/sigmodr/MapTrainerUI.h index f50d590c..2fd1185e 100644 --- a/sigmodr/MapTrainerUI.h +++ b/sigmodr/MapTrainerUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPTRAINERUI__ -#define __SIGMODR_MAPTRAINERUI__ +#ifndef SIGMODR_MAPTRAINERUI +#define SIGMODR_MAPTRAINERUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/MapUI.h b/sigmodr/MapUI.h index 3cd8a3e1..488a74a6 100644 --- a/sigmodr/MapUI.h +++ b/sigmodr/MapUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPUI__ -#define __SIGMODR_MAPUI__ +#ifndef SIGMODR_MAPUI +#define SIGMODR_MAPUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/MapWarpUI.h b/sigmodr/MapWarpUI.h index b52b45fd..5e5f9ef3 100644 --- a/sigmodr/MapWarpUI.h +++ b/sigmodr/MapWarpUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPWARPUI__ -#define __SIGMODR_MAPWARPUI__ +#ifndef SIGMODR_MAPWARPUI +#define SIGMODR_MAPWARPUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/MapWildListEncounterUI.h b/sigmodr/MapWildListEncounterUI.h index bd08ec4a..205b1eb1 100644 --- a/sigmodr/MapWildListEncounterUI.h +++ b/sigmodr/MapWildListEncounterUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPWILDLISTENCOUNTERUI__ -#define __SIGMODR_MAPWILDLISTENCOUNTERUI__ +#ifndef SIGMODR_MAPWILDLISTENCOUNTERUI +#define SIGMODR_MAPWILDLISTENCOUNTERUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/MapWildListUI.h b/sigmodr/MapWildListUI.h index 029a995b..de934d48 100644 --- a/sigmodr/MapWildListUI.h +++ b/sigmodr/MapWildListUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPWILDLISTUI__ -#define __SIGMODR_MAPWILDLISTUI__ +#ifndef SIGMODR_MAPWILDLISTUI +#define SIGMODR_MAPWILDLISTUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/MoveUI.h b/sigmodr/MoveUI.h index 83cb9b9a..6c1219f9 100644 --- a/sigmodr/MoveUI.h +++ b/sigmodr/MoveUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MOVEUI__ -#define __SIGMODR_MOVEUI__ +#ifndef SIGMODR_MOVEUI +#define SIGMODR_MOVEUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/NatureUI.h b/sigmodr/NatureUI.h index a2aca25d..01199ad3 100644 --- a/sigmodr/NatureUI.h +++ b/sigmodr/NatureUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_NATUREUI__ -#define __SIGMODR_NATUREUI__ +#ifndef SIGMODR_NATUREUI +#define SIGMODR_NATUREUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/ObjectUI.h b/sigmodr/ObjectUI.h index 3892025b..500024ca 100644 --- a/sigmodr/ObjectUI.h +++ b/sigmodr/ObjectUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_OBJECTUI__ -#define __SIGMODR_OBJECTUI__ +#ifndef SIGMODR_OBJECTUI +#define SIGMODR_OBJECTUI // Qt includes #include <QtGui/QWidget> diff --git a/sigmodr/PointWidget.h b/sigmodr/PointWidget.h index e9662144..009f1334 100644 --- a/sigmodr/PointWidget.h +++ b/sigmodr/PointWidget.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_POINTWIDGET__ -#define __SIGMODR_POINTWIDGET__ +#ifndef SIGMODR_POINTWIDGET +#define SIGMODR_POINTWIDGET // Qt includes #include <QtCore/QPoint> diff --git a/sigmodr/RulesUI.h b/sigmodr/RulesUI.h index 68cef7da..9eb58fae 100644 --- a/sigmodr/RulesUI.h +++ b/sigmodr/RulesUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_RULESUI__ -#define __SIGMODR_RULESUI__ +#ifndef SIGMODR_RULESUI +#define SIGMODR_RULESUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/ScriptWidget.h b/sigmodr/ScriptWidget.h index c1490eae..09856fa6 100644 --- a/sigmodr/ScriptWidget.h +++ b/sigmodr/ScriptWidget.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SCRIPTWIDGET__ -#define __SIGMODR_SCRIPTWIDGET__ +#ifndef SIGMODR_SCRIPTWIDGET +#define SIGMODR_SCRIPTWIDGET // Sigmod includes #include "../sigmod/Script.h" diff --git a/sigmodr/SigmodTree.h b/sigmodr/SigmodTree.h index d66c4c6b..d2a0cedc 100644 --- a/sigmodr/SigmodTree.h +++ b/sigmodr/SigmodTree.h @@ -15,17 +15,17 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SIGMODTREE__ -#define __SIGMODR_SIGMODTREE__ +#ifndef SIGMODR_SIGMODTREE +#define SIGMODR_SIGMODTREE + +// KDE includes +#include <KMenu> // Qt includes #include <QtCore/QMap> #include <QtGui/QTreeView> #include <QtXml/QDomDocument> -// KDE includes -#include <KUrl> - // Forward declarations class KMenu; namespace Sigmod diff --git a/sigmodr/SigmodTreeModel.h b/sigmodr/SigmodTreeModel.h index bdf0ed64..874e7194 100644 --- a/sigmodr/SigmodTreeModel.h +++ b/sigmodr/SigmodTreeModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SIGMODTREEMODELMODEL__ -#define __SIGMODR_SIGMODTREEMODELMODEL__ +#ifndef SIGMODR_SIGMODTREEMODELMODEL +#define SIGMODR_SIGMODTREEMODELMODEL // Model includes #include "models/RootModel.h" diff --git a/sigmodr/SigmodUI.h b/sigmodr/SigmodUI.h index 4d97544b..44dd9f1d 100644 --- a/sigmodr/SigmodUI.h +++ b/sigmodr/SigmodUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SIGMODUI__ -#define __SIGMODR_SIGMODUI__ +#ifndef SIGMODR_SIGMODUI +#define SIGMODR_SIGMODUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/SigmodrPreferences.cpp b/sigmodr/SigmodrPreferences.cpp index e585eb2a..ebcaf9d4 100644 --- a/sigmodr/SigmodrPreferences.cpp +++ b/sigmodr/SigmodrPreferences.cpp @@ -18,12 +18,12 @@ // Header include #include "SigmodrPreferences.h" -// Qt includes -#include <QtGui/QCheckBox> - // KDE includes #include <KConfigGroup> +// Qt includes +#include <QtGui/QCheckBox> + Sigmodr::SigmodrPreferences::SigmodrPreferences(QWidget* parent, KConfigGroup& config) : KDialog(parent), m_config(config) diff --git a/sigmodr/SigmodrPreferences.h b/sigmodr/SigmodrPreferences.h index 16a0d72c..75bb6e74 100644 --- a/sigmodr/SigmodrPreferences.h +++ b/sigmodr/SigmodrPreferences.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_PREFERENCES__ -#define __SIGMODR_PREFERENCES__ +#ifndef SIGMODR_PREFERENCES +#define SIGMODR_PREFERENCES // KDE includes #include <KDialog> diff --git a/sigmodr/SigmodrUI.cpp b/sigmodr/SigmodrUI.cpp index 348d4018..00f49aa1 100644 --- a/sigmodr/SigmodrUI.cpp +++ b/sigmodr/SigmodrUI.cpp @@ -27,10 +27,6 @@ #include "../sigmod/Rules.h" #include "../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QString> -#include <QtGui/QCloseEvent> - // KDE includes #include <KAction> #include <KActionCollection> @@ -53,6 +49,10 @@ #include <KIO/NetAccess> #include <KNS/Engine> +// Qt includes +#include <QtCore/QString> +#include <QtGui/QCloseEvent> + Sigmodr::SigmodrUI::SigmodrUI(QWidget* parent) : KXmlGuiWindow(parent), m_config(KGlobal::config()->group("sigmodr")) diff --git a/sigmodr/SigmodrUI.h b/sigmodr/SigmodrUI.h index 6b467560..ea1ae3cb 100644 --- a/sigmodr/SigmodrUI.h +++ b/sigmodr/SigmodrUI.h @@ -15,16 +15,16 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SIGMODRUI__ -#define __SIGMODR_SIGMODRUI__ - -// Qt includes -#include <QtXml/QDomDocument> +#ifndef SIGMODR_SIGMODRUI +#define SIGMODR_SIGMODRUI // KDE includes #include <KConfigGroup> #include <KXmlGuiWindow> +// Qt includes +#include <QtXml/QDomDocument> + // Form include #include "ui_sigmodr.h" diff --git a/sigmodr/SkinUI.h b/sigmodr/SkinUI.h index 6a4b52ff..660ca9ac 100644 --- a/sigmodr/SkinUI.h +++ b/sigmodr/SkinUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SKINUI__ -#define __SIGMODR_SKINUI__ +#ifndef SIGMODR_SKINUI +#define SIGMODR_SKINUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/SoundUI.cpp b/sigmodr/SoundUI.cpp index 17af5b8d..06763a7f 100644 --- a/sigmodr/SoundUI.cpp +++ b/sigmodr/SoundUI.cpp @@ -22,14 +22,13 @@ #include "../sigmod/Sigmod.h" #include "../sigmod/Sound.h" +// KDE includes +#include <KMenu> + // Qt includes #include <QtCore/QBuffer> #include <QtCore/QFile> -// KDE includes -#include <KFileDialog> -#include <KMessageBox> - // Phonon includes #include <Phonon/AudioOutput> #include <Phonon/MediaObject> diff --git a/sigmodr/SoundUI.h b/sigmodr/SoundUI.h index aa552526..bdeca309 100644 --- a/sigmodr/SoundUI.h +++ b/sigmodr/SoundUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SOUNDUI__ -#define __SIGMODR_SOUNFUI__ +#ifndef SIGMODR_SOUNDUI +#define SIGMODR_SOUNFUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/SpeciesAbilityUI.h b/sigmodr/SpeciesAbilityUI.h index 7fa96e30..c3d10bb0 100644 --- a/sigmodr/SpeciesAbilityUI.h +++ b/sigmodr/SpeciesAbilityUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPECIESABILITYUI__ -#define __SIGMODR_SPECIESABILITYUI__ +#ifndef SIGMODR_SPECIESABILITYUI +#define SIGMODR_SPECIESABILITYUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/SpeciesItemUI.h b/sigmodr/SpeciesItemUI.h index 9a53e68d..e14f0ccc 100644 --- a/sigmodr/SpeciesItemUI.h +++ b/sigmodr/SpeciesItemUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPECIESITEMUI__ -#define __SIGMODR_SPECIESITEMUI__ +#ifndef SIGMODR_SPECIESITEMUI +#define SIGMODR_SPECIESITEMUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/SpeciesMoveUI.h b/sigmodr/SpeciesMoveUI.h index 3bd45c0a..5aebb07b 100644 --- a/sigmodr/SpeciesMoveUI.h +++ b/sigmodr/SpeciesMoveUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPECIESMOVEUI__ -#define __SIGMODR_SPECIESMOVEUI__ +#ifndef SIGMODR_SPECIESMOVEUI +#define SIGMODR_SPECIESMOVEUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/SpeciesUI.h b/sigmodr/SpeciesUI.h index 3283b80e..a6fbc9cc 100644 --- a/sigmodr/SpeciesUI.h +++ b/sigmodr/SpeciesUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPECIESUI__ -#define __SIGMODR_SPECIESUI__ +#ifndef SIGMODR_SPECIESUI +#define SIGMODR_SPECIESUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/SpriteUI.h b/sigmodr/SpriteUI.h index 51ccdb8c..34eac4d0 100644 --- a/sigmodr/SpriteUI.h +++ b/sigmodr/SpriteUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPRITEUI__ -#define __SIGMODR_SPRITEUI__ +#ifndef SIGMODR_SPRITEUI +#define SIGMODR_SPRITEUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/StatusUI.h b/sigmodr/StatusUI.h index 9f1d03e7..1254f6fb 100644 --- a/sigmodr/StatusUI.h +++ b/sigmodr/StatusUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_STATUSUI__ -#define __SIGMODR_STATUSUI__ +#ifndef SIGMODR_STATUSUI +#define SIGMODR_STATUSUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/StoreUI.h b/sigmodr/StoreUI.h index 16eb33b3..154cb24f 100644 --- a/sigmodr/StoreUI.h +++ b/sigmodr/StoreUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_STOREUI__ -#define __SIGMODR_STOREUI__ +#ifndef SIGMODR_STOREUI +#define SIGMODR_STOREUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/TileUI.h b/sigmodr/TileUI.h index 29ffcefb..cc0db6c3 100644 --- a/sigmodr/TileUI.h +++ b/sigmodr/TileUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TILEUI__ -#define __SIGMODR_TILEUI__ +#ifndef SIGMODR_TILEUI +#define SIGMODR_TILEUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/TilemapModel.h b/sigmodr/TilemapModel.h index ec2dd6e5..52f0c407 100644 --- a/sigmodr/TilemapModel.h +++ b/sigmodr/TilemapModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TILEMAPMODEL__ -#define __SIGMODR_TILEMAPMODEL__ +#ifndef SIGMODR_TILEMAPMODEL +#define SIGMODR_TILEMAPMODEL // Sigmod includes #include "../sigmod/Matrix.h" diff --git a/sigmodr/TimeUI.h b/sigmodr/TimeUI.h index 4d49c79f..6e1edf31 100644 --- a/sigmodr/TimeUI.h +++ b/sigmodr/TimeUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TIMEUI__ -#define __SIGMODR_TIMEUI__ +#ifndef SIGMODR_TIMEUI +#define SIGMODR_TIMEUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/TrainerUI.h b/sigmodr/TrainerUI.h index 431de2a9..5bd53137 100644 --- a/sigmodr/TrainerUI.h +++ b/sigmodr/TrainerUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TRAINERUI__ -#define __SIGMODR_TRAINERUI__ +#ifndef SIGMODR_TRAINERUI +#define SIGMODR_TRAINERUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/TypeUI.h b/sigmodr/TypeUI.h index 98f8c1a4..924b7c85 100644 --- a/sigmodr/TypeUI.h +++ b/sigmodr/TypeUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TYPEUI__ -#define __SIGMODR_TYPEUI__ +#ifndef SIGMODR_TYPEUI +#define SIGMODR_TYPEUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/TypechartModel.h b/sigmodr/TypechartModel.h index 62b75519..6ccbc4e9 100644 --- a/sigmodr/TypechartModel.h +++ b/sigmodr/TypechartModel.h @@ -15,21 +15,21 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TYPECHARTMODEL__ -#define __SIGMODR_TYPECHARTMODEL__ +#ifndef SIGMODR_TYPECHARTMODEL +#define SIGMODR_TYPECHARTMODEL // Sigmod includes #include "../sigmod/Fraction.h" #include "../sigmod/Matrix.h" +// KDE includes +#include <KColorScheme> + // Qt includes #include <QtCore/QAbstractTableModel> #include <QtCore/QStringList> #include <QtCore/QVariant> -// KDE includes -#include <KColorScheme> - namespace Sigmodr { class TypechartModel : public QAbstractTableModel diff --git a/sigmodr/ValidationDialog.cpp b/sigmodr/ValidationDialog.cpp index fe87bb82..43290859 100644 --- a/sigmodr/ValidationDialog.cpp +++ b/sigmodr/ValidationDialog.cpp @@ -21,16 +21,16 @@ // Sigmod includes #include "../sigmod/Object.h" -// Qt includes -#include <QtGui/QLabel> -#include <QtGui/QTreeWidget> -#include <QtGui/QVBoxLayout> - // KDE includes #include <KColorScheme> #include <KMessageBox> #include <KProgressDialog> +// Qt includes +#include <QtGui/QLabel> +#include <QtGui/QTreeWidget> +#include <QtGui/QVBoxLayout> + Sigmodr::ValidationDialog::ValidationDialog(Sigmod::Object* object, QWidget* parent) : QWidget(parent), m_processed(false), diff --git a/sigmodr/ValidationDialog.h b/sigmodr/ValidationDialog.h index bf00eb1f..3833e94d 100644 --- a/sigmodr/ValidationDialog.h +++ b/sigmodr/ValidationDialog.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_VALIDATIONDIALOG__ -#define __SIGMODR_VALIDATIONDIALOG__ +#ifndef SIGMODR_VALIDATIONDIALOG +#define SIGMODR_VALIDATIONDIALOG // Qt includes #include <QtCore/QPair> diff --git a/sigmodr/WeatherUI.h b/sigmodr/WeatherUI.h index ac899ceb..afdd1e64 100644 --- a/sigmodr/WeatherUI.h +++ b/sigmodr/WeatherUI.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_WEATHERUI__ -#define __SIGMODR_WEATHERUI__ +#ifndef SIGMODR_WEATHERUI +#define SIGMODR_WEATHERUI // Sigmodr includes #include "ObjectUI.h" diff --git a/sigmodr/models/AbilityGroupModel.cpp b/sigmodr/models/AbilityGroupModel.cpp index 7b22addd..adb5b19f 100644 --- a/sigmodr/models/AbilityGroupModel.cpp +++ b/sigmodr/models/AbilityGroupModel.cpp @@ -21,13 +21,13 @@ // Model includes #include "AbilityModel.h" -// Qt includes -#include <QtCore/QFile> - // Sigmod includes #include "../../sigmod/Ability.h" #include "../../sigmod/Sigmod.h" +// Qt includes +#include <QtCore/QFile> + // KDE includes #include <KMenu> diff --git a/sigmodr/models/AbilityGroupModel.h b/sigmodr/models/AbilityGroupModel.h index 3a7d02dd..eb55985c 100644 --- a/sigmodr/models/AbilityGroupModel.h +++ b/sigmodr/models/AbilityGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_ABILITYGROUPMODEL__ -#define __SIGMODR_ABILITYGROUPMODEL__ +#ifndef SIGMODR_ABILITYGROUPMODEL +#define SIGMODR_ABILITYGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/AbilityModel.cpp b/sigmodr/models/AbilityModel.cpp index 08c1d281..135cfc58 100644 --- a/sigmodr/models/AbilityModel.cpp +++ b/sigmodr/models/AbilityModel.cpp @@ -27,12 +27,12 @@ // Sigmod includes #include "../../sigmod/Ability.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::AbilityModel::AbilityModel(BaseModel* parent, Sigmod::Ability* ability) : ObjectModel(parent, ability) { diff --git a/sigmodr/models/AbilityModel.h b/sigmodr/models/AbilityModel.h index 5fb3a6f0..163c111c 100644 --- a/sigmodr/models/AbilityModel.h +++ b/sigmodr/models/AbilityModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_ABILITYMODEL__ -#define __SIGMODR_ABILITYMODEL__ +#ifndef SIGMODR_ABILITYMODEL +#define SIGMODR_ABILITYMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/AuthorGroupModel.cpp b/sigmodr/models/AuthorGroupModel.cpp index b73475bb..8e2c635a 100644 --- a/sigmodr/models/AuthorGroupModel.cpp +++ b/sigmodr/models/AuthorGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Author.h" #include "../../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::AuthorGroupModel::AuthorGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Authors") { diff --git a/sigmodr/models/AuthorGroupModel.h b/sigmodr/models/AuthorGroupModel.h index 560db21d..6894f477 100644 --- a/sigmodr/models/AuthorGroupModel.h +++ b/sigmodr/models/AuthorGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_AUTHORGROUPMODEL__ -#define __SIGMODR_AUTHORGROUPMODEL__ +#ifndef SIGMODR_AUTHORGROUPMODEL +#define SIGMODR_AUTHORGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/AuthorModel.cpp b/sigmodr/models/AuthorModel.cpp index dde61dad..1441cd0c 100644 --- a/sigmodr/models/AuthorModel.cpp +++ b/sigmodr/models/AuthorModel.cpp @@ -27,12 +27,12 @@ // Sigmod includes #include "../../sigmod/Author.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::AuthorModel::AuthorModel(BaseModel* parent, Sigmod::Author* author) : ObjectModel(parent, author) { diff --git a/sigmodr/models/AuthorModel.h b/sigmodr/models/AuthorModel.h index 00d318ed..0cee7c02 100644 --- a/sigmodr/models/AuthorModel.h +++ b/sigmodr/models/AuthorModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_AUTHORMODEL__ -#define __SIGMODR_AUTHORMODEL__ +#ifndef SIGMODR_AUTHORMODEL +#define SIGMODR_AUTHORMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/BadgeGroupModel.cpp b/sigmodr/models/BadgeGroupModel.cpp index da41d897..5a018abc 100644 --- a/sigmodr/models/BadgeGroupModel.cpp +++ b/sigmodr/models/BadgeGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Badge.h" #include "../../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::BadgeGroupModel::BadgeGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Badges") { diff --git a/sigmodr/models/BadgeGroupModel.h b/sigmodr/models/BadgeGroupModel.h index e21e6fa3..908ecd73 100644 --- a/sigmodr/models/BadgeGroupModel.h +++ b/sigmodr/models/BadgeGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_BADGEGROUPMODEL__ -#define __SIGMODR_BADGEGROUPMODEL__ +#ifndef SIGMODR_BADGEGROUPMODEL +#define SIGMODR_BADGEGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/BadgeModel.cpp b/sigmodr/models/BadgeModel.cpp index 775643b2..fb76bb76 100644 --- a/sigmodr/models/BadgeModel.cpp +++ b/sigmodr/models/BadgeModel.cpp @@ -27,12 +27,12 @@ // Sigmod includes #include "../../sigmod/Badge.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::BadgeModel::BadgeModel(BaseModel* parent, Sigmod::Badge* badge) : ObjectModel(parent, badge) { diff --git a/sigmodr/models/BadgeModel.h b/sigmodr/models/BadgeModel.h index 54454110..b5f5e896 100644 --- a/sigmodr/models/BadgeModel.h +++ b/sigmodr/models/BadgeModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_BADGEMODEL__ -#define __SIGMODR_BADGEMODEL__ +#ifndef SIGMODR_BADGEMODEL +#define SIGMODR_BADGEMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/BaseModel.h b/sigmodr/models/BaseModel.h index 3095b97a..dfa1c260 100644 --- a/sigmodr/models/BaseModel.h +++ b/sigmodr/models/BaseModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_BASEMODEL__ -#define __SIGMODR_BASEMODEL__ +#ifndef SIGMODR_BASEMODEL +#define SIGMODR_BASEMODEL // Qt includes #include <QtCore/QString> diff --git a/sigmodr/models/BaseObjectModel.h b/sigmodr/models/BaseObjectModel.h index 80e90aca..b67f315f 100644 --- a/sigmodr/models/BaseObjectModel.h +++ b/sigmodr/models/BaseObjectModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_BASEOBJECTMODEL__ -#define __SIGMODR_BASEOBJECTMODEL__ +#ifndef SIGMODR_BASEOBJECTMODEL +#define SIGMODR_BASEOBJECTMODEL // Model includes #include "BaseModel.h" diff --git a/sigmodr/models/CoinListGroupModel.cpp b/sigmodr/models/CoinListGroupModel.cpp index ba8c25e8..8921a8aa 100644 --- a/sigmodr/models/CoinListGroupModel.cpp +++ b/sigmodr/models/CoinListGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/CoinList.h" #include "../../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::CoinListGroupModel::CoinListGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Coin Lists") { diff --git a/sigmodr/models/CoinListGroupModel.h b/sigmodr/models/CoinListGroupModel.h index 9d41e4f4..68ec213d 100644 --- a/sigmodr/models/CoinListGroupModel.h +++ b/sigmodr/models/CoinListGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_COINLISTGROUPMODEL__ -#define __SIGMODR_COINLISTGROUPMODEL__ +#ifndef SIGMODR_COINLISTGROUPMODEL +#define SIGMODR_COINLISTGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/CoinListModel.cpp b/sigmodr/models/CoinListModel.cpp index 96117d25..cac2db61 100644 --- a/sigmodr/models/CoinListModel.cpp +++ b/sigmodr/models/CoinListModel.cpp @@ -29,12 +29,12 @@ #include "../../sigmod/CoinList.h" #include "../../sigmod/CoinListObject.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::CoinListModel::CoinListModel(BaseModel* parent, Sigmod::CoinList* coinList) : GroupObjectModel(parent, coinList) { diff --git a/sigmodr/models/CoinListModel.h b/sigmodr/models/CoinListModel.h index 72167934..1908afa1 100644 --- a/sigmodr/models/CoinListModel.h +++ b/sigmodr/models/CoinListModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_COINLISTMODEL__ -#define __SIGMODR_COINLISTMODEL__ +#ifndef SIGMODR_COINLISTMODEL +#define SIGMODR_COINLISTMODEL // Model includes #include "GroupObjectModel.h" diff --git a/sigmodr/models/CoinListObjectModel.cpp b/sigmodr/models/CoinListObjectModel.cpp index 21d4a66c..028b667f 100644 --- a/sigmodr/models/CoinListObjectModel.cpp +++ b/sigmodr/models/CoinListObjectModel.cpp @@ -31,12 +31,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Species.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::CoinListObjectModel::CoinListObjectModel(BaseModel* parent, Sigmod::CoinListObject* object) : ObjectModel(parent, object) { diff --git a/sigmodr/models/CoinListObjectModel.h b/sigmodr/models/CoinListObjectModel.h index c6a502e9..5862db3a 100644 --- a/sigmodr/models/CoinListObjectModel.h +++ b/sigmodr/models/CoinListObjectModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_COINLISTOBJECTMODEL__ -#define __SIGMODR_COINLISTOBJECTMODEL__ +#ifndef SIGMODR_COINLISTOBJECTMODEL +#define SIGMODR_COINLISTOBJECTMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/EggGroupGroupModel.cpp b/sigmodr/models/EggGroupGroupModel.cpp index fa82bb79..d309cd0a 100644 --- a/sigmodr/models/EggGroupGroupModel.cpp +++ b/sigmodr/models/EggGroupGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/EggGroup.h" #include "../../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::EggGroupGroupModel::EggGroupGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Egg Groups") { diff --git a/sigmodr/models/EggGroupGroupModel.h b/sigmodr/models/EggGroupGroupModel.h index 9cba95f7..39b50e22 100644 --- a/sigmodr/models/EggGroupGroupModel.h +++ b/sigmodr/models/EggGroupGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_EGGGROUPGROUPMODEL__ -#define __SIGMODR_EGGGROUPGROUPMODEL__ +#ifndef SIGMODR_EGGGROUPGROUPMODEL +#define SIGMODR_EGGGROUPGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/EggGroupModel.cpp b/sigmodr/models/EggGroupModel.cpp index ec5c6adb..cf093951 100644 --- a/sigmodr/models/EggGroupModel.cpp +++ b/sigmodr/models/EggGroupModel.cpp @@ -27,12 +27,12 @@ // Sigmod includes #include "../../sigmod/EggGroup.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::EggGroupModel::EggGroupModel(BaseModel* parent, Sigmod::EggGroup* eggGroup) : ObjectModel(parent, eggGroup) { diff --git a/sigmodr/models/EggGroupModel.h b/sigmodr/models/EggGroupModel.h index 08eba758..453d1fae 100644 --- a/sigmodr/models/EggGroupModel.h +++ b/sigmodr/models/EggGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_EGGGROUPMODEL__ -#define __SIGMODR_EGGGROUPMODEL__ +#ifndef SIGMODR_EGGGROUPMODEL +#define SIGMODR_EGGGROUPMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/GlobalScriptGroupModel.cpp b/sigmodr/models/GlobalScriptGroupModel.cpp index 90a1b90b..48c02b8e 100644 --- a/sigmodr/models/GlobalScriptGroupModel.cpp +++ b/sigmodr/models/GlobalScriptGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/GlobalScript.h" #include "../../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::GlobalScriptGroupModel::GlobalScriptGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Global Scripts") { diff --git a/sigmodr/models/GlobalScriptGroupModel.h b/sigmodr/models/GlobalScriptGroupModel.h index ce67e1cf..d9a8b5ed 100644 --- a/sigmodr/models/GlobalScriptGroupModel.h +++ b/sigmodr/models/GlobalScriptGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_GLOBALSCRIPTGROUPMODEL__ -#define __SIGMODR_GLOBALSCRIPTGROUPMODEL__ +#ifndef SIGMODR_GLOBALSCRIPTGROUPMODEL +#define SIGMODR_GLOBALSCRIPTGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/GlobalScriptModel.cpp b/sigmodr/models/GlobalScriptModel.cpp index 8382a117..cc6198b7 100644 --- a/sigmodr/models/GlobalScriptModel.cpp +++ b/sigmodr/models/GlobalScriptModel.cpp @@ -27,12 +27,12 @@ // Sigmod includes #include "../../sigmod/GlobalScript.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::GlobalScriptModel::GlobalScriptModel(BaseModel* parent, Sigmod::GlobalScript* globalScript) : ObjectModel(parent, globalScript) { diff --git a/sigmodr/models/GlobalScriptModel.h b/sigmodr/models/GlobalScriptModel.h index edc713d9..5d408e99 100644 --- a/sigmodr/models/GlobalScriptModel.h +++ b/sigmodr/models/GlobalScriptModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_GLOBALSCRIPTMODEL__ -#define __SIGMODR_GLOBALSCRIPTMODEL__ +#ifndef SIGMODR_GLOBALSCRIPTMODEL +#define SIGMODR_GLOBALSCRIPTMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/GroupModel.h b/sigmodr/models/GroupModel.h index 09b51287..b579922f 100644 --- a/sigmodr/models/GroupModel.h +++ b/sigmodr/models/GroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_GROUPMODEL__ -#define __SIGMODR_GROUPMODEL__ +#ifndef SIGMODR_GROUPMODEL +#define SIGMODR_GROUPMODEL // Model includes #include "BaseModel.h" diff --git a/sigmodr/models/GroupObjectModel.h b/sigmodr/models/GroupObjectModel.h index baafe9e1..6202dc39 100644 --- a/sigmodr/models/GroupObjectModel.h +++ b/sigmodr/models/GroupObjectModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_GROUPOBJECTMODEL__ -#define __SIGMODR_GROUPOBJECTMODEL__ +#ifndef SIGMODR_GROUPOBJECTMODEL +#define SIGMODR_GROUPOBJECTMODEL // Model includes #include "BaseObjectModel.h" diff --git a/sigmodr/models/Grouping.h b/sigmodr/models/Grouping.h index 6e7eb461..f8de21d1 100644 --- a/sigmodr/models/Grouping.h +++ b/sigmodr/models/Grouping.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_GROUPING__ -#define __SIGMODR_GROUPING__ +#ifndef SIGMODR_GROUPING +#define SIGMODR_GROUPING // Qt includes #include <QtCore/QList> diff --git a/sigmodr/models/ItemGroupModel.cpp b/sigmodr/models/ItemGroupModel.cpp index 2daab0fe..c7a0d2a7 100644 --- a/sigmodr/models/ItemGroupModel.cpp +++ b/sigmodr/models/ItemGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Item.h" #include "../../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::ItemGroupModel::ItemGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Items") { diff --git a/sigmodr/models/ItemGroupModel.h b/sigmodr/models/ItemGroupModel.h index 5398386b..181fda7e 100644 --- a/sigmodr/models/ItemGroupModel.h +++ b/sigmodr/models/ItemGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_ITEMGROUPMODEL__ -#define __SIGMODR_ITEMGROUPMODEL__ +#ifndef SIGMODR_ITEMGROUPMODEL +#define SIGMODR_ITEMGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/ItemModel.cpp b/sigmodr/models/ItemModel.cpp index d7729ac4..abc57ce2 100644 --- a/sigmodr/models/ItemModel.cpp +++ b/sigmodr/models/ItemModel.cpp @@ -27,12 +27,12 @@ // Sigmod includes #include "../../sigmod/Item.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::ItemModel::ItemModel(BaseModel* parent, Sigmod::Item* item) : ObjectModel(parent, item) { diff --git a/sigmodr/models/ItemModel.h b/sigmodr/models/ItemModel.h index 96113ae2..6026b872 100644 --- a/sigmodr/models/ItemModel.h +++ b/sigmodr/models/ItemModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_ITEMMODEL__ -#define __SIGMODR_ITEMMODEL__ +#ifndef SIGMODR_ITEMMODEL +#define SIGMODR_ITEMMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/ItemTypeGroupModel.cpp b/sigmodr/models/ItemTypeGroupModel.cpp index c3173d65..b43964c6 100644 --- a/sigmodr/models/ItemTypeGroupModel.cpp +++ b/sigmodr/models/ItemTypeGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/ItemType.h" #include "../../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::ItemTypeGroupModel::ItemTypeGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Item Types") { diff --git a/sigmodr/models/ItemTypeGroupModel.h b/sigmodr/models/ItemTypeGroupModel.h index 3d860068..c607bddf 100644 --- a/sigmodr/models/ItemTypeGroupModel.h +++ b/sigmodr/models/ItemTypeGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_ITEMTYPEGROUPMODEL__ -#define __SIGMODR_ITEMTYPEGROUPMODEL__ +#ifndef SIGMODR_ITEMTYPEGROUPMODEL +#define SIGMODR_ITEMTYPEGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/ItemTypeModel.cpp b/sigmodr/models/ItemTypeModel.cpp index 45ddeed5..dd041b03 100644 --- a/sigmodr/models/ItemTypeModel.cpp +++ b/sigmodr/models/ItemTypeModel.cpp @@ -27,12 +27,12 @@ // Sigmod includes #include "../../sigmod/ItemType.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::ItemTypeModel::ItemTypeModel(BaseModel* parent, Sigmod::ItemType* itemType) : ObjectModel(parent, itemType) { diff --git a/sigmodr/models/ItemTypeModel.h b/sigmodr/models/ItemTypeModel.h index bea645f4..1fbb2919 100644 --- a/sigmodr/models/ItemTypeModel.h +++ b/sigmodr/models/ItemTypeModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_ITEMTYPEMODEL__ -#define __SIGMODR_ITEMTYPEMODEL__ +#ifndef SIGMODR_ITEMTYPEMODEL +#define SIGMODR_ITEMTYPEMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/MapEffectGroupModel.cpp b/sigmodr/models/MapEffectGroupModel.cpp index 41519a9d..ed31414f 100644 --- a/sigmodr/models/MapEffectGroupModel.cpp +++ b/sigmodr/models/MapEffectGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Map.h" #include "../../sigmod/MapEffect.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MapEffectGroupModel::MapEffectGroupModel(BaseModel* parent, Sigmod::Map* map) : GroupModel(parent, map, "Effects") { diff --git a/sigmodr/models/MapEffectGroupModel.h b/sigmodr/models/MapEffectGroupModel.h index 7fd9f62f..88608370 100644 --- a/sigmodr/models/MapEffectGroupModel.h +++ b/sigmodr/models/MapEffectGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPEFFECTGROUPMODEL__ -#define __SIGMODR_MAPEFFECTGROUPMODEL__ +#ifndef SIGMODR_MAPEFFECTGROUPMODEL +#define SIGMODR_MAPEFFECTGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/MapEffectModel.cpp b/sigmodr/models/MapEffectModel.cpp index bf0f6f7b..438e6a33 100644 --- a/sigmodr/models/MapEffectModel.cpp +++ b/sigmodr/models/MapEffectModel.cpp @@ -28,12 +28,12 @@ #include "../../sigmod/Map.h" #include "../../sigmod/MapEffect.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MapEffectModel::MapEffectModel(BaseModel* parent, Sigmod::MapEffect* effect) : ObjectModel(parent, effect) { diff --git a/sigmodr/models/MapEffectModel.h b/sigmodr/models/MapEffectModel.h index 1c33672c..8dd172fe 100644 --- a/sigmodr/models/MapEffectModel.h +++ b/sigmodr/models/MapEffectModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPEFFECTMODEL__ -#define __SIGMODR_MAPEFFECTMODEL__ +#ifndef SIGMODR_MAPEFFECTMODEL +#define SIGMODR_MAPEFFECTMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/MapGroupModel.cpp b/sigmodr/models/MapGroupModel.cpp index e66b1978..9058bbac 100644 --- a/sigmodr/models/MapGroupModel.cpp +++ b/sigmodr/models/MapGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Map.h" #include "../../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MapGroupModel::MapGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Maps") { diff --git a/sigmodr/models/MapGroupModel.h b/sigmodr/models/MapGroupModel.h index 5467f451..89836a2b 100644 --- a/sigmodr/models/MapGroupModel.h +++ b/sigmodr/models/MapGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPGROUPMODEL__ -#define __SIGMODR_MAPGROUPMODEL__ +#ifndef SIGMODR_MAPGROUPMODEL +#define SIGMODR_MAPGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/MapModel.cpp b/sigmodr/models/MapModel.cpp index 9333a313..ecd75227 100644 --- a/sigmodr/models/MapModel.cpp +++ b/sigmodr/models/MapModel.cpp @@ -30,12 +30,12 @@ // Sigmod includes #include "../../sigmod/Map.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MapModel::MapModel(BaseModel* parent, Sigmod::Map* map) : GroupObjectModel(parent, map) { diff --git a/sigmodr/models/MapModel.h b/sigmodr/models/MapModel.h index 27586a25..2fe4c2d1 100644 --- a/sigmodr/models/MapModel.h +++ b/sigmodr/models/MapModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPMODEL__ -#define __SIGMODR_MAPMODEL__ +#ifndef SIGMODR_MAPMODEL +#define SIGMODR_MAPMODEL // Model includes #include "GroupObjectModel.h" diff --git a/sigmodr/models/MapTrainerGroupModel.cpp b/sigmodr/models/MapTrainerGroupModel.cpp index 5144eba7..5dec0733 100644 --- a/sigmodr/models/MapTrainerGroupModel.cpp +++ b/sigmodr/models/MapTrainerGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Map.h" #include "../../sigmod/MapTrainer.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MapTrainerGroupModel::MapTrainerGroupModel(BaseModel* parent, Sigmod::Map* map) : GroupModel(parent, map, "Trainers") { diff --git a/sigmodr/models/MapTrainerGroupModel.h b/sigmodr/models/MapTrainerGroupModel.h index 71ae6c54..f9572033 100644 --- a/sigmodr/models/MapTrainerGroupModel.h +++ b/sigmodr/models/MapTrainerGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPTRAINERGROUPMODEL__ -#define __SIGMODR_MAPTRAINERGROUPMODEL__ +#ifndef SIGMODR_MAPTRAINERGROUPMODEL +#define SIGMODR_MAPTRAINERGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/MapTrainerModel.cpp b/sigmodr/models/MapTrainerModel.cpp index 14a1ab2b..f4421956 100644 --- a/sigmodr/models/MapTrainerModel.cpp +++ b/sigmodr/models/MapTrainerModel.cpp @@ -30,12 +30,12 @@ #include "../../sigmod/MapTrainer.h" #include "../../sigmod/MapTrainerTeamMember.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MapTrainerModel::MapTrainerModel(BaseModel* parent, Sigmod::MapTrainer* trainer) : GroupObjectModel(parent, trainer) { diff --git a/sigmodr/models/MapTrainerModel.h b/sigmodr/models/MapTrainerModel.h index db3e130e..9af22b8d 100644 --- a/sigmodr/models/MapTrainerModel.h +++ b/sigmodr/models/MapTrainerModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPTRAINERMODEL__ -#define __SIGMODR_MAPTRAINERMODEL__ +#ifndef SIGMODR_MAPTRAINERMODEL +#define SIGMODR_MAPTRAINERMODEL // Model includes #include "GroupObjectModel.h" diff --git a/sigmodr/models/MapTrainerTeamMemberModel.cpp b/sigmodr/models/MapTrainerTeamMemberModel.cpp index 12cf39d3..5f6753b3 100644 --- a/sigmodr/models/MapTrainerTeamMemberModel.cpp +++ b/sigmodr/models/MapTrainerTeamMemberModel.cpp @@ -30,12 +30,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Species.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MapTrainerTeamMemberModel::MapTrainerTeamMemberModel(BaseModel* parent, Sigmod::MapTrainerTeamMember* teamMember) : ObjectModel(parent, teamMember) { diff --git a/sigmodr/models/MapTrainerTeamMemberModel.h b/sigmodr/models/MapTrainerTeamMemberModel.h index 5f628d67..560b0032 100644 --- a/sigmodr/models/MapTrainerTeamMemberModel.h +++ b/sigmodr/models/MapTrainerTeamMemberModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPTRAINERTEAMMEMBERMODEL__ -#define __SIGMODR_MAPTRAINERTEAMMEMBERMODEL__ +#ifndef SIGMODR_MAPTRAINERTEAMMEMBERMODEL +#define SIGMODR_MAPTRAINERTEAMMEMBERMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/MapWarpGroupModel.cpp b/sigmodr/models/MapWarpGroupModel.cpp index 52698193..775f80e2 100644 --- a/sigmodr/models/MapWarpGroupModel.cpp +++ b/sigmodr/models/MapWarpGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Map.h" #include "../../sigmod/MapWarp.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MapWarpGroupModel::MapWarpGroupModel(BaseModel* parent, Sigmod::Map* map) : GroupModel(parent, map, "Warps") { diff --git a/sigmodr/models/MapWarpGroupModel.h b/sigmodr/models/MapWarpGroupModel.h index 93efbe13..c6c7ccd3 100644 --- a/sigmodr/models/MapWarpGroupModel.h +++ b/sigmodr/models/MapWarpGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPWARPGROUPMODEL__ -#define __SIGMODR_MAPWARPGROUPMODEL__ +#ifndef SIGMODR_MAPWARPGROUPMODEL +#define SIGMODR_MAPWARPGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/MapWarpModel.cpp b/sigmodr/models/MapWarpModel.cpp index aae2b4f2..c01ef5bf 100644 --- a/sigmodr/models/MapWarpModel.cpp +++ b/sigmodr/models/MapWarpModel.cpp @@ -28,12 +28,12 @@ #include "../../sigmod/Map.h" #include "../../sigmod/MapWarp.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MapWarpModel::MapWarpModel(BaseModel* parent, Sigmod::MapWarp* warp) : ObjectModel(parent, warp) { diff --git a/sigmodr/models/MapWarpModel.h b/sigmodr/models/MapWarpModel.h index 5442ab84..cb4bbbec 100644 --- a/sigmodr/models/MapWarpModel.h +++ b/sigmodr/models/MapWarpModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPWARPMODEL__ -#define __SIGMODR_MAPWARPMODEL__ +#ifndef SIGMODR_MAPWARPMODEL +#define SIGMODR_MAPWARPMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/MapWildListEncounterModel.cpp b/sigmodr/models/MapWildListEncounterModel.cpp index e4f3f965..bb8491b5 100644 --- a/sigmodr/models/MapWildListEncounterModel.cpp +++ b/sigmodr/models/MapWildListEncounterModel.cpp @@ -30,12 +30,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Species.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MapWildListEncounterModel::MapWildListEncounterModel(BaseModel* parent, Sigmod::MapWildListEncounter* encounter) : ObjectModel(parent, encounter) { diff --git a/sigmodr/models/MapWildListEncounterModel.h b/sigmodr/models/MapWildListEncounterModel.h index a87c5436..2fcd8a7f 100644 --- a/sigmodr/models/MapWildListEncounterModel.h +++ b/sigmodr/models/MapWildListEncounterModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPWILDLISTENCOUNTERMODEL__ -#define __SIGMODR_MAPWILDLISTENCOUNTERMODEL__ +#ifndef SIGMODR_MAPWILDLISTENCOUNTERMODEL +#define SIGMODR_MAPWILDLISTENCOUNTERMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/MapWildListGroupModel.cpp b/sigmodr/models/MapWildListGroupModel.cpp index 50b6a98c..8598d155 100644 --- a/sigmodr/models/MapWildListGroupModel.cpp +++ b/sigmodr/models/MapWildListGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Map.h" #include "../../sigmod/MapWildList.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MapWildListGroupModel::MapWildListGroupModel(BaseModel* parent, Sigmod::Map* map) : GroupModel(parent, map, "Wild Lists") { diff --git a/sigmodr/models/MapWildListGroupModel.h b/sigmodr/models/MapWildListGroupModel.h index 033ec5a8..ee6e623e 100644 --- a/sigmodr/models/MapWildListGroupModel.h +++ b/sigmodr/models/MapWildListGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPWILDLISTGROUPMODEL__ -#define __SIGMODR_MAPWILDLISTGROUPMODEL__ +#ifndef SIGMODR_MAPWILDLISTGROUPMODEL +#define SIGMODR_MAPWILDLISTGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/MapWildListModel.cpp b/sigmodr/models/MapWildListModel.cpp index 7204e394..3f7f8b00 100644 --- a/sigmodr/models/MapWildListModel.cpp +++ b/sigmodr/models/MapWildListModel.cpp @@ -30,12 +30,12 @@ #include "../../sigmod/MapWildList.h" #include "../../sigmod/MapWildListEncounter.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MapWildListModel::MapWildListModel(BaseModel* parent, Sigmod::MapWildList* wildList) : GroupObjectModel(parent, wildList) { diff --git a/sigmodr/models/MapWildListModel.h b/sigmodr/models/MapWildListModel.h index 18f6d832..97fd08f8 100644 --- a/sigmodr/models/MapWildListModel.h +++ b/sigmodr/models/MapWildListModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MAPWILDLISTMODEL__ -#define __SIGMODR_MAPWILDLISTMODEL__ +#ifndef SIGMODR_MAPWILDLISTMODEL +#define SIGMODR_MAPWILDLISTMODEL // Model includes #include "GroupObjectModel.h" diff --git a/sigmodr/models/MoveGroupModel.cpp b/sigmodr/models/MoveGroupModel.cpp index b6cdaa6b..b371f573 100644 --- a/sigmodr/models/MoveGroupModel.cpp +++ b/sigmodr/models/MoveGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Move.h" #include "../../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MoveGroupModel::MoveGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Moves") { diff --git a/sigmodr/models/MoveGroupModel.h b/sigmodr/models/MoveGroupModel.h index 26f227b8..2babfcf8 100644 --- a/sigmodr/models/MoveGroupModel.h +++ b/sigmodr/models/MoveGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MOVEGROUPMODEL__ -#define __SIGMODR_MOVEGROUPMODEL__ +#ifndef SIGMODR_MOVEGROUPMODEL +#define SIGMODR_MOVEGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/MoveModel.cpp b/sigmodr/models/MoveModel.cpp index 05d273c5..fd6eaa4e 100644 --- a/sigmodr/models/MoveModel.cpp +++ b/sigmodr/models/MoveModel.cpp @@ -27,12 +27,12 @@ // Sigmod includes #include "../../sigmod/Move.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::MoveModel::MoveModel(BaseModel* parent, Sigmod::Move* move) : ObjectModel(parent, move) { diff --git a/sigmodr/models/MoveModel.h b/sigmodr/models/MoveModel.h index df207a9d..cfea06ab 100644 --- a/sigmodr/models/MoveModel.h +++ b/sigmodr/models/MoveModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_MOVEMODEL__ -#define __SIGMODR_MOVEMODEL__ +#ifndef SIGMODR_MOVEMODEL +#define SIGMODR_MOVEMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/NatureGroupModel.cpp b/sigmodr/models/NatureGroupModel.cpp index 00a6350b..13e044ab 100644 --- a/sigmodr/models/NatureGroupModel.cpp +++ b/sigmodr/models/NatureGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Nature.h" #include "../../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::NatureGroupModel::NatureGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Natures") { diff --git a/sigmodr/models/NatureGroupModel.h b/sigmodr/models/NatureGroupModel.h index e6af658c..912320ea 100644 --- a/sigmodr/models/NatureGroupModel.h +++ b/sigmodr/models/NatureGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_NATUREGROUPMODEL__ -#define __SIGMODR_NATUREGROUPMODEL__ +#ifndef SIGMODR_NATUREGROUPMODEL +#define SIGMODR_NATUREGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/NatureModel.cpp b/sigmodr/models/NatureModel.cpp index 6d585e93..4dcc2d03 100644 --- a/sigmodr/models/NatureModel.cpp +++ b/sigmodr/models/NatureModel.cpp @@ -28,12 +28,12 @@ #include "../../sigmod/Nature.h" #include "../../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::NatureModel::NatureModel(BaseModel* parent, Sigmod::Nature* nature) : ObjectModel(parent, nature) { diff --git a/sigmodr/models/NatureModel.h b/sigmodr/models/NatureModel.h index 5b018943..8ca70cb8 100644 --- a/sigmodr/models/NatureModel.h +++ b/sigmodr/models/NatureModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_NATUREMODEL__ -#define __SIGMODR_NATUREMODEL__ +#ifndef SIGMODR_NATUREMODEL +#define SIGMODR_NATUREMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/ObjectModel.h b/sigmodr/models/ObjectModel.h index 67473235..e8d1081c 100644 --- a/sigmodr/models/ObjectModel.h +++ b/sigmodr/models/ObjectModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_OBJECTMODEL__ -#define __SIGMODR_OBJECTMODEL__ +#ifndef SIGMODR_OBJECTMODEL +#define SIGMODR_OBJECTMODEL // Model includes #include "BaseObjectModel.h" diff --git a/sigmodr/models/RootModel.h b/sigmodr/models/RootModel.h index af79f8c2..c3bf27c0 100644 --- a/sigmodr/models/RootModel.h +++ b/sigmodr/models/RootModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_ROOTMODEL__ -#define __SIGMODR_ROOTMODEL__ +#ifndef SIGMODR_ROOTMODEL +#define SIGMODR_ROOTMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/RulesModel.cpp b/sigmodr/models/RulesModel.cpp index 00393775..39889fc0 100644 --- a/sigmodr/models/RulesModel.cpp +++ b/sigmodr/models/RulesModel.cpp @@ -24,12 +24,12 @@ // Sigmod includes #include "../../sigmod/Rules.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::RulesModel::RulesModel(BaseModel* parent, Sigmod::Rules* rules) : ObjectModel(parent, rules) { diff --git a/sigmodr/models/RulesModel.h b/sigmodr/models/RulesModel.h index 53f7bfb9..7ee07084 100644 --- a/sigmodr/models/RulesModel.h +++ b/sigmodr/models/RulesModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_RULESMODEL__ -#define __SIGMODR_RULESMODEL__ +#ifndef SIGMODR_RULESMODEL +#define SIGMODR_RULESMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/SigmodModel.cpp b/sigmodr/models/SigmodModel.cpp index 4b138b3c..f7409275 100644 --- a/sigmodr/models/SigmodModel.cpp +++ b/sigmodr/models/SigmodModel.cpp @@ -49,12 +49,12 @@ // Sigmod includes #include "../../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SigmodModel::SigmodModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupObjectModel(parent, sigmod) { diff --git a/sigmodr/models/SigmodModel.h b/sigmodr/models/SigmodModel.h index 01cbc60c..c1ddc544 100644 --- a/sigmodr/models/SigmodModel.h +++ b/sigmodr/models/SigmodModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SIGMODMODEL__ -#define __SIGMODR_SIGMODMODEL__ +#ifndef SIGMODR_SIGMODMODEL +#define SIGMODR_SIGMODMODEL // Model includes #include "GroupObjectModel.h" diff --git a/sigmodr/models/SkinGroupModel.cpp b/sigmodr/models/SkinGroupModel.cpp index b7303183..4f3402f5 100644 --- a/sigmodr/models/SkinGroupModel.cpp +++ b/sigmodr/models/SkinGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Skin.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SkinGroupModel::SkinGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Skins") { diff --git a/sigmodr/models/SkinGroupModel.h b/sigmodr/models/SkinGroupModel.h index a77490ab..bd832055 100644 --- a/sigmodr/models/SkinGroupModel.h +++ b/sigmodr/models/SkinGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SKINGROUPMODEL__ -#define __SIGMODR_SKINGROUPMODEL__ +#ifndef SIGMODR_SKINGROUPMODEL +#define SIGMODR_SKINGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/SkinModel.cpp b/sigmodr/models/SkinModel.cpp index 059656a4..1a7cee17 100644 --- a/sigmodr/models/SkinModel.cpp +++ b/sigmodr/models/SkinModel.cpp @@ -27,12 +27,12 @@ // Sigmod includes #include "../../sigmod/Skin.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SkinModel::SkinModel(BaseModel* parent, Sigmod::Skin* skin) : ObjectModel(parent, skin) { diff --git a/sigmodr/models/SkinModel.h b/sigmodr/models/SkinModel.h index 47d96ee9..5e203f03 100644 --- a/sigmodr/models/SkinModel.h +++ b/sigmodr/models/SkinModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SKINMODEL__ -#define __SIGMODR_SKINMODEL__ +#ifndef SIGMODR_SKINMODEL +#define SIGMODR_SKINMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/SoundGroupModel.cpp b/sigmodr/models/SoundGroupModel.cpp index fb7616a4..670a3188 100644 --- a/sigmodr/models/SoundGroupModel.cpp +++ b/sigmodr/models/SoundGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Sound.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SoundGroupModel::SoundGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Sounds") { diff --git a/sigmodr/models/SoundGroupModel.h b/sigmodr/models/SoundGroupModel.h index f4102f66..2076a9ad 100644 --- a/sigmodr/models/SoundGroupModel.h +++ b/sigmodr/models/SoundGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SOUNDGROUPMODEL__ -#define __SIGMODR_SOUNDGROUPMODEL__ +#ifndef SIGMODR_SOUNDGROUPMODEL +#define SIGMODR_SOUNDGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/SoundModel.cpp b/sigmodr/models/SoundModel.cpp index 93653a28..4412bd35 100644 --- a/sigmodr/models/SoundModel.cpp +++ b/sigmodr/models/SoundModel.cpp @@ -28,12 +28,12 @@ #include "../../sigmod/Sound.h" #include "../../sigmod/Sigmod.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SoundModel::SoundModel(BaseModel* parent, Sigmod::Sound* sound) : ObjectModel(parent, sound) { diff --git a/sigmodr/models/SoundModel.h b/sigmodr/models/SoundModel.h index 81ecfd02..9fb02d3b 100644 --- a/sigmodr/models/SoundModel.h +++ b/sigmodr/models/SoundModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SOUNDMODEL__ -#define __SIGMODR_SOUNDMODEL__ +#ifndef SIGMODR_SOUNDMODEL +#define SIGMODR_SOUNDMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/SpeciesAbilityGroupModel.cpp b/sigmodr/models/SpeciesAbilityGroupModel.cpp index 3558c1c7..8014c01d 100644 --- a/sigmodr/models/SpeciesAbilityGroupModel.cpp +++ b/sigmodr/models/SpeciesAbilityGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Species.h" #include "../../sigmod/SpeciesAbility.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SpeciesAbilityGroupModel::SpeciesAbilityGroupModel(BaseModel* parent, Sigmod::Species* species) : GroupModel(parent, species, "Abilities") { diff --git a/sigmodr/models/SpeciesAbilityGroupModel.h b/sigmodr/models/SpeciesAbilityGroupModel.h index 4fb4be23..846be1b5 100644 --- a/sigmodr/models/SpeciesAbilityGroupModel.h +++ b/sigmodr/models/SpeciesAbilityGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPECIESABILITYGROUPMODEL__ -#define __SIGMODR_SPECIESABILITYGROUPMODEL__ +#ifndef SIGMODR_SPECIESABILITYGROUPMODEL +#define SIGMODR_SPECIESABILITYGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/SpeciesAbilityModel.cpp b/sigmodr/models/SpeciesAbilityModel.cpp index 56d2281d..cb6e038c 100644 --- a/sigmodr/models/SpeciesAbilityModel.cpp +++ b/sigmodr/models/SpeciesAbilityModel.cpp @@ -30,12 +30,12 @@ #include "../../sigmod/Species.h" #include "../../sigmod/SpeciesAbility.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SpeciesAbilityModel::SpeciesAbilityModel(BaseModel* parent, Sigmod::SpeciesAbility* ability) : ObjectModel(parent, ability) { diff --git a/sigmodr/models/SpeciesAbilityModel.h b/sigmodr/models/SpeciesAbilityModel.h index b55c81bb..9c8adfc8 100644 --- a/sigmodr/models/SpeciesAbilityModel.h +++ b/sigmodr/models/SpeciesAbilityModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPECIESABILITYMODEL__ -#define __SIGMODR_SPECIESABILITYMODEL__ +#ifndef SIGMODR_SPECIESABILITYMODEL +#define SIGMODR_SPECIESABILITYMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/SpeciesGroupModel.cpp b/sigmodr/models/SpeciesGroupModel.cpp index ba6d01cc..5d108830 100644 --- a/sigmodr/models/SpeciesGroupModel.cpp +++ b/sigmodr/models/SpeciesGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Species.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SpeciesGroupModel::SpeciesGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Species") { diff --git a/sigmodr/models/SpeciesGroupModel.h b/sigmodr/models/SpeciesGroupModel.h index 5cf8ea92..12701b96 100644 --- a/sigmodr/models/SpeciesGroupModel.h +++ b/sigmodr/models/SpeciesGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPECIESGROUPMODEL__ -#define __SIGMODR_SPECIESGROUPMODEL__ +#ifndef SIGMODR_SPECIESGROUPMODEL +#define SIGMODR_SPECIESGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/SpeciesItemGroupModel.cpp b/sigmodr/models/SpeciesItemGroupModel.cpp index 378fd91b..f652b1c9 100644 --- a/sigmodr/models/SpeciesItemGroupModel.cpp +++ b/sigmodr/models/SpeciesItemGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Species.h" #include "../../sigmod/SpeciesItem.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SpeciesItemGroupModel::SpeciesItemGroupModel(BaseModel* parent, Sigmod::Species* species) : GroupModel(parent, species, "Items") { diff --git a/sigmodr/models/SpeciesItemGroupModel.h b/sigmodr/models/SpeciesItemGroupModel.h index ebd1fd40..7d94ad5b 100644 --- a/sigmodr/models/SpeciesItemGroupModel.h +++ b/sigmodr/models/SpeciesItemGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPECIESITEMGROUPMODEL__ -#define __SIGMODR_SPECIESITEMGROUPMODEL__ +#ifndef SIGMODR_SPECIESITEMGROUPMODEL +#define SIGMODR_SPECIESITEMGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/SpeciesItemModel.cpp b/sigmodr/models/SpeciesItemModel.cpp index 58807828..7ebb6f1c 100644 --- a/sigmodr/models/SpeciesItemModel.cpp +++ b/sigmodr/models/SpeciesItemModel.cpp @@ -30,12 +30,12 @@ #include "../../sigmod/Species.h" #include "../../sigmod/SpeciesItem.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SpeciesItemModel::SpeciesItemModel(BaseModel* parent, Sigmod::SpeciesItem* item) : ObjectModel(parent, item) { diff --git a/sigmodr/models/SpeciesItemModel.h b/sigmodr/models/SpeciesItemModel.h index c0c815a7..678a36fc 100644 --- a/sigmodr/models/SpeciesItemModel.h +++ b/sigmodr/models/SpeciesItemModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPECIESITEMMODEL__ -#define __SIGMODR_SPECIESITEMMODEL__ +#ifndef SIGMODR_SPECIESITEMMODEL +#define SIGMODR_SPECIESITEMMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/SpeciesModel.cpp b/sigmodr/models/SpeciesModel.cpp index 8e2f5ca3..0addf10d 100644 --- a/sigmodr/models/SpeciesModel.cpp +++ b/sigmodr/models/SpeciesModel.cpp @@ -30,12 +30,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Species.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SpeciesModel::SpeciesModel(BaseModel* parent, Sigmod::Species* species) : GroupObjectModel(parent, species) { diff --git a/sigmodr/models/SpeciesModel.h b/sigmodr/models/SpeciesModel.h index 42ca6890..a523b9f6 100644 --- a/sigmodr/models/SpeciesModel.h +++ b/sigmodr/models/SpeciesModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPECIESMODEL__ -#define __SIGMODR_SPECIESMODEL__ +#ifndef SIGMODR_SPECIESMODEL +#define SIGMODR_SPECIESMODEL // Model includes #include "GroupObjectModel.h" diff --git a/sigmodr/models/SpeciesMoveGroupModel.cpp b/sigmodr/models/SpeciesMoveGroupModel.cpp index 90b8e27a..e992a215 100644 --- a/sigmodr/models/SpeciesMoveGroupModel.cpp +++ b/sigmodr/models/SpeciesMoveGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Species.h" #include "../../sigmod/SpeciesMove.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SpeciesMoveGroupModel::SpeciesMoveGroupModel(BaseModel* parent, Sigmod::Species* species) : GroupModel(parent, species, "Moves") { diff --git a/sigmodr/models/SpeciesMoveGroupModel.h b/sigmodr/models/SpeciesMoveGroupModel.h index 5d15ecd1..c7f3000b 100644 --- a/sigmodr/models/SpeciesMoveGroupModel.h +++ b/sigmodr/models/SpeciesMoveGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPECIESMOVEGROUPMODEL__ -#define __SIGMODR_SPECIESMOVEGROUPMODEL__ +#ifndef SIGMODR_SPECIESMOVEGROUPMODEL +#define SIGMODR_SPECIESMOVEGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/SpeciesMoveModel.cpp b/sigmodr/models/SpeciesMoveModel.cpp index a935d514..9a80b0f1 100644 --- a/sigmodr/models/SpeciesMoveModel.cpp +++ b/sigmodr/models/SpeciesMoveModel.cpp @@ -30,12 +30,12 @@ #include "../../sigmod/Species.h" #include "../../sigmod/SpeciesMove.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SpeciesMoveModel::SpeciesMoveModel(BaseModel* parent, Sigmod::SpeciesMove* move) : ObjectModel(parent, move) { diff --git a/sigmodr/models/SpeciesMoveModel.h b/sigmodr/models/SpeciesMoveModel.h index 94a7841f..896351ab 100644 --- a/sigmodr/models/SpeciesMoveModel.h +++ b/sigmodr/models/SpeciesMoveModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPECIESMOVEMODEL__ -#define __SIGMODR_SPECIESMOVEMODEL__ +#ifndef SIGMODR_SPECIESMOVEMODEL +#define SIGMODR_SPECIESMOVEMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/SpriteGroupModel.cpp b/sigmodr/models/SpriteGroupModel.cpp index 2955371c..7fe1940e 100644 --- a/sigmodr/models/SpriteGroupModel.cpp +++ b/sigmodr/models/SpriteGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Sprite.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SpriteGroupModel::SpriteGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Sprites") { diff --git a/sigmodr/models/SpriteGroupModel.h b/sigmodr/models/SpriteGroupModel.h index c7469257..bacacaae 100644 --- a/sigmodr/models/SpriteGroupModel.h +++ b/sigmodr/models/SpriteGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPRITEGROUPMODEL__ -#define __SIGMODR_SPRITEGROUPMODEL__ +#ifndef SIGMODR_SPRITEGROUPMODEL +#define SIGMODR_SPRITEGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/SpriteModel.cpp b/sigmodr/models/SpriteModel.cpp index 08541d51..be9ee918 100644 --- a/sigmodr/models/SpriteModel.cpp +++ b/sigmodr/models/SpriteModel.cpp @@ -27,12 +27,12 @@ // Sigmod includes #include "../../sigmod/Sprite.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::SpriteModel::SpriteModel(BaseModel* parent, Sigmod::Sprite* sprite) : ObjectModel(parent, sprite) { diff --git a/sigmodr/models/SpriteModel.h b/sigmodr/models/SpriteModel.h index 82cc0148..bf86fc91 100644 --- a/sigmodr/models/SpriteModel.h +++ b/sigmodr/models/SpriteModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_SPRITEMODEL__ -#define __SIGMODR_SPRITEMODEL__ +#ifndef SIGMODR_SPRITEMODEL +#define SIGMODR_SPRITEMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/StatusGroupModel.cpp b/sigmodr/models/StatusGroupModel.cpp index 5f50d250..c9b0fbf1 100644 --- a/sigmodr/models/StatusGroupModel.cpp +++ b/sigmodr/models/StatusGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Status.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::StatusGroupModel::StatusGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Status Effects") { diff --git a/sigmodr/models/StatusGroupModel.h b/sigmodr/models/StatusGroupModel.h index 1b085d1f..372057c3 100644 --- a/sigmodr/models/StatusGroupModel.h +++ b/sigmodr/models/StatusGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_STATUSGROUPMODEL__ -#define __SIGMODR_STATUSGROUPMODEL__ +#ifndef SIGMODR_STATUSGROUPMODEL +#define SIGMODR_STATUSGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/StatusModel.cpp b/sigmodr/models/StatusModel.cpp index f0436f90..04bc76cd 100644 --- a/sigmodr/models/StatusModel.cpp +++ b/sigmodr/models/StatusModel.cpp @@ -27,12 +27,12 @@ // Sigmod includes #include "../../sigmod/Status.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::StatusModel::StatusModel(BaseModel* parent, Sigmod::Status* status) : ObjectModel(parent, status) { diff --git a/sigmodr/models/StatusModel.h b/sigmodr/models/StatusModel.h index 3cdb15ac..2573de6e 100644 --- a/sigmodr/models/StatusModel.h +++ b/sigmodr/models/StatusModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_STATUSMODEL__ -#define __SIGMODR_STATUSMODEL__ +#ifndef SIGMODR_STATUSMODEL +#define SIGMODR_STATUSMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/StoreGroupModel.cpp b/sigmodr/models/StoreGroupModel.cpp index feb3975b..4935f73c 100644 --- a/sigmodr/models/StoreGroupModel.cpp +++ b/sigmodr/models/StoreGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Store.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::StoreGroupModel::StoreGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Stores") { diff --git a/sigmodr/models/StoreGroupModel.h b/sigmodr/models/StoreGroupModel.h index 0239bfbe..f1b2d569 100644 --- a/sigmodr/models/StoreGroupModel.h +++ b/sigmodr/models/StoreGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_STOREGROUPMODEL__ -#define __SIGMODR_STOREGROUPMODEL__ +#ifndef SIGMODR_STOREGROUPMODEL +#define SIGMODR_STOREGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/StoreModel.cpp b/sigmodr/models/StoreModel.cpp index 834e0d9d..85aca1b1 100644 --- a/sigmodr/models/StoreModel.cpp +++ b/sigmodr/models/StoreModel.cpp @@ -28,12 +28,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Store.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::StoreModel::StoreModel(BaseModel* parent, Sigmod::Store* store) : ObjectModel(parent, store) { diff --git a/sigmodr/models/StoreModel.h b/sigmodr/models/StoreModel.h index cd9f03d7..ed108fe8 100644 --- a/sigmodr/models/StoreModel.h +++ b/sigmodr/models/StoreModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_STOREMODEL__ -#define __SIGMODR_STOREMODEL__ +#ifndef SIGMODR_STOREMODEL +#define SIGMODR_STOREMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/TileGroupModel.cpp b/sigmodr/models/TileGroupModel.cpp index 8b2c1de2..56f15686 100644 --- a/sigmodr/models/TileGroupModel.cpp +++ b/sigmodr/models/TileGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Tile.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::TileGroupModel::TileGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Tiles") { diff --git a/sigmodr/models/TileGroupModel.h b/sigmodr/models/TileGroupModel.h index 9156096c..f97e93d7 100644 --- a/sigmodr/models/TileGroupModel.h +++ b/sigmodr/models/TileGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TILEGROUPMODEL__ -#define __SIGMODR_TILEGROUPMODEL__ +#ifndef SIGMODR_TILEGROUPMODEL +#define SIGMODR_TILEGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/TileModel.cpp b/sigmodr/models/TileModel.cpp index e99dc6d6..63f6344f 100644 --- a/sigmodr/models/TileModel.cpp +++ b/sigmodr/models/TileModel.cpp @@ -28,12 +28,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Tile.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::TileModel::TileModel(BaseModel* parent, Sigmod::Tile* tile) : ObjectModel(parent, tile) { diff --git a/sigmodr/models/TileModel.h b/sigmodr/models/TileModel.h index 8ec03f26..11a089a2 100644 --- a/sigmodr/models/TileModel.h +++ b/sigmodr/models/TileModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TILEMODEL__ -#define __SIGMODR_TILEMODEL__ +#ifndef SIGMODR_TILEMODEL +#define SIGMODR_TILEMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/TimeGroupModel.cpp b/sigmodr/models/TimeGroupModel.cpp index e4f1457a..17f977f7 100644 --- a/sigmodr/models/TimeGroupModel.cpp +++ b/sigmodr/models/TimeGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Time.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::TimeGroupModel::TimeGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Times") { diff --git a/sigmodr/models/TimeGroupModel.h b/sigmodr/models/TimeGroupModel.h index 39bfb6a6..c81bbf7d 100644 --- a/sigmodr/models/TimeGroupModel.h +++ b/sigmodr/models/TimeGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TIMEGROUPMODEL__ -#define __SIGMODR_TIMEGROUPMODEL__ +#ifndef SIGMODR_TIMEGROUPMODEL +#define SIGMODR_TIMEGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/TimeModel.cpp b/sigmodr/models/TimeModel.cpp index d954c75d..af90c502 100644 --- a/sigmodr/models/TimeModel.cpp +++ b/sigmodr/models/TimeModel.cpp @@ -28,12 +28,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Time.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::TimeModel::TimeModel(BaseModel* parent, Sigmod::Time* time) : ObjectModel(parent, time) { diff --git a/sigmodr/models/TimeModel.h b/sigmodr/models/TimeModel.h index f141a4d6..922081a6 100644 --- a/sigmodr/models/TimeModel.h +++ b/sigmodr/models/TimeModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TIMEMODEL__ -#define __SIGMODR_TIMEMODEL__ +#ifndef SIGMODR_TIMEMODEL +#define SIGMODR_TIMEMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/TrainerGroupModel.cpp b/sigmodr/models/TrainerGroupModel.cpp index 0d647801..ded2f278 100644 --- a/sigmodr/models/TrainerGroupModel.cpp +++ b/sigmodr/models/TrainerGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Trainer.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::TrainerGroupModel::TrainerGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Trainers") { diff --git a/sigmodr/models/TrainerGroupModel.h b/sigmodr/models/TrainerGroupModel.h index bf8dae5b..217cf9ab 100644 --- a/sigmodr/models/TrainerGroupModel.h +++ b/sigmodr/models/TrainerGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TRAINERGROUPMODEL__ -#define __SIGMODR_TRAINERGROUPMODEL__ +#ifndef SIGMODR_TRAINERGROUPMODEL +#define SIGMODR_TRAINERGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/TrainerModel.cpp b/sigmodr/models/TrainerModel.cpp index 6507d8f1..b6b9d76b 100644 --- a/sigmodr/models/TrainerModel.cpp +++ b/sigmodr/models/TrainerModel.cpp @@ -28,12 +28,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Trainer.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::TrainerModel::TrainerModel(BaseModel* parent, Sigmod::Trainer* trainer) : ObjectModel(parent, trainer) { diff --git a/sigmodr/models/TrainerModel.h b/sigmodr/models/TrainerModel.h index 42768090..7c1f8bd3 100644 --- a/sigmodr/models/TrainerModel.h +++ b/sigmodr/models/TrainerModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TRAINERMODEL__ -#define __SIGMODR_TRAINERMODEL__ +#ifndef SIGMODR_TRAINERMODEL +#define SIGMODR_TRAINERMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/TypeGroupModel.cpp b/sigmodr/models/TypeGroupModel.cpp index 8ff98bb6..e50adae2 100644 --- a/sigmodr/models/TypeGroupModel.cpp +++ b/sigmodr/models/TypeGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Type.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::TypeGroupModel::TypeGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Types") { diff --git a/sigmodr/models/TypeGroupModel.h b/sigmodr/models/TypeGroupModel.h index 0ec45863..f45ad51b 100644 --- a/sigmodr/models/TypeGroupModel.h +++ b/sigmodr/models/TypeGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TYPEGROUPMODEL__ -#define __SIGMODR_TYPEGROUPMODEL__ +#ifndef SIGMODR_TYPEGROUPMODEL +#define SIGMODR_TYPEGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/TypeModel.cpp b/sigmodr/models/TypeModel.cpp index c648acc0..27755053 100644 --- a/sigmodr/models/TypeModel.cpp +++ b/sigmodr/models/TypeModel.cpp @@ -28,12 +28,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Type.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::TypeModel::TypeModel(BaseModel* parent, Sigmod::Type* type) : ObjectModel(parent, type) { diff --git a/sigmodr/models/TypeModel.h b/sigmodr/models/TypeModel.h index 13904544..a32ffdb9 100644 --- a/sigmodr/models/TypeModel.h +++ b/sigmodr/models/TypeModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_TYPEMODEL__ -#define __SIGMODR_TYPEMODEL__ +#ifndef SIGMODR_TYPEMODEL +#define SIGMODR_TYPEMODEL // Model includes #include "ObjectModel.h" diff --git a/sigmodr/models/WeatherGroupModel.cpp b/sigmodr/models/WeatherGroupModel.cpp index c2994324..96d0a87e 100644 --- a/sigmodr/models/WeatherGroupModel.cpp +++ b/sigmodr/models/WeatherGroupModel.cpp @@ -25,12 +25,12 @@ #include "../../sigmod/Sigmod.h" #include "../../sigmod/Weather.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::WeatherGroupModel::WeatherGroupModel(BaseModel* parent, Sigmod::Sigmod* sigmod) : GroupModel(parent, sigmod, "Weathers") { diff --git a/sigmodr/models/WeatherGroupModel.h b/sigmodr/models/WeatherGroupModel.h index e997b9af..dc670f98 100644 --- a/sigmodr/models/WeatherGroupModel.h +++ b/sigmodr/models/WeatherGroupModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_WEATHERGROUPMODEL__ -#define __SIGMODR_WEATHERGROUPMODEL__ +#ifndef SIGMODR_WEATHERGROUPMODEL +#define SIGMODR_WEATHERGROUPMODEL // Model includes #include "GroupModel.h" diff --git a/sigmodr/models/WeatherModel.cpp b/sigmodr/models/WeatherModel.cpp index 2cb4c423..186d06bf 100644 --- a/sigmodr/models/WeatherModel.cpp +++ b/sigmodr/models/WeatherModel.cpp @@ -27,12 +27,12 @@ // Sigmod includes #include "../../sigmod/Weather.h" -// Qt includes -#include <QtCore/QFile> - // KDE includes #include <KMenu> +// Qt includes +#include <QtCore/QFile> + Sigmodr::WeatherModel::WeatherModel(BaseModel* parent, Sigmod::Weather* weather) : ObjectModel(parent, weather) { diff --git a/sigmodr/models/WeatherModel.h b/sigmodr/models/WeatherModel.h index 86592169..700555e2 100644 --- a/sigmodr/models/WeatherModel.h +++ b/sigmodr/models/WeatherModel.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __SIGMODR_WEATHERMODEL__ -#define __SIGMODR_WEATHERMODEL__ +#ifndef SIGMODR_WEATHERMODEL +#define SIGMODR_WEATHERMODEL // Model includes #include "ObjectModel.h" |