StelPluginInterface: Use the most-used override in base class.

- comment away all same-code overrides. (But keep it to remind us of possible override)
Stellarium · Sep 11, 2023 · dec1204 · dec1204
1 parent cfe356a
commit dec1204
Show file tree

Hide file tree

Showing 27 changed files with 29 additions and 25 deletions.
diff --git a/plugins/AngleMeasure/src/AngleMeasure.hpp b/plugins/AngleMeasure/src/AngleMeasure.hpp
@@ -237,7 +237,7 @@ class AngleMeasureStelPluginInterface : public QObject, public StelPluginInterfa
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /*ANGLEMEASURE_HPP*/
diff --git a/plugins/ArchaeoLines/src/ArchaeoLines.hpp b/plugins/ArchaeoLines/src/ArchaeoLines.hpp
@@ -594,7 +594,7 @@ class ArchaeoLinesStelPluginInterface : public QObject, public StelPluginInterfa
 public:
 	virtual StelModule* getStelModule()    const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /*ARCHAEOLINES_HPP*/

diff --git a/plugins/Calendars/src/Calendars.hpp b/plugins/Calendars/src/Calendars.hpp
@@ -364,7 +364,7 @@ class CalendarsStelPluginInterface : public QObject, public StelPluginInterface
 public:
 	StelModule* getStelModule() const override;
 	StelPluginInfo getPluginInfo() const override;
-	QObjectList getExtensionList() const override { return QObjectList(); }
+	//QObjectList getExtensionList() const override { return QObjectList(); }
 };
 
 #endif /* CALENDARS_HPP */
diff --git a/plugins/EquationOfTime/src/EquationOfTime.hpp b/plugins/EquationOfTime/src/EquationOfTime.hpp
@@ -181,7 +181,7 @@ class EquationOfTimeStelPluginInterface : public QObject, public StelPluginInter
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /* EQUATIONOFTIME_HPP */
diff --git a/plugins/Exoplanets/src/Exoplanets.hpp b/plugins/Exoplanets/src/Exoplanets.hpp
@@ -470,7 +470,7 @@ class ExoplanetsStelPluginInterface : public QObject, public StelPluginInterface
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /* EXOPLANETS_HPP */
diff --git a/plugins/MeteorShowers/src/MeteorShowersMgr.hpp b/plugins/MeteorShowers/src/MeteorShowersMgr.hpp
@@ -361,7 +361,7 @@ class MeteorShowersStelPluginInterface : public QObject, public StelPluginInterf
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /*METEORSHOWERSMGR_HPP*/
diff --git a/plugins/MissingStars/src/MissingStars.hpp b/plugins/MissingStars/src/MissingStars.hpp
@@ -158,7 +158,7 @@ class MissingStarsStelPluginInterface : public QObject, public StelPluginInterfa
 public:
 	virtual StelModule* getStelModule() const override;
 	virtual StelPluginInfo getPluginInfo() const override;
-	virtual QObjectList getExtensionList() const override { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const override { return QObjectList(); }
 };
 
 #endif /* MISSINGSTARS_HPP */
diff --git a/plugins/NavStars/src/NavStars.hpp b/plugins/NavStars/src/NavStars.hpp
@@ -258,7 +258,7 @@ class NavStarsStelPluginInterface : public QObject, public StelPluginInterface
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif // NAVSTARS_HPP
diff --git a/plugins/Novae/src/Novae.hpp b/plugins/Novae/src/Novae.hpp
@@ -280,7 +280,7 @@ class NovaeStelPluginInterface : public QObject, public StelPluginInterface
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /*NOVAE_HPP*/
diff --git a/plugins/Observability/src/Observability.hpp b/plugins/Observability/src/Observability.hpp
@@ -449,7 +449,7 @@ class ObservabilityStelPluginInterface : public QObject, public StelPluginInterf
 public:
        virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
        virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-       virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+       //virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /*OBSERVABILITY_HPP*/
diff --git a/plugins/Oculars/src/Oculars.hpp b/plugins/Oculars/src/Oculars.hpp
@@ -596,7 +596,7 @@ class OcularsStelPluginInterface : public QObject, public StelPluginInterface
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /* OCULARS_HPP */
diff --git a/plugins/OnlineQueries/src/OnlineQueries.hpp b/plugins/OnlineQueries/src/OnlineQueries.hpp
@@ -144,7 +144,7 @@ class OnlineQueriesPluginInterface : public QObject, public StelPluginInterface
 public:
 	StelModule* getStelModule() const override;
 	StelPluginInfo getPluginInfo() const override;
-	QObjectList getExtensionList() const override { return QObjectList(); }
+	//QObjectList getExtensionList() const override { return QObjectList(); }
 };
 
 #endif /* ONLINEQUERIES_HPP */
diff --git a/plugins/PointerCoordinates/src/PointerCoordinates.hpp b/plugins/PointerCoordinates/src/PointerCoordinates.hpp
@@ -217,7 +217,7 @@ class PointerCoordinatesStelPluginInterface : public QObject, public StelPluginI
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /* POINTERCOORDINATES_HPP */
diff --git a/plugins/Pulsars/src/Pulsars.hpp b/plugins/Pulsars/src/Pulsars.hpp
@@ -376,7 +376,7 @@ class PulsarsStelPluginInterface : public QObject, public StelPluginInterface
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /* PULSARS_HPP */
diff --git a/plugins/Quasars/src/Quasars.hpp b/plugins/Quasars/src/Quasars.hpp
@@ -340,7 +340,7 @@ class QuasarsStelPluginInterface : public QObject, public StelPluginInterface
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /* QUASARS_HPP */
diff --git a/plugins/RemoteControl/src/RemoteControl.hpp b/plugins/RemoteControl/src/RemoteControl.hpp
@@ -188,7 +188,7 @@ class RemoteControlStelPluginInterface : public QObject, public StelPluginInterf
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /*REMOTECONTROL_HPP*/

diff --git a/plugins/RemoteSync/src/RemoteSync.hpp b/plugins/RemoteSync/src/RemoteSync.hpp
@@ -215,7 +215,7 @@ class RemoteSyncStelPluginInterface : public QObject, public StelPluginInterface
 public:
 	StelModule* getStelModule() const override;
 	StelPluginInfo getPluginInfo() const override;
-	QObjectList getExtensionList() const override { return QObjectList(); }
+	//QObjectList getExtensionList() const override { return QObjectList(); }
 };
 
 #endif /*REMOTESYNC_HPP*/

diff --git a/plugins/Satellites/src/Satellites.hpp b/plugins/Satellites/src/Satellites.hpp
@@ -978,7 +978,7 @@ class SatellitesStelPluginInterface : public QObject, public StelPluginInterface
 public:
 	StelModule* getStelModule() const override;
 	StelPluginInfo getPluginInfo() const override;
-	QObjectList getExtensionList() const override { return QObjectList(); }
+	//QObjectList getExtensionList() const override { return QObjectList(); }
 };
 
 #endif /* SATELLITES_HPP */

diff --git a/plugins/SimpleDrawLine/CMakeLists.txt b/plugins/SimpleDrawLine/CMakeLists.txt
@@ -1,6 +1,8 @@
 # This is the cmake config file for the SimpleDrawLine
 SET(SIMPLEDRAWLINE_VERSION "0.1.0")
 ADD_DEFINITIONS(-DBUILD_DYNAMIC_PLUGIN=0)
+ADD_DEFINITIONS(-DSIMPLEDRAWLINE_PLUGIN_VERSION="${SIMPLEDRAWLINE_VERSION}")
+ADD_DEFINITIONS(-DSIMPLEDRAWLINE_PLUGIN_LICENSE="GNU GPLv2 or later")
 
 ADD_SUBDIRECTORY( src )
 

diff --git a/plugins/SimpleDrawLine/src/CMakeLists.txt b/plugins/SimpleDrawLine/src/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(SimpleDrawLine_SRCS
      SimpleDrawLine.cpp
 )
 
-SET(SimpleDrawLine_Qt_Libraries Qt5::Core Qt5::Gui)
+SET(SimpleDrawLine_Qt_Libraries Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui)
 
 ############### For building the dynamic library ######################
 IF(BUILD_DYNAMIC_PLUGIN)

diff --git a/plugins/SimpleDrawLine/src/SimpleDrawLine.cpp b/plugins/SimpleDrawLine/src/SimpleDrawLine.cpp
@@ -44,6 +44,8 @@ StelPluginInfo SimpleDrawLineStelPluginInterface::getPluginInfo() const
 	info.authors = "Stellarium team";
 	info.contact = "www.stellarium.org";
 	info.description = "An minimal plugin example for drawing lines.";
+	info.version = SIMPLEDRAWLINE_PLUGIN_VERSION;
+	info.license = SIMPLEDRAWLINE_PLUGIN_LICENSE;
 	return info;
 }
 

diff --git a/plugins/SimpleDrawLine/src/SimpleDrawLine.hpp b/plugins/SimpleDrawLine/src/SimpleDrawLine.hpp
@@ -52,7 +52,7 @@ class SimpleDrawLineStelPluginInterface : public QObject, public StelPluginInter
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /* SIMPLEDRAWLINE_HPP */
diff --git a/plugins/SolarSystemEditor/src/SolarSystemEditor.hpp b/plugins/SolarSystemEditor/src/SolarSystemEditor.hpp
@@ -332,7 +332,7 @@ class SolarSystemEditorStelPluginInterface : public QObject, public StelPluginIn
 public:
 	StelModule* getStelModule() const override;
 	StelPluginInfo getPluginInfo() const override;
-	QObjectList getExtensionList() const override { return QObjectList(); }
+	//QObjectList getExtensionList() const override { return QObjectList(); }
 };
 
 #endif // SOLARSYSTEMEDITOR_HPP
diff --git a/plugins/Supernovae/src/Supernovae.hpp b/plugins/Supernovae/src/Supernovae.hpp
@@ -276,7 +276,7 @@ class SupernovaeStelPluginInterface : public QObject, public StelPluginInterface
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /* SUPERNOVAE_HPP */
diff --git a/plugins/TelescopeControl/src/TelescopeControl.hpp b/plugins/TelescopeControl/src/TelescopeControl.hpp
@@ -517,7 +517,7 @@ class TelescopeControlStelPluginInterface : public QObject, public StelPluginInt
 public:
 	StelModule* getStelModule() const override;
 	StelPluginInfo getPluginInfo() const override;
-	QObjectList getExtensionList() const override { return QObjectList(); }
+	//QObjectList getExtensionList() const override { return QObjectList(); }
 };
 
 #endif /* TELESCOPECONTROL_HPP */
diff --git a/plugins/TextUserInterface/src/TextUserInterface.hpp b/plugins/TextUserInterface/src/TextUserInterface.hpp
@@ -104,7 +104,7 @@ class TextUserInterfaceStelPluginInterface : public QObject, public StelPluginIn
 public:
 	virtual StelModule* getStelModule() const Q_DECL_OVERRIDE;
 	virtual StelPluginInfo getPluginInfo() const Q_DECL_OVERRIDE;
-	virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
+	//virtual QObjectList getExtensionList() const Q_DECL_OVERRIDE { return QObjectList(); }
 };
 
 #endif /* TEXTUSERINTERFACE_HPP*/
diff --git a/src/core/StelPluginInterface.hpp b/src/core/StelPluginInterface.hpp
@@ -73,7 +73,7 @@ class StelPluginInterface
 	//! The StelModuleMgr remembers all loaded extensions and provides
 	//! methods to access them. You should use qobject_cast to try to
 	//! cast each object to a specific interface in which you are interested in.
-	virtual QObjectList getExtensionList() const = 0;
+	virtual QObjectList getExtensionList() const { return QObjectList(); };
 };
 
 #define StelPluginInterface_iid "org.stellarium.StelPluginInterface/2.0"