summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-10-16 01:03:02 +0300
committerAndrei Karas <akaras@inbox.ru>2019-10-16 01:03:02 +0300
commite15da561988948de26c80105dc9762943009b9e7 (patch)
tree717dbdffe08daf6a1832ce79043697d3f7e62a23 /src/gui
parent71cfaf012217cf3bbbc39207a12131b748535fcc (diff)
downloadmv-e15da561988948de26c80105dc9762943009b9e7.tar.gz
mv-e15da561988948de26c80105dc9762943009b9e7.tar.bz2
mv-e15da561988948de26c80105dc9762943009b9e7.tar.xz
mv-e15da561988948de26c80105dc9762943009b9e7.zip
Fix code style, ignore some warning in clang-tidy
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/spellshortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/tabs/chat/emulateguildtab.cpp2
-rw-r--r--src/gui/windows/chatwindow.cpp4
-rw-r--r--src/gui/windows/chatwindow.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index dfe7c99af..88d3d26ef 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -47,7 +47,7 @@ SpellShortcutContainer::SpellShortcutContainer(Widget2 *const widget,
mSpellClicked(false)
{
if (spellShortcut != nullptr)
- mMaxItems = spellShortcut->getSpellsCount();
+ mMaxItems = SpellShortcut::getSpellsCount();
else
mMaxItems = 0;
}
diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.cpp b/src/gui/widgets/tabs/chat/emulateguildtab.cpp
index 88bff63c6..16b3e2c2e 100644
--- a/src/gui/widgets/tabs/chat/emulateguildtab.cpp
+++ b/src/gui/widgets/tabs/chat/emulateguildtab.cpp
@@ -82,7 +82,7 @@ void EmulateGuildTab::getAutoCompleteList(StringVect &names) const
if (guildManager == nullptr)
return;
- guildManager->getNames(names);
+ GuildManager::getNames(names);
}
void EmulateGuildTab::getAutoCompleteCommands(StringVect &names) const
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 0f0970c51..f96cf976d 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -253,7 +253,7 @@ void ChatWindow::loadCommandsFile(const std::string &name)
void ChatWindow::fillCommands()
{
loadCommandsFile("chatcommands.txt");
- inputManager.addChatCommands(mCommands);
+ InputManager::addChatCommands(mCommands);
}
void ChatWindow::loadGMCommands()
@@ -1531,7 +1531,7 @@ std::string ChatWindow::autoComplete(const StringVect &names,
}
std::string ChatWindow::autoComplete(const std::string &partName,
- const History *const words) const
+ const History *const words)
{
if (words == nullptr)
return "";
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 8e3a3cec0..f40690c3d 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -330,8 +330,8 @@ class ChatWindow final : public Window,
std::string autoCompleteHistory(const std::string &partName) const;
- std::string autoComplete(const std::string &partName,
- const History *const words) const;
+ static std::string autoComplete(const std::string &partName,
+ const History *const words);
static std::string autoComplete(const StringVect &names,
std::string partName);