- use QFile::encodeName instead of (const char*) or latin1()

- use POSIX rename

1 files changed, 9 insertions, 10 deletions

diff --git a/library/filemanager.cpp b/library/filemanager.cpp
index 47af1c6..2e5efdd 100644
--- a/library/filemanager.cpp
+++ b/library/filemanager.cpp
@@ -19,24 +19,25 @@
 **********************************************************************/
 
 #include "filemanager.h"
 #include "applnk.h"
 
 /* QT */
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 
 /* STD */
 #include <stdlib.h>
+#include <errno.h>
 #include <sys/stat.h>
 
 /*!
   \class FileManager
   \brief The FileManager class assists with AppLnk input/output.
 */
 
 /*!
   Constructs a FileManager.
 */
 FileManager::FileManager()
 {
@@ -179,31 +180,31 @@ bool FileManager::copyFile( const AppLnk &src, const AppLnk &dest )
 
     ensurePathExists( fileName );
 
     bool ok = TRUE;
     ok = copyFile( src.file(), fileName );
 
     if ( ok )
         ok = dest.writeLink();
 
     if ( ok )
     {
         // okay now rename the file...
-        if ( !renameFile( fileName.latin1(), dest.file().latin1() )  )
+        if ( !renameFile( fileName, dest.file() )  )
             // remove the tmp file, otherwise, it will just lay around...
-            QFile::remove( fileName.latin1() );
+            QFile::remove( fileName );
     }
     else
     {
-        QFile::remove( fileName.latin1() );
+        QFile::remove( fileName );
     }
     return ok;
 }
 
 bool FileManager::copyFile( const QString & src, const QString & dest )
 {
     //open read file
     QFile srcFile( src );
     if( !srcFile.open( IO_ReadOnly|IO_Raw) )
     {
         qWarning( "open read failed %s, %s", src.latin1(), dest.latin1() );
         return FALSE;
@@ -232,38 +233,37 @@ bool FileManager::copyFile( const QString & src, const QString & dest )
         {
             int bytesWritten = destFile.writeBlock( buffer, bytesRead );
             if ( bytesWritten < 0 )
                 ok = FALSE;
             else
                 bytesRead -= bytesWritten;
         }
     }
     srcFile.close();
     destFile.close();
     // Set file permissions
     struct stat status;
-    if( stat( (const char *) src, &status ) == 0 )
+    if( stat( QFile::encodeName( src ), &status ) == 0 )
     {
-        chmod( (const char *) dest, status.st_mode );
+        chmod( QFile::encodeName( dest ), status.st_mode );
     }
     return ok;
 }
 
 
 bool FileManager::renameFile( const QString & src, const QString & dest )
 {
-    QDir dir( QFileInfo( src ).absFilePath() );
-    if ( !dir.rename( src, dest ) )
+    if( rename( QFile::encodeName( src ), QFile::encodeName( dest ) ) == -1);
     {
-        qWarning( "problem renaming file %s to %s", src, dest );
+        qWarning( "problem renaming file %s to %s, errno: %d", src.latin1(), dest.latin1(), errno );
         return false;
     }
     return true;
 }
 
 /*!
   Opens the document specified by \a f as a readable QIODevice.
   The caller must delete the return value.
 
   Returns 0 if the operation fails.
 */
 QIODevice* FileManager::openFile( const DocLnk& f )
@@ -311,18 +311,17 @@ bool FileManager::exists( const DocLnk &f )
 }
 
 /*!
   Ensures that the path \a fn exists, by creating required directories.
   Returns TRUE if successful.
 */
 bool FileManager::ensurePathExists( const QString &fn )
 {
     QFileInfo fi(fn);
     fi.setFile( fi.dirPath(TRUE) );
     if ( !fi.exists() )
     {
-        if ( system(("mkdir -p "+fi.filePath())) )
+        if ( system( ("mkdir -p " + QFile::encodeName( fi.filePath() ) ) ) )
             return FALSE;
     }
-
     return TRUE;
 }