Moved to GPLv3 and Qt4, Changed String -> QString, other minor fixes

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

1 files changed, 11 insertions, 12 deletions

diff --git a/pokemod/PokemonEvolution.cpp b/pokemod/PokemonEvolution.cpp
index daa05b13..c04f379f 100644
--- a/pokemod/PokemonEvolution.cpp
+++ b/pokemod/PokemonEvolution.cpp
@@ -6,19 +6,18 @@
 // Created:     Tue Mar 20 18:45:29 2007

 // Copyright:   ©2007 Ben Boeckel and Nerdy Productions

 // Licence:

-//    This program is free software; you can redistribute it and/or modify

+//    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 2 of the License, or

+//    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, write to the Free Software Foundation, Inc.,

-//    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+//    with this program.  If not, see <http://www.gnu.org/licenses/>.

 /////////////////////////////////////////////////////////////////////////////

 

 #include "PokemonEvolution.h"

@@ -94,7 +93,7 @@ void PokeGen::PokeMod::PokemonEvolution::ImportIni(Ini &ini, const unsigned _id)
    LogImportOver("PokemonEvolution", id);

 }

 

-void PokeGen::PokeMod::PokemonEvolution::ExportIni(std::ofstream &fout, const String &pokemon) const

+void PokeGen::PokeMod::PokemonEvolution::ExportIni(QFile &fout, const QString &pokemon) const

 {

    LogExportStart("PokemonEvolution", id);

    Ini exPokemonEvolution("pokemonEvolution " + pokemon);

@@ -115,7 +114,7 @@ void PokeGen::PokeMod::PokemonEvolution::SetSpecies(const unsigned s)
       species = s;

 }

 

-void PokeGen::PokeMod::PokemonEvolution::SetSpecies(const String &s)

+void PokeGen::PokeMod::PokemonEvolution::SetSpecies(const QString &s)

 {

    LogSetVar("PokemonEvolution", id, "species", s);

    if (const Pokemon *temp = pokemod->GetPokemon(s))

@@ -143,7 +142,7 @@ void PokeGen::PokeMod::PokemonEvolution::SetItem(const unsigned i)
       item = i;

 }

 

-void PokeGen::PokeMod::PokemonEvolution::SetItem(const String &i)

+void PokeGen::PokeMod::PokemonEvolution::SetItem(const QString &i)

 {

    LogSetVar("PokemonEvolution", id, "item", i);

    if (const Item *temp = pokemod->GetItem(i))

@@ -162,7 +161,7 @@ unsigned PokeGen::PokeMod::PokemonEvolution::GetSpecies() const
    return species;

 }

 

-PokeGen::PokeMod::String PokeGen::PokeMod::PokemonEvolution::GetSpeciesString() const

+QString PokeGen::PokeMod::PokemonEvolution::GetSpeciesString() const

 {

    LogFetchVar("PokemonEvolution", id, "species string", species);

    if (const Pokemon *s = pokemod->GetPokemon(species))

@@ -176,7 +175,7 @@ unsigned PokeGen::PokeMod::PokemonEvolution::GetStyle() const
    return style;

 }

 

-PokeGen::PokeMod::String PokeGen::PokeMod::PokemonEvolution::GetStyleString() const

+QString PokeGen::PokeMod::PokemonEvolution::GetStyleString() const

 {

    LogFetchVar("PokemonEvolution", id, "style string", style);

    if (style < STY_END)

@@ -196,7 +195,7 @@ unsigned PokeGen::PokeMod::PokemonEvolution::GetItem() const
    return item;

 }

 

-PokeGen::PokeMod::String PokeGen::PokeMod::PokemonEvolution::GetItemString() const

+QString PokeGen::PokeMod::PokemonEvolution::GetItemString() const

 {

    LogFetchVar("PokemonEvolution", id, "item string", item);

    if (const Item *i = pokemod->GetItem(item))