From 10cfac3d42dbfd249875ddb9a94afded44fbf584 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Fri, 15 Jun 2018 00:31:46 +0200
Subject: [PATCH] WIP: fixed linker issues.

---
 src/db/db/dbTechnology.cc                                  | 3 ++-
 src/laybasic/laybasic/layTechnology.cc                     | 7 +++----
 src/laybasic/laybasic/layTechnology.h                      | 2 ++
 src/laybasic/laybasic/laybasic.pro                         | 1 -
 ...{layCommonStreamOptions.cc => layCommonReaderPlugin.cc} | 0
 .../streamers/common/lay_plugin}/layCommonReaderPlugin.h   | 0
 src/plugins/streamers/common/lay_plugin/lay_plugin.pro     | 3 ++-
 7 files changed, 9 insertions(+), 7 deletions(-)
 rename src/plugins/streamers/common/lay_plugin/{layCommonStreamOptions.cc => layCommonReaderPlugin.cc} (100%)
 rename src/{laybasic/laybasic => plugins/streamers/common/lay_plugin}/layCommonReaderPlugin.h (100%)

diff --git a/src/db/db/dbTechnology.cc b/src/db/db/dbTechnology.cc
index 182e571be..1f9d78bc9 100644
--- a/src/db/db/dbTechnology.cc
+++ b/src/db/db/dbTechnology.cc
@@ -31,7 +31,8 @@
 
 namespace tl
 {
-  template <> tl::Registrar<db::TechnologyComponentProvider> *Registrar<db::TechnologyComponentProvider>::instance = 0;
+  template<> DB_PUBLIC tl::Registrar<db::TechnologyComponentProvider> *tl::Registrar<db::TechnologyComponentProvider>::instance = 0;
+  template class DB_PUBLIC tl::RegisteredClass<db::TechnologyComponentProvider>;
 }
 
 namespace db
diff --git a/src/laybasic/laybasic/layTechnology.cc b/src/laybasic/laybasic/layTechnology.cc
index 1e6d06737..89e141731 100644
--- a/src/laybasic/laybasic/layTechnology.cc
+++ b/src/laybasic/laybasic/layTechnology.cc
@@ -30,10 +30,9 @@
 #include <QFileInfo>
 #include <QDir>
 
-namespace lay
+namespace tl
 {
-
-  //  .. nothing yet ..
-
+  template<> LAYBASIC_PUBLIC tl::Registrar<lay::TechnologyEditorProvider> *tl::Registrar<lay::TechnologyEditorProvider>::instance = 0;
+  template class LAYBASIC_PUBLIC tl::RegisteredClass<lay::TechnologyEditorProvider>;
 }
 
diff --git a/src/laybasic/laybasic/layTechnology.h b/src/laybasic/laybasic/layTechnology.h
index e9aedb21d..49d043b5f 100644
--- a/src/laybasic/laybasic/layTechnology.h
+++ b/src/laybasic/laybasic/layTechnology.h
@@ -106,12 +106,14 @@ private:
  *  @brief A base class for a technology component provider
  */
 class LAYBASIC_PUBLIC TechnologyEditorProvider
+  : public tl::RegisteredClass<TechnologyEditorProvider>
 {
 public:
   /**
    *  @brief The constructor
    */
   TechnologyEditorProvider ()
+    : tl::RegisteredClass<TechnologyEditorProvider> (this)
   {
     // .. nothing yet ..
   }
diff --git a/src/laybasic/laybasic/laybasic.pro b/src/laybasic/laybasic/laybasic.pro
index b3954db7f..316d434e8 100644
--- a/src/laybasic/laybasic/laybasic.pro
+++ b/src/laybasic/laybasic/laybasic.pro
@@ -237,7 +237,6 @@ HEADERS = \
   rdbMarkerBrowserDialog.h \
   rdbMarkerBrowser.h \
   rdbMarkerBrowserPage.h \
-  layCommonReaderPlugin.h \
   layLineStyles.h \
   laySelectLineStyleForm.h \
   layLineStylePalette.h \
diff --git a/src/plugins/streamers/common/lay_plugin/layCommonStreamOptions.cc b/src/plugins/streamers/common/lay_plugin/layCommonReaderPlugin.cc
similarity index 100%
rename from src/plugins/streamers/common/lay_plugin/layCommonStreamOptions.cc
rename to src/plugins/streamers/common/lay_plugin/layCommonReaderPlugin.cc
diff --git a/src/laybasic/laybasic/layCommonReaderPlugin.h b/src/plugins/streamers/common/lay_plugin/layCommonReaderPlugin.h
similarity index 100%
rename from src/laybasic/laybasic/layCommonReaderPlugin.h
rename to src/plugins/streamers/common/lay_plugin/layCommonReaderPlugin.h
diff --git a/src/plugins/streamers/common/lay_plugin/lay_plugin.pro b/src/plugins/streamers/common/lay_plugin/lay_plugin.pro
index 8d6b54d7b..b9d701d2b 100644
--- a/src/plugins/streamers/common/lay_plugin/lay_plugin.pro
+++ b/src/plugins/streamers/common/lay_plugin/lay_plugin.pro
@@ -13,9 +13,10 @@ LIBS += -L$$DESTDIR/../db_plugins -lcif
 }
 
 HEADERS = \
+  layCommonReaderPlugin.h \
 
 SOURCES = \
-  layCommonStreamOptions.cc \
+  layCommonReaderPlugin.cc \
 
 FORMS = \
   CommonReaderOptionsPage.ui \