From a454e25e723f61bd10c89399b848ba3416fa8d15 Mon Sep 17 00:00:00 2001
From: dd86k <dd@dax.moe>
Date: Sun, 20 Mar 2022 18:37:27 -0400
Subject: [PATCH] Bump 0.4.1, remove common module

---
 src/ddhx/common.d  | 58 ----------------------------------------------
 src/ddhx/ddhx.d    | 51 ++++++++++++++++++++++++++++++++++++++++
 src/ddhx/package.d |  1 -
 3 files changed, 51 insertions(+), 59 deletions(-)
 delete mode 100644 src/ddhx/common.d

diff --git a/src/ddhx/common.d b/src/ddhx/common.d
deleted file mode 100644
index 9048316..0000000
--- a/src/ddhx/common.d
+++ /dev/null
@@ -1,58 +0,0 @@
-/// Common global variables.
-/// Copyright: dd86k <dd@dax.moe>
-/// License: MIT
-/// Authors: $(LINK2 github.com/dd86k, dd86k)
-module ddhx.common;
-
-import ddhx;
-
-/// Copyright string
-enum COPYRIGHT = "Copyright (c) 2017-2022 dd86k <dd@dax.moe>";
-
-/// App version
-enum VERSION = "0.4.0";
-
-/// Version line
-enum ABOUT = "ddhx " ~ VERSION ~ " (built: " ~ __TIMESTAMP__~")";
-
-//
-// SECTION Input structure
-//
-
-// !SECTION
-
-/// Number type to render either for offset or data
-enum NumberType {
-	hexadecimal,
-	decimal,
-	octal
-}
-
-/// Character translation
-enum CharType {
-	ascii,	/// 7-bit US-ASCII
-	cp437,	/// IBM PC CP-437
-	ebcdic,	/// IBM EBCDIC Code Page 37
-	mac,	/// Mac OS Roman
-//	gsm,	/// GSM 03.38
-}
-
-//TODO: --no-header: bool
-//TODO: --no-offset: bool
-//TODO: --no-status: bool
-/// Global definitions and default values
-// Aren't all of these engine settings anyway?
-struct Globals {
-	// Settings
-	ushort rowWidth = 16;	/// How many bytes are shown per row
-	NumberType offsetType;	/// Current offset view type
-	NumberType dataType;	/// Current data view type
-	CharType charType;	/// Current charset
-	char defaultChar = '.';	/// Default character to use for non-ascii characters
-//	int include;	/// Include what panels
-	// Internals
-	TerminalSize termSize;	/// Last known terminal size
-}
-
-__gshared Globals globals; /// Single-instance of globals.
-__gshared Io io;	/// File/stream I/O instance.
\ No newline at end of file
diff --git a/src/ddhx/ddhx.d b/src/ddhx/ddhx.d
index 8ae9463..7934c70 100644
--- a/src/ddhx/ddhx.d
+++ b/src/ddhx/ddhx.d
@@ -10,6 +10,57 @@ import std.string : split;
 import core.stdc.string : memset;
 import ddhx;
 
+/// Copyright string
+enum COPYRIGHT = "Copyright (c) 2017-2022 dd86k <dd@dax.moe>";
+
+/// App version
+enum VERSION = "0.4.1";
+
+/// Version line
+enum ABOUT = "ddhx " ~ VERSION ~ " (built: " ~ __TIMESTAMP__~")";
+
+//
+// SECTION Input structure
+//
+
+// !SECTION
+
+/// Number type to render either for offset or data
+enum NumberType {
+	hexadecimal,
+	decimal,
+	octal
+}
+
+/// Character translation
+enum CharType {
+	ascii,	/// 7-bit US-ASCII
+	cp437,	/// IBM PC CP-437
+	ebcdic,	/// IBM EBCDIC Code Page 37
+	mac,	/// Mac OS Roman
+//	gsm,	/// GSM 03.38
+}
+
+//TODO: --no-header: bool
+//TODO: --no-offset: bool
+//TODO: --no-status: bool
+/// Global definitions and default values
+// Aren't all of these engine settings anyway?
+struct Globals {
+	// Settings
+	ushort rowWidth = 16;	/// How many bytes are shown per row
+	NumberType offsetType;	/// Current offset view type
+	NumberType dataType;	/// Current data view type
+	CharType charType;	/// Current charset
+	char defaultChar = '.';	/// Default character to use for non-ascii characters
+//	int include;	/// Include what panels
+	// Internals
+	TerminalSize termSize;	/// Last known terminal size
+}
+
+__gshared Globals globals; /// Single-instance of globals.
+__gshared Io io;	/// File/stream I/O instance.
+
 int printError() {
 	stderr.write("error: ");
 	stderr.writeln(errorMsg);
diff --git a/src/ddhx/package.d b/src/ddhx/package.d
index 417d138..d944321 100644
--- a/src/ddhx/package.d
+++ b/src/ddhx/package.d
@@ -6,7 +6,6 @@ module ddhx;
 
 public import
 	ddhx.ddhx,
-	ddhx.common,
 	ddhx.command,
 	ddhx.display,
 	ddhx.error,