SVN commit 837152 by harris:

EBN fixes (use single-quotes for single-character strings)

Thanks Mederic!

CCMAIL: kstars-devel@kde.org



 M  +9 -3      kstars.kdevelop  
 M  +2 -2      kstars/addcatdialog.cpp  
 M  +1 -1      kstars/dms.cpp  
 M  +1 -1      kstars/fov.cpp  
 M  +1 -1      kstars/fovdialog.cpp  
 M  +2 -2      kstars/ksmoon.cpp  
 M  +1 -1      kstars/kstarsactions.cpp  
 M  +1 -1      kstars/kstarsdata.cpp  
 M  +1 -1      kstars/kstarsinit.cpp  
 M  +4 -4      kstars/skycomponents/customcatalogcomponent.cpp  
 M  +1 -1      kstars/tools/modcalcaltaz.cpp  
 M  +1 -1      kstars/tools/modcalcangdist.cpp  
 M  +1 -1      kstars/tools/modcalcapcoord.cpp  
 M  +1 -1      kstars/tools/modcalceclipticcoords.cpp  
 M  +1 -1      kstars/tools/modcalcgalcoord.cpp  
 M  +1 -1      kstars/tools/modcalcgeodcoord.cpp  
 M  +1 -1      kstars/tools/modcalcjd.cpp  
 M  +1 -1      kstars/tools/modcalcplanets.cpp  
 M  +1 -1      kstars/tools/modcalcsidtime.cpp  
 M  +1 -1      kstars/tools/modcalcvlsr.cpp  
 M  +1 -1      kstars/tools/observinglist.cpp  
 M  +2 -2      kstars/tools/scriptbuilder.cpp  
 M  +1 -1      kstars/widgets/timebox.cpp  


--- trunk/KDE/kdeedu/kstars/kstars.kdevelop #837151:837152
@@ -1,22 +1,25 @@
 <!DOCTYPE kdevelop>
 <kdevelop>
   <general>
+  <projectmanagement>KDevCustomProject</projectmanagement>
+  <projectdirectory>/Users/jharris/kde/src/kdeedu_trunk</projectdirectory>
+  <absoluteprojectpath>true</absoluteprojectpath>
     <author>Jason Harris</author>
     <email>kstars@30doradus.org</email>
-    <projectmanagement>KDevKDEAutoProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <keywords>
       <keyword>KDE</keyword>
       <keyword>Qt</keyword>
     </keywords>
-    <projectdirectory>.</projectdirectory>
-    <absoluteprojectpath>false</absoluteprojectpath>
     <version/>
     <description/>
     <ignoreparts/>
   </general>
   <kdevautoproject>
     <general>
+  <projectmanagement>KDevCustomProject</projectmanagement>
+  <projectdirectory>/Users/jharris/kde/src/kdeedu_trunk</projectdirectory>
+  <absoluteprojectpath>true</absoluteprojectpath>
       <mainprogram>kstars</mainprogram>
     </general>
     <configure>
@@ -72,6 +75,9 @@
   </kdevdoctreeview>
   <kdevdebugger>
     <general>
+  <projectmanagement>KDevCustomProject</projectmanagement>
+  <projectdirectory>/Users/jharris/kde/src/kdeedu_trunk</projectdirectory>
+  <absoluteprojectpath>true</absoluteprojectpath>
       <dbgshell>/home/jharris/kde4svn/kdeedu/libtool --mode=execute /home/jharris/kde4/bin/kstars</dbgshell>
       <programargs/>
       <gdbpath/>
--- trunk/KDE/kdeedu/kstars/kstars/addcatdialog.cpp #837151:837152
@@ -188,7 +188,7 @@
     if ( ! acd->DataURL->url().isEmpty() && dataFile.open( QIODevice::ReadOnly ) ) {
         acd->DataFileBox->clear();
         QTextStream dataStream( &dataFile );
-        acd->DataFileBox->addItems( dataStream.readAll().split( "\n" ) );
+        acd->DataFileBox->addItems( dataStream.readAll().split( '\n' ) );
         dataFile.close();
     }
 }
@@ -196,7 +196,7 @@
 void AddCatDialog::slotPreviewCatalog() {
     if ( validateDataFile() ) {
         KMessageBox::informationList( 0, i18n( "Preview of %1", acd->CatalogName->text() ),
-                                      CatalogContents.split( "\n" ), i18n( "Catalog Preview" ) );
+                                      CatalogContents.split( '\n' ), i18n( "Catalog Preview" ) );
     }
 }
 
--- trunk/KDE/kdeedu/kstars/kstars/dms.cpp #837151:837152
@@ -97,7 +97,7 @@
     //check for colon-delimiters or space-delimiters
     if ( entry.contains(':') )
         fields = entry.split( ':', QString::SkipEmptyParts );
-    else fields = entry.split( " ", QString::SkipEmptyParts );
+    else fields = entry.split( ' ', QString::SkipEmptyParts );
 
     //anything with one field is invalid!
     if ( fields.count() == 1 ) {
--- trunk/KDE/kdeedu/kstars/kstars/fov.cpp #837151:837152
@@ -41,7 +41,7 @@
     if ( f.exists() && f.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &f );
         while ( !stream.atEnd() ) {
-            QStringList fields = stream.readLine().split( ":" );
+            QStringList fields = stream.readLine().split( ':' );
             bool ok( false );
 
             if ( fields.count() == 4 ) {
--- trunk/KDE/kdeedu/kstars/kstars/fovdialog.cpp #837151:837152
@@ -80,7 +80,7 @@
     if ( f.exists() && f.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &f );
         while ( !stream.atEnd() ) {
-            fields = stream.readLine().split( ":" );
+            fields = stream.readLine().split( ':' );
             bool ok( false );
 
             if ( fields.count() == 4 ) {
--- trunk/KDE/kdeedu/kstars/kstars/ksmoon.cpp #837151:837152
@@ -62,7 +62,7 @@
     if ( KSUtils::openDataFile( f, "moonLR.dat" ) ) {
         QTextStream stream( &f );
         while ( !stream.atEnd() ) {
-            fields = stream.readLine().split( " ", QString::SkipEmptyParts );
+            fields = stream.readLine().split( ' ', QString::SkipEmptyParts );
 
             if ( fields.size() == 6 ) {
                 nd = fields[0].toInt();
@@ -82,7 +82,7 @@
     if ( KSUtils::openDataFile( f, "moonB.dat" ) ) {
         QTextStream stream( &f );
         while ( !stream.atEnd() ) {
-            fields = stream.readLine().split( " ", QString::SkipEmptyParts );
+            fields = stream.readLine().split( ' ', QString::SkipEmptyParts );
             
             if ( fields.size() == 5 ) {
                 nd = fields[0].toInt();
--- trunk/KDE/kdeedu/kstars/kstars/kstarsactions.cpp #837151:837152
@@ -972,7 +972,7 @@
             QTextStream stream( &f );
             while ( !stream.atEnd() ) {
                 QString line = stream.readLine();
-                QStringList fields = line.split( ":" );
+                QStringList fields = line.split( ':' );
 
                 if ( fields.count() == 4 ) {
                     QString nm = fields[0].trimmed();
--- trunk/KDE/kdeedu/kstars/kstars/kstarsdata.cpp #837151:837152
@@ -584,7 +584,7 @@
         while ( !stream.atEnd() ) {
             QString line = stream.readLine().trimmed();
             if ( line.length() && !line.startsWith('#') ) { //ignore commented and blank lines
-                QStringList fields = line.split( " ", QString::SkipEmptyParts );
+                QStringList fields = line.split( ' ', QString::SkipEmptyParts );
                 id = fields[0];
                 QTime stime = QTime( fields[3].left( fields[3].indexOf(':')).toInt() ,
                                      fields[3].mid( fields[3].indexOf(':')+1, fields[3].length()).toInt() );
--- trunk/KDE/kdeedu/kstars/kstars/kstarsinit.cpp #837151:837152
@@ -526,7 +526,7 @@
         QTextStream stream( &f );
         while ( !stream.atEnd() ) {
             QString line = stream.readLine();
-            fields = line.split( ":" );
+            fields = line.split( ':' );
 
             if ( fields.count() == 4 ) {
                 nm = fields[0].trimmed();
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/customcatalogcomponent.cpp #837151:837152
@@ -32,7 +32,7 @@
 #include "starobject.h"
 #include "deepskyobject.h"
 
-QStringList CustomCatalogComponent::m_Columns = QString( "ID RA Dc Tp Nm Mg Mj Mn PA Ig" ).split( " ", QString::SkipEmptyParts );
+QStringList CustomCatalogComponent::m_Columns = QString( "ID RA Dc Tp Nm Mg Mj Mn PA Ig" ).split( ' ', QString::SkipEmptyParts );
 
 CustomCatalogComponent::CustomCatalogComponent(SkyComponent *parent, const QString &fname, bool showerrs, bool (*visibleMethod)()) : ListComponent(parent, visibleMethod), m_Filename( fname ), m_Showerrs( showerrs )
 {
@@ -59,12 +59,12 @@
         QStringList Columns; //list of data column descriptors in the header
 
         QTextStream stream( &ccFile );
-        QStringList lines = stream.readAll().split( "\n", QString::SkipEmptyParts );
+        QStringList lines = stream.readAll().split( '\n', QString::SkipEmptyParts );
 
         if ( parseCustomDataHeader( lines, Columns, iStart, m_Showerrs, errs ) ) {
 
             for ( int i=iStart; i < lines.size(); ++i ) {
-                QStringList d = lines.at(i).split( " ", QString::SkipEmptyParts );
+                QStringList d = lines.at(i).split( ' ', QString::SkipEmptyParts );
 
                 //Now, if one of the columns is the "Name" field, the name may contain spaces.
                 //In this case, the name field will need to be surrounded by quotes.
@@ -242,7 +242,7 @@
             //Chomp off leading "#" character
             d = d.replace( QRegExp( "#" ), QString() );
 
-            QStringList fields = d.split( " ", QString::SkipEmptyParts ); //split on whitespace
+            QStringList fields = d.split( ' ', QString::SkipEmptyParts ); //split on whitespace
 
             //we need a copy of the master list of data fields, so we can
             //remove fields from it as they are encountered in the "fields" list.
--- trunk/KDE/kdeedu/kstars/kstars/tools/modcalcaltaz.cpp #837151:837152
@@ -312,7 +312,7 @@
 
         //Go through the line, looking for parameters
 
-        QStringList fields = line.split( " " );
+        QStringList fields = line.split( ' ' );
 
         i = 0;
 
--- trunk/KDE/kdeedu/kstars/kstars/tools/modcalcangdist.cpp #837151:837152
@@ -183,7 +183,7 @@
 
         //Go through the line, looking for parameters
 
-        QStringList fields = line.split( " " );
+        QStringList fields = line.split( ' ' );
 
         i = 0;
 
--- trunk/KDE/kdeedu/kstars/kstars/tools/modcalcapcoord.cpp #837151:837152
@@ -210,7 +210,7 @@
 
         //Go through the line, looking for parameters
 
-        QStringList fields = line.split( " " );
+        QStringList fields = line.split( ' ' );
 
         i = 0;
 
--- trunk/KDE/kdeedu/kstars/kstars/tools/modcalceclipticcoords.cpp #837151:837152
@@ -243,7 +243,7 @@
 
         //Go through the line, looking for parameters
 
-        QStringList fields = line.split( " " );
+        QStringList fields = line.split( ' ' );
 
         i = 0;
 
--- trunk/KDE/kdeedu/kstars/kstars/tools/modcalcgalcoord.cpp #837151:837152
@@ -231,7 +231,7 @@
 
         //Go through the line, looking for parameters
 
-        QStringList fields = line.split( " " );
+        QStringList fields = line.split( ' ' );
 
         i = 0;
 
--- trunk/KDE/kdeedu/kstars/kstars/tools/modcalcgeodcoord.cpp #837151:837152
@@ -275,7 +275,7 @@
 
         //Go through the line, looking for parameters
 
-        QStringList fields = line.split( " " );
+        QStringList fields = line.split( ' ' );
 
         i = 0;
 
--- trunk/KDE/kdeedu/kstars/kstars/tools/modcalcjd.cpp #837151:837152
@@ -149,7 +149,7 @@
     while ( ! istream.atEnd() ) {
         line = istream.readLine();
         line = line.trimmed();
-        QStringList data = line.split( " ", QString::SkipEmptyParts );
+        QStringList data = line.split( ' ', QString::SkipEmptyParts );
 
         if ( inputData == 0 ) { //Parse date & time
             //Is the first field parseable as a date or date&time?
--- trunk/KDE/kdeedu/kstars/kstars/tools/modcalcplanets.cpp #837151:837152
@@ -354,7 +354,7 @@
 
         //Go through the line, looking for parameters
 
-        QStringList fields = line.split( " " );
+        QStringList fields = line.split( ' ' );
 
         if (fields.count() != numberOfRequiredFields ) {
             lineIsValid = false;
--- trunk/KDE/kdeedu/kstars/kstars/tools/modcalcsidtime.cpp #837151:837152
@@ -241,7 +241,7 @@
         line = istream.readLine();
         line = line.trimmed();
 
-        QStringList fields = line.split( " ", QString::SkipEmptyParts );
+        QStringList fields = line.split( ' ', QString::SkipEmptyParts );
 
         //Find and parse the location string
         if (LocationCheckBatch->isChecked() ) {
--- trunk/KDE/kdeedu/kstars/kstars/tools/modcalcvlsr.cpp #837151:837152
@@ -319,7 +319,7 @@
 
         //Go through the line, looking for parameters
 
-        QStringList fields = line.split( " " );
+        QStringList fields = line.split( ' ' );
 
         i = 0;
 
--- trunk/KDE/kdeedu/kstars/kstars/tools/observinglist.cpp #837151:837152
@@ -575,7 +575,7 @@
             //If the object is named "star", add it by coordinates
             SkyObject *o;
             if ( line.startsWith( "star" ) ) {
-                QStringList fields = line.split( " ", QString::SkipEmptyParts );
+                QStringList fields = line.split( ' ', QString::SkipEmptyParts );
                 dms ra = dms::fromString( fields[1], false ); //false = hours
                 dms dc = dms::fromString( fields[2], true );  //true  = degrees
                 SkyPoint p( ra, dc );
--- trunk/KDE/kdeedu/kstars/kstars/tools/scriptbuilder.cpp #837151:837152
@@ -1240,7 +1240,7 @@
 
             // If the function lacks any arguments, do not attempt to split
             if (fn_name != line)
-                fn = line.split(" ");
+                fn = line.split(' ');
 
             if ( parseFunction( fn_name, fn ) )
             {
@@ -1303,7 +1303,7 @@
     }
 
     if (quoteProcessed)
-        fn = arg.split( "'", QString::SkipEmptyParts );
+        fn = arg.split( '\'', QString::SkipEmptyParts );
 
     //loop over known functions to find a name match
     foreach ( ScriptFunction *sf, KStarsFunctionList )
--- trunk/KDE/kdeedu/kstars/kstars/widgets/timebox.cpp #837151:837152
@@ -96,7 +96,7 @@
         //check for colon-delimiters or space-delimiters
         if ( entry.contains(':') )
             fields = entry.split( ':', QString::SkipEmptyParts );
-        else fields = entry.split( " ", QString::SkipEmptyParts );
+        else fields = entry.split( ' ', QString::SkipEmptyParts );
 
         // If two fields we will add a third one, and then parse with
         // the 3-field code block. If field[1] is a double, convert
_______________________________________________
Kstars-devel mailing list
Kstars-devel@kde.org
https://mail.kde.org/mailman/listinfo/kstars-devel