1 files changed, 11 insertions, 12 deletions
diff --git a/pokemod/StatusEffect.cpp b/pokemod/StatusEffect.cpp
index 11b55a50..b73b28b0 100644
--- a/pokemod/StatusEffect.cpp
+++ b/pokemod/StatusEffect.cpp
@@ -6,19 +6,18 @@
 // Created:     Sat June 2 2007 12:16:48
 // 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
 //    MERCHANTStatus 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 "StatusEffect.h"
@@ -95,7 +94,7 @@ void PokeGen::PokeMod::StatusEffect::ImportIni(Ini &ini, const unsigned _id)
    LogImportOver("StatusEffect", id);
 }
 
-void PokeGen::PokeMod::StatusEffect::ExportIni(std::ofstream &fout, const String &Status) const
+void PokeGen::PokeMod::StatusEffect::ExportIni(QFile &fout, const QString &Status) const
 {
    LogExportStart("StatusEffect", id);
    Ini exStatusEffect("statusEffect " + status);
@@ -118,7 +117,7 @@ void PokeGen::PokeMod::StatusEffect::SetEffect(const unsigned e)
    }
 }
 
-void PokeGen::PokeMod::StatusEffect::SetEffect(const String &e)
+void PokeGen::PokeMod::StatusEffect::SetEffect(const QString &e)
 {
    SetEffect(FindIn(SE_END, e, StatusEffectStr));
 }
@@ -147,7 +146,7 @@ void PokeGen::PokeMod::StatusEffect::SetVal2(const unsigned v2)
    }
 }
 
-void PokeGen::PokeMod::StatusEffect::SetVal2(const String &v2)
+void PokeGen::PokeMod::StatusEffect::SetVal2(const QString &v2)
 {
    switch (effect)
    {
@@ -164,7 +163,7 @@ unsigned PokeGen::PokeMod::StatusEffect::GetEffect() const
    return effect;
 }
 
-PokeGen::PokeMod::String PokeGen::PokeMod::StatusEffect::GetEffectString() const
+QString PokeGen::PokeMod::StatusEffect::GetEffectString() const
 {
    LogFetchVar("StatusEffect", id, "effect string", effect);
    if (effect < SE_END)
@@ -184,10 +183,10 @@ unsigned PokeGen::PokeMod::StatusEffect::GetVal2() const
    return val2;
 }
 
-PokeGen::PokeMod::String PokeGen::PokeMod::StatusEffect::GetVal2String() const
+QString PokeGen::PokeMod::StatusEffect::GetVal2String() const
 {
    LogFetchVar("StatusEffect", id, "val2 string", val2);
-   String ret = "";
+   QString ret;
    switch (effect)
    {
 //            ret = BattleMemberStr[val2];