-Started to move stuff from library back to main game

[supertux.git] / lib / app / setup.h

diff --git a/lib/app/setup.h b/lib/app/setup.h
index 9d05267..98e947f 100644 (file)
--- a/lib/app/setup.h
+++ b/lib/app/setup.h
@@ -23,45 +23,22 @@
 #include <vector>
 #include <set>
 #include <string>
-#include "../gui/menu.h"
 
 namespace SuperTux {
 
 /// File system utility functions
 struct FileSystem
   {
-    static int faccessible(const std::string& filename);
-    static int fcreatedir(const std::string& relative_dir);
-    static int fwriteable(const std::string& filename);
+    static bool faccessible(const std::string& filename);
+    static bool fcreatedir(const std::string& relative_dir);
+    static bool fwriteable(const std::string& filename);
     static std::set<std::string> read_directory(const std::string& pathname);
     static std::set<std::string> dsubdirs(const std::string& rel_path, const std::string& expected_file);
     static std::set<std::string> dfiles(const std::string& rel_path, const std::string& glob, const std::string& exception_str);
-  };
-
-/// All you need to get an application up and running
-struct Setup
-  {
-    static void info(const std::string& _package_name, const std::string& _package_symbol_name, const std::string& _package_version);
-    static void directories(void);
-    static void general(void);
-    static void general_free();
-    static void video(unsigned int screen_w, unsigned int screen_h);
-    static void audio(void);
-    static void joystick(void);
-    static void parseargs(int argc, char * argv[]);
 
-    private:
-    static void video_sdl(unsigned int screen_w, unsigned int screen_h);
-    static void video_gl(unsigned int screen_w, unsigned int screen_h);
+    static std::string dirname(const std::string& filename);
   };
 
-/// Termination handling
-struct Termination
-  {
-    static void shutdown(void);
-    static void abort(const std::string& reason, const std::string& details);
-  };
-  
 } //namespace SuperTux
 
 #endif /*SUPERTUX_SETUP_H*/