From 21664767f0a9d6f6c7d81c46efa84f725d1bd1f3 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 13 Aug 2019 17:01:25 +0100
Subject: Move the Module parameter of ExtensionItem et al to the start.

This matches what other ServiceProvider types do.
---
 src/base.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/base.cpp')

diff --git a/src/base.cpp b/src/base.cpp
index 094ea6222..14a28af17 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -99,16 +99,12 @@ void ServiceProvider::RegisterService()
 {
 }
 
-ExtensionItem::ExtensionItem(const std::string& Key, ExtensibleType exttype, Module* mod)
+ExtensionItem::ExtensionItem(Module* mod, const std::string& Key, ExtensibleType exttype)
 	: ServiceProvider(mod, Key, SERVICE_METADATA)
 	, type(exttype)
 {
 }
 
-ExtensionItem::~ExtensionItem()
-{
-}
-
 void* ExtensionItem::get_raw(const Extensible* container) const
 {
 	Extensible::ExtensibleStore::const_iterator i =
@@ -250,8 +246,8 @@ std::string ExtensionItem::ToNetwork(const Extensible* container, void* item) co
 	return std::string();
 }
 
-LocalStringExt::LocalStringExt(const std::string& Key, ExtensibleType exttype, Module* Owner)
-	: SimpleExtItem<std::string>(Key, exttype, Owner)
+LocalStringExt::LocalStringExt(Module* Owner, const std::string& Key, ExtensibleType exttype)
+	: SimpleExtItem<std::string>(Owner, Key, exttype)
 {
 }
 
@@ -269,8 +265,8 @@ void LocalStringExt::FromInternal(Extensible* container, const std::string& valu
 	set(container, value);
 }
 
-LocalIntExt::LocalIntExt(const std::string& Key, ExtensibleType exttype, Module* mod)
-	: ExtensionItem(Key, exttype, mod)
+LocalIntExt::LocalIntExt(Module* mod, const std::string& Key, ExtensibleType exttype)
+	: ExtensionItem(mod, Key, exttype)
 {
 }
 
@@ -305,8 +301,8 @@ void LocalIntExt::Delete(Extensible* container, void* item)
 {
 }
 
-StringExtItem::StringExtItem(const std::string& Key, ExtensibleType exttype, Module* mod)
-	: ExtensionItem(Key, exttype, mod)
+StringExtItem::StringExtItem(Module* mod, const std::string& Key, ExtensibleType exttype)
+	: ExtensionItem(mod, Key, exttype)
 {
 }
 
-- 
cgit v1.3.1-10-gc9f91