more typedef removals

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/src/bar-gps.cc b/src/bar-gps.cc
index d0abf24..5036a72 100644 (file)
--- a/src/bar-gps.cc
+++ b/src/bar-gps.cc
@@ -54,8 +54,7 @@
  *-------------------------------------------------------------------
  */
 
-typedef struct _PaneGPSData PaneGPSData;
-struct _PaneGPSData
+struct PaneGPSData
 {
        PaneData pane;
        GtkWidget *widget;

diff --git a/src/color-man.cc b/src/color-man.cc
index c6e6b17..3d8ae6a 100644 (file)
--- a/src/color-man.cc
+++ b/src/color-man.cc
@@ -36,8 +36,7 @@
 #endif
 
 
-typedef struct _ColorManCache ColorManCache;
-struct _ColorManCache {
+struct ColorManCache {
        cmsHPROFILE   profile_in;
        cmsHPROFILE   profile_out;
        cmsHTRANSFORM transform;

diff --git a/src/format-raw.cc b/src/format-raw.cc
index 66570b0..1fb8c9a 100644 (file)
--- a/src/format-raw.cc
+++ b/src/format-raw.cc
@@ -43,8 +43,7 @@
 #include "format-olympus.h"
 
 
-typedef struct _FormatRawEntry FormatRawEntry;
-struct _FormatRawEntry {
+struct FormatRawEntry {
        const gchar *extension;
        FormatRawMatchType magic_type;
        const guint magic_offset;
@@ -70,8 +69,7 @@ static FormatRawEntry format_raw_list[] = {
 };
 
 
-typedef struct _FormatExifEntry FormatExifEntry;
-struct _FormatExifEntry {
+struct FormatExifEntry {
        FormatExifMatchType header_type;
        gconstpointer header_pattern;
        const guint header_length;

diff --git a/src/image-load-djvu.cc b/src/image-load-djvu.cc
index 963c6ce..70d4bc3 100644 (file)
--- a/src/image-load-djvu.cc
+++ b/src/image-load-djvu.cc
@@ -28,8 +28,7 @@
 #include <libdjvu/ddjvuapi.h>
 #include <libdjvu/miniexp.h>
 
-typedef struct _ImageLoaderDJVU ImageLoaderDJVU;
-struct _ImageLoaderDJVU {
+struct ImageLoaderDJVU {
        ImageLoaderBackendCbAreaUpdated area_updated_cb;
        ImageLoaderBackendCbSize size_cb;
        ImageLoaderBackendCbAreaPrepared area_prepared_cb;

diff --git a/src/image-load-heif.cc b/src/image-load-heif.cc
index a8d16da..7ebbaf5 100644 (file)
--- a/src/image-load-heif.cc
+++ b/src/image-load-heif.cc
@@ -26,8 +26,7 @@
 #ifdef HAVE_HEIF
 #include <libheif/heif.h>
 
-typedef struct _ImageLoaderHEIF ImageLoaderHEIF;
-struct _ImageLoaderHEIF {
+struct ImageLoaderHEIF {
        ImageLoaderBackendCbAreaUpdated area_updated_cb;
        ImageLoaderBackendCbSize size_cb;
        ImageLoaderBackendCbAreaPrepared area_prepared_cb;

diff --git a/src/image-load-j2k.cc b/src/image-load-j2k.cc
index 79d3475..584ad50 100644 (file)
--- a/src/image-load-j2k.cc
+++ b/src/image-load-j2k.cc
@@ -29,8 +29,7 @@
 
 #include "openjpeg.h"
 
-typedef struct _ImageLoaderJ2K ImageLoaderJ2K;
-struct _ImageLoaderJ2K {
+struct ImageLoaderJ2K {
        ImageLoaderBackendCbAreaUpdated area_updated_cb;
        ImageLoaderBackendCbSize size_cb;
        ImageLoaderBackendCbAreaPrepared area_prepared_cb;
@@ -46,11 +45,11 @@ static void free_buffer(guchar *pixels, gpointer UNUSED(data))
        g_free (pixels);
 }
 
-typedef struct opj_buffer_info {
+struct opj_buffer_info {
     OPJ_BYTE* buf;
     OPJ_BYTE* cur;
     OPJ_SIZE_T len;
-} opj_buffer_info_t;
+};
 
 static OPJ_SIZE_T opj_read_from_buffer (void* pdst, OPJ_SIZE_T len, opj_buffer_info_t* psrc)
 {

diff --git a/src/image-load-jpegxl.cc b/src/image-load-jpegxl.cc
index 5cb98be..75fb638 100644 (file)
--- a/src/image-load-jpegxl.cc
+++ b/src/image-load-jpegxl.cc
@@ -17,26 +17,26 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * 
+ *
  * Including parts:
- * 
+ *
  * Copyright (c) the JPEG XL Project Authors.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice, this
  *    list of conditions and the following disclaimer.
- * 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * 3. Neither the name of the copyright holder nor the names of its
  *    contributors may be used to endorse or promote products derived from
  *    this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -47,7 +47,7 @@
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #include "main.h"
@@ -59,8 +59,7 @@
 
 #include "jxl/decode.h"
 
-typedef struct _ImageLoaderJPEGXL ImageLoaderJPEGXL;
-struct _ImageLoaderJPEGXL {
+struct ImageLoaderJPEGXL {
        ImageLoaderBackendCbAreaUpdated area_updated_cb;
        ImageLoaderBackendCbSize size_cb;
        ImageLoaderBackendCbAreaPrepared area_prepared_cb;

diff --git a/src/image-load-libraw.cc b/src/image-load-libraw.cc
index 03ed3a5..a67b57c 100644 (file)
--- a/src/image-load-libraw.cc
+++ b/src/image-load-libraw.cc
@@ -36,8 +36,7 @@
 #include <libraw/libraw.h>
 #include <sys/mman.h>
 
-typedef struct _UnmapData UnmapData;
-struct _UnmapData
+struct UnmapData
 {
        guchar *ptr;
        guchar *map_data;

diff --git a/src/image-load-pdf.cc b/src/image-load-pdf.cc
index 63c28b0..b522de1 100644 (file)
--- a/src/image-load-pdf.cc
+++ b/src/image-load-pdf.cc
@@ -26,8 +26,7 @@
 #ifdef HAVE_PDF
 #include <poppler/glib/poppler.h>
 
-typedef struct _ImageLoaderPDF ImageLoaderPDF;
-struct _ImageLoaderPDF {
+struct ImageLoaderPDF {
        ImageLoaderBackendCbAreaUpdated area_updated_cb;
        ImageLoaderBackendCbSize size_cb;
        ImageLoaderBackendCbAreaPrepared area_prepared_cb;

diff --git a/src/image-load-tiff.cc b/src/image-load-tiff.cc
index af16e6b..fb5e3e6 100644 (file)
--- a/src/image-load-tiff.cc
+++ b/src/image-load-tiff.cc
@@ -34,8 +34,7 @@
 
 #include <tiffio.h>
 
-typedef struct _ImageLoaderTiff ImageLoaderTiff;
-struct _ImageLoaderTiff {
+struct ImageLoaderTiff {
        ImageLoaderBackendCbAreaUpdated area_updated_cb;
        ImageLoaderBackendCbSize size_cb;
        ImageLoaderBackendCbAreaPrepared area_prepared_cb;