Use util_clip_triangle() in pan_item_tri_new()

[geeqie.git] / src / cache-loader.h

diff --git a/src/cache-loader.h b/src/cache-loader.h
index e800350..1db8b74 100644 (file)
--- a/src/cache-loader.h
+++ b/src/cache-loader.h
@@ -22,15 +22,11 @@
 #ifndef CACHE_LOADER_H
 #define CACHE_LOADER_H
 
+#include <glib.h>
 
-#include "cache.h"
-#include "image-load.h"
-
-
-struct CacheLoader;
-
-using CacheLoaderDoneFunc = void (*)(CacheLoader *, gint, gpointer);
-
+struct CacheData;
+struct FileData;
+struct ImageLoader;
 
 enum CacheDataType {
        CACHE_LOADER_NONE       = 0,
@@ -47,7 +43,8 @@ struct CacheLoader {
        CacheDataType todo_mask;
        CacheDataType done_mask;
 
-       CacheLoaderDoneFunc done_func;
+       using DoneFunc = void (*)(CacheLoader *, gint, gpointer);
+       DoneFunc done_func;
        gpointer done_data;
 
        gboolean error;
@@ -58,7 +55,7 @@ struct CacheLoader {
 
 
 CacheLoader *cache_loader_new(FileData *fd, CacheDataType load_mask,
-                             CacheLoaderDoneFunc done_func, gpointer done_data);
+                             CacheLoader::DoneFunc done_func, gpointer done_data);
 
 void cache_loader_free(CacheLoader *cl);