summaryrefslogtreecommitdiff
path: root/src/progs
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/progs
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/progs')
-rw-r--r--src/progs/dyecmd/dyemain.cpp2
-rw-r--r--src/progs/manaplus/actions/actions.cpp4
-rw-r--r--src/progs/manaplus/actions/chat.cpp2
-rw-r--r--src/progs/manaplus/actions/commands.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/progs/dyecmd/dyemain.cpp b/src/progs/dyecmd/dyemain.cpp
index b4ff54af5..bc2a72cf9 100644
--- a/src/progs/dyecmd/dyemain.cpp
+++ b/src/progs/dyecmd/dyemain.cpp
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
Cpu::detect();
DyePalette::initFunctions();
- graphicsManager.createWindow(10, 10, 0, SDL_ANYFORMAT);
+ GraphicsManager::createWindow(10, 10, 0, SDL_ANYFORMAT);
#ifdef USE_SDL2
imageHelper = new SurfaceImageHelper;
diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp
index 2993904ce..1a351d268 100644
--- a/src/progs/manaplus/actions/actions.cpp
+++ b/src/progs/manaplus/actions/actions.cpp
@@ -2004,9 +2004,9 @@ impHandler(seen)
impHandler(dumpMemoryUsage)
{
if (event.tab != nullptr)
- memoryManager.printAllMemory(event.tab);
+ MemoryManager::printAllMemory(event.tab);
else
- memoryManager.printAllMemory(localChatTab);
+ MemoryManager::printAllMemory(localChatTab);
return true;
}
diff --git a/src/progs/manaplus/actions/chat.cpp b/src/progs/manaplus/actions/chat.cpp
index ce63419cf..22d0656cb 100644
--- a/src/progs/manaplus/actions/chat.cpp
+++ b/src/progs/manaplus/actions/chat.cpp
@@ -779,7 +779,7 @@ impHandler(sendGuiKey)
}
if (sz == 2)
{
- const InputActionT actionId = inputManager.getActionByConfigField(
+ const InputActionT actionId = InputManager::getActionByConfigField(
pars[1]);
guiInput->simulateKey(keyValue, actionId);
}
diff --git a/src/progs/manaplus/actions/commands.cpp b/src/progs/manaplus/actions/commands.cpp
index ba4ae0d61..dd58c221b 100644
--- a/src/progs/manaplus/actions/commands.cpp
+++ b/src/progs/manaplus/actions/commands.cpp
@@ -1670,7 +1670,7 @@ impHandler(mailTo)
}
else
{
- mailWindow->createMail(args);
+ MailWindow::createMail(args);
}
return true;
}