diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2010-11-12 09:16:29 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2010-11-15 12:25:40 (GMT) |
| commit | 012c865ab30ed45fc57ee5b49b625697cc065e82 (patch) | |
| tree | e0dd752dbfc4b1d0bd19367eb9e9fa4f08e5e619 | |
| parent | 4715182e9c600811c045fe5ed7989d4d52d1f4e9 (diff) | |
| download | Qt-012c865ab30ed45fc57ee5b49b625697cc065e82.zip Qt-012c865ab30ed45fc57ee5b49b625697cc065e82.tar.gz Qt-012c865ab30ed45fc57ee5b49b625697cc065e82.tar.bz2 | |
Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
This flags used to be Q_WS_S60 flags but as part of fabf804b they were
changed to Q_OS_SYMBIAN. However since the whole while is only included
to build when Q_OS_SYMBIAN is defined, the flags can be removed.
Reviewed-by: mread
| -rw-r--r-- | src/gui/util/qdesktopservices_s60.cpp | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp index cd023cb..d1eeeae 100644 --- a/src/gui/util/qdesktopservices_s60.cpp +++ b/src/gui/util/qdesktopservices_s60.cpp @@ -62,15 +62,10 @@ // copied from miutset.h, so we don't get a dependency into the app layer const TUid KUidMsgTypeSMTP = {0x10001028}; // 268439592 -#ifdef Q_OS_SYMBIAN -# 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 +#include <pathinfo.h> // PathInfo +#ifdef USE_DOCUMENTHANDLER +# include <DocumentHandler.h> // CDocumentHandler +# include <AknServerApp.h> #endif QT_BEGIN_NAMESPACE @@ -268,7 +263,6 @@ static TDriveUnit writableExeDrive() static TPtrC writableDataRoot() { TDriveUnit drive = exeDrive(); -#ifdef Q_OS_SYMBIAN switch(drive.operator TInt()){ case EDriveC: return PathInfo::PhoneMemoryRootPath(); @@ -285,10 +279,6 @@ static TPtrC writableDataRoot() return PathInfo::PhoneMemoryRootPath(); break; } -#else -#warning No fallback implementation of writableDataRoot() - return 0; -#endif } static void openDocumentL(const TDesC& aUrl) @@ -395,21 +385,15 @@ QString QDesktopServices::storageLocation(StandardLocation type) break; case MusicLocation: path.Append(writableDataRoot()); -#ifdef Q_OS_SYMBIAN path.Append(PathInfo::SoundsPath()); -#endif break; case MoviesLocation: path.Append(writableDataRoot()); -#ifdef Q_OS_SYMBIAN path.Append(PathInfo::VideosPath()); -#endif break; case PicturesLocation: path.Append(writableDataRoot()); -#ifdef Q_OS_SYMBIAN path.Append(PathInfo::ImagesPath()); -#endif break; case TempLocation: return QDir::tempPath(); |