From 7897aa542ea3120a18bf6fc884a38187e48da703 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sat, 10 Feb 2018 14:58:26 -0500 Subject: [PATCH] Removed CAPI base classes from glbarcode. Will reconcile when merging back to stand-alone version of glbarcode. --- glbarcode/Barcode.h | 8 +------- glbarcode/Factory.h | 8 +------- glbarcode/Renderer.h | 8 +------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/glbarcode/Barcode.h b/glbarcode/Barcode.h index 6f0e63f..ebfa3f5 100644 --- a/glbarcode/Barcode.h +++ b/glbarcode/Barcode.h @@ -27,12 +27,6 @@ #include "Renderer.h" -/** - * Barcode base for CAPI - */ -extern "C" struct gbcBarcode {}; - - namespace glbarcode { @@ -47,7 +41,7 @@ namespace glbarcode * See Barcode1dBase or Barcode2dBase. * */ - class Barcode : public gbcBarcode + class Barcode { protected: diff --git a/glbarcode/Factory.h b/glbarcode/Factory.h index 7a663d4..98a31b7 100644 --- a/glbarcode/Factory.h +++ b/glbarcode/Factory.h @@ -28,12 +28,6 @@ #include "TypeIdList.h" -/** - * Barcode factory base for CAPI - */ -extern "C" struct gbcFactory {}; - - namespace glbarcode { /** @@ -41,7 +35,7 @@ namespace glbarcode * * Singleton Barcode factory class. */ - class Factory : public gbcFactory + class Factory { public: diff --git a/glbarcode/Renderer.h b/glbarcode/Renderer.h index 47c37a7..1aeb9fa 100644 --- a/glbarcode/Renderer.h +++ b/glbarcode/Renderer.h @@ -27,12 +27,6 @@ #include "DrawingPrimitives.h" -/** - * Renderer base for CAPI - */ -extern "C" struct gbcRenderer {}; - - namespace glbarcode { @@ -44,7 +38,7 @@ namespace glbarcode * * Base class for all renderers. */ - class Renderer : public gbcRenderer + class Renderer { public: /**