summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-09-30 03:27:33 +0300
committerAndrei Karas <akaras@inbox.ru>2019-09-30 03:30:11 +0300
commitbf9fc1de4c53a88a28be48dbf7cf4795199442d4 (patch)
tree46018d5b85c669961fb2fe6ab8af06f432139999 /src/gui
parentfdf8230a80fa418e4b46dc489e5b2dda7901b55c (diff)
downloadmanaverse-bf9fc1de4c53a88a28be48dbf7cf4795199442d4.tar.gz
manaverse-bf9fc1de4c53a88a28be48dbf7cf4795199442d4.tar.bz2
manaverse-bf9fc1de4c53a88a28be48dbf7cf4795199442d4.tar.xz
manaverse-bf9fc1de4c53a88a28be48dbf7cf4795199442d4.zip
Add missing static keywords
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/itempopup.h3
-rw-r--r--src/gui/shortcut/spellshortcut.cpp2
-rw-r--r--src/gui/shortcut/spellshortcut.h2
-rw-r--r--src/gui/windows/chatwindow.cpp2
-rw-r--r--src/gui/windows/chatwindow.h4
-rw-r--r--src/gui/windows/mailwindow.h2
-rw-r--r--src/gui/windows/npcdialog.h4
-rw-r--r--src/gui/windows/skilldialog.h4
8 files changed, 12 insertions, 11 deletions
diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h
index 903875b34..d42bee103 100644
--- a/src/gui/popups/itempopup.h
+++ b/src/gui/popups/itempopup.h
@@ -78,7 +78,8 @@ class ItemPopup final : public Popup
private:
std::string getCardsString(const int *const cards);
- std::string getOptionsString(const ItemOptionsList *const options);
+ static std::string getOptionsString(const ItemOptionsList *const
+ options);
Label *mItemName A_NONNULLPOINTER;
TextBox *mItemDesc A_NONNULLPOINTER;
diff --git a/src/gui/shortcut/spellshortcut.cpp b/src/gui/shortcut/spellshortcut.cpp
index cdf7d6656..5ef1d56da 100644
--- a/src/gui/shortcut/spellshortcut.cpp
+++ b/src/gui/shortcut/spellshortcut.cpp
@@ -57,7 +57,7 @@ void SpellShortcut::load()
}
}
-unsigned int SpellShortcut::getSpellsCount() const
+unsigned int SpellShortcut::getSpellsCount()
{
return SPELL_SHORTCUT_ITEMS;
}
diff --git a/src/gui/shortcut/spellshortcut.h b/src/gui/shortcut/spellshortcut.h
index 31c201872..c2facaf0d 100644
--- a/src/gui/shortcut/spellshortcut.h
+++ b/src/gui/shortcut/spellshortcut.h
@@ -48,7 +48,7 @@ class SpellShortcut final
*/
void load();
- unsigned int getSpellsCount() const A_CONST A_WARN_UNUSED;
+ static unsigned int getSpellsCount();
/**
* Set the item that is selected.
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 7c4678a7e..0f0970c51 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -1929,7 +1929,7 @@ void ChatWindow::saveState() const
}
bool ChatWindow::saveTab(const int num,
- const ChatTab *const tab) const
+ const ChatTab *const tab)
{
if (tab == nullptr)
return false;
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 654ec2357..8e3a3cec0 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -238,8 +238,8 @@ class ChatWindow final : public Window,
void saveState() const;
- bool saveTab(const int num,
- const ChatTab *const tab) const;
+ static bool saveTab(const int num,
+ const ChatTab *const tab);
void loadCustomList();
diff --git a/src/gui/windows/mailwindow.h b/src/gui/windows/mailwindow.h
index 6b77696cf..90088dc34 100644
--- a/src/gui/windows/mailwindow.h
+++ b/src/gui/windows/mailwindow.h
@@ -68,7 +68,7 @@ class MailWindow final : public Window,
void postConnection();
- void createMail(const std::string &to);
+ static void createMail(const std::string &to);
MailMessage *findMail(const int64_t id) A_WARN_UNUSED;
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index d0e891d91..7f03593eb 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -264,9 +264,9 @@ class NpcDialog final : public Window,
void deleteSkinControls();
- void restoreVirtuals();
+ static void restoreVirtuals();
- std::string complexItemToStr(const ComplexItem *const item);
+ static std::string complexItemToStr(const ComplexItem *const item);
BeingId mNpcId;
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index 575d07088..4546c70b6 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -217,8 +217,8 @@ class SkillDialog final : public Window,
SkillInfo *loadSkill(XmlNodeConstPtr node,
SkillModel *const model);
- void loadSkillData(XmlNodeConstPtr node,
- SkillInfo *const skill);
+ static void loadSkillData(XmlNodeConstPtr node,
+ SkillInfo *const skill);
void addDefaultTab();