From 13f2f8de06c44ee9622acb2f42378d467a6aa8da Mon Sep 17 00:00:00 2001 From: Zardshard <0azrune6@zard.anonaddy.com> Date: Mon, 22 May 2023 10:24:07 -0400 Subject: [PATCH] Icon-O-Matic: Move some functions to header files Change-Id: I3b12e88e133cfe8e9b0f5830f69d582bbaaa93c2 Reviewed-on: https://review.haiku-os.org/c/haiku/+/6466 Tested-by: Commit checker robot Reviewed-by: Adrien Destugues --- .../import_export/flat_icon/FlatIconExporter.cpp | 7 ------- .../import_export/flat_icon/FlatIconExporter.h | 2 +- .../import_export/flat_icon/RDefExporter.cpp | 7 ------- .../import_export/flat_icon/RDefExporter.h | 2 +- .../import_export/flat_icon/SourceExporter.cpp | 7 ------- .../import_export/flat_icon/SourceExporter.h | 2 +- .../icon-o-matic/import_export/svg/SVGExporter.cpp | 14 -------------- .../icon-o-matic/import_export/svg/SVGExporter.h | 4 ++-- 8 files changed, 5 insertions(+), 40 deletions(-) diff --git a/src/apps/icon-o-matic/import_export/flat_icon/FlatIconExporter.cpp b/src/apps/icon-o-matic/import_export/flat_icon/FlatIconExporter.cpp index 1115a6229f..a81c398615 100644 --- a/src/apps/icon-o-matic/import_export/flat_icon/FlatIconExporter.cpp +++ b/src/apps/icon-o-matic/import_export/flat_icon/FlatIconExporter.cpp @@ -89,13 +89,6 @@ FlatIconExporter::Export(const Icon* icon, BPositionIO* stream) return B_OK; } -// MIMEType -const char* -FlatIconExporter::MIMEType() -{ - return NULL; -} - // Export status_t FlatIconExporter::Export(const Icon* icon, BNode* node, diff --git a/src/apps/icon-o-matic/import_export/flat_icon/FlatIconExporter.h b/src/apps/icon-o-matic/import_export/flat_icon/FlatIconExporter.h index 909e159c4f..90edaeef14 100644 --- a/src/apps/icon-o-matic/import_export/flat_icon/FlatIconExporter.h +++ b/src/apps/icon-o-matic/import_export/flat_icon/FlatIconExporter.h @@ -57,7 +57,7 @@ class FlatIconExporter : public Exporter { virtual status_t Export(const Icon* icon, BPositionIO* stream); - virtual const char* MIMEType(); + virtual const char* MIMEType() { return NULL; } /*! Export to file attribute */ status_t Export(const Icon* icon, BNode* node, diff --git a/src/apps/icon-o-matic/import_export/flat_icon/RDefExporter.cpp b/src/apps/icon-o-matic/import_export/flat_icon/RDefExporter.cpp index c1db24bf80..f844a16e69 100644 --- a/src/apps/icon-o-matic/import_export/flat_icon/RDefExporter.cpp +++ b/src/apps/icon-o-matic/import_export/flat_icon/RDefExporter.cpp @@ -36,13 +36,6 @@ RDefExporter::Export(const Icon* icon, BPositionIO* stream) return _Export((const uint8*)buffer.Buffer(), buffer.BufferLength(), stream); } -// MIMEType -const char* -RDefExporter::MIMEType() -{ - return "text/x-vnd.Be.ResourceDef"; -} - // #pragma mark - // _Export diff --git a/src/apps/icon-o-matic/import_export/flat_icon/RDefExporter.h b/src/apps/icon-o-matic/import_export/flat_icon/RDefExporter.h index f2f5168279..ebc127029a 100644 --- a/src/apps/icon-o-matic/import_export/flat_icon/RDefExporter.h +++ b/src/apps/icon-o-matic/import_export/flat_icon/RDefExporter.h @@ -21,7 +21,7 @@ class RDefExporter : public FlatIconExporter { virtual status_t Export(const Icon* icon, BPositionIO* stream); - virtual const char* MIMEType(); + virtual const char* MIMEType() { return "text/x-vnd.Be.ResourceDef"; } private: status_t _Export(const uint8* source, diff --git a/src/apps/icon-o-matic/import_export/flat_icon/SourceExporter.cpp b/src/apps/icon-o-matic/import_export/flat_icon/SourceExporter.cpp index 5541c87b75..d000087293 100644 --- a/src/apps/icon-o-matic/import_export/flat_icon/SourceExporter.cpp +++ b/src/apps/icon-o-matic/import_export/flat_icon/SourceExporter.cpp @@ -37,13 +37,6 @@ SourceExporter::Export(const Icon* icon, BPositionIO* stream) stream); } -// MIMEType -const char* -SourceExporter::MIMEType() -{ - return "text/x-source-code"; -} - // #pragma mark - // _Export diff --git a/src/apps/icon-o-matic/import_export/flat_icon/SourceExporter.h b/src/apps/icon-o-matic/import_export/flat_icon/SourceExporter.h index 4ae1f79193..658c857d97 100644 --- a/src/apps/icon-o-matic/import_export/flat_icon/SourceExporter.h +++ b/src/apps/icon-o-matic/import_export/flat_icon/SourceExporter.h @@ -21,7 +21,7 @@ class SourceExporter : public FlatIconExporter { virtual status_t Export(const Icon* icon, BPositionIO* stream); - virtual const char* MIMEType(); + virtual const char* MIMEType() { return "text/x-source-code"; } private: status_t _Export(const uint8* source, diff --git a/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp b/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp index ee9fcec11c..061bb336e0 100644 --- a/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp +++ b/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp @@ -125,20 +125,6 @@ SVGExporter::Export(const Icon* icon, BPositionIO* stream) return ret; } -// MIMEType -const char* -SVGExporter::MIMEType() -{ - return "image/svg+xml"; -} - -// Extension -const char* -SVGExporter::Extension() -{ - return "svg"; -} - // #pragma mark - // SetOriginalEntry diff --git a/src/apps/icon-o-matic/import_export/svg/SVGExporter.h b/src/apps/icon-o-matic/import_export/svg/SVGExporter.h index febd59cef2..6e7d47edb5 100644 --- a/src/apps/icon-o-matic/import_export/svg/SVGExporter.h +++ b/src/apps/icon-o-matic/import_export/svg/SVGExporter.h @@ -32,8 +32,8 @@ class SVGExporter : public Exporter { // Exporter virtual status_t Export(const Icon* icon, BPositionIO* stream); - virtual const char* MIMEType(); - virtual const char* Extension(); + virtual const char* MIMEType() { return "image/svg+xml"; } + virtual const char* Extension() { return "svg"; } // SVGExporter void SetOriginalEntry(const entry_ref* ref);