Workaround for Qt bug #176201 (affect only Qt 4.5.0)

[vlc] / src / modules / modules.h

diff --git a/src/modules/modules.h b/src/modules/modules.h
index baafe45cc5d0bd7831436aeb1abf29d752c025c7..00836dde077124bc8c537967396cab7afe549868 100644 (file)
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -39,17 +39,13 @@
  *****************************************************************************/
 struct module_bank_t
 {
-    VLC_COMMON_MEMBERS
+    unsigned         i_usage;
 
-    int              i_usage;
-
-    bool             b_builtins;
     bool             b_plugins;
 
     /* Plugins cache */
     bool             b_cache;
     bool             b_cache_dirty;
-    bool             b_cache_delete;
 
     int            i_cache;
     module_cache_t **pp_cache;
@@ -149,16 +145,15 @@ struct module_t
     bool          b_loaded;        /* Set to true if the dll is loaded */
 };
 
+module_t *vlc_module_create (vlc_object_t *);
+module_t *vlc_submodule_create (module_t *module);
+
 #define module_InitBank(a)     __module_InitBank(VLC_OBJECT(a))
 void  __module_InitBank        ( vlc_object_t * );
-#define module_LoadBuiltins(a) __module_LoadBuiltins(VLC_OBJECT(a))
-void  __module_LoadBuiltins    ( vlc_object_t * );
-#define module_LoadPlugins(a)  __module_LoadPlugins(VLC_OBJECT(a))
-void  __module_LoadPlugins     ( vlc_object_t * );
-#define module_EndBank(a)      __module_EndBank(VLC_OBJECT(a))
-void  __module_EndBank         ( vlc_object_t * );
-#define module_ResetBank(a)    __module_ResetBank(VLC_OBJECT(a))
-void  __module_ResetBank       ( vlc_object_t * );
+void module_LoadPlugins( vlc_object_t *, bool );
+#define module_LoadPlugins(a,b) module_LoadPlugins(VLC_OBJECT(a),b)
+void module_EndBank( vlc_object_t *, bool );
+#define module_EndBank(a,b) module_EndBank(VLC_OBJECT(a), b)
 
 /* Low-level OS-dependent handler */
 int  module_Load   (vlc_object_t *, const char *, module_handle_t *);
@@ -167,8 +162,8 @@ void module_Unload (module_handle_t);
 
 /* Plugins cache */
 void   CacheMerge (vlc_object_t *, module_t *, module_t *);
-void   CacheLoad  (vlc_object_t * );
-void   CacheSave  (vlc_object_t * );
-module_cache_t * CacheFind (const char *, int64_t, int64_t);
+void   CacheLoad  (vlc_object_t *, module_bank_t *, bool);
+void   CacheSave  (vlc_object_t *, module_bank_t *);
+module_cache_t * CacheFind (module_bank_t *, const char *, int64_t, int64_t);
 
 #endif /* !__LIBVLC_MODULES_H */