[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/kstars/kstars/skycomponents
From:       Alexey Khudyakov <alexey.skladnoy () gmail ! com>
Date:       2010-01-31 14:14:56
Message-ID: 1264947296.197033.15774.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1083012 by khudyakov:

Factor out code for deleting object from list of names to function
in SkyComponent

 M  +1 -7      deepskycomponent.cpp  
 M  +1 -7      listcomponent.cpp  
 M  +23 -4     skycomponent.cpp  
 M  +3 -0      skycomponent.h  
 M  +1 -8      solarsystemsinglecomponent.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/deepskycomponent.cpp #1083011:1083012
@@ -574,15 +574,9 @@
 }
 
 void DeepSkyComponent::clearList(QList<DeepSkyObject*>& list) {
-    int i;
     while( !list.isEmpty() ) {
         SkyObject *o = list.takeFirst();
-        i = objectNames(o->type()).indexOf( o->name() );
-        if( i >= 0 )
-            objectNames(o->type()).removeAt( i );
-        i = objectNames(o->type()).indexOf( o->longname() );
-        if( i >= 0 )
-            objectNames(o->type()).removeAt( i );
+        removeFromNames( o );
         delete o;
     }
 }
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/listcomponent.cpp #1083011:1083012
@@ -34,13 +34,7 @@
 void ListComponent::clear() {
     while ( ! m_ObjectList.isEmpty() ) {
         SkyObject *o = m_ObjectList.takeFirst();
-        int i;
-        i = objectNames(o->type()).indexOf( o->name() );
-        if ( i >= 0 )
-            objectNames(o->type()).removeAt( i );
-        i = objectNames(o->type()).indexOf( o->longname() );
-        if ( i >= 0 )
-            objectNames(o->type()).removeAt( i );
+        removeFromNames( o );
         delete o;
     }
 }
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/skycomponent.cpp #1083011:1083012
@@ -37,10 +37,29 @@
     parent()->emitProgressText( message );
 }
 
-SkyObject* SkyComponent::findByName( const QString & ) { return 0; }
+SkyObject* SkyComponent::findByName( const QString & ) {
+    return 0;
+}
 
-SkyObject* SkyComponent::objectNearest( SkyPoint *, double & ) { return 0; }
+SkyObject* SkyComponent::objectNearest( SkyPoint *, double & ) {
+    return 0;
+}
 
-void SkyComponent::drawTrails( QPainter & ) {}
+void SkyComponent::drawTrails( QPainter & )
+{}
 
-QHash<int, QStringList>& SkyComponent::getObjectNames() { return parent()->objectNames(); }
+QHash<int, QStringList>& SkyComponent::getObjectNames() {
+    return parent()->objectNames();
+}
+
+void SkyComponent::removeFromNames(const SkyObject* obj) {
+    QStringList& names = getObjectNames()[obj->type()];
+    int i;
+    i = names.indexOf( obj->name() );
+    if ( i >= 0 )
+        names.removeAt( i );
+
+    i = names.indexOf( obj->longname() );
+    if ( i >= 0 )
+        names.removeAt( i );
+}
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/skycomponent.h #1083011:1083012
@@ -117,6 +117,9 @@
 
     inline QStringList& objectNames(int type) { return getObjectNames()[type]; }
 
+protected:
+    void removeFromNames(const SkyObject* obj);
+
 private:
     /** */
     virtual QHash<int, QStringList>& getObjectNames();
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/solarsystemsinglecomponent.cpp #1083011:1083012
@@ -39,14 +39,7 @@
 
 SolarSystemSingleComponent::~SolarSystemSingleComponent()
 {
-    int i;
-    i = objectNames(m_Planet->type()).indexOf( m_Planet->name() );
-    if ( i >= 0 )
-        objectNames(m_Planet->type()).removeAt( i );
-
-    i = objectNames(m_Planet->type()).indexOf( m_Planet->longname() );
-    if ( i >= 0 )
-        objectNames(m_Planet->type()).removeAt( i );
+    removeFromNames( m_Planet );
     delete m_Planet;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]