Filled in the parameter names in the prototype of get_frame() to keep doxygen quiet...

git-svn-id: http://svn.voria.com/code@328 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp
index e1399a3..cc86015 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp
+++ b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp
@@ -120,7 +120,7 @@ bmp_mptr::~bmp_mptr()
 }
 
 bool
-bmp_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback *cb)
+bmp_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallback *cb)
 {
        FILE *file=fopen(filename.c_str(),"rb");
        if(!file)
@@ -227,3 +227,4 @@ bmp_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback *cb)
        fclose(file);
        return true;
 }
+ 

diff --git a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.h b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.h
index 8f368f8..32c7b9a 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.h
+++ b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.h
@@ -49,7 +49,7 @@ public:
        bmp_mptr(const char *filename);
        ~bmp_mptr();
 
-       virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *);
+       virtual bool get_frame(synfig::Surface &surface,synfig::Time time, synfig::ProgressCallback *callback);
 };
 
 /* === E N D =============================================================== */

diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h
index 7517340..fb7333d 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mptr_ffmpeg.h
@@ -64,7 +64,7 @@ public:
        ~ffmpeg_mptr();
 
 
-       virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *);
+       virtual bool get_frame(synfig::Surface &surface,synfig::Time time, synfig::ProgressCallback *callback);
 };
 
 /* === E N D =============================================================== */

diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.h b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.h
index 45810ed..46311da 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.h
+++ b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.h
@@ -52,7 +52,7 @@ public:
 
        ~imagemagick_mptr();
 
-       virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *);
+       virtual bool get_frame(synfig::Surface &surface,synfig::Time time, synfig::ProgressCallback *callback);
 };
 
 /* === E N D =============================================================== */

diff --git a/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.h b/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.h
index d2f1f60..39340f1 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.h
+++ b/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.h
@@ -57,7 +57,7 @@ public:
        jpeg_mptr(const char *filename);
        ~jpeg_mptr();
 
-       virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *);
+       virtual bool get_frame(synfig::Surface &surface,synfig::Time time, synfig::ProgressCallback *callback);
 };
 
 /* === E N D =============================================================== */

diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/mptr.h b/synfig-core/trunk/src/modules/mod_libavcodec/mptr.h
index 501c674..e826517 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_libavcodec/mptr.h
+++ b/synfig-core/trunk/src/modules/mod_libavcodec/mptr.h
@@ -49,7 +49,7 @@ public:
        Importer_LibAVCodec(const char *filename);
        ~Importer_LibAVCodec();
 
-       virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *);
+       virtual bool get_frame(synfig::Surface &surface,synfig::Time time, synfig::ProgressCallback *callback);
 };
 
 /* === E N D =============================================================== */

diff --git a/synfig-core/trunk/src/modules/mod_openexr/mptr_openexr.h b/synfig-core/trunk/src/modules/mod_openexr/mptr_openexr.h
index b50cf5e..255c7e4 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_openexr/mptr_openexr.h
+++ b/synfig-core/trunk/src/modules/mod_openexr/mptr_openexr.h
@@ -49,7 +49,7 @@ public:
 
 
 
-       virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *);
+       virtual bool get_frame(synfig::Surface &surface,synfig::Time time, synfig::ProgressCallback *callback);
 
 };
 

diff --git a/synfig-core/trunk/src/modules/mod_png/mptr_png.h b/synfig-core/trunk/src/modules/mod_png/mptr_png.h
index 00340b2..e678482 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_png/mptr_png.h
+++ b/synfig-core/trunk/src/modules/mod_png/mptr_png.h
@@ -57,7 +57,7 @@ public:
        png_mptr(const char *filename);
        ~png_mptr();
 
-       virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *);
+       virtual bool get_frame(synfig::Surface &surface,synfig::Time time, synfig::ProgressCallback *callback);
 };
 
 /* === E N D =============================================================== */

diff --git a/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.h b/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.h
index 6fd2732..a80d980 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.h
+++ b/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.h
@@ -45,7 +45,7 @@ public:
        ppm_mptr(const char *filename);
        ~ppm_mptr();
 
-       virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::ProgressCallback *);
+       virtual bool get_frame(synfig::Surface &surface,synfig::Time time, synfig::ProgressCallback *callback);
 }; // END of class ppm_mptr
 
 /* === E N D =============================================================== */