Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fafb0c54 authored by Vojtech Bocek's avatar Vojtech Bocek Committed by Gerrit Code Review
Browse files

Unify indentation and little clean-up in TWRP files 



Signed-off-by: default avatarVojtech Bocek <vbocek@gmail.com>
parent 8b44bbda

data.cpp

+336 −330
Original line number Diff line number Diff line
@@ -286,13 +286,15 @@ int DataManager::Flush() 


int DataManager::SaveValues()

{

    if (mBackingFile.empty())       return -1;

	if (mBackingFile.empty())

		return -1;



	string mount_path = GetSettingsStoragePath();

	PartitionManager.Mount_By_Path(mount_path.c_str(), 1);



	FILE* out = fopen(mBackingFile.c_str(), "wb");

    if (!out)                       return -1;

	if (!out)

		return -1;



	int file_version = FILE_VERSION;

	fwrite(&file_version, 1, sizeof(int), out);
@@ -330,7 +332,8 @@ int DataManager::GetValue(const string varName, string& value) 
	}



	// Handle magic values

    if (GetMagicValue(localStr, value) == 0)     return 0;

	if (GetMagicValue(localStr, value) == 0)

		return 0;



	map<string, string>::iterator constPos;

	constPos = mConstValues.find(localStr);
@@ -485,14 +488,15 @@ int DataManager::SetValue(const string varName, unsigned long long value, int pe 
{

	ostringstream valStr;

	valStr << value;

    return SetValue(varName, valStr.str(), persist);;

	return SetValue(varName, valStr.str(), persist);

}



int DataManager::SetProgress(float Fraction) {

	return SetValue("ui_progress", (float) (Fraction * 100.0));

}



int DataManager::ShowProgress(float Portion, float Seconds) {

int DataManager::ShowProgress(float Portion, float Seconds)

{

	float Starting_Portion;

	GetValue("ui_progress_portion", Starting_Portion);

	if (SetValue("ui_progress_portion", (float)(Portion * 100.0) + Starting_Portion) != 0)
@@ -507,12 +511,11 @@ void DataManager::DumpValues() 
	map<string, TStrIntPair>::iterator iter;

	gui_print("Data Manager dump - Values with leading X are persisted.\n");

	for (iter = mValues.begin(); iter != mValues.end(); ++iter)

    {

		gui_print("%c %s=%s\n", iter->second.second ? 'X' : ' ', iter->first.c_str(), iter->second.first.c_str());

}

}



void DataManager::update_tz_environment_variables(void) {

void DataManager::update_tz_environment_variables(void)

{

	setenv("TZ", DataManager_GetStrValue(TW_TIME_ZONE_VAR), 1);

	tzset();

}
@@ -951,13 +954,15 @@ int DataManager::GetMagicValue(const string varName, string& value) 
		now = time(0);

		current = localtime(&now);

		GetValue(TW_MILITARY_TIME, tw_military_time); 

        if (current->tm_hour >= 12) {

		if (current->tm_hour >= 12)

		{

			if (tw_military_time == 1)

				sprintf(tmp, "%d:%02d", current->tm_hour, current->tm_min);

			else

				sprintf(tmp, "%d:%02d PM", current->tm_hour == 12 ? 12 : current->tm_hour - 12, current->tm_min);

		}

        else {

		else

		{

			if (tw_military_time == 1) 

				sprintf(tmp, "%d:%02d", current->tm_hour, current->tm_min);

			else
@@ -966,7 +971,7 @@ int DataManager::GetMagicValue(const string varName, string& value) 
		value = tmp;

		return 0;

	}

    if (varName == "tw_battery")

	else if (varName == "tw_battery")

	{

		char tmp[16];

		static char charging = ' ';
@@ -1017,7 +1022,8 @@ int DataManager::GetMagicValue(const string varName, string& value) 
	return -1;

}



void DataManager::Output_Version(void) {

void DataManager::Output_Version(void)

{

	string Path;

	char version[255];
@@ -1131,12 +1137,12 @@ string& DataManager::CGetSettingsStoragePath() 
	return GetValueRef("tw_settings_path");

}



extern "C" int DataManager_ResetDefaults()

extern "C" int DataManager_ResetDefaults(void)

{

	return DataManager::ResetDefaults();

}



extern "C" void DataManager_LoadDefaults()

extern "C" void DataManager_LoadDefaults(void)

{

	return DataManager::SetDefaultValues();

}
@@ -1146,7 +1152,7 @@ extern "C" int DataManager_LoadValues(const char* filename) 
	return DataManager::LoadValues(filename);

}



extern "C" int DataManager_Flush()

extern "C" int DataManager_Flush(void)

{

	return DataManager::Flush();

}
@@ -1208,12 +1214,12 @@ extern "C" int DataManager_ToggleIntValue(const char* varName) 
		return DataManager::SetValue(varName, 1);

}



extern "C" void DataManager_DumpValues()

extern "C" void DataManager_DumpValues(void)

{

	return DataManager::DumpValues();

}



extern "C" void DataManager_ReadSettingsFile()

extern "C" void DataManager_ReadSettingsFile(void)

{

	return DataManager::ReadSettingsFile();

}

data.h

+7 −7
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
#ifndef _DATA_HEADER

#define _DATA_HEADER



int DataManager_ResetDefaults();

void DataManager_LoadDefaults();

int DataManager_ResetDefaults(void);

void DataManager_LoadDefaults(void);

int DataManager_LoadValues(const char* filename);

int DataManager_Flush();

int DataManager_Flush(void);

const char* DataManager_GetStrValue(const char* varName);

const char* DataManager_GetCurrentStoragePath();

const char* DataManager_GetSettingsStoragePath();

const char* DataManager_GetCurrentStoragePath(void);

const char* DataManager_GetSettingsStoragePath(void);

int DataManager_GetIntValue(const char* varName);



int DataManager_SetStrValue(const char* varName, char* value);
@@ -32,8 +32,8 @@ int DataManager_SetFloatValue(const char* varName, float value); 


int DataManager_ToggleIntValue(const char* varName);



void DataManager_DumpValues();

void DataManager_ReadSettingsFile();

void DataManager_DumpValues(void);

void DataManager_ReadSettingsFile(void);



#endif  // _DATA_HEADER

gui/blanktimer.hpp

+29 −25
Original line number Diff line number Diff line
@@ -24,15 +24,20 @@ 


using namespace std;



class blanktimer {

class blanktimer

{

public:

	blanktimer(void);



	int setTimerThread(void);

	void resetTimerAndUnblank(void);

	void setTime(int newtime);

	bool IsScreenOff();



private:

	typedef int (blanktimer::*ThreadPtr)(void);

	typedef void* (*PThreadPtr)(void*);



	void setConBlank(int blank);

	void setTimer(void);

	timespec getTimer(void);
@@ -40,8 +45,7 @@ class blanktimer { 
	int setBrightness(int brightness);

	int setBlankTimer(void);

	int setClockTimer(void);

		typedef int (blanktimer::*ThreadPtr)(void);

		typedef void* (*PThreadPtr)(void*);



	pthread_mutex_t conblankmutex;

	pthread_mutex_t timermutex;

	int conblank;

gui/button.cpp

+127 −128
Original line number Diff line number Diff line
@@ -291,4 +291,3 @@ int GUIButton::NotifyTouch(TOUCH_STATE state, int x, int y) 
		return 0;

	return (mAction ? mAction->NotifyTouch(state, x, y) : 1);

}

gui/checkbox.cpp

+114 −110
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ GUICheckbox::GUICheckbox(xml_node<>* node) 


	mLastState = 0;



    if (!node)  return;

	if (!node)

		return;



	// The label can be loaded directly

	mLabel = new GUIText(node);
@@ -111,7 +112,8 @@ int GUICheckbox::Render(void) 
		if (mUnchecked && mUnchecked->GetResource())

			gr_blit(mUnchecked->GetResource(), 0, 0, mCheckW, mCheckH, mRenderX, mRenderY);

	}

    if (mLabel)     ret = mLabel->Render();

	if (mLabel)

		ret = mLabel->Render();

	mLastState = lastState;

	mRendered = true;

	return ret;
@@ -135,7 +137,8 @@ int GUICheckbox::SetRenderPos(int x, int y, int w, int h) 
	mRenderX = x;

	mRenderY = y;



    if (w || h)     return -1;

	if (w || h)

		return -1;



	int textW, textH;

	mLabel->GetCurrentBounds(textW, textH);
@@ -154,7 +157,8 @@ int GUICheckbox::SetRenderPos(int x, int y, int w, int h) 


int GUICheckbox::NotifyTouch(TOUCH_STATE state, int x, int y)

{

    if (!isConditionTrue())     return -1;

	if (!isConditionTrue())

		return -1;



	if (state == TOUCH_RELEASE)

	{