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/CoinItem.cpp b/pokemod/CoinItem.cpp
index ecb67c57..834ca7c3 100644
--- a/pokemod/CoinItem.cpp
+++ b/pokemod/CoinItem.cpp
@@ -6,19 +6,18 @@
 // Created:     Wed Feb 28 21:21:23 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 "CoinItem.h"

@@ -76,7 +75,7 @@ void PokeGen::PokeMod::CoinItem::Validate()
    {

       LogVarNotValid("CoinItem", id, "amount", GetObjectString());

       isValid = false;

-   }
+   }

    LogValidateOver("CoinItem", id, isValid, GetObjectString());

 }

 

@@ -98,7 +97,7 @@ void PokeGen::PokeMod::CoinItem::ImportIni(Ini &ini, const unsigned _id)
    LogImportOver("CoinItem", id);

 }

 

-void PokeGen::PokeMod::CoinItem::ExportIni(std::ofstream &fout, const String &coinList) const

+void PokeGen::PokeMod::CoinItem::ExportIni(QFile &fout, const QString &coinList) const

 {

    LogExportStart("CoinItem", id);

    Ini exCoinItem("coinItem " + coinList);

@@ -128,7 +127,7 @@ void PokeGen::PokeMod::CoinItem::SetObject(const unsigned o)
       object = o;

 }

 

-void PokeGen::PokeMod::CoinItem::SetObject(const String &o)

+void PokeGen::PokeMod::CoinItem::SetObject(const QString &o)

 {

    LogSetVar("CoinItem", id, "object string", o);

    if (type == CIT_ITEM)

@@ -168,7 +167,7 @@ unsigned PokeGen::PokeMod::CoinItem::GetObject() const
    return object;

 }

 

-PokeGen::PokeMod::String PokeGen::PokeMod::CoinItem::GetObjectString() const

+QString PokeGen::PokeMod::CoinItem::GetObjectString() const

 {

    LogFetchVar("CoinItem", id, "object string", object);

    if (type == CIT_ITEM)