Cleanup, removed old extension instantiation.

hmatuschek · Jan 6, 2022 · f9565ea · f9565ea
1 parent eba275f
commit f9565ea
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 123 deletions.
diff --git a/lib/channel.cc b/lib/channel.cc
@@ -279,20 +279,6 @@ Channel::populate(YAML::Node &node, const Context &context) {
   return true;
 }
 
-/*ConfigItem *
-Channel::allocateChild(QMetaProperty &prop, const YAML::Node &node, const Context &ctx, const ErrorStack &err) {
-  Q_UNUSED(node); Q_UNUSED(ctx)
-  if (0 == strcmp("openGD77", prop.name())) {
-    return new OpenGD77ChannelExtension();
-  } else if (0 == strcmp("tyt", prop.name())) {
-    return new TyTChannelExtension();
-  }
-
-  errMsg(err) << "Cannot allocate instance for unknown child '" << prop.name() << "'.";
-  return nullptr;
-}
-*/
-
 bool
 Channel::parse(const YAML::Node &node, ConfigItem::Context &ctx, const ErrorStack &err) {
   if (! node)

diff --git a/lib/channel.hh b/lib/channel.hh
@@ -144,7 +144,6 @@ public:
   void setTyTChannelExtension(TyTChannelExtension *ext);
 
 public:
-  //ConfigItem *allocateChild(QMetaProperty &prop, const YAML::Node &node, const Context &ctx, const ErrorStack &err=ErrorStack());
   bool parse(const YAML::Node &node, Context &ctx, const ErrorStack &err=ErrorStack());
   bool link(const YAML::Node &node, const Context &ctx, const ErrorStack &err=ErrorStack());
 

diff --git a/lib/config.cc b/lib/config.cc
@@ -340,21 +340,6 @@ Config::readYAML(const QString &filename, const ErrorStack &err) {
   return true;
 }
 
-/*ConfigItem *
-Config::allocateChild(QMetaProperty &prop, const YAML::Node &node,
-                      const Context &ctx, const ErrorStack &err)
-{
-  if (ConfigItem *item = ConfigItem::allocateChild(prop, node, ctx, err))
-    return item;
-
-  logDebug() << "Manual instantiation of extensions.";
-  if (0==strcmp("tytExtension", prop.name())) {
-    return new TyTConfigExtension(this);
-  }
-
-  return nullptr;
-}*/
-
 bool
 Config::parse(const YAML::Node &node, Context &ctx, const ErrorStack &err)
 {

diff --git a/lib/config.hh b/lib/config.hh
@@ -122,8 +122,6 @@ public:
   /** Imports a configuration from the given YAML file. */
   bool readYAML(const QString &filename, const ErrorStack &err=ErrorStack());
 
-  /*ConfigItem *allocateChild(QMetaProperty &prop, const YAML::Node &node,
-                            const Context &ctx, const ErrorStack &err=ErrorStack());*/
   bool parse(const YAML::Node &node, Context &ctx, const ErrorStack &err=ErrorStack());
   bool link(const YAML::Node &node, const Context &ctx, const ErrorStack &err=ErrorStack());
 

diff --git a/lib/configobject.cc b/lib/configobject.cc
@@ -373,9 +373,9 @@ ConfigItem::allocateChild(QMetaProperty &prop, const YAML::Node &node, const Con
   }
 
   const QMetaObject *propType = type.metaObject();
-  logDebug() << "Try to instantiate child of type " << prop.typeName()
+  /*logDebug() << "Try to instantiate child of type " << prop.typeName()
              << " for element " << prop.name()
-             << " in " << this->metaObject()->className() << ".";
+             << " in " << this->metaObject()->className() << ".";*/
 
   ConfigItem *item = qobject_cast<ConfigItem *>(
         propType->newInstance(Q_ARG(QObject *,this)));

diff --git a/lib/configobject.hh b/lib/configobject.hh
@@ -111,7 +111,9 @@ public:
    * The complete configuration must be labeled first. */
   virtual YAML::Node serialize(const Context &context);
 
-  /** Allocates an instance for the given property on the given YAML node. */
+  /** Allocates an instance for the given property on the given YAML node.
+   * This is usually done automatically based on the meta-type of the property. To be able to
+   * instantiate the item, its default constructor must be Q_INVOKABLE. */
   virtual ConfigItem *allocateChild(QMetaProperty &prop, const YAML::Node &node,
                                     const Context &ctx, const ErrorStack &err=ErrorStack());
   /** Parses the given YAML node, updates the given object and updates the given context (IDs). */

diff --git a/lib/contact.cc b/lib/contact.cc
@@ -35,14 +35,6 @@ Contact::setRing(bool enable) {
   emit modified(this);
 }
 
-/*ConfigItem *
-Contact::allocateChild(QMetaProperty &prop, const YAML::Node &node,
-                       const Context &ctx, const ErrorStack &err) {
-  Q_UNUSED(prop); Q_UNUSED(node); Q_UNUSED(ctx); Q_UNUSED(err)
-  // There are no children yet
-  return nullptr;
-}*/
-
 bool
 Contact::parse(const YAML::Node &node, Context &ctx, const ErrorStack &err) {
   if (! node)
@@ -178,15 +170,6 @@ DigitalContact::setNumber(unsigned number) {
   return true;
 }
 
-/*ConfigItem *
-DigitalContact::allocateChild(QMetaProperty &prop, const YAML::Node &node, const Context &ctx, const ErrorStack &err) {
-  Q_UNUSED(node); Q_UNUSED(ctx); Q_UNUSED(err)
-
-  if (0 == strcmp("openGD77", prop.name()))
-    return new OpenGD77ContactExtension();
-  return nullptr;
-}*/
-
 YAML::Node
 DigitalContact::serialize(const Context &context) {
   YAML::Node node = Contact::serialize(context);

diff --git a/lib/contact.hh b/lib/contact.hh
@@ -57,8 +57,6 @@ public:
 	}
 
 public:
-  /*ConfigItem *allocateChild(QMetaProperty &prop, const YAML::Node &node,
-                            const Context &ctx, const ErrorStack &err=ErrorStack());*/
   bool parse(const YAML::Node &node, Context &ctx, const ErrorStack &err=ErrorStack());
   bool link(const YAML::Node &node, const Context &ctx, const ErrorStack &err=ErrorStack());
 
@@ -156,7 +154,6 @@ public:
   void setOpenGD77ContactExtension(OpenGD77ContactExtension *ext);
 
 public:
-  //ConfigItem *allocateChild(QMetaProperty &prop, const YAML::Node &node, const Context &ctx, const ErrorStack &err);
   YAML::Node serialize(const Context &context);
 
 protected:

diff --git a/lib/gpssystem.cc b/lib/gpssystem.cc
@@ -42,13 +42,6 @@ PositioningSystem::populate(YAML::Node &node, const ConfigItem::Context &context
   return true;
 }
 
-/*ConfigItem *
-PositioningSystem::allocateChild(QMetaProperty &prop, const YAML::Node &node, const Context &ctx, const ErrorStack &err) {
-  Q_UNUSED(prop); Q_UNUSED(node); Q_UNUSED(ctx); Q_UNUSED(err)
-  // No children yet
-  return nullptr;
-}*/
-
 bool
 PositioningSystem::parse(const YAML::Node &node, Context &ctx, const ErrorStack &err) {
   if (! node)

diff --git a/lib/gpssystem.hh b/lib/gpssystem.hh
@@ -40,7 +40,6 @@ public:
   void setPeriod(unsigned period);
 
 public:
-  //ConfigItem *allocateChild(QMetaProperty &prop, const YAML::Node &node, const Context &ctx, const ErrorStack &err=ErrorStack());
   bool parse(const YAML::Node &node, Context &ctx, const ErrorStack &err=ErrorStack());
   bool link(const YAML::Node &node, const Context &ctx, const ErrorStack &err=ErrorStack());
 

diff --git a/lib/radioid.cc b/lib/radioid.cc
@@ -51,15 +51,6 @@ RadioID::serialize(const Context &context) {
   return type;
 }
 
-/*ConfigItem *
-RadioID::allocateChild(QMetaProperty &prop, const YAML::Node &node,
-                       const Context &ctx, const ErrorStack &err)
-{
-  Q_UNUSED(prop); Q_UNUSED(node); Q_UNUSED(ctx); Q_UNUSED(err)
-  // No extensions defined yet for RadioID
-  return nullptr;
-}*/
-
 bool
 RadioID::parse(const YAML::Node &node, ConfigItem::Context &ctx, const ErrorStack &err) {
   if (! node)

diff --git a/lib/radioid.hh b/lib/radioid.hh
@@ -32,8 +32,6 @@ public:
   void setNumber(uint32_t number);
 
   YAML::Node serialize(const Context &context);
-  /*ConfigItem *allocateChild(QMetaProperty &prop, const YAML::Node &node,
-                            const Context &ctx, const ErrorStack &err=ErrorStack());*/
   bool parse(const YAML::Node &node, ConfigItem::Context &ctx, const ErrorStack &err=ErrorStack());
   bool link(const YAML::Node &node, const ConfigItem::Context &ctx, const ErrorStack &err=ErrorStack());
 

diff --git a/lib/roaming.cc b/lib/roaming.cc
@@ -80,12 +80,6 @@ RoamingZone::channels() {
   return &_channel;
 }
 
-/*ConfigItem *
-RoamingZone::allocateChild(QMetaProperty &prop, const YAML::Node &node, const Context &ctx, const ErrorStack &err) {
-  Q_UNUSED(prop); Q_UNUSED(node); Q_UNUSED(ctx); Q_UNUSED(err)
-  return nullptr;
-}*/
-
 
 /* ********************************************************************************************* *
  * Implementation of DefaultRoamingZone

diff --git a/lib/roaming.hh b/lib/roaming.hh
@@ -55,10 +55,6 @@ public:
   /** Retruns the list of digital channels in this roaming zone. */
   DigitalChannelRefList *channels();
 
-public:
-  /*ConfigItem *allocateChild(QMetaProperty &prop, const YAML::Node &node,
-                            const Context &ctx, const ErrorStack &err=ErrorStack());*/
-
 protected:
   /** Holds the actual channels of the roaming zone. */
   DigitalChannelRefList _channel;

diff --git a/lib/rxgrouplist.cc b/lib/rxgrouplist.cc
@@ -93,14 +93,6 @@ RXGroupList::serialize(const Context &context) {
   return node;
 }
 
-/*ConfigItem *
-RXGroupList::allocateChild(QMetaProperty &prop, const YAML::Node &node,
-                           const Context &ctx, const ErrorStack &err) {
-  Q_UNUSED(prop); Q_UNUSED(node); Q_UNUSED(ctx); Q_UNUSED(err)
-  // There are no children yet.
-  return nullptr;
-}*/
-
 void
 RXGroupList::onModified() {
   emit modified(this);

diff --git a/lib/rxgrouplist.hh b/lib/rxgrouplist.hh
@@ -51,8 +51,6 @@ public:
 
 public:
   YAML::Node serialize(const Context &context);
-  /*ConfigItem *allocateChild(QMetaProperty &prop, const YAML::Node &node,
-                            const Context &ctx, const ErrorStack &err=ErrorStack());*/
 
 protected slots:
   /** Internal used callback to handle list modifications. */

diff --git a/lib/scanlist.cc b/lib/scanlist.cc
@@ -186,20 +186,6 @@ ScanList::setTyTScanListExtension(TyTScanListExtension *tyt) {
     _tyt->setParent(this);
 }
 
-/*ConfigItem *
-ScanList::allocateChild(QMetaProperty &prop, const YAML::Node &node,
-                        const Context &ctx, const ErrorStack &err)
-{
-  Q_UNUSED(node); Q_UNUSED(ctx); Q_UNUSED(err)
-
-  if (0 == strcmp("tyt", prop.name())) {
-      return new TyTScanListExtension();
-  }
-
-  errMsg(err) << "Cannot allocate instance for unknown child '" << prop.name() << "'.";
-  return nullptr;
-}*/
-
 
 /* ********************************************************************************************* *
  * Implementation of ScanLists

diff --git a/lib/scanlist.hh b/lib/scanlist.hh
@@ -90,10 +90,6 @@ public:
   /** Sets the TyT scan-list extension. */
   void setTyTScanListExtension(TyTScanListExtension *tyt);
 
-public:
-  /*ConfigItem *allocateChild(QMetaProperty &prop, const YAML::Node &node,
-                            const Context &ctx, const ErrorStack &err=ErrorStack());*/
-
 protected:
   /** The channel list. */
   ChannelRefList _channels;

diff --git a/lib/zone.cc b/lib/zone.cc
@@ -70,13 +70,6 @@ ChannelRefList *Zone::B() {
   return &_B;
 }
 
-/*ConfigItem *
-Zone::allocateChild(QMetaProperty &prop, const YAML::Node &node, const Context &ctx, const ErrorStack &err) {
-  Q_UNUSED(prop); Q_UNUSED(node); Q_UNUSED(ctx); Q_UNUSED(err)
-  // There are no children yet.
-  return nullptr;
-}*/
-
 
 /* ********************************************************************************************* *
  * Implementation of ZoneList

diff --git a/lib/zone.hh b/lib/zone.hh
@@ -47,10 +47,6 @@ signals:
   /** Gets emitted whenever the zone gets modified. */
 	void modified();
 
-public:
-  /*ConfigItem *allocateChild(QMetaProperty &prop, const YAML::Node &node,
-                            const Context &ctx, const ErrorStack &err=ErrorStack());*/
-
 protected:
   /** List of channels for VFO A. */
   ChannelRefList _A;