From kde-commits  Thu Jul 10 06:27:37 2008
From: Jason Harris <kstars () 30doradus ! org>
Date: Thu, 10 Jul 2008 06:27:37 +0000
To: kde-commits
Subject: KDE/kdeedu/kstars [POSSIBLY UNSAFE]
Message-Id: <1215671257.529908.4507.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=121567128415850

SVN commit 830325 by harris:

Merged revisions 826351,827476 via svnmerge from 
https://svn.kde.org/home/kde/branches/kstars/unfrozen/kstars

NOTE: this is stage 1 of 2 to merge the PLANET enum fixes.

........
  r826351 | harris | 2008-06-30 07:44:15 -0700 (Mon, 30 Jun 2008) | 16 lines
  
  Better fix for bug #165170.  Now the order of items in the planet comboboxes is 
  hard-coded in conjunctions.cpp, using a new PLANET enum I added to KSPlanetBase.  
  So it's not possible for the order to be wrong.
  
  I also added a convenience function 'static KSPlanetBase* 
  KSPlanetBase::createPlanet(int)', so you can simply call: 
  KSPlanetBase::createPlanet(VENUS), rather than using the KSPlanet ctor, and using 
  the planet's name to determine which planet gets created.  There is also a new 
  KSPlanet(int) ctor that does essentially the same thing.
  
  Note: this commit won't be merged into trunk until after 4.1 is released.
  
........
  r827476 | harris | 2008-07-02 22:37:35 -0700 (Wed, 02 Jul 2008) | 6 lines
  
  Use the new KSPlanetBase PLANET enum in the PlanetViewer tool.  Also some other 
  cosmetic fixes.
  
........

CCMAIL: kstars-devel@kde.org



 _M            . (directory)  
 M  +31 -1     kstars/ksplanet.cpp  
 M  +33 -26    kstars/ksplanet.h   [POSSIBLY UNSAFE: system]
 M  +40 -6     kstars/ksplanetbase.cpp  
 M  +11 -6     kstars/ksplanetbase.h  
 M  +21 -44    kstars/tools/conjunctions.cpp  
 M  +0 -1      kstars/tools/conjunctions.h  
 M  +0 -100    kstars/tools/conjunctions.ui  
 M  +24 -23    kstars/tools/planetviewer.cpp  
 M  +4 -5      kstars/tools/planetviewer.h