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, 13 insertions, 14 deletions

diff --git a/pokemod/ItemEffect.cpp b/pokemod/ItemEffect.cpp
index 8e544778..e1870769 100644
--- a/pokemod/ItemEffect.cpp
+++ b/pokemod/ItemEffect.cpp
@@ -6,19 +6,18 @@
 // Created:     Tue Mar 20 18:25:26 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 "ItemEffect.h"

@@ -88,7 +87,7 @@ void PokeGen::PokeMod::ItemEffect::ImportIni(Ini &ini, const unsigned _id)
    LogImportOver("ItemEffect", id);

 }

 

-void PokeGen::PokeMod::ItemEffect::ExportIni(std::ofstream &fout, const String &item) const

+void PokeGen::PokeMod::ItemEffect::ExportIni(QFile &fout, const QString &item) const

 {

    LogExportStart("ItemEffect", id);

    Ini exItemEffect(item + " itemEffect");

@@ -139,7 +138,7 @@ void PokeGen::PokeMod::ItemEffect::SetEffect(const unsigned e)
    }

 }

 

-void PokeGen::PokeMod::ItemEffect::SetEffect(const String &e)

+void PokeGen::PokeMod::ItemEffect::SetEffect(const QString &e)

 {

    SetEffect(FindIn(IE_END, e, ItemEffectStr));

 }

@@ -566,7 +565,7 @@ void PokeGen::PokeMod::ItemEffect::SetVal4(const unsigned v4)
    }

 }

 

-void PokeGen::PokeMod::ItemEffect::SetVal4(const String &v4)

+void PokeGen::PokeMod::ItemEffect::SetVal4(const QString &v4)

 {

    LogSetVar("ItemEffect", id, "val4 string", v4);

    switch (effect)

@@ -678,7 +677,7 @@ void PokeGen::PokeMod::ItemEffect::SetVal5(const unsigned v5)
    }

 }

 

-void PokeGen::PokeMod::ItemEffect::SetVal5(const String &v5)

+void PokeGen::PokeMod::ItemEffect::SetVal5(const QString &v5)

 {

    LogSetVar("ItemEffect", id, "val5", v5);

    switch (effect)

@@ -786,10 +785,10 @@ unsigned PokeGen::PokeMod::ItemEffect::GetVal4() const
    return val4;

 }

 

-PokeGen::PokeMod::String PokeGen::PokeMod::ItemEffect::GetVal4String() const

+QString PokeGen::PokeMod::ItemEffect::GetVal4String() const

 {

    LogFetchVar("ItemEffect", id, "val4 string", val4);

-   String ret = "";

+   QString ret;

    switch (effect)

    {

       case IE_HP_CURE:

@@ -841,10 +840,10 @@ unsigned PokeGen::PokeMod::ItemEffect::GetVal5() const
    return val5;

 }

 

-PokeGen::PokeMod::String PokeGen::PokeMod::ItemEffect::GetVal5String() const

+QString PokeGen::PokeMod::ItemEffect::GetVal5String() const

 {

    LogFetchVar("ItemEffect", id, "val5 string", val5);

-   String ret = "";

+   QString ret;

    switch (effect)

    {

       case IE_BALL: