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

List:       kde-commits
Subject:    branches/KDE/4.1/kdeedu/kstars/kstars
From:       Jason Harris <kstars () 30doradus ! org>
Date:       2008-07-15 21:14:52
Message-ID: 1216156492.581977.26327.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 832959 by harris:

Don't show unnamed stars when the user searches for white space in the
find dialog.  Thanks for th patch, Prakash!



 M  +10 -6     starobject.cpp  


--- branches/KDE/4.1/kdeedu/kstars/kstars/starobject.cpp #832958:832959
@@ -73,11 +73,9 @@
     if ( hasName() ) {
         lname = n;
         if ( hasName2() ) lname += " (" + gname() + ')';
-    } else if ( hasName2() )
+    } else if ( hasName2() ) {
         lname = gname();
-
-    //If genetive name exists, but no primary name, set primary name = genetive name.
-    if ( hasName2() && !hasName() ) {
+        //If genetive name exists, but no primary name, set primary name = genetive name.
         setName( gname() );
     }
 
@@ -98,8 +96,11 @@
     if ( hasName() ) {
         lname = n;
         if ( hasName2() )lname += " (" + gname() + ')';
-    } else if ( hasName2() )
+    } else if ( hasName2() ) {
         lname = gname();
+        //If genetive name exists, but no primary name, set primary name = genetive name.
+        setName( gname() );
+    }
 
     setLongName(lname);
     updateID = updateNumID = 0;
@@ -230,7 +231,10 @@
 }
 
 QString StarObject::gname( bool useGreekChars ) const {
-    return greekLetter( useGreekChars ) + ' ' + constell();
+    if(!name2().isEmpty())
+        return greekLetter( useGreekChars ) + ' ' + constell();
+    else
+        return QString();
 }
 
 QString StarObject::greekLetter( bool gchar ) const {
[prev in list] [next in list] [prev in thread] [next in thread]