[Kst] branches/work/kst/kst1kde4/kst/src/datasources/lfiio

[Zongyi Zhang]

SVN commit 1098074 by zhang:

continue kst1kde4

 A             CMakeLists.txt  
 M  +9 -9      lfiio.cpp  


--- branches/work/kst/kst1kde4/kst/src/datasources/lfiio/lfiio.cpp #1098073:1098074
@@ -73,7 +73,7 @@
 
     if( _first )
     {
-      iResult = fits_open_table( &ffits, _filename.ascii( ), READONLY, &iStatus );
+      iResult = fits_open_table( &ffits, _filename.toAscii( ), READONLY, &iStatus );
       if( iResult == 0 )
       {
         int keysexist;
@@ -96,7 +96,7 @@
 
               str.sprintf( "%s %s", value, comment );
               metaString = new KstString( KstObjectTag( keyname, tag() ), this, str );
-              _metaData.insert( keyname, metaString );
+              _metaData.insert( keyname, *metaString );
             }
           }
 
@@ -143,7 +143,7 @@
 
   if( !_filename.isNull( ) && !_filename.isEmpty( ) )
   {
-    iResult = fits_open_table( &ffits, _filename.ascii( ), READONLY, &iStatus );
+    iResult = fits_open_table( &ffits, _filename.toAscii( ), READONLY, &iStatus );
     if( iResult == 0 )
     {
       //
@@ -178,7 +178,7 @@
               //
               // ensure that we don't add duplicates to the _fieldList...
               //
-              while( _fieldList.findIndex( strName ) != -1 )
+              while( _fieldList.indexOf( strName ) != -1 )
               {
                 strName = QString("%1[%2]").arg( charName ).arg( iOffset );
                 iOffset++;
@@ -217,7 +217,7 @@
             iResult = fits_read_key( ffits, TDOUBLE, charTimeDelta, &_dTimeDelta, 0L, &iStatus );
             if( iResult == 0 )
             {
-              if( _fieldList.find( QString( TIME_FIELD ) ) == _fieldList.end( ) )
+              if( _fieldList.indexOf( QString( TIME_FIELD ) ) == _fieldList.size( )-1 )
               {
                 _bHasTime = true;
                 _fieldList.append( TIME_FIELD );
@@ -288,7 +288,7 @@
 
       if( !_filename.isNull( ) && !_filename.isEmpty( ) )
       {
-        iResult = fits_open_table( &ffits, _filename.ascii( ), READONLY, &iStatus );
+        iResult = fits_open_table( &ffits, _filename.toAscii( ), READONLY, &iStatus );
         if( iResult == 0 )
         {
           _valid = true;
@@ -342,8 +342,8 @@
     //
     for( i=1; i<iCount; i++ )
     {
-      strName = _fieldList[i].lower( );
-      if( strName.compare( field.lower( ) ) == 0 )
+      strName = _fieldList[i].toLower( );
+      if( strName.compare( field.toLower( ) ) == 0 )
       {
         bRetVal = true;
 
@@ -440,7 +440,7 @@
     //
     // determine if it is a FITS file...
     //
-    if( fits_open_table( &ffits, filename.ascii( ), READONLY, &iStatus ) == 0 )
+    if( fits_open_table( &ffits, filename.toAscii( ), READONLY, &iStatus ) == 0 )
     {
       fits_close_file( ffits, &iStatus );