chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Remove "C" prefix in class names

Browse Source
This commit is contained in:
Birunthan Mohanathas
2013-05-31 17:18:52 +03:00
parent 4332cea3d0
commit da9384cfad
126 changed files with 2114 additions and 2116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Library/lua/glue/LuaMeasure.cpp
View File

@ -24,7 +24,7 @@
#define DECLARE_SELF(L) \
void* selfData = lua_touserdata(L, 1); \
if (!selfData) return 0; \
CMeasure* self = *(CMeasure**)selfData;
Measure* self = *(Measure**)selfData;
static int GetName(lua_State* L)
{
@ -37,8 +37,8 @@ static int GetName(lua_State* L)
static int GetOption(lua_State* L)
{
DECLARE_SELF(L)
CMeterWindow* meterWindow = self->GetMeterWindow();
CConfigParser& parser = meterWindow->GetParser();
MeterWindow* meterWindow = self->GetMeterWindow();
ConfigParser& parser = meterWindow->GetParser();
std::wstring strTmp = LuaManager::ToWide(L, 2);
strTmp = parser.ReadString(self->GetName(), strTmp.c_str(), LuaManager::ToWide(L, 3).c_str());
@ -50,8 +50,8 @@ static int GetOption(lua_State* L)
static int GetNumberOption(lua_State* L)
{
DECLARE_SELF(L)
CMeterWindow* meterWindow = self->GetMeterWindow();
CConfigParser& parser = meterWindow->GetParser();
MeterWindow* meterWindow = self->GetMeterWindow();
ConfigParser& parser = meterWindow->GetParser();
std::wstring strTmp = LuaManager::ToWide(L, 2);
double value = parser.ReadFloat(self->GetName(), strTmp.c_str(), lua_tonumber(L, 3));
@ -150,7 +150,7 @@ void LuaManager::RegisterMeasure(lua_State* L)
{ NULL, NULL }
};
luaL_register(L, "CMeasure", functions);
luaL_register(L, "Measure", functions);
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
lua_pop(L, 1);

12
Library/lua/glue/LuaMeter.cpp
View File

@ -24,7 +24,7 @@
#define DECLARE_SELF(L) \
void* selfData = lua_touserdata(L, 1); \
if (!selfData) return 0; \
CMeter* self = *(CMeter**)selfData;
Meter* self = *(Meter**)selfData;
static int GetName(lua_State* L)
{
@ -37,8 +37,8 @@ static int GetName(lua_State* L)
static int GetOption(lua_State* L)
{
DECLARE_SELF(L)
CMeterWindow* meterWindow = self->GetMeterWindow();
CConfigParser& parser = meterWindow->GetParser();
MeterWindow* meterWindow = self->GetMeterWindow();
ConfigParser& parser = meterWindow->GetParser();
std::wstring strTmp = LuaManager::ToWide(L, 2);
strTmp = parser.ReadString(self->GetName(), strTmp.c_str(), L"");
@ -137,9 +137,9 @@ static int Show(lua_State* L)
static int SetText(lua_State* L)
{
DECLARE_SELF(L)
if (self->GetTypeID() == TypeID<CMeterString>())
if (self->GetTypeID() == TypeID<MeterString>())
{
CMeterString* string = (CMeterString*)self;
MeterString* string = (MeterString*)self;
std::wstring str = LuaManager::ToWide(L, 2);
string->SetText(str.c_str());
}
@ -167,7 +167,7 @@ void LuaManager::RegisterMeter(lua_State* L)
{ NULL, NULL }
};
luaL_register(L, "CMeter", functions);
luaL_register(L, "Meter", functions);
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
lua_pop(L, 1);

24
Library/lua/glue/LuaMeterWindow.cpp
View File

@ -22,17 +22,17 @@
#include "../../MeterWindow.h"
#include "../../MeterString.h"
extern CRainmeter* Rainmeter;
extern Rainmeter* g_Rainmeter;
#define DECLARE_SELF(L) \
void* selfData = lua_touserdata(L, 1); \
if (!selfData) return 0; \
CMeterWindow* self = *(CMeterWindow**)selfData;
MeterWindow* self = *(MeterWindow**)selfData;
static int Bang(lua_State* L)
{
DECLARE_SELF(L)
CConfigParser& parser = self->GetParser();
ConfigParser& parser = self->GetParser();
std::wstring bang = LuaManager::ToWide(L, 2);
@ -40,7 +40,7 @@ static int Bang(lua_State* L)
if (top == 2) // 1 argument
{
parser.ReplaceVariables(bang);
Rainmeter->ExecuteCommand(bang.c_str(), self);
g_Rainmeter->ExecuteCommand(bang.c_str(), self);
}
else
{
@ -56,7 +56,7 @@ static int Bang(lua_State* L)
args.push_back(tmpSz);
}
Rainmeter->ExecuteBang(bangSz, args, self);
g_Rainmeter->ExecuteBang(bangSz, args, self);
}
}
@ -68,11 +68,11 @@ static int GetMeter(lua_State* L)
DECLARE_SELF(L)
const std::wstring meterName = LuaManager::ToWide(L, 2);
CMeter* meter = self->GetMeter(meterName);
Meter* meter = self->GetMeter(meterName);
if (meter)
{
*(CMeter**)lua_newuserdata(L, sizeof(CMeter*)) = meter;
lua_getglobal(L, "CMeter");
*(Meter**)lua_newuserdata(L, sizeof(Meter*)) = meter;
lua_getglobal(L, "Meter");
lua_setmetatable(L, -2);
}
else
@ -88,11 +88,11 @@ static int GetMeasure(lua_State* L)
DECLARE_SELF(L)
const std::wstring measureName = LuaManager::ToWide(L, 2);
CMeasure* measure = self->GetMeasure(measureName);
Measure* measure = self->GetMeasure(measureName);
if (measure)
{
*(CMeasure**)lua_newuserdata(L, sizeof(CMeasure*)) = measure;
lua_getglobal(L, "CMeasure");
*(Measure**)lua_newuserdata(L, sizeof(Measure*)) = measure;
lua_getglobal(L, "Measure");
lua_setmetatable(L, -2);
}
else
@ -231,7 +231,7 @@ void LuaManager::RegisterMeterWindow(lua_State* L)
{ NULL, NULL }
};
luaL_register(L, "CMeterWindow", functions);
luaL_register(L, "MeterWindow", functions);
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
lua_pop(L, 1);