From fafb0c541bb4b24515c57251a44d87825eec90fb Mon Sep 17 00:00:00 2001 From: Vojtech Bocek Date: Thu, 25 Jul 2013 22:53:02 +0200 Subject: Unify indentation and little clean-up in TWRP files Signed-off-by: Vojtech Bocek --- gui/pages.hpp | 128 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 64 insertions(+), 64 deletions(-) (limited to 'gui/pages.hpp') diff --git a/gui/pages.hpp b/gui/pages.hpp index 2c7173552..c308c1a5c 100644 --- a/gui/pages.hpp +++ b/gui/pages.hpp @@ -4,10 +4,10 @@ #define _PAGES_HEADER_HPP typedef struct { - unsigned char red; - unsigned char green; - unsigned char blue; - unsigned char alpha; + unsigned char red; + unsigned char green; + unsigned char blue; + unsigned char alpha; } COLOR; // Utility Functions @@ -26,110 +26,110 @@ class InputObject; class Page { public: - virtual ~Page() {} + virtual ~Page() {} public: - Page(xml_node<>* page, xml_node<>* templates = NULL); - std::string GetName(void) { return mName; } + Page(xml_node<>* page, xml_node<>* templates = NULL); + std::string GetName(void) { return mName; } public: - virtual int Render(void); - virtual int Update(void); - virtual int NotifyTouch(TOUCH_STATE state, int x, int y); - virtual int NotifyKey(int key); + virtual int Render(void); + virtual int Update(void); + virtual int NotifyTouch(TOUCH_STATE state, int x, int y); + virtual int NotifyKey(int key); virtual int NotifyKeyboard(int key); virtual int SetKeyBoardFocus(int inFocus); - virtual int NotifyVarChange(std::string varName, std::string value); - virtual void SetPageFocus(int inFocus); + virtual int NotifyVarChange(std::string varName, std::string value); + virtual void SetPageFocus(int inFocus); protected: - std::string mName; - std::vector mRenders; - std::vector mActions; + std::string mName; + std::vector mRenders; + std::vector mActions; std::vector mInputs; - ActionObject* mTouchStart; - COLOR mBackground; + ActionObject* mTouchStart; + COLOR mBackground; protected: - bool ProcessNode(xml_node<>* page, xml_node<>* templates = NULL, int depth = 0); + bool ProcessNode(xml_node<>* page, xml_node<>* templates = NULL, int depth = 0); }; class PageSet { public: - PageSet(char* xmlFile); - virtual ~PageSet(); + PageSet(char* xmlFile); + virtual ~PageSet(); public: - int Load(ZipArchive* package); + int Load(ZipArchive* package); - Page* FindPage(std::string name); - int SetPage(std::string page); + Page* FindPage(std::string name); + int SetPage(std::string page); int SetOverlay(Page* page); - Resource* FindResource(std::string name); + Resource* FindResource(std::string name); - // Helper routine for identifing if we're the current page - int IsCurrentPage(Page* page); + // Helper routine for identifing if we're the current page + int IsCurrentPage(Page* page); - // These are routing routines - int Render(void); - int Update(void); - int NotifyTouch(TOUCH_STATE state, int x, int y); - int NotifyKey(int key); + // These are routing routines + int Render(void); + int Update(void); + int NotifyTouch(TOUCH_STATE state, int x, int y); + int NotifyKey(int key); int NotifyKeyboard(int key); int SetKeyBoardFocus(int inFocus); - int NotifyVarChange(std::string varName, std::string value); + int NotifyVarChange(std::string varName, std::string value); protected: - int LoadPages(xml_node<>* pages, xml_node<>* templates = NULL); - int LoadVariables(xml_node<>* vars); + int LoadPages(xml_node<>* pages, xml_node<>* templates = NULL); + int LoadVariables(xml_node<>* vars); protected: - char* mXmlFile; - xml_document<> mDoc; - ResourceManager* mResources; - std::vector mPages; - Page* mCurrentPage; - Page* mOverlayPage; // This is a special case, used for "locking" the screen + char* mXmlFile; + xml_document<> mDoc; + ResourceManager* mResources; + std::vector mPages; + Page* mCurrentPage; + Page* mOverlayPage; // This is a special case, used for "locking" the screen }; class PageManager { public: - // Used by GUI - static int LoadPackage(std::string name, std::string package, std::string startpage); - static PageSet* SelectPackage(std::string name); - static int ReloadPackage(std::string name, std::string package); - static void ReleasePackage(std::string name); - - // Used for actions and pages - static int ChangePage(std::string name); + // Used by GUI + static int LoadPackage(std::string name, std::string package, std::string startpage); + static PageSet* SelectPackage(std::string name); + static int ReloadPackage(std::string name, std::string package); + static void ReleasePackage(std::string name); + + // Used for actions and pages + static int ChangePage(std::string name); static int ChangeOverlay(std::string name); - static Resource* FindResource(std::string name); - static Resource* FindResource(std::string package, std::string name); + static Resource* FindResource(std::string name); + static Resource* FindResource(std::string package, std::string name); - // Used for console-only mode - Can be reverted via ChangePage - static int SwitchToConsole(void); + // Used for console-only mode - Can be reverted via ChangePage + static int SwitchToConsole(void); - // Helper to identify if a particular page is the active page - static int IsCurrentPage(Page* page); + // Helper to identify if a particular page is the active page + static int IsCurrentPage(Page* page); - // These are routing routines - static int Render(void); - static int Update(void); - static int NotifyTouch(TOUCH_STATE state, int x, int y); - static int NotifyKey(int key); + // These are routing routines + static int Render(void); + static int Update(void); + static int NotifyTouch(TOUCH_STATE state, int x, int y); + static int NotifyKey(int key); static int NotifyKeyboard(int key); static int SetKeyBoardFocus(int inFocus); - static int NotifyVarChange(std::string varName, std::string value); + static int NotifyVarChange(std::string varName, std::string value); protected: - static PageSet* FindPackage(std::string name); + static PageSet* FindPackage(std::string name); protected: - static std::map mPageSets; - static PageSet* mCurrentSet; + static std::map mPageSets; + static PageSet* mCurrentSet; static PageSet* mBaseSet; }; -- cgit v1.2.3