From 91f00a4c656fd2270ed7e2980fe89855ba20b206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boldizs=C3=A1r=20Lipka?= Date: Thu, 5 Jun 2014 14:12:16 +0200 Subject: [PATCH] Apply a more conventional indent style. --- src/loadscreen.hpp | 78 +++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/loadscreen.hpp b/src/loadscreen.hpp index 0f935bf9305e..2ed345dca659 100644 --- a/src/loadscreen.hpp +++ b/src/loadscreen.hpp @@ -22,16 +22,16 @@ class CVideo; #include "sdl/utils.hpp" class loadscreen { - public: - // Preferred constructor - explicit loadscreen(CVideo &screen, const int percent = 0); - // Keep default copy constructor - // Keep default copy assignment - // Destructor, dumps the counter values to stderr - ~loadscreen() - { - dump_counters(); - } +public: + // Preferred constructor + explicit loadscreen(CVideo &screen, const int percent = 0); + // Keep default copy constructor + // Keep default copy assignment + // Destructor, dumps the counter values to stderr + ~loadscreen() + { + dump_counters(); + } /** * Starts the stage with identifier @a id. @@ -43,43 +43,43 @@ class loadscreen { */ static void increment_progress(); - /** Function to draw a blank screen. */ - void clear_screen(); - - /** - * A global loadscreen instance that can be used to avoid - * passing it on to functions that are many levels deep. - */ - static loadscreen *global_loadscreen; - - struct global_loadscreen_manager { - explicit global_loadscreen_manager(CVideo& screen); - ~global_loadscreen_manager(); - static global_loadscreen_manager* get() - { return manager; } - void reset(); -private: - static global_loadscreen_manager* manager; - bool owns; - }; + /** Function to draw a blank screen. */ + void clear_screen(); + + /** + * A global loadscreen instance that can be used to avoid + * passing it on to functions that are many levels deep. + */ + static loadscreen *global_loadscreen; + + struct global_loadscreen_manager { + explicit global_loadscreen_manager(CVideo& screen); + ~global_loadscreen_manager(); + static global_loadscreen_manager* get() + { return manager; } + void reset(); + private: + static global_loadscreen_manager* manager; + bool owns; + }; private: /** * Displays a load progress bar. */ void draw_screen(const std::string &text); - // Prohibit default constructor - loadscreen(); + // Prohibit default constructor + loadscreen(); - // Data members - CVideo &screen_; - SDL_Rect textarea_; - surface logo_surface_; - bool logo_drawn_; - int pby_offset_; - int prcnt_; + // Data members + CVideo &screen_; + SDL_Rect textarea_; + surface logo_surface_; + bool logo_drawn_; + int pby_offset_; + int prcnt_; - void dump_counters() const; + void dump_counters() const; }; #endif