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

diff --git a/pokemod/PokemonNature.cpp b/pokemod/PokemonNature.cpp
index da9c6e03..705d1817 100644
--- a/pokemod/PokemonNature.cpp
+++ b/pokemod/PokemonNature.cpp
@@ -6,19 +6,18 @@
 // Created:     Tue Mar 20 18:39:17 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 "PokemonNature.h"

@@ -78,7 +77,7 @@ void PokeGen::PokeMod::PokemonNature::ImportIni(Ini &ini, const unsigned _id)
    LogImportOver("PokemonNature", id);

 }

 

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

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

 {

    LogExportStart("PokemonNature", id);

    Ini exPokemonNature("pokemonNature " + pokemon);

@@ -96,7 +95,7 @@ void PokeGen::PokeMod::PokemonNature::SetNature(const unsigned n)
       nature = n;

 }

 

-void PokeGen::PokeMod::PokemonNature::SetNature(const String &n)

+void PokeGen::PokeMod::PokemonNature::SetNature(const QString &n)

 {

    LogSetVar("PokemonNature", id, "nature", n);

    if (const Nature *temp = pokemod->GetNature(n))

@@ -116,7 +115,7 @@ unsigned PokeGen::PokeMod::PokemonNature::GetNature() const
    return nature;

 }

 

-PokeGen::PokeMod::String PokeGen::PokeMod::PokemonNature::GetNatureString() const

+QString PokeGen::PokeMod::PokemonNature::GetNatureString() const

 {

    LogFetchVar("PokemonNature", id, "nature string", nature);

    if (const Nature *n = pokemod->GetNature(nature))