From 19362522e09ce9e9584fed37ffee6a7e3ab281cb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 6 Jun 2023 22:26:38 -0400 Subject: [PATCH] print: Rename private headers Rename private print-related headers to follow our naming conventions: gtkprintutils.h -> gtkprintutilsprivate.h gtkprinteroption.h -> gtkprinteroptionprivate.h gtkprinteroptionset.h => gtkprinteroptionsetprivate.h gtkprinteroptionwidget.h -> gtkprinteroptionwidgetprivate.h --- gtk/gtkcustompaperunixdialog.c | 2 +- gtk/gtkpagesetup.c | 2 +- gtk/gtkpagesetupunixdialog.c | 2 +- gtk/gtkpapersize.c | 2 +- gtk/gtkprintbackendprivate.h | 2 +- gtk/gtkprinteroption.c | 2 +- gtk/{gtkprinteroption.h => gtkprinteroptionprivate.h} | 0 gtk/gtkprinteroptionset.c | 2 +- gtk/{gtkprinteroptionset.h => gtkprinteroptionsetprivate.h} | 2 +- gtk/gtkprinteroptionwidget.c | 2 +- ...kprinteroptionwidget.h => gtkprinteroptionwidgetprivate.h} | 2 +- gtk/gtkprinterprivate.h | 2 +- gtk/gtkprintsettings.c | 2 +- gtk/gtkprintunixdialog.c | 4 ++-- gtk/gtkprintutils.c | 2 +- gtk/{gtkprintutils.h => gtkprintutilsprivate.h} | 0 modules/printbackends/gtkprintbackendcups.c | 2 +- 17 files changed, 16 insertions(+), 16 deletions(-) rename gtk/{gtkprinteroption.h => gtkprinteroptionprivate.h} (100%) rename gtk/{gtkprinteroptionset.h => gtkprinteroptionsetprivate.h} (98%) rename gtk/{gtkprinteroptionwidget.h => gtkprinteroptionwidgetprivate.h} (98%) rename gtk/{gtkprintutils.h => gtkprintutilsprivate.h} (100%) diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c index f6c9a239fb..375927e517 100644 --- a/gtk/gtkcustompaperunixdialog.c +++ b/gtk/gtkcustompaperunixdialog.c @@ -36,7 +36,7 @@ #include "gtkcustompaperunixdialog.h" #include "gtkprintbackendprivate.h" -#include "gtkprintutils.h" +#include "gtkprintutilsprivate.h" #include "deprecated/gtkdialogprivate.h" #define LEGACY_CUSTOM_PAPER_FILENAME ".gtk-custom-papers" diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c index dae688c498..588e43d8e7 100644 --- a/gtk/gtkpagesetup.c +++ b/gtk/gtkpagesetup.c @@ -19,7 +19,7 @@ #include "config.h" #include "gtkpagesetup.h" -#include "gtkprintutils.h" +#include "gtkprintutilsprivate.h" #include "gtkprintoperation.h" /* for GtkPrintError */ #include #include "gtktypebuiltins.h" diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c index 799a732892..e9f5cfd6ab 100644 --- a/gtk/gtkpagesetupunixdialog.c +++ b/gtk/gtkpagesetupunixdialog.c @@ -34,7 +34,7 @@ #include "gtkcustompaperunixdialog.h" #include "gtkprintbackendprivate.h" #include "gtkpapersize.h" -#include "gtkprintutils.h" +#include "gtkprintutilsprivate.h" #include "deprecated/gtkdialogprivate.h" /** diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c index 9a2ef889cd..97bd96d49c 100644 --- a/gtk/gtkpapersize.c +++ b/gtk/gtkpapersize.c @@ -27,7 +27,7 @@ #include #include "gtkpapersize.h" -#include "gtkprintutils.h" +#include "gtkprintutilsprivate.h" #include "gtkprintoperation.h" /* for GtkPrintError */ #include diff --git a/gtk/gtkprintbackendprivate.h b/gtk/gtkprintbackendprivate.h index ef3be89fef..be14331673 100644 --- a/gtk/gtkprintbackendprivate.h +++ b/gtk/gtkprintbackendprivate.h @@ -28,7 +28,7 @@ #include #include -#include +#include G_BEGIN_DECLS diff --git a/gtk/gtkprinteroption.c b/gtk/gtkprinteroption.c index d81981eaf3..91e4bdecb9 100644 --- a/gtk/gtkprinteroption.c +++ b/gtk/gtkprinteroption.c @@ -21,7 +21,7 @@ #include #include "gtkprivate.h" -#include "gtkprinteroption.h" +#include "gtkprinteroptionprivate.h" /***************************************** * GtkPrinterOption * diff --git a/gtk/gtkprinteroption.h b/gtk/gtkprinteroptionprivate.h similarity index 100% rename from gtk/gtkprinteroption.h rename to gtk/gtkprinteroptionprivate.h diff --git a/gtk/gtkprinteroptionset.c b/gtk/gtkprinteroptionset.c index 333f110bb6..288fda6f37 100644 --- a/gtk/gtkprinteroptionset.c +++ b/gtk/gtkprinteroptionset.c @@ -21,7 +21,7 @@ #include #include -#include "gtkprinteroptionset.h" +#include "gtkprinteroptionsetprivate.h" #include "gtkprivate.h" /***************************************** diff --git a/gtk/gtkprinteroptionset.h b/gtk/gtkprinteroptionsetprivate.h similarity index 98% rename from gtk/gtkprinteroptionset.h rename to gtk/gtkprinteroptionsetprivate.h index 6b00206aa3..416a82a604 100644 --- a/gtk/gtkprinteroptionset.h +++ b/gtk/gtkprinteroptionsetprivate.h @@ -28,7 +28,7 @@ #include #include -#include "gtkprinteroption.h" +#include "gtkprinteroptionprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c index 958dc5e80f..c14a675761 100644 --- a/gtk/gtkprinteroptionwidget.c +++ b/gtk/gtkprinteroptionwidget.c @@ -36,7 +36,7 @@ #include "gtkprivate.h" #include "gtkstringlist.h" -#include "gtkprinteroptionwidget.h" +#include "gtkprinteroptionwidgetprivate.h" /* This defines the max file length that the file chooser * button should display. The total length will be diff --git a/gtk/gtkprinteroptionwidget.h b/gtk/gtkprinteroptionwidgetprivate.h similarity index 98% rename from gtk/gtkprinteroptionwidget.h rename to gtk/gtkprinteroptionwidgetprivate.h index 427eca506d..b470cfd398 100644 --- a/gtk/gtkprinteroptionwidget.h +++ b/gtk/gtkprinteroptionwidgetprivate.h @@ -16,7 +16,7 @@ */ #pragma once -#include "gtkprinteroption.h" +#include "gtkprinteroptionprivate.h" #include "gtkbox.h" G_BEGIN_DECLS diff --git a/gtk/gtkprinterprivate.h b/gtk/gtkprinterprivate.h index 91c49b5b4d..409e66ffb3 100644 --- a/gtk/gtkprinterprivate.h +++ b/gtk/gtkprinterprivate.h @@ -20,7 +20,7 @@ #include #include -#include "gtkprinteroptionset.h" +#include "gtkprinteroptionsetprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c index 7ca8bbb8c0..5daa6e6711 100644 --- a/gtk/gtkprintsettings.c +++ b/gtk/gtkprintsettings.c @@ -24,7 +24,7 @@ #include #include "gtkprintsettings.h" -#include "gtkprintutils.h" +#include "gtkprintutilsprivate.h" #include "gtktypebuiltins.h" #include "gtkwidget.h" diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index 3fc7eb2d4d..1835002b9a 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -30,8 +30,8 @@ #include "gtkcustompaperunixdialog.h" #include "gtkprintbackendprivate.h" #include "gtkprinterprivate.h" -#include "gtkprinteroptionwidget.h" -#include "gtkprintutils.h" +#include "gtkprinteroptionwidgetprivate.h" +#include "gtkprintutilsprivate.h" #include "gtkspinbutton.h" #include "gtkimage.h" diff --git a/gtk/gtkprintutils.c b/gtk/gtkprintutils.c index a8e2095b2b..105ad08a5c 100644 --- a/gtk/gtkprintutils.c +++ b/gtk/gtkprintutils.c @@ -17,7 +17,7 @@ */ #include "config.h" -#include "gtkprintutils.h" +#include "gtkprintutilsprivate.h" double _gtk_print_convert_to_mm (double len, diff --git a/gtk/gtkprintutils.h b/gtk/gtkprintutilsprivate.h similarity index 100% rename from gtk/gtkprintutils.h rename to gtk/gtkprintutilsprivate.h diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c index d5c6acbe48..ed40db68aa 100644 --- a/modules/printbackends/gtkprintbackendcups.c +++ b/modules/printbackends/gtkprintbackendcups.c @@ -57,7 +57,7 @@ #include "gtkcupssecretsutils.h" #include "gtkprintbackendutils.h" -#include +#include #include "gtkprivate.h" #ifdef HAVE_COLORD