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

List:       kde-commits
Subject:    KDE/kdebase
From:       Jaison Lee <lee.jaison () gmail ! com>
Date:       2006-10-16 0:45:38
Message-ID: 1160959538.258999.21890.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 595874 by jlee:

Port to new KSaveFile API.



 M  +1 -2      konqueror/about/konq_aboutpage.cc  
 M  +7 -7      libkonq/konq_historymgr.cc  
 M  +2 -2      workspace/kcontrol/krdb/krdb.cpp  
 M  +5 -3      workspace/kicker/menuext/konsole/konsolebookmarkhandler.cpp  
 M  +3 -2      workspace/klipper/toplevel.cpp  
 M  +8 -5      workspace/ksysguard/gui/KSysGuardApplet.cc  


--- trunk/KDE/kdebase/konqueror/about/konq_aboutpage.cc #595873:595874
@@ -503,11 +503,10 @@
 	{
 	    QString profile = KStandardDirs::locateLocal("data", "konqueror/profiles/webbrowsing");
 	    KSaveFile file( profile );
-	    if ( file.status() == 0 ) {
+	    if ( file.open() ) {
 		QByteArray content = "[Profile]\n"
 			           "Name=Web-Browser";
 		fputs( content.data(), file.fstream() );
-		file.close();
 	    }
 	}
 	return;
--- trunk/KDE/kdebase/libkonq/konq_historymgr.cc #595873:595874
@@ -212,13 +212,13 @@
 bool KonqHistoryManager::saveHistory()
 {
     KSaveFile file( m_filename );
-    if ( file.status() != 0 ) {
-	kWarning() << "Can't open " << file.name() << endl;
-	return false;
+    if ( !file.open() ) {
+        kWarning() << "Can't open " << file.fileName() << endl;
+        return false;
     }
 
-    QDataStream *fileStream = file.dataStream();
-    *fileStream << s_historyVersion;
+    QDataStream fileStream ( &file );
+    fileStream << s_historyVersion;
 
     QByteArray data;
     QDataStream stream( &data, QIODevice::WriteOnly );
@@ -235,9 +235,9 @@
     KonqHistoryEntry::marshalURLAsStrings = true;
 
     quint32 crc = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() );
-    *fileStream << crc << data;
+    fileStream << crc << data;
 
-    file.close();
+    file.finalize(); //check for error here?
 
     return true;
 }
--- trunk/KDE/kdebase/workspace/kcontrol/krdb/krdb.cpp #595873:595874
@@ -340,10 +340,10 @@
     // pfeiffer: so that we don't overwrite the user's gtkrc.
     // it is found via the GTK_RC_FILES environment variable.
     KSaveFile saveFile( KStandardDirs::locateLocal( "config", 2==version?"gtkrc-2.0":"gtkrc" ) );
-    if ( saveFile.status() != 0 || saveFile.textStream() == 0L )
+    if ( !saveFile.open() )
         return;
 
-    QTextStream& t = *saveFile.textStream();
+    QTextStream t ( &saveFile );
     t.setCodec( QTextCodec::codecForLocale () );
 
     t << i18n(
--- trunk/KDE/kdebase/workspace/kicker/menuext/konsole/konsolebookmarkhandler.cpp #595873:595874
@@ -58,10 +58,10 @@
                                                  const QString& destinationPath )
 {
     KSaveFile file( destinationPath );
-    if ( file.status() != 0 )
+    if ( !file.open() )
         return;
 
-    m_importStream = file.textStream();
+    m_importStream = new QTextStream ( &file );
     *m_importStream << "<!DOCTYPE xbel>\n<xbel>\n";
 
     KNSBookmarkImporter importer( path );
@@ -77,8 +77,10 @@
     importer.parseNSBookmarks( false );
 
     *m_importStream << "</xbel>";
+    m_importStream->flush();
 
-    file.close();
+    file.finalize();
+    delete m_importStream;
     m_importStream = 0L;
 }
 
--- trunk/KDE/kdebase/workspace/klipper/toplevel.cpp #595873:595874
@@ -415,7 +415,7 @@
         return;
     }
     KSaveFile history_file( history_file_name );
-    if ( history_file.status() != 0  ) {
+    if ( !history_file.open() ) {
         kWarning() << failed_save_warning << endl;
         return;
     }
@@ -426,7 +426,8 @@
         history_stream << item;
     }
     quint32 crc = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() );
-    *history_file.dataStream() << crc << data;
+    QDataStream ds ( &history_file );
+    ds << crc << data;
 }
 
 void KlipperWidget::readProperties(KConfig *kc)
--- trunk/KDE/kdebase/workspace/ksysguard/gui/KSysGuardApplet.cc #595873:595874
@@ -447,17 +447,20 @@
   QString fileName = kstd->saveLocation( "data", "ksysguard" );
   fileName += "/KSysGuardApplet.xml";
 
-  KSaveFile file( fileName, 0644 );
+  KSaveFile file( fileName );
 
-  if ( file.status() != 0 /* 0 means successful.  See errno.h */ )
+  if ( !file.open() )
   {
     KMessageBox::sorry( this, i18n( "Cannot save file %1", fileName ) );
     return false;
   }
+  file.setPermissions(QFile::ReadUser|QFile::WriteUser|QFile::ReadGroup|QFile::ReadOther);
   
-  file.textStream()->setCodec( "UTF-8" );
-  *(file.textStream()) << doc;
-  file.close();
+  QTextStream ts ( &file );
+  ts.setCodec( "UTF-8" );
+  ts << doc;
+  ts.flush();
+  file.finalize(); //check for error here?
 
   return true;
 }
[prev in list] [next in list] [prev in thread] [next in thread]