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, 9 insertions, 10 deletions

diff --git a/pokemod/MapWildPokemon.cpp b/pokemod/MapWildPokemon.cpp
index 11b12708..23480aa5 100644
--- a/pokemod/MapWildPokemon.cpp
+++ b/pokemod/MapWildPokemon.cpp
@@ -6,19 +6,18 @@
 // Created:     Tue Mar 20 18:50:59 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 "MapWildPokemon.h"

@@ -85,10 +84,10 @@ void PokeGen::PokeMod::MapWildPokemon::ImportIni(Ini &ini, const unsigned _id)
    LogImportOver("MapWildPokemon", id);

 }

 

-void PokeGen::PokeMod::MapWildPokemon::ExportIni(std::ofstream &fout, const String &map, const unsigned listId) const

+void PokeGen::PokeMod::MapWildPokemon::ExportIni(QFile &fout, const QString &map, const unsigned listId) const

 {

    LogExportStart("MapWildPokemon", id);

-   Ini exMapWildPokemon(String("mapWildPokemon %u ", listId) + map);

+   Ini exMapWildPokemon(QString("mapWildPokemon %u ", listId) + map);

    exMapWildPokemon.AddField("id", id);

    exMapWildPokemon.AddField("pokemon", pokemon);

    exMapWildPokemon.AddField("level", level);

@@ -104,7 +103,7 @@ void PokeGen::PokeMod::MapWildPokemon::SetPokemon(const unsigned p)
       pokemon = p;

 }

 

-void PokeGen::PokeMod::MapWildPokemon::SetPokemon(const String &p)

+void PokeGen::PokeMod::MapWildPokemon::SetPokemon(const QString &p)

 {

    LogSetVar("MapWildPokemon", id, "pokemon string", p);

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

@@ -130,7 +129,7 @@ unsigned PokeGen::PokeMod::MapWildPokemon::GetPokemon() const
    return pokemon;

 }

 

-PokeGen::PokeMod::String PokeGen::PokeMod::MapWildPokemon::GetPokemonString() const

+QString PokeGen::PokeMod::MapWildPokemon::GetPokemonString() const

 {

    LogFetchVar("MapWildPokemon", id, "pokemon string", pokemon);

    if (const Pokemon *p = pokemod->GetPokemon(pokemon))