Make sure all files have the correct header

[libs/core.git] / source / core / application.h

diff --git a/source/core/application.h b/source/core/application.h
index d3b992e17a019321c31579cfb6804178a4d2d2ac..ca51bbc0a5f59009227fb3dffc3e54f4a86e9d9a 100644 (file)
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -17,17 +17,11 @@ member of type RegApp<MainClass>.
 */
 class Application
 {
-public:
-       virtual ~Application() { }
-
-       static int run(int, char **, void * =0);
-       static void usage(const char *, const char *, bool);
-       static void *get_data() { return data_; }
 protected:
        enum LoopMode
        {
                NONE,       /// No main loop - main() will just return
-               SLEEP,      /// Only sleep in the main loop - useful for servers
+               SLEEP,      /// Only sleep in the main loop - useful for threaded servers
                TICK_SLEEP, /// Call tick every iteration, with a short sleep in between
                TICK_YIELD, /// Call tick every iteration, with sched_yield in between
                TICK_BUSY   /// Call tick every iteration
@@ -52,9 +46,26 @@ protected:
        };
 
        bool done;
-       int  exit_code;
+       int exit_code;
 
+private:
+       LoopMode loop_mode_;
+       Semaphore sleep_sem_;
+
+       static RegBase *reg_app_;
+       static Application *app_;
+       static void *data_;
+
+protected:
        Application();
+public:
+       virtual ~Application() { }
+
+       static int run(int, char **, void * =0);
+       static void usage(const char *, const char *, bool);
+       static void *get_data() { return data_; }
+
+protected:
        virtual int main();
        void catch_signal(int);
        void set_loop_mode(LoopMode);
@@ -63,18 +74,10 @@ protected:
        virtual void tick() { }
        virtual void sighandler(int) { }
 private:
-       LoopMode     loop_mode_;
-       Semaphore    sleep_sem_;
+       static void sighandler_(int);
 
        Application(const Application &);
        Application &operator=(const Application &);
-
-       static RegBase     *reg_app_;
-       static Application *app_;
-       static void        *data_;
-
-       static void sighandler_(int);
-       static void sigalrm_(int) { }
 };
 
 } // namespace Msp