[Kstars-devel] branches/kstars/summer/kdeedu/kstars/kstars [POSSIBLY UNSAFE]

[Akarsh Simha]

SVN commit 831198 by asimha:

Porting fixes from trunk into the summer branch. The only conflict was
in skycomponents/starcomponent.cpp which was resolved manually,
keeping the code from the working copy (summer branch)

The commit messages are 440 lines long, so here's a temporary link:
http://pastebin.com/f43ce9d6d

CCMAIL: kstars-devel at kde.org



 M  +10 -11    finddialog.cpp  
 M  +1 -1      finddialog.h  
 M  +1 -0      htmesh/CMakeLists.txt  
 M  +9 -4      imageviewer.cpp  
 M  +2 -6      imageviewer.h  
 M  +4 -1      indi/CMakeLists.txt  
 M  +5 -0      indi/drivers.xml  
 M  +21 -52    indi/drivers/telescope/lx200_16.cpp  
 M  +0 -7      indi/drivers/telescope/lx200_16.h  
 A             indi/drivers/telescope/lx200ap.cpp   trunk/KDE/kdeedu/kstars/kstars/indi/drivers/telescope/lx200ap.cpp#830459 [License: LGPL (v2.1+)]
 A             indi/drivers/telescope/lx200ap.h   trunk/KDE/kdeedu/kstars/kstars/indi/drivers/telescope/lx200ap.h#830459 [License: LGPL (v2.1+)]
 A             indi/drivers/telescope/lx200apdriver.c   trunk/KDE/kdeedu/kstars/kstars/indi/drivers/telescope/lx200apdriver.c#830459 [License: LGPL (v2.1+)]
 A             indi/drivers/telescope/lx200apdriver.h   trunk/KDE/kdeedu/kstars/kstars/indi/drivers/telescope/lx200apdriver.h#830459 [License: LGPL (v2.1+)]
 A             indi/drivers/telescope/lx200aplib.h   trunk/KDE/kdeedu/kstars/kstars/indi/drivers/telescope/lx200aplib.h#830459 [License: LGPL (v2.1+)]
 M  +29 -1     indi/drivers/telescope/lx200autostar.cpp  
 M  +2 -6      indi/drivers/telescope/lx200basic.cpp  
 M  +6 -1      indi/drivers/telescope/lx200classic.cpp  
 M  +1 -1      indi/drivers/telescope/lx200driver.c  
 M  +164 -371  indi/drivers/telescope/lx200generic.cpp  
 M  +4 -9      indi/drivers/telescope/lx200generic.h  
 M  +10 -33    indidriver.cpp  
 M  +0 -1      indidriver.h  
 M  +31 -1     ksplanet.cpp  
 M  +33 -26    ksplanet.h   [POSSIBLY UNSAFE: system]
 M  +40 -6     ksplanetbase.cpp  
 M  +11 -6     ksplanetbase.h  
 M  +2 -0      kstars.desktop  
 M  +20 -0     kstars.h  
 M  +42 -12    kstarsactions.cpp  
 M  +3 -2      kstarsdata.h  
 M  +1 -0      kstarsdcop.cpp  
 M  +6 -1      kstarsinit.cpp  
 M  +1 -1      main.cpp  
 M  +1 -1      skycomponents/skylabeler.cpp  
 M  +3 -2      skycomponents/starcomponent.cpp  
 M  +29 -10    skymap.cpp  
 M  +47 -0     skymap.h  
 M  +66 -4     skymapevents.cpp  
 M  +29 -43    tools/conjunctions.cpp  
 M  +1 -1      tools/conjunctions.h  
 M  +94 -138   tools/conjunctions.ui  
 M  +74 -17    tools/ksconjunct.cpp  
 M  +7 -2      tools/ksconjunct.h  
 M  +24 -23    tools/planetviewer.cpp  
 M  +4 -5      tools/planetviewer.h