summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2009-01-06 23:32:16 -0500
committerBen Boeckel <MathStuf@gmail.com>2009-01-06 23:32:16 -0500
commit0acae04908d05fffdd333ed5bcd16d4e389d7863 (patch)
tree8351fe9cda74694d22a98826b57c5d8320d458ab
parentee514f8b7e609516a6d6528141260341880f8b5b (diff)
downloadsigen-0acae04908d05fffdd333ed5bcd16d4e389d7863.tar.gz
sigen-0acae04908d05fffdd333ed5bcd16d4e389d7863.tar.xz
sigen-0acae04908d05fffdd333ed5bcd16d4e389d7863.zip
Krazy check fixes
-rw-r--r--sigmodr/SigmodrUI.cpp4
-rw-r--r--sigmodr/ValidationDialog.cpp6
-rw-r--r--sigmodr/models/CoinListModel.cpp4
-rw-r--r--sigmodr/models/MapModel.cpp4
-rw-r--r--sigmodr/models/MapTrainerModel.cpp4
-rw-r--r--sigmodr/models/MapWildListModel.cpp4
-rw-r--r--sigmodr/models/SigmodModel.cpp4
-rw-r--r--sigmodr/models/SpeciesModel.cpp4
-rw-r--r--signet/ServerConnectionHandler.cpp6
-rw-r--r--sigscript/Config.cpp4
10 files changed, 22 insertions, 22 deletions
diff --git a/sigmodr/SigmodrUI.cpp b/sigmodr/SigmodrUI.cpp
index 05c13ef8..5252b81f 100644
--- a/sigmodr/SigmodrUI.cpp
+++ b/sigmodr/SigmodrUI.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
*
* 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
@@ -413,7 +413,7 @@ void Sigmodr::SigmodrUI::preferences()
return;
KConfigDialog* dialog = new KConfigDialog(this, "sigmodr-prefs", SigmodrPreferences::self());
SigmodrPreferencesWidget* widget = new SigmodrPreferencesWidget;
- dialog->addPage(widget, i18n("General"), "configure");
+ dialog->addPage(widget, i18nc("General settings tab", "General"), "configure");
connect(dialog, SIGNAL(okClicked()), widget, SLOT(save()));
dialog->exec();
}
diff --git a/sigmodr/ValidationDialog.cpp b/sigmodr/ValidationDialog.cpp
index 43290859..8a32486d 100644
--- a/sigmodr/ValidationDialog.cpp
+++ b/sigmodr/ValidationDialog.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
*
* 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
@@ -110,9 +110,9 @@ void Sigmodr::ValidationDialog::insertMessage(const QString& msg, const QBrush&
void Sigmodr::ValidationDialog::addMessage(const QString& msg)
{
- if (msg.startsWith("++"))
+ if (msg.startsWith(QString("++")))
m_parents.push(ObjectErrorCount(new QTreeWidgetItem(QStringList(msg.mid(2))), 0));
- else if (msg.startsWith("--"))
+ else if (msg.startsWith(QString("--")))
{
ObjectErrorCount count = m_parents.pop();
if (count.second)
diff --git a/sigmodr/models/CoinListModel.cpp b/sigmodr/models/CoinListModel.cpp
index 6a728a41..5b3e4055 100644
--- a/sigmodr/models/CoinListModel.cpp
+++ b/sigmodr/models/CoinListModel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
*
* 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
@@ -99,7 +99,7 @@ bool Sigmodr::CoinListModel::setData(const QVariant& value, int role)
QString Sigmodr::CoinListModel::types() const
{
- return type().append(";CoinListItem");
+ return type().append(QString(";CoinListItem"));
}
void Sigmodr::CoinListModel::addObject(Sigmod::Object* object)
diff --git a/sigmodr/models/MapModel.cpp b/sigmodr/models/MapModel.cpp
index 8a3b51f2..a6dd8e15 100644
--- a/sigmodr/models/MapModel.cpp
+++ b/sigmodr/models/MapModel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
*
* 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
@@ -99,7 +99,7 @@ bool Sigmodr::MapModel::setData(const QVariant& value, int role)
QString Sigmodr::MapModel::types() const
{
- return type().append(";MapEffect;MapTrainer;MapWarp;MapWildList");
+ return type().append(QString(";MapEffect;MapTrainer;MapWarp;MapWildList"));
}
void Sigmodr::MapModel::addObject(Sigmod::Object* object)
diff --git a/sigmodr/models/MapTrainerModel.cpp b/sigmodr/models/MapTrainerModel.cpp
index e242aa54..c88efac5 100644
--- a/sigmodr/models/MapTrainerModel.cpp
+++ b/sigmodr/models/MapTrainerModel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
*
* 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
@@ -100,7 +100,7 @@ bool Sigmodr::MapTrainerModel::setData(const QVariant& value, int role)
QString Sigmodr::MapTrainerModel::types() const
{
- return type().append(";MapTrainerTeamMember");
+ return type().append(QString(";MapTrainerTeamMember"));
}
void Sigmodr::MapTrainerModel::addObject(Sigmod::Object* object)
diff --git a/sigmodr/models/MapWildListModel.cpp b/sigmodr/models/MapWildListModel.cpp
index f798f193..af24f99d 100644
--- a/sigmodr/models/MapWildListModel.cpp
+++ b/sigmodr/models/MapWildListModel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
*
* 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
@@ -101,7 +101,7 @@ bool Sigmodr::MapWildListModel::setData(const QVariant& value, int role)
QString Sigmodr::MapWildListModel::types() const
{
- return type().append(";MapWildListEncounter");
+ return type().append(QString(";MapWildListEncounter"));
}
void Sigmodr::MapWildListModel::addObject(Sigmod::Object* object)
diff --git a/sigmodr/models/SigmodModel.cpp b/sigmodr/models/SigmodModel.cpp
index 26631744..cef51bbd 100644
--- a/sigmodr/models/SigmodModel.cpp
+++ b/sigmodr/models/SigmodModel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
*
* 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
@@ -117,7 +117,7 @@ bool Sigmodr::SigmodModel::setData(const QVariant& value, int role)
QString Sigmodr::SigmodModel::types() const
{
- return type().append(";Rules;Ability;Author;Badge;CoinList;EggGroup;GlobalScript;Item;ItemType;Map;Move;Nature;Skin;Sound;Species;Sprite;Status;Store;Tile;Time;Trainer;Type;Weather");
+ return type().append(QString(";Rules;Ability;Author;Badge;CoinList;EggGroup;GlobalScript;Item;ItemType;Map;Move;Nature;Skin;Sound;Species;Sprite;Status;Store;Tile;Time;Trainer;Type;Weather"));
}
void Sigmodr::SigmodModel::addObject(Sigmod::Object* object)
diff --git a/sigmodr/models/SpeciesModel.cpp b/sigmodr/models/SpeciesModel.cpp
index 4147e597..f0a9dc5c 100644
--- a/sigmodr/models/SpeciesModel.cpp
+++ b/sigmodr/models/SpeciesModel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
*
* 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
@@ -99,7 +99,7 @@ bool Sigmodr::SpeciesModel::setData(const QVariant& value, int role)
QString Sigmodr::SpeciesModel::types() const
{
- return type().append(";SpeciesAbility;SpeciesItem;SpeciesMove");
+ return type().append(QString(";SpeciesAbility;SpeciesItem;SpeciesMove"));
}
void Sigmodr::SpeciesModel::addObject(Sigmod::Object* object)
diff --git a/signet/ServerConnectionHandler.cpp b/signet/ServerConnectionHandler.cpp
index 940b3421..a05a9e52 100644
--- a/signet/ServerConnectionHandler.cpp
+++ b/signet/ServerConnectionHandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
*
* 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
@@ -43,7 +43,7 @@ void Signet::ServerConnectionHandler::run()
{
Protocol::Packet packet = Protocol::PacketMaker::unwrap(m_socket);
const QString receiver = packet.received();
- if (receiver.startsWith("server-") && receiver.endsWith(m_server->m_name))
+ if (receiver.startsWith(QString("server-")) && receiver.endsWith(m_server->m_name))
{
switch (packet.type())
{
@@ -120,7 +120,7 @@ void Signet::ServerConnectionHandler::run()
}
else
{
- if (receiver.startsWith("room-"))
+ if (receiver.startsWith(QString("room-")))
{
const QString room = receiver.mid(receiver.indexOf('-') + 1);
m_server->createRoom(room);
diff --git a/sigscript/Config.cpp b/sigscript/Config.cpp
index 9113badf..f498a9b0 100644
--- a/sigscript/Config.cpp
+++ b/sigscript/Config.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
*
* 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
@@ -108,7 +108,7 @@ QStringList Sigscript::Config::values(const bool recursive) const
QStringList values = m_values.keys();
if (recursive && m_parent)
values += m_parent->values(true);
- foreach (QString value, values)
+ foreach (const QString& value, values)
{
if (m_values.contains(value) && (m_values[value].second & (Deleted | Hidden)))
values.removeAll(value);