[Kstars-devel] branches/kstars/unfrozen/kstars/kstars

[Jason Harris]

SVN commit 829109 by harris:

Remove KStarsData pointers from function argument lists (use 
KStarsData::Instance() instead).

Stage 1: SkyComponents.

I have added a protected KStarsData* member to SkyComponent (so all 
Components/Composites inherit this member).  The pointer is assigned to 
KStarsData::Instance() in the component's init() function.

Question: does it make sense to store this pointer as a member, or should we 
simply call KStarsData::Instance() locally in the functions that need it?

Note: I made init() pure virtual in abstract classes (i.e., "virtual void init() = 
0;" instead of "virtual void init() {}") to make sure they can't be instantiated.

As a result of this change, I had to add a CustomCatalogComposite class, because I 
had been using a SkyComposite directly to store our custom catalog components, and 
I decided that SkyComposite should be an abstract class.

CCMAIL: kstars-devel at kde.org



 M  +1 -0      CMakeLists.txt  
 M  +1 -1      addcatdialog.cpp  
 M  +2 -0      ksplanetbase.cpp  
 M  +7 -7      kstarsdata.cpp  
 M  +2 -2      opscatalog.cpp  
 M  +3 -2      skycomponents/asteroidscomponent.cpp  
 M  +1 -3      skycomponents/asteroidscomponent.h  
 M  +3 -1      skycomponents/cometscomponent.cpp  
 M  +1 -2      skycomponents/cometscomponent.h  
 M  +4 -2      skycomponents/constellationboundary.cpp  
 M  +2 -0      skycomponents/constellationboundary.h  
 M  +3 -2      skycomponents/constellationboundarylines.cpp  
 M  +1 -2      skycomponents/constellationboundarylines.h  
 M  +4 -2      skycomponents/constellationlines.cpp  
 M  +21 -16    skycomponents/constellationlines.h  
 M  +4 -2      skycomponents/constellationnamescomponent.cpp  
 M  +4 -4      skycomponents/constellationnamescomponent.h  
 M  +3 -1      skycomponents/coordinategrid.cpp  
 M  +1 -1      skycomponents/coordinategrid.h  
 M  +4 -2      skycomponents/customcatalogcomponent.cpp  
 M  +2 -3      skycomponents/customcatalogcomponent.h  
 A             skycomponents/customcatalogcomposite.cpp   [License: GPL (v2+)]
 A             skycomponents/customcatalogcomposite.h   [License: GPL (v2+)]
 M  +4 -3      skycomponents/deepskycomponent.cpp  
 M  +2 -3      skycomponents/deepskycomponent.h  
 M  +29 -31    skycomponents/ecliptic.cpp  
 M  +1 -1      skycomponents/ecliptic.h  
 M  +2 -1      skycomponents/equator.cpp  
 M  +1 -1      skycomponents/equator.h  
 M  +4 -2      skycomponents/horizoncomponent.cpp  
 M  +2 -3      skycomponents/horizoncomponent.h  
 M  +5 -3      skycomponents/jupitermoonscomponent.cpp  
 M  +3 -4      skycomponents/jupitermoonscomponent.h  
 M  +3 -1      skycomponents/linelistcomponent.cpp  
 M  +1 -2      skycomponents/linelistcomponent.h  
 M  +4 -7      skycomponents/linelistindex.cpp  
 M  +1 -1      skycomponents/linelistindex.h  
 M  +0 -1      skycomponents/linelistlabel.cpp  
 M  +1 -1      skycomponents/listcomponent.cpp  
 M  +1 -2      skycomponents/listcomponent.h  
 M  +2 -4      skycomponents/milkyway.cpp  
 M  +1 -1      skycomponents/milkyway.h  
 M  +1 -1      skycomponents/noprecessindex.cpp  
 M  +1 -1      skycomponents/noprecessindex.h  
 M  +1 -1      skycomponents/pointlistcomponent.cpp  
 M  +1 -2      skycomponents/pointlistcomponent.h  
 M  +1 -1      skycomponents/polylistindex.h  
 M  +5 -1      skycomponents/satellitecomponent.cpp  
 M  +2 -2      skycomponents/satellitecomponent.h  
 M  +6 -4      skycomponents/satellitecomposite.cpp  
 M  +2 -4      skycomponents/satellitecomposite.h  
 M  +1 -1      skycomponents/singlecomponent.cpp  
 M  +1 -2      skycomponents/singlecomponent.h  
 M  +1 -2      skycomponents/skycomponent.cpp  
 M  +6 -7      skycomponents/skycomponent.h  
 M  +6 -4      skycomponents/skycomposite.cpp  
 M  +5 -13     skycomponents/skycomposite.h  
 M  +1 -1      skycomponents/skylabel.h  
 M  +45 -34    skycomponents/skymapcomposite.cpp  
 M  +12 -13    skycomponents/skymapcomposite.h  
 M  +6 -4      skycomponents/skymesh.cpp  
 M  +2 -2      skycomponents/skymesh.h  
 M  +20 -15    skycomponents/solarsystemcomposite.cpp  
 M  +7 -7      skycomponents/solarsystemcomposite.h  
 M  +2 -3      skycomponents/solarsystemlistcomponent.cpp  
 M  +2 -3      skycomponents/solarsystemlistcomponent.h  
 M  +7 -4      skycomponents/solarsystemsinglecomponent.cpp  
 M  +3 -6      skycomponents/solarsystemsinglecomponent.h  
 M  +10 -11    skycomponents/starcomponent.cpp  
 M  +2 -5      skycomponents/starcomponent.h