Changeset 846 for trunk/src/gui/util/qdesktopservices_s60.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/util/qdesktopservices_s60.cpp (modified) (13 diffs)

trunk/src/gui/util/qdesktopservices_s60.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -40 +40 @@
 ****************************************************************************/
 
-// This flag changes the implementation to use S60 CDcoumentHandler
-// instead of apparch when opening the files
-#define USE_DOCUMENTHANDLER
 
 #include <qcoreapplication.h>
@@ -49 +46 @@
 #include <private/qcore_symbian_p.h>
 
+#include <f32file.h>                // TDriveUnit etc
+#include <pathinfo.h>               // PathInfo
+
+#ifndef USE_SCHEMEHANDLER
+#ifdef Q_WS_S60
+// This flag changes the implementation to use S60 CDcoumentHandler
+// instead of apparc when opening the files
+#define USE_DOCUMENTHANDLER
+#endif
+
 #include <txtrich.h>                // CRichText
-#include <f32file.h>                // TDriveUnit etc
 #include <eikenv.h>                 // CEikonEnv
 #include <apgcli.h>                 // RApaLsSession
@@ -57 +63 @@
 #include <rsendasmessage.h>         // RSendAsMessage
 
-// copied from miutset.h, so we don't get a dependency into the app layer
-const TUid KUidMsgTypeSMTP                      = {0x10001028}; // 268439592
-
-#ifdef Q_WS_S60
-#  include <pathinfo.h>             // PathInfo
-#  ifdef USE_DOCUMENTHANDLER
-#    include <DocumentHandler.h>    // CDocumentHandler
-#    include <AknServerApp.h>
-#  endif
-#else
-#  warning CDocumentHandler requires support for S60
-#  undef USE_DOCUMENTHANDLER        // Fallback to RApaLsSession based implementation
+#ifdef USE_DOCUMENTHANDLER
+#include <DocumentHandler.h>        // CDocumentHandler
+#include <AknServerApp.h>
+#endif
+#else // USE_SCHEMEHANDLER
+#include <schemehandler.h>
 #endif
 
@@ -77 +77 @@
 _LIT(KBrowserPrefix, "4 " );
 _LIT(KFontsDir, "z:\\resource\\Fonts\\");
+
+#ifndef USE_SCHEMEHANDLER
+// copied from miutset.h, so we don't get a dependency into the app layer
+const TUid KUidMsgTypeSMTP = {0x10001028}; // 268439592
 const TUid KUidBrowser = { 0x10008D39 };
 
@@ -135 +139 @@
 #endif
 
-
 static void handleMailtoSchemeLX(const QUrl &url)
 {
@@ -153 +156 @@
     QStringList bccs = bcc.split(QLatin1String(","), QString::SkipEmptyParts);
 
-
     RSendAs sendAs;
     User::LeaveIfError(sendAs.Connect());
     QAutoClose<RSendAs> sendAsCleanup(sendAs);
-
 
     CSendAsAccounts* accounts = CSendAsAccounts::NewL();
@@ -221 +222 @@
     if (task.Exists()){
         // Switch to existing browser instance
+        task.BringToForeground();
         HBufC8* param8 = HBufC8::NewLC(buf16->Length());
         param8->Des().Append(buf16->Des());
@@ -246 +248 @@
 }
 
-static TDriveUnit exeDrive()
-{
-    RProcess me;
-    TFileName processFileName = me.FileName();
-    TDriveUnit drive(processFileName);
-    return drive;
-}
-
-static TDriveUnit writableExeDrive()
-{
-    TDriveUnit drive = exeDrive();
-    if(drive.operator TInt() == EDriveZ)
-        return TDriveUnit(EDriveC);
-    return drive;
-}
-
-static TPtrC writableDataRoot()
-{
-    TDriveUnit drive = exeDrive();
-#ifdef Q_WS_S60
-    switch(drive.operator TInt()){
-        case EDriveC:
-            return PathInfo::PhoneMemoryRootPath();
-            break;
-        case EDriveE:
-            return PathInfo::MemoryCardRootPath();
-            break;
-        case EDriveZ:
-            // It is not possible to write on ROM drive ->
-            // return phone mem root path instead
-            return PathInfo::PhoneMemoryRootPath();
-            break;
-        default:
-            return PathInfo::PhoneMemoryRootPath();
-            break;
-    }
-#else
-#warning No fallback implementation of writableDataRoot()
-    return 0;
-#endif
-}
 
 static void openDocumentL(const TDesC& aUrl)
@@ -311 +272 @@
 }
 
-#ifdef USE_SCHEMEHANDLER
-// The schemehandler component only exist in private SDK. This implementation
-// exist here just for convenience in case that we need to use it later on
-// The schemehandle based implementation is not yet tested.
-
-// The biggest advantage of schemehandler is that it can handle
-// wide range of schemes and is extensible by plugins
-static bool handleUrl(const QUrl &url)
-{
-    if (!url.isValid())
-        return false;
-
-    QString urlString(url.toString());
-    TPtrC urlPtr(qt_QString2TPtrC(urlString));
-    TRAPD( err, handleUrlL(urlPtr));
-    return err ? false : true;
-}
-
-static void handleUrlL(const TDesC& aUrl)
-{
-    CSchemeHandler* schemeHandler = CSchemeHandler::NewL(aUrl);
-    CleanupStack::PushL(schemeHandler);
-    schemeHandler->HandleUrlStandaloneL(); // Process the Url in standalone mode
-    CleanupStack::PopAndDestroy();
-}
-static bool launchWebBrowser(const QUrl &url)
-{
-    return handleUrl(url);
-}
-
-static bool openDocument(const QUrl &file)
-{
-    return handleUrl(url);
-}
-#endif
-
 static bool launchWebBrowser(const QUrl &url)
 {
@@ -370 +295 @@
 }
 
+#else //USE_SCHEMEHANDLER
+// The schemehandler component only exist in private SDK. This implementation
+// exist here just for convenience in case that we need to use it later on
+// The schemehandle based implementation is not yet tested.
+
+// The biggest advantage of schemehandler is that it can handle
+// wide range of schemes and is extensible by plugins
+static void handleUrlL(const TDesC& aUrl)
+{
+    CSchemeHandler* schemeHandler = CSchemeHandler::NewL(aUrl);
+    CleanupStack::PushL(schemeHandler);
+    schemeHandler->HandleUrlStandaloneL(); // Process the Url in standalone mode
+    CleanupStack::PopAndDestroy();
+}
+
+static bool handleUrl(const QUrl &url)
+{
+    if (!url.isValid())
+        return false;
+
+    QString urlString(url.toString());
+    TPtrC urlPtr(qt_QString2TPtrC(urlString));
+    TRAPD( err, handleUrlL(urlPtr));
+    return err ? false : true;
+}
+
+static bool launchWebBrowser(const QUrl &url)
+{
+    return handleUrl(url);
+}
+
+static bool openDocument(const QUrl &file)
+{
+    return handleUrl(file);
+}
+
+#endif //USE_SCHEMEHANDLER
+
+// Common functions to all implementations
+
+static TDriveUnit exeDrive()
+{
+    RProcess me;
+    TFileName processFileName = me.FileName();
+    TDriveUnit drive(processFileName);
+    return drive;
+}
+
+static TDriveUnit writableExeDrive()
+{
+    TDriveUnit drive = exeDrive();
+    if (drive.operator TInt() == EDriveZ)
+        return TDriveUnit(EDriveC);
+    return drive;
+}
+
+static TPtrC writableDataRoot()
+{
+    TDriveUnit drive = exeDrive();
+    switch (drive.operator TInt()){
+        case EDriveC:
+            return PathInfo::PhoneMemoryRootPath();
+            break;
+        case EDriveE:
+            return PathInfo::MemoryCardRootPath();
+            break;
+        case EDriveZ:
+            // It is not possible to write on ROM drive ->
+            // return phone mem root path instead
+            return PathInfo::PhoneMemoryRootPath();
+            break;
+        default:
+            return PathInfo::PhoneMemoryRootPath();
+            break;
+    }
+}
+
 QString QDesktopServices::storageLocation(StandardLocation type)
 {
@@ -392 +394 @@
     case MusicLocation:
         path.Append(writableDataRoot());
-#ifdef Q_WS_S60
         path.Append(PathInfo::SoundsPath());
-#endif
         break;
     case MoviesLocation:
         path.Append(writableDataRoot());
-#ifdef Q_WS_S60
         path.Append(PathInfo::VideosPath());
-#endif
         break;
     case PicturesLocation:
         path.Append(writableDataRoot());
-#ifdef Q_WS_S60
         path.Append(PathInfo::ImagesPath());
-#endif
         break;
     case TempLocation:
@@ -416 +412 @@
         break;
     case DataLocation:
-        CEikonEnv::Static()->FsSession().PrivatePath(path);
+        qt_s60GetRFs().PrivatePath(path);
         path.Insert(0, writableExeDrive().Name());
         break;
     case CacheLocation:
-        CEikonEnv::Static()->FsSession().PrivatePath(path);
+        qt_s60GetRFs().PrivatePath(path);
         path.Insert(0, writableExeDrive().Name());
         path.Append(KCacheSubDir);