filemanager/src/inc/fmutils_s60.cpp
changeset 24 1d0c87b42e2e
parent 18 edd66bde63a4
child 29 b3155376f2b4
--- a/filemanager/src/inc/fmutils_s60.cpp	Thu May 27 12:45:43 2010 +0300
+++ b/filemanager/src/inc/fmutils_s60.cpp	Fri Jun 11 13:29:48 2010 +0300
@@ -571,14 +571,26 @@
 
 QString FmUtils::fillPathWithSplash( const QString &filePath )
 {
-    QString newFilePath( filePath );
+    QString newFilePath = filePath ;
     if( filePath.isEmpty() ) {
         return newFilePath;
     }
-
-    if( filePath.at( filePath.length()-1 ) != QChar( '/' ) ){
-        newFilePath.append( QChar( '/' ) );
+    
+    QString tempString;
+    for( int i=0; i<newFilePath.length(); i++ ) {
+        QChar ch( newFilePath[i] );
+        if( ch == QChar('\\') ) {
+            tempString.append( QChar('/') );
+        } else {
+            tempString.append( ch );
+        }
     }
+    newFilePath = tempString;
+    
+    if( newFilePath.right( 1 )!= QChar('/') ){
+        newFilePath.append( QChar('/') );
+    }
+    
     return newFilePath;
 }
 
@@ -594,7 +606,9 @@
 // used to filter drive which need be hide.
 bool FmUtils::checkDriveFilter( const QString &driveName )
 {
-    if( driveName.contains( "D:" ) || driveName.contains( "Z:" ) ) {
+    FmDriverInfo driveInfo = queryDriverInfo( driveName );
+    if( ( driveInfo.driveState()& FmDriverInfo::EDriveRam ) ||
+        ( driveInfo.driveState()& FmDriverInfo::EDriveRom ) ) {
         return false;
     }
     return true;
@@ -734,6 +748,10 @@
 int FmUtils::launchFile( const QString &filePath )
 {
     QFile file( filePath );
+    if( !file.exists() ) {
+        return false;
+    }
+        
     XQApplicationManager mAiwMgr;
     XQAiwRequest *request = mAiwMgr.create(file);
     if ( request == 0 ) {
@@ -830,24 +848,24 @@
     QRegExp regExp( "/" );
     formatPath.replace( regExp, "\\" );
     
-    if( path.right( 1 )!= "\\"){
-        formatPath.append( "\\" );
+    if( formatPath.right( 1 ) != QChar('\\') ){
+        formatPath.append( QChar('\\') );
     }
     return formatPath;
 }
 
 int FmUtils::getMaxFileNameLength()
-    {
+{
     return KMaxFileName;
-    }
+}
 
 bool FmUtils::checkMaxPathLength( const QString& path )
-    {
+{
     if( path.length() > KMaxPath ) {
         return false;
     }
     return true;
-    }
+}
 bool FmUtils::checkFolderFileName( const QString& name )
 {
     if( name.endsWith( QChar('.'),  Qt::CaseInsensitive ) ) {