X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fapp%2Fsetup.h;h=ad70bd4d81bb2eb5ef33a5f291d4149ded7af73c;hb=8e0bad9f82ccbc811a18edd7ce6c6f69c5bca082;hp=60a0272b0899a95ec032de1a90b00cf7f6cc1aee;hpb=c5cbd36c2e01d8c807c8c931ca44fb7c1b48ad18;p=supertux.git

diff --git a/lib/app/setup.h b/lib/app/setup.h
index 60a0272b0..ad70bd4d8 100644
--- a/lib/app/setup.h
+++ b/lib/app/setup.h
@@ -21,36 +21,39 @@
 #define SUPERTUX_SETUP_H
 
 #include <vector>
+#include <set>
 #include <string>
-#include "../gui/menu.h"
-#include "../special/base.h"
 
 namespace SuperTux {
 
 /// File system utility functions
 struct FileSystem
   {
-    static int faccessible(const char *filename);
-    static int fcreatedir(const char* relative_dir);
-    static int fwriteable(const char *filename);
-    static std::vector<std::string> read_directory(const std::string& pathname);
-    static string_list_type dsubdirs(const char *rel_path, const char* expected_file);
-    static string_list_type dfiles(const char *rel_path, const char* glob, const char* exception_str);
+    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);
+
+    static std::string dirname(const std::string& filename);
   };
 
 /// 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 init(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_sdl(unsigned int screen_w, unsigned int screen_h);
-    static void video_gl(unsigned int screen_w, unsigned int screen_h);
     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);
   };
 
 /// Termination handling