summaryrefslogtreecommitdiff
path: root/src/server_info.cpp
diff options
context:
space:
mode:
authorAndrzej Rybczak <electricityispower@gmail.com>2012-09-13 19:23:33 +0200
committerAndrzej Rybczak <electricityispower@gmail.com>2012-09-13 19:23:33 +0200
commitdd7665bb7d66420b95784a882a5fd8c5199a1cd3 (patch)
treec225e765c3e6c98b047f56b88d512110ceda32eb /src/server_info.cpp
parent8e6d9a97e3b21c0fc08fbc2bd9aae84420c7d149 (diff)
more PascalCase to camelCase conversions
Diffstat (limited to 'src/server_info.cpp')
-rw-r--r--src/server_info.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/server_info.cpp b/src/server_info.cpp
index f7a66e95..f07f2f27 100644
--- a/src/server_info.cpp
+++ b/src/server_info.cpp
@@ -32,7 +32,7 @@ using Global::myOldScreen;
ServerInfo *myServerInfo = new ServerInfo;
-void ServerInfo::Init()
+void ServerInfo::init()
{
SetDimensions();
w = new NC::Scrollpad((COLS-itsWidth)/2, (MainHeight-itsHeight)/2+MainStartY, itsWidth, itsHeight, "MPD server info", Config.main_color, Config.window_border);
@@ -43,13 +43,13 @@ void ServerInfo::Init()
isInitialized = 1;
}
-void ServerInfo::SwitchTo()
+void ServerInfo::switchTo()
{
using Global::myScreen;
if (myScreen == this)
{
- myOldScreen->SwitchTo();
+ myOldScreen->switchTo();
return;
}
if (MainHeight < 5)
@@ -59,39 +59,39 @@ void ServerInfo::SwitchTo()
}
if (!isInitialized)
- Init();
+ init();
- // Resize() can fall back to old screen, so we need it updated
+ // resize() can fall back to old screen, so we need it updated
myOldScreen = myScreen;
if (hasToBeResized)
- Resize();
+ resize();
myScreen = this;
//w->Window::clear();
}
-void ServerInfo::Resize()
+void ServerInfo::resize()
{
SetDimensions();
if (itsHeight < 5) // screen too low to display this window
- return myOldScreen->SwitchTo();
+ return myOldScreen->switchTo();
w->resize(itsWidth, itsHeight);
w->moveTo((COLS-itsWidth)/2, (MainHeight-itsHeight)/2+MainStartY);
if (myOldScreen && myOldScreen->hasToBeResized) // resize background window
{
- myOldScreen->Resize();
- myOldScreen->Refresh();
+ myOldScreen->resize();
+ myOldScreen->refresh();
}
hasToBeResized = 0;
}
-std::wstring ServerInfo::Title()
+std::wstring ServerInfo::title()
{
- return myOldScreen->Title();
+ return myOldScreen->title();
}
-void ServerInfo::Update()
+void ServerInfo::update()
{
static timeval past = { 0, 0 };
if (Global::Timer.tv_sec <= past.tv_sec)