Merge branch 'master' of git://anongit.kde.org/kstars

kstars/kstarsdcop.cpp

@@ -276,7 +276,7 @@ QString KStars::getOption( const QString &name ) {
 }
 
 void KStars::changeViewOption( const QString &op, const QString &val ) {
-    bool bOk(false), nOk(false), dOk(false);
+    bool bOk(false), dOk(false);
 
     //parse bool value
     bool bVal(false);

kstars/skycomponents/asteroidscomponent.cpp

@@ -78,13 +78,12 @@ bool AsteroidsComponent::selected() {
  * @li 23 orbit classification [string]
  */
 void AsteroidsComponent::loadData() {
-    QString line, name, full_name, orbit_id, orbit_class, dimensions;
-    QStringList fields;
+    QString name, full_name, orbit_id, orbit_class, dimensions;
     int mJD;
     double q, a, e, dble_i, dble_w, dble_N, dble_M, H, G, earth_moid;
     long double JD;
     float diameter, albedo, rot_period, period;
-    bool ok, neo;
+    bool neo;
 
     emitProgressText( i18n("Loading asteroids") );
 

kstars/skycomponents/cometscomponent.cpp

@@ -78,10 +78,8 @@ bool CometsComponent::selected() {
  * @note See KSComet constructor for more details.
  */
 void CometsComponent::loadData() {
-    QFile file;
-    QString line, name, orbit_id, orbit_class, dimensions;
-    QStringList fields;
-    bool ok, neo;
+    QString name, orbit_id, orbit_class, dimensions;
+    bool neo;
     int mJD;
     double q, e, dble_i, dble_w, dble_N, Tp, earth_moid;
     long double JD;