diff --git a/src/adaptors/UBExportAdaptor.cpp b/src/adaptors/UBExportAdaptor.cpp index 737a27b5..e2b8b3f6 100644 --- a/src/adaptors/UBExportAdaptor.cpp +++ b/src/adaptors/UBExportAdaptor.cpp @@ -17,7 +17,6 @@ #include "document/UBDocumentProxy.h" -#include "frameworks/UBDesktopServices.h" #include "frameworks/UBFileSystemUtils.h" #include "core/UBSettings.h" diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index 1326b458..12c0eb67 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -16,7 +16,6 @@ #include "frameworks/UBFileSystemUtils.h" #include "frameworks/UBPlatformUtils.h" -#include "frameworks/UBDesktopServices.h" #include "core/UBApplication.h" #include "core/UBPersistenceManager.h" @@ -54,13 +53,13 @@ UBLibraryController::UBLibraryController(QWidget *pParentWidget) : { readFavoriteList(); - mAudioStandardDirectoryPath = QUrl::fromLocalFile(UBDesktopServices::storageLocation(QDesktopServices::MusicLocation)); + mAudioStandardDirectoryPath = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::MusicLocation)); userPath(mAudioStandardDirectoryPath); - mVideoStandardDirectoryPath = QUrl::fromLocalFile(UBDesktopServices::storageLocation(QDesktopServices::MoviesLocation)); + mVideoStandardDirectoryPath = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::MoviesLocation)); userPath(mVideoStandardDirectoryPath); - mPicturesStandardDirectoryPath = QUrl::fromLocalFile(UBDesktopServices::storageLocation(QDesktopServices::PicturesLocation)); + mPicturesStandardDirectoryPath = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::PicturesLocation)); userPath(mPicturesStandardDirectoryPath); mInteractiveUserDirectoryPath = QUrl::fromLocalFile(UBSettings::settings()->uniboardInteractiveUserDirectory()); diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp index 8e92e360..9ac5d13a 100644 --- a/src/core/UBPersistenceManager.cpp +++ b/src/core/UBPersistenceManager.cpp @@ -20,7 +20,6 @@ #include "frameworks/UBPlatformUtils.h" #include "frameworks/UBFileSystemUtils.h" -#include "frameworks/UBDesktopServices.h" #include "core/UBApplication.h" #include "core/UBSettings.h" @@ -171,7 +170,7 @@ QStringList UBPersistenceManager::allGips() QStringList UBPersistenceManager::allSounds() { - QString soundLibraryPath = UBDesktopServices::storageLocation(QDesktopServices::MusicLocation); + QString soundLibraryPath = QDesktopServices::storageLocation(QDesktopServices::MusicLocation); QDir dir(soundLibraryPath); diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 8d01f3c2..9847842f 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -13,7 +13,6 @@ #include "frameworks/UBPlatformUtils.h" #include "frameworks/UBFileSystemUtils.h" -#include "frameworks/UBDesktopServices.h" #include "frameworks/UBCryptoUtils.h" #include "UB.h" @@ -294,15 +293,15 @@ void UBSettings::init() mirroringRefreshRateInFps = new UBSetting(this, "Mirroring", "RefreshRateInFramePerSecond", QVariant(defaultRefreshRateInFramePerSecond)); - lastImportFilePath = new UBSetting(this, "Import", "LastImportFilePath", QVariant(UBDesktopServices::storageLocation(QDesktopServices::DocumentsLocation))); - lastImportFolderPath = new UBSetting(this, "Import", "LastImportFolderPath", QVariant(UBDesktopServices::storageLocation(QDesktopServices::DocumentsLocation))); - lastExportFilePath = new UBSetting(this, "Export", "LastExportFilePath", QVariant(UBDesktopServices::storageLocation(QDesktopServices::DocumentsLocation))); - lastExportDirPath = new UBSetting(this, "Export", "LastExportDirPath", QVariant(UBDesktopServices::storageLocation(QDesktopServices::DocumentsLocation))); - lastImportToLibraryPath = new UBSetting(this, "Library", "LastImportToLibraryPath", QVariant(UBDesktopServices::storageLocation(QDesktopServices::DocumentsLocation))); + lastImportFilePath = new UBSetting(this, "Import", "LastImportFilePath", QVariant(QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation))); + lastImportFolderPath = new UBSetting(this, "Import", "LastImportFolderPath", QVariant(QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation))); + lastExportFilePath = new UBSetting(this, "Export", "LastExportFilePath", QVariant(QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation))); + lastExportDirPath = new UBSetting(this, "Export", "LastExportDirPath", QVariant(QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation))); + lastImportToLibraryPath = new UBSetting(this, "Library", "LastImportToLibraryPath", QVariant(QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation))); - lastPicturePath = new UBSetting(this, "Library", "LastPicturePath", QVariant(UBDesktopServices::storageLocation(QDesktopServices::PicturesLocation))); - lastWidgetPath = new UBSetting(this, "Library", "LastWidgetPath", QVariant(UBDesktopServices::storageLocation(QDesktopServices::DocumentsLocation))); - lastVideoPath = new UBSetting(this, "Library", "LastVideoPath", QVariant(UBDesktopServices::storageLocation(QDesktopServices::MoviesLocation))); + lastPicturePath = new UBSetting(this, "Library", "LastPicturePath", QVariant(QDesktopServices::storageLocation(QDesktopServices::PicturesLocation))); + lastWidgetPath = new UBSetting(this, "Library", "LastWidgetPath", QVariant(QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation))); + lastVideoPath = new UBSetting(this, "Library", "LastVideoPath", QVariant(QDesktopServices::storageLocation(QDesktopServices::MoviesLocation))); defaultDocumentGroupName = tr("Untitled Documents"); documentTrashGroupName = tr("Trash"); @@ -761,9 +760,8 @@ QString UBSettings::uniboardDataDirectory() // ", defaulting to " + UBDesktopServices::storageLocation(QDesktopServices::DataLocation); } } - QString qtDataPath = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation)); + QString qtDataPath = UBFileSystemUtils::normalizeFilePath(QDesktopServices::storageLocation(QDesktopServices::DataLocation)); qtDataPath.replace("/Open-Sankore", ""); - qDebug() << qtDataPath; return qtDataPath; } @@ -771,7 +769,7 @@ QString UBSettings::uniboardDataDirectory() QString UBSettings::uniboardUserImageDirectory() { QString valideUserImageDirectory = - UBDesktopServices::storageLocation(QDesktopServices::PicturesLocation) + QDesktopServices::storageLocation(QDesktopServices::PicturesLocation) + "/" + QCoreApplication::applicationName(); bool hasCreatedDir = false; @@ -853,7 +851,7 @@ QString UBSettings::defaultUserImagesDirectory() QString UBSettings::uniboardUserVideoDirectory() { QString valideUserVideoDirectory = - UBDesktopServices::storageLocation(QDesktopServices::MoviesLocation); + QDesktopServices::storageLocation(QDesktopServices::MoviesLocation); // first look into the application settings if (sAppSettings && getAppSettings()->contains("App/UserVideoDirectory")) @@ -924,7 +922,7 @@ QString UBSettings::uniboardUserVideoDirectory() QString UBSettings::podcastRecordingDirectory() { QString validePodcastRecordingDirectory = - UBDesktopServices::storageLocation(QDesktopServices::DesktopLocation); + QDesktopServices::storageLocation(QDesktopServices::DesktopLocation); // first look into the application settings if (sAppSettings && getAppSettings()->contains("Podcast/RecordingDirectory")) diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index aa4b0504..48663bf2 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -372,6 +372,7 @@ void UBDesktopAnnotationController::close() void UBDesktopAnnotationController::stylusToolChanged(int tool) { + Q_UNUSED(tool); // UBStylusTool::Enum eTool = (UBStylusTool::Enum)tool; // if(eTool != UBStylusTool::Selector && eTool != UBStylusTool::Text) // { diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp index 27539123..04595b12 100644 --- a/src/document/UBDocumentController.cpp +++ b/src/document/UBDocumentController.cpp @@ -19,7 +19,6 @@ #include "frameworks/UBFileSystemUtils.h" #include "frameworks/UBStringUtils.h" -#include "frameworks/UBDesktopServices.h" #include "frameworks/UBPlatformUtils.h" #include "core/UBApplication.h" diff --git a/src/frameworks/UBDesktopServices.h b/src/frameworks/UBDesktopServices.h deleted file mode 100644 index 0e7c3dc9..00000000 --- a/src/frameworks/UBDesktopServices.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef UBDESKTOPSERVICES_H_ -#define UBDESKTOPSERVICES_H_ - -#include -#include - -#include "core/memcheck.h" - -// TODO Qt 4.6 #error Delete this UBDesktopServices class, -// it was used to work around a bug in Qt 4.4 that was fixed in Qt 4.5 and another that should be fixed -// in 4.5.1 - -class UBDesktopServices : public QDesktopServices -{ - public: - static QString storageLocation(StandardLocation type); -}; - -#endif /* UBDESKTOPSERVICES_H_ */ diff --git a/src/frameworks/UBDesktopServices_linux.cpp b/src/frameworks/UBDesktopServices_linux.cpp deleted file mode 100644 index 2c03b51b..00000000 --- a/src/frameworks/UBDesktopServices_linux.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "UBDesktopServices.h" - -QString UBDesktopServices::storageLocation(StandardLocation type) -{ - return QDesktopServices::storageLocation(type); -} diff --git a/src/frameworks/UBDesktopServices_mac.cpp b/src/frameworks/UBDesktopServices_mac.cpp deleted file mode 100644 index 839502dc..00000000 --- a/src/frameworks/UBDesktopServices_mac.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "UBDesktopServices.h" - -#include - -#import - -/* - Translates a QDesktopServices::StandardLocation into the mac equivalent. -*/ -OSType translateLocation(QDesktopServices::StandardLocation type) -{ - switch (type) { - case QDesktopServices::DesktopLocation: - return kDesktopFolderType; break; - - case QDesktopServices::DocumentsLocation: - return kDocumentsFolderType; break; - - case QDesktopServices::FontsLocation: - // There are at least two different font directories on the mac: /Library/Fonts and ~/Library/Fonts. - // To select a specific one we have to specify a different first parameter when calling FSFindFolder. - return kFontsFolderType; break; - - case QDesktopServices::ApplicationsLocation: - return kApplicationsFolderType; break; - - case QDesktopServices::MusicLocation: - return kMusicDocumentsFolderType; break; - - case QDesktopServices::MoviesLocation: - return kMovieDocumentsFolderType; break; - - case QDesktopServices::PicturesLocation: - return kPictureDocumentsFolderType; break; - - case QDesktopServices::TempLocation: - return kTemporaryFolderType; break; - - case QDesktopServices::DataLocation: - return kApplicationSupportFolderType; break; - - case QDesktopServices::CacheLocation: - return kCachedDataFolderType; break; - - default: - return kDesktopFolderType; break; - } -} - -/* - Constructs a full unicode path from a FSRef. -*/ -static QString getFullPath(const FSRef &ref) -{ - QByteArray ba(2048, 0); - if (FSRefMakePath(&ref, reinterpret_cast(ba.data()), ba.size()) == noErr) - return QString::fromUtf8(ba).normalized(QString::NormalizationForm_C); - return QString(); -} - -// Mac OS X implementation of QDesktopServices is bugged in Qt 4.4, -// we use the implementation inspired from Qt 4.5 snapshot -QString UBDesktopServices::storageLocation(StandardLocation type) -{ - if (QDesktopServices::HomeLocation == type) - return QDir::homePath(); - else if (QDesktopServices::TempLocation == type) - return QDir::tempPath(); - - short domain = kOnAppropriateDisk; - - if (QDesktopServices::DataLocation == type || QDesktopServices::CacheLocation == type) - domain = kUserDomain; - - // http://developer.apple.com/documentation/Carbon/Reference/Folder_Manager/Reference/reference.html - FSRef ref; - OSErr err = FSFindFolder(domain, translateLocation(type), false, &ref); - if (err) - return QString(); - - QString path = getFullPath(ref); - - if (QDesktopServices::DataLocation == type || QDesktopServices::CacheLocation == type) - path += "/Sankore/Open-Sankore"; - - return path; -} - diff --git a/src/frameworks/UBDesktopServices_win.cpp b/src/frameworks/UBDesktopServices_win.cpp deleted file mode 100644 index d92fa1e7..00000000 --- a/src/frameworks/UBDesktopServices_win.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "UBDesktopServices.h" -#include "core/memcheck.h" - -QString UBDesktopServices::storageLocation(StandardLocation type) -{ - // Windows implementation of QDesktopServices is fine - return QDesktopServices::storageLocation(type); -} diff --git a/src/frameworks/UBFileSystemUtils.cpp b/src/frameworks/UBFileSystemUtils.cpp index 1c315dfe..1cd8e27e 100644 --- a/src/frameworks/UBFileSystemUtils.cpp +++ b/src/frameworks/UBFileSystemUtils.cpp @@ -14,7 +14,6 @@ */ #include "UBFileSystemUtils.h" -#include "UBDesktopServices.h" #include @@ -57,12 +56,12 @@ bool UBFileSystemUtils::isAZipFile(QString &filePath) QString UBFileSystemUtils::defaultTempDirPath() { - return UBDesktopServices::storageLocation(QDesktopServices::TempLocation) + "/" + defaultTempDirName(); + return QDesktopServices::storageLocation(QDesktopServices::TempLocation) + "/" + defaultTempDirName(); } QString UBFileSystemUtils::createTempDir(const QString& templateString, bool autoDeleteOnExit) { - QString appTempDir = UBDesktopServices::storageLocation(QDesktopServices::TempLocation) + QString appTempDir = QDesktopServices::storageLocation(QDesktopServices::TempLocation) + "/" + templateString; int index = 0; @@ -127,7 +126,7 @@ void UBFileSystemUtils::deleteAllTempDirCreatedDuringSession() void UBFileSystemUtils::cleanupGhostTempFolders(const QString& templateString) { - QDir dir(UBDesktopServices::storageLocation(QDesktopServices::TempLocation)); + QDir dir(QDesktopServices::storageLocation(QDesktopServices::TempLocation)); foreach (QFileInfo dirContent, dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden , QDir::Name)) { diff --git a/src/frameworks/frameworks.pri b/src/frameworks/frameworks.pri index e38a9aa1..2f317b93 100644 --- a/src/frameworks/frameworks.pri +++ b/src/frameworks/frameworks.pri @@ -1,46 +1,41 @@ - -HEADERS += src/frameworks/UBGeometryUtils.h \ - src/frameworks/UBDesktopServices.h \ - src/frameworks/UBPlatformUtils.h \ - src/frameworks/UBFileSystemUtils.h \ - src/frameworks/UBStringUtils.h \ - src/frameworks/UBVersion.h \ - src/frameworks/UBCoreGraphicsScene.h \ - src/frameworks/UBCryptoUtils.h \ - src/frameworks/UBBase32.h - -SOURCES += src/frameworks/UBGeometryUtils.cpp \ - src/frameworks/UBPlatformUtils.cpp \ - src/frameworks/UBFileSystemUtils.cpp \ - src/frameworks/UBStringUtils.cpp \ - src/frameworks/UBVersion.cpp \ - src/frameworks/UBCoreGraphicsScene.cpp \ - src/frameworks/UBCryptoUtils.cpp \ - src/frameworks/UBBase32.cpp - - -win32 { - - SOURCES += src/frameworks/UBPlatformUtils_win.cpp \ - src/frameworks/UBDesktopServices_win.cpp -} - - -macx { - - SOURCES += src/frameworks/UBPlatformUtils_mac.mm \ - src/frameworks/UBDesktopServices_mac.cpp - -} - - -linux-g++ { - - SOURCES += src/frameworks/UBPlatformUtils_linux.cpp \ - src/frameworks/UBDesktopServices_linux.cpp -} -linux-g++-32 { - - SOURCES += src/frameworks/UBPlatformUtils_linux.cpp \ - src/frameworks/UBDesktopServices_linux.cpp -} + +HEADERS += src/frameworks/UBGeometryUtils.h \ + src/frameworks/UBPlatformUtils.h \ + src/frameworks/UBFileSystemUtils.h \ + src/frameworks/UBStringUtils.h \ + src/frameworks/UBVersion.h \ + src/frameworks/UBCoreGraphicsScene.h \ + src/frameworks/UBCryptoUtils.h \ + src/frameworks/UBBase32.h + +SOURCES += src/frameworks/UBGeometryUtils.cpp \ + src/frameworks/UBPlatformUtils.cpp \ + src/frameworks/UBFileSystemUtils.cpp \ + src/frameworks/UBStringUtils.cpp \ + src/frameworks/UBVersion.cpp \ + src/frameworks/UBCoreGraphicsScene.cpp \ + src/frameworks/UBCryptoUtils.cpp \ + src/frameworks/UBBase32.cpp + + +win32 { + + SOURCES += src/frameworks/UBPlatformUtils_win.cpp +} + + +macx { + + SOURCES += src/frameworks/UBPlatformUtils_mac.mm + +} + + +linux-g++ { + + SOURCES += src/frameworks/UBPlatformUtils_linux.cpp +} +linux-g++-32 { + + SOURCES += src/frameworks/UBPlatformUtils_linux.cpp +} diff --git a/src/network/UBNetworkAccessManager.cpp b/src/network/UBNetworkAccessManager.cpp index 4f32444a..4a7f1ed1 100644 --- a/src/network/UBNetworkAccessManager.cpp +++ b/src/network/UBNetworkAccessManager.cpp @@ -17,8 +17,6 @@ #include #include -#include "frameworks/UBDesktopServices.h" - #include "core/UBApplication.h" #include "core/UBApplicationController.h" #include "core/UBSettings.h" diff --git a/src/podcast/UBPodcastController.cpp b/src/podcast/UBPodcastController.cpp index 9b6e03d5..e377249a 100644 --- a/src/podcast/UBPodcastController.cpp +++ b/src/podcast/UBPodcastController.cpp @@ -15,7 +15,6 @@ #include "UBPodcastController.h" -#include "frameworks/UBDesktopServices.h" #include "frameworks/UBFileSystemUtils.h" #include "frameworks/UBStringUtils.h" #include "frameworks/UBPlatformUtils.h" diff --git a/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp b/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp index f188ab80..2ae6b90e 100644 --- a/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp +++ b/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp @@ -19,7 +19,6 @@ #include -#include "frameworks/UBDesktopServices.h" #include "frameworks/UBFileSystemUtils.h" #include "core/UBApplication.h" diff --git a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp index bc2ee2fe..1d2d773e 100644 --- a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp +++ b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp @@ -17,7 +17,6 @@ #include -#include "frameworks/UBDesktopServices.h" #include "frameworks/UBFileSystemUtils.h" #include "core/UBApplication.h" diff --git a/src/softwareupdate/UBSoftwareUpdateController.cpp b/src/softwareupdate/UBSoftwareUpdateController.cpp index 50fad512..6f651db1 100644 --- a/src/softwareupdate/UBSoftwareUpdateController.cpp +++ b/src/softwareupdate/UBSoftwareUpdateController.cpp @@ -14,7 +14,6 @@ */ //#include "frameworks/UBVersion.h" -//#include "frameworks/UBDesktopServices.h" //#include "frameworks/UBFileSystemUtils.h" //#include "frameworks/UBPlatformUtils.h" diff --git a/src/tools/UBGraphicsCache.cpp b/src/tools/UBGraphicsCache.cpp index a7e97895..cff7c43c 100644 --- a/src/tools/UBGraphicsCache.cpp +++ b/src/tools/UBGraphicsCache.cpp @@ -89,10 +89,9 @@ void UBGraphicsCache::init() void UBGraphicsCache::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - //Q_UNUSED(option); + Q_UNUSED(option); Q_UNUSED(widget); -// setZValue(CACHE_ZVALUE); UBGraphicsItem::assignZValue(this, CACHE_ZVALUE); painter->setBrush(mMaskColor); diff --git a/src/transition/UniboardSankoreTransition.cpp b/src/transition/UniboardSankoreTransition.cpp index 6ed3acae..32c320af 100644 --- a/src/transition/UniboardSankoreTransition.cpp +++ b/src/transition/UniboardSankoreTransition.cpp @@ -15,7 +15,6 @@ #include "UniboardSankoreTransition.h" #include "core/UBSettings.h" -#include "frameworks/UBDesktopServices.h" #include "frameworks/UBFileSystemUtils.h" #include "core/UBApplication.h" #include "core/UBPersistenceManager.h" @@ -28,9 +27,9 @@ UniboardSankoreTransition::UniboardSankoreTransition(QObject *parent) : , mTransitionDlg(NULL) , mThread(NULL) { - mOldSankoreDirectory = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation)); + mOldSankoreDirectory = UBFileSystemUtils::normalizeFilePath(QDesktopServices::storageLocation(QDesktopServices::DataLocation)); - mUniboardSourceDirectory = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation)); + mUniboardSourceDirectory = UBFileSystemUtils::normalizeFilePath(QDesktopServices::storageLocation(QDesktopServices::DataLocation)); #if defined(Q_WS_MACX) mOldSankoreDirectory.replace("Sankore/Sankore 3.1", "Sankore"); mUniboardSourceDirectory.replace("Sankore/Sankore 3.1", "Uniboard"); @@ -86,7 +85,7 @@ void UniboardSankoreTransition::documentTransition() QFileInfoList fileInfoList = UBFileSystemUtils::allElementsInDirectory(uniboardDocumentDirectory); fileInfoList << UBFileSystemUtils::allElementsInDirectory(mOldSankoreDirectory + "/document"); - QString backupDirectoryPath = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DesktopLocation)); + QString backupDirectoryPath = UBFileSystemUtils::normalizeFilePath(QDesktopServices::storageLocation(QDesktopServices::DesktopLocation)); if (fileInfoList.count() != 0){ mTransitionDlg = new UBUpdateDlg(NULL, fileInfoList.count(), backupDirectoryPath); diff --git a/src/web/UBTrapFlashController.cpp b/src/web/UBTrapFlashController.cpp index d93c0a17..a701353d 100644 --- a/src/web/UBTrapFlashController.cpp +++ b/src/web/UBTrapFlashController.cpp @@ -116,7 +116,7 @@ void UBTrapFlashController::text_Changed(const QString &newText) void UBTrapFlashController::text_Edited(const QString &newText) { - + Q_UNUSED(newText); } void UBTrapFlashController::hideTrapFlash() diff --git a/src/web/browser/WBDownloadManager.cpp b/src/web/browser/WBDownloadManager.cpp index f45976d8..1b3206f6 100644 --- a/src/web/browser/WBDownloadManager.cpp +++ b/src/web/browser/WBDownloadManager.cpp @@ -58,8 +58,6 @@ #include #include -#include "frameworks/UBDesktopServices.h" - #include "network/UBAutoSaver.h" #include "network/UBNetworkAccessManager.h" #include "frameworks/UBFileSystemUtils.h" @@ -134,7 +132,7 @@ void WBDownloadItem::getFileName() { QSettings settings; settings.beginGroup(QLatin1String("downloadmanager")); - QString defaultLocation = !mCustomDownloadPath.isEmpty() ? mCustomDownloadPath : UBDesktopServices::storageLocation(QDesktopServices::DesktopLocation); + QString defaultLocation = !mCustomDownloadPath.isEmpty() ? mCustomDownloadPath : QDesktopServices::storageLocation(QDesktopServices::DesktopLocation); QString downloadDirectory = settings.value(QLatin1String("downloadDirectory"), defaultLocation).toString(); if (!downloadDirectory.isEmpty()) downloadDirectory += QLatin1Char('/');