summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-02-02 18:01:41 +0300
committerAndrei Karas <akaras@inbox.ru>2013-02-02 18:12:41 +0300
commitab4a00c231e84267c7d06b2b1bb167593f22d91f (patch)
tree63b34f392cf88fb2db6b7a253e3978235c7fbe58
parent67ab809edd61bbcf7f22b79c0fa212cfe2625efb (diff)
downloadmanaplus-1.3.2.3.tar.gz
manaplus-1.3.2.3.tar.bz2
manaplus-1.3.2.3.tar.xz
manaplus-1.3.2.3.zip
Fix errors in some compilers.v1.3.2.3
-rw-r--r--src/gui/buydialog.cpp12
-rw-r--r--src/gui/socialwindow.cpp2
-rw-r--r--src/gui/widgets/itemcontainer.cpp10
-rw-r--r--src/gui/widgets/setuptouchitem.cpp2
-rw-r--r--src/guild.cpp2
-rw-r--r--src/party.cpp2
-rw-r--r--src/playerrelations.cpp2
7 files changed, 16 insertions, 16 deletions
diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp
index 40e7648a6..2fc49d240 100644
--- a/src/gui/buydialog.cpp
+++ b/src/gui/buydialog.cpp
@@ -78,7 +78,7 @@ public:
}
};
-static const class SortItemPriceFunctor final
+static class SortItemPriceFunctor final
{
public:
bool operator() (const ShopItem *const item1,
@@ -95,7 +95,7 @@ static const class SortItemPriceFunctor final
}
} itemPriceSorter;
-static const class SortItemNameFunctor final
+static class SortItemNameFunctor final
{
public:
bool operator() (const ShopItem *const item1,
@@ -112,7 +112,7 @@ static const class SortItemNameFunctor final
}
} itemNameSorter;
-static const class SortItemIdFunctor final
+static class SortItemIdFunctor final
{
public:
bool operator() (const ShopItem *const item1,
@@ -129,7 +129,7 @@ static const class SortItemIdFunctor final
}
} itemIdSorter;
-static const class SortItemWeightFunctor final
+static class SortItemWeightFunctor final
{
public:
bool operator() (const ShopItem *const item1,
@@ -146,7 +146,7 @@ static const class SortItemWeightFunctor final
}
} itemWeightSorter;
-static const class SortItemAmountFunctor final
+static class SortItemAmountFunctor final
{
public:
bool operator() (const ShopItem *const item1,
@@ -163,7 +163,7 @@ static const class SortItemAmountFunctor final
}
} itemAmountSorter;
-static const class SortItemTypeFunctor final
+static class SortItemTypeFunctor final
{
public:
bool operator() (const ShopItem *const item1,
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 2abdf8286..b5a2d74fc 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -54,7 +54,7 @@
#include "debug.h"
-static const class SortFriendsFunctor final
+static class SortFriendsFunctor final
{
public:
bool operator() (const Avatar *const m1, const Avatar *const m2) const
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 0764aee08..70c938559 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -62,7 +62,7 @@ class ItemIdPair final
Item* mItem;
};
-static const class SortItemAlphaFunctor final
+static class SortItemAlphaFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
@@ -76,7 +76,7 @@ static const class SortItemAlphaFunctor final
}
} itemAlphaSorter;
-static const class SortItemIdFunctor final
+static class SortItemIdFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
@@ -89,7 +89,7 @@ static const class SortItemIdFunctor final
}
} itemIdSorter;
-static const class SortItemWeightFunctor final
+static class SortItemWeightFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
@@ -109,7 +109,7 @@ static const class SortItemWeightFunctor final
}
} itemWeightSorter;
-static const class SortItemAmountFunctor final
+static class SortItemAmountFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
@@ -129,7 +129,7 @@ static const class SortItemAmountFunctor final
}
} itemAmountSorter;
-static const class SortItemTypeFunctor final
+static class SortItemTypeFunctor final
{
public:
bool operator() (const ItemIdPair *const pair1,
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp
index e75b0a724..5d1ddfadc 100644
--- a/src/gui/widgets/setuptouchitem.cpp
+++ b/src/gui/widgets/setuptouchitem.cpp
@@ -27,7 +27,7 @@
#include "debug.h"
-static const class SortTouchActionFunctor final
+static class SortTouchActionFunctor final
{
public:
bool operator() (const SetupActionData *const data1,
diff --git a/src/guild.cpp b/src/guild.cpp
index 36f9afc53..c7ad34c30 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -26,7 +26,7 @@
#include "debug.h"
-static const class SortGuildFunctor final
+static class SortGuildFunctor final
{
public:
bool operator() (const GuildMember *const m1,
diff --git a/src/party.cpp b/src/party.cpp
index ab4e921d1..a27456548 100644
--- a/src/party.cpp
+++ b/src/party.cpp
@@ -25,7 +25,7 @@
#include "debug.h"
-static const class SortPartyFunctor final
+static class SortPartyFunctor final
{
public:
bool operator() (const PartyMember *const p1,
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp
index 24969d4ec..0b5507876 100644
--- a/src/playerrelations.cpp
+++ b/src/playerrelations.cpp
@@ -49,7 +49,7 @@ typedef PlayerRelations::const_iterator PlayerRelationsCIter;
typedef std::list<PlayerRelationsListener *> PlayerRelationListeners;
typedef PlayerRelationListeners::const_iterator PlayerRelationListenersCIter;
-static const class SortPlayersFunctor final
+static class SortPlayersFunctor final
{
public:
bool operator() (const std::string &str1,