Merge branch 'master' of github.com:Sankore/Sankore-3.1

src/adaptors/UBCFFSubsetAdaptor.cpp

@@ -729,10 +729,8 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgFlash(const QDomElement &ele
 
     QTransform transform;
     QString textTransform = element.attribute(aTransform);
-    bool hastransform = false;
     if (!textTransform.isNull()) {
         transform = transformFromString(textTransform);
-        hastransform = true;
     }
     repositionSvgItem(flashItem, width, height, x, y, true, transform);
     hashSceneItem(element, flashItem);
@@ -923,13 +921,12 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbElement(QDomElement &element
     }
 
     bool locked = false;
-    bool isBackground = false;
     bool isEditableItem = false;
     bool isEditable = false; //Text items to convert to UBGraphicsTextItem only
 
     QString IDRef = element.attribute(aRef);
     if (!IDRef.isNull()) {
-        isBackground = element.hasAttribute(aBackground) ? strToBool(element.attribute(aBackground)) : false;
+        element.hasAttribute(aBackground) ? strToBool(element.attribute(aBackground)) : false;
         locked = element.hasAttribute(aBackground) ? strToBool(element.attribute(aBackground)) : false;
         isEditableItem = element.hasAttribute(aEditable);
         if (isEditableItem)

src/adaptors/UBExportAdaptor.cpp

@@ -17,7 +17,6 @@
 
 #include "document/UBDocumentProxy.h"
 
-#include "frameworks/UBDesktopServices.h"
 #include "frameworks/UBFileSystemUtils.h"
 
 #include "core/UBSettings.h"

src/adaptors/UBMetadataDcSubsetAdaptor.cpp

@@ -90,8 +90,6 @@ void UBMetadataDcSubsetAdaptor::persist(UBDocumentProxy* proxy)
     xmlWriter.writeStartElement("Description");
     xmlWriter.writeAttribute("about", proxy->metaData(UBSettings::documentIdentifer).toString());
 
-    QDate today = QDate::currentDate();
-
     xmlWriter.writeTextElement(nsDc, "title", proxy->metaData(UBSettings::documentName).toString());
     xmlWriter.writeTextElement(nsDc, "type", proxy->metaData(UBSettings::documentGroupName).toString());
     xmlWriter.writeTextElement(nsDc, "date", QDate::currentDate().toString("yyyy-MM-dd"));

src/adaptors/publishing/UBDocumentPublisher.cpp

@@ -240,8 +240,6 @@ void UBDocumentPublisher::upgradeDocumentForPublishing()
     {
         UBGraphicsScene *scene = UBSvgSubsetAdaptor::loadScene(mPublishingDocument, pageIndex);
 
-        bool sceneHasWidget = false;
-
         QList<UBGraphicsW3CWidgetItem*> widgets;
 
         foreach(QGraphicsItem* item, scene->items()){
@@ -249,7 +247,6 @@ void UBDocumentPublisher::upgradeDocumentForPublishing()
 
             if(widgetItem){
                 generateWidgetPropertyScript(widgetItem, pageIndex + 1);
-                sceneHasWidget = true;
                 widgets << widgetItem;
             }
         }

src/board/UBBoardController.cpp

@@ -1184,7 +1184,6 @@ void UBBoardController::ClearUndoStack()
 {
     QSet<QGraphicsItem*> uniqueItems;
     // go through all stack command
-    int count = UBApplication::undoStack->count();
     for(int i = 0; i < UBApplication::undoStack->count(); i++)
     {
 
@@ -1214,7 +1213,6 @@ void UBBoardController::ClearUndoStack()
 
     // clear stack, and command list
     UBApplication::undoStack->clear();
-    count = UBApplication::undoStack->count();
 
     // go through all unique items, and check, ot on scene, or not.
     // if not on scene, than item can be deleted
@@ -1226,7 +1224,7 @@ void UBBoardController::ClearUndoStack()
         UBGraphicsScene *scene = (UBGraphicsScene*)item->scene();
         if(!scene)
         {
-            bool retCode = mActiveScene->deleteItem(item);
+            mActiveScene->deleteItem(item);
         }
     }
 

src/board/UBBoardPaletteManager.cpp

@@ -81,8 +81,8 @@ UBBoardPaletteManager::UBBoardPaletteManager(QWidget* container, UBBoardControll
     , mpLibWidget(NULL)
     , mpCachePropWidget(NULL)
     , mpTeacherBarWidget(NULL)
-    , mpDesktopLibWidget(NULL)
     , mpDownloadWidget(NULL)
+    , mpDesktopLibWidget(NULL)
     , mDownloadInProgress(false)
 {
     setupPalettes();

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());

src/core/UBApplication.cpp

@@ -109,7 +109,7 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing
 
     setOrganizationName("Sankore");
     setOrganizationDomain("sankore.org");
-    setApplicationName("Sankore 3.1");
+    setApplicationName("Open-Sankore");
 
     setApplicationVersion(UBVERSION);
 
@@ -222,7 +222,6 @@ int UBApplication::exec(const QString& pFileToImport)
     QWebSettings *gs = QWebSettings::globalSettings();
     gs->setAttribute(QWebSettings::JavaEnabled, true);
     gs->setAttribute(QWebSettings::PluginsEnabled, true);
-	gs->setAttribute(QWebSettings::JavaEnabled, true);
     gs->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, true);
     gs->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);
     gs->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);

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);
 

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,8 +760,8 @@ QString UBSettings::uniboardDataDirectory()
             //    ", defaulting to " + UBDesktopServices::storageLocation(QDesktopServices::DataLocation);
         }
     }
-    QString qtDataPath = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation));
-    qtDataPath.replace("/Sankore", "");
+    QString qtDataPath = UBFileSystemUtils::normalizeFilePath(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
+    qtDataPath.replace("/Open-Sankore", "");
     return qtDataPath;
 }
 
@@ -770,7 +769,7 @@ QString UBSettings::uniboardDataDirectory()
 QString UBSettings::uniboardUserImageDirectory()
 {
     QString valideUserImageDirectory =
-        UBDesktopServices::storageLocation(QDesktopServices::PicturesLocation)
+        QDesktopServices::storageLocation(QDesktopServices::PicturesLocation)
         + "/" + QCoreApplication::applicationName();
 
     bool hasCreatedDir = false;
@@ -852,9 +851,7 @@ QString UBSettings::defaultUserImagesDirectory()
 QString UBSettings::uniboardUserVideoDirectory()
 {
     QString valideUserVideoDirectory =
-        UBDesktopServices::storageLocation(QDesktopServices::MoviesLocation);
-
-    bool hasCreatedDir = false;
+        QDesktopServices::storageLocation(QDesktopServices::MoviesLocation);
 
     // first look into the application settings
     if (sAppSettings && getAppSettings()->contains("App/UserVideoDirectory"))
@@ -889,7 +886,6 @@ QString UBSettings::uniboardUserVideoDirectory()
         if (!dir.exists())
         {
             dir.mkpath(userVideoDirectory);
-            hasCreatedDir = true;
         }
 
         if (dir.exists())
@@ -898,7 +894,6 @@ QString UBSettings::uniboardUserVideoDirectory()
         }
         else
         {
-            hasCreatedDir = false;
             qWarning() << "Failed to interpret App/UserVideoDirectory config : "
                 + getAppSettings()->value("App/UserVideoDirectory").toString()
                 + ", defaulting to " + valideUserVideoDirectory;
@@ -927,9 +922,7 @@ QString UBSettings::uniboardUserVideoDirectory()
 QString UBSettings::podcastRecordingDirectory()
 {
     QString validePodcastRecordingDirectory =
-        UBDesktopServices::storageLocation(QDesktopServices::DesktopLocation);
-
-    bool hasCreatedDir = false;
+        QDesktopServices::storageLocation(QDesktopServices::DesktopLocation);
 
     // first look into the application settings
     if (sAppSettings && getAppSettings()->contains("Podcast/RecordingDirectory"))
@@ -964,7 +957,6 @@ QString UBSettings::podcastRecordingDirectory()
         if (!dir.exists())
         {
             dir.mkpath(userPodcastRecordingDirectory);
-            hasCreatedDir = true;
         }
 
         if (dir.exists())
@@ -973,7 +965,6 @@ QString UBSettings::podcastRecordingDirectory()
         }
         else
         {
-            hasCreatedDir = false;
             qWarning() << "Failed to interpret Podcast/RecordingDirectory config : "
                 + getAppSettings()->value("Podcast/RecordingDirectory").toString()
                 + ", defaulting to user Desktop";
@@ -1099,8 +1090,6 @@ QString UBSettings::uniboardInteractiveUserDirectory()
 {
     QString valideUserInteractiveDirectory = uniboardDataDirectory() + "/interactive content";
 
-    bool hasCreatedDir = false;
-
     // first look into the application settings
     if (sAppSettings && getAppSettings()->contains("App/UserInteractiveContentDirectory"))
     {
@@ -1129,7 +1118,6 @@ QString UBSettings::uniboardInteractiveUserDirectory()
         if (!dir.exists())
         {
             dir.mkpath(userWidgetDirectory);
-            hasCreatedDir = true;
         }
 
         if (dir.exists())
@@ -1138,7 +1126,6 @@ QString UBSettings::uniboardInteractiveUserDirectory()
         }
         else
         {
-            hasCreatedDir = false;
             qWarning() << "Failed to interpret App/UserInteractiveContentDirectory config : "
                 + getAppSettings()->value("App/UserInteractiveContentDirectory").toString()
                 + ", defaulting to " + valideUserInteractiveDirectory;
@@ -1194,8 +1181,6 @@ QString UBSettings::uniboardInteractiveFavoritesDirectory()
 {
     QString valideUserInteractiveDirectory = uniboardDataDirectory() + "/interactive favorites";
 
-    bool hasCreatedDir = false;
-
     // first look into the application settings
     if (sAppSettings && getAppSettings()->contains("App/UserInteractiveFavoritesDirectory"))
     {
@@ -1224,7 +1209,6 @@ QString UBSettings::uniboardInteractiveFavoritesDirectory()
         if (!dir.exists())
         {
             dir.mkpath(userWidgetDirectory);
-            hasCreatedDir = true;
         }
 
         if (dir.exists())
@@ -1233,7 +1217,6 @@ QString UBSettings::uniboardInteractiveFavoritesDirectory()
         }
         else
         {
-            hasCreatedDir = false;
             qWarning() << "Failed to interpret App/UserInteractiveFavoritesDirectory config : "
                 + getAppSettings()->value("App/UserInteractiveFavoritesDirectory").toString()
                 + ", defaulting to " + valideUserInteractiveDirectory;

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)
 //     {

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"

src/domain/UBGraphicsScene.cpp

@@ -1632,8 +1632,6 @@ void UBGraphicsScene::addMagnifier(UBMagnifierParams params)
     QGraphicsView *cView = (QGraphicsView*)UBApplication::boardController->controlView();
     QGraphicsView *dView = (QGraphicsView*)UBApplication::boardController->displayView();
 
-    QPoint ccZeroPoint = cContainer->mapToGlobal(QPoint(0,0));
-    QPoint cvZeroPoint = cView->mapToGlobal(QPoint(0,0));
     QPoint dvZeroPoint = dView->mapToGlobal(QPoint(0,0));
 
     int cvW = cView->width();
@@ -1681,8 +1679,6 @@ void UBGraphicsScene::moveMagnifier(QPoint newPos)
     QGraphicsView *cView = (QGraphicsView*)UBApplication::boardController->controlView();
     QGraphicsView *dView = (QGraphicsView*)UBApplication::boardController->displayView();
 
-    QPoint ccZeroPoint = cContainer->mapToGlobal(QPoint(0,0));
-    QPoint cvZeroPoint = cView->mapToGlobal(QPoint(0,0));
     QPoint dvZeroPoint = dView->mapToGlobal(QPoint(0,0));
 
     int cvW = cView->width();
@@ -1759,16 +1755,7 @@ void UBGraphicsScene::addCache()
 {
     UBGraphicsCache* cache = new UBGraphicsCache();
     mTools << cache;
-    QGraphicsView* view;
 
-    if(UBApplication::applicationController->displayManager()->hasDisplay())
-    {
-        view = (QGraphicsView*)(UBApplication::boardController->displayView());
-    }
-    else
-    {
-        view = (QGraphicsView*)(UBApplication::boardController->controlView());
-    }
     addItem(cache);
     cache->setVisible(true);
     cache->setSelected(true);

src/frameworks/UBDesktopServices.h

@@ -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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UBDESKTOPSERVICES_H_
-#define UBDESKTOPSERVICES_H_
-
-#include <QtCore/qglobal.h>
-#include <QDesktopServices>
-
-#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_ */

src/frameworks/UBDesktopServices_linux.cpp

@@ -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 <http://www.gnu.org/licenses/>.
- */
-
-#include "UBDesktopServices.h"
-
-QString UBDesktopServices::storageLocation(StandardLocation type)
-{
-    return QDesktopServices::storageLocation(type);
-}

src/frameworks/UBDesktopServices_mac.cpp

@@ -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 <http://www.gnu.org/licenses/>.
- */
-
-#include "UBDesktopServices.h"
-
-#include <QtCore>
-
-#import <Carbon/Carbon.h>
-
-/*
-    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<UInt8 *>(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/Sankore";
-
-    return path;
-}
-

src/frameworks/UBDesktopServices_win.cpp

@@ -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 <http://www.gnu.org/licenses/>.
- */
-
-#include "UBDesktopServices.h"
-#include "core/memcheck.h"
-
-QString UBDesktopServices::storageLocation(StandardLocation type)
-{
-    // Windows implementation of QDesktopServices is fine
-    return QDesktopServices::storageLocation(type);
-}

src/frameworks/UBFileSystemUtils.cpp

@@ -14,7 +14,6 @@
  */
 
 #include "UBFileSystemUtils.h"
-#include "UBDesktopServices.h"
 
 #include <QtGui>
 
@@ -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))
     {

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
+}

src/gui/UBActionPalette.cpp

@@ -306,9 +306,5 @@ UBActionPaletteButton* UBActionPalette::getButtonFromAction(QAction *action)
 bool UBActionPaletteButton::hitButton(const QPoint &pos) const
 {
     Q_UNUSED(pos);
-//    if(isChecked())
-//    {
-//        return false;
-//    }
     return true;
 }

src/gui/UBDocumentNavigator.cpp

@@ -105,7 +105,6 @@ void UBDocumentNavigator::generateThumbnails()
 
     // Get the thumbnails
     QList<QPixmap> thumbs = UBThumbnailAdaptor::load(mCrntDoc);
-    QGraphicsPixmapItem* selection = NULL;
 
     for(int i = 0; i < thumbs.count(); i++)
     {
@@ -115,7 +114,6 @@ void UBDocumentNavigator::generateThumbnails()
         // Get the selected item
         if(UBApplication::boardController->activeSceneIndex() == i)
         {
-            selection = pixmapItem;
             mCrntItem = dynamic_cast<UBSceneThumbnailNavigPixmap*>(pixmapItem);
             mCrntItem->setSelected(true);
         }
@@ -290,11 +288,6 @@ void UBDocumentNavigator::refreshScene()
             mLabels.at(i)->setPos(pos);
         }
     }
-
-    QScrollBar *vertScrollBar = verticalScrollBar();
-    int scrollBarThickness = 0;
-    if (vertScrollBar && vertScrollBar->isVisible())
-        scrollBarThickness = vertScrollBar->width();
 }
 
 /**

src/gui/UBMagnifer.cpp

@@ -204,7 +204,6 @@ void UBMagnifier::mouseMoveEvent ( QMouseEvent * event )
     {
         if(mShouldMoveWidget && (event->buttons() & Qt::LeftButton))
         {
-            QPoint offset = event->pos() - mMousePressPos;
             move(pos() - mMousePressPos + event->pos());
             event->accept();
 

src/gui/UBToolWidget.cpp

@@ -183,7 +183,6 @@ void UBToolWidget::mouseMoveEvent ( QMouseEvent * event )
 {
     if(mShouldMoveWidget && (event->buttons() & Qt::LeftButton))
     {
-        QPoint offset = event->pos() - mMousePressPos;
         move(pos() - mMousePressPos + event->pos());
         event->accept();
     }

src/network/UBNetworkAccessManager.cpp

@@ -17,8 +17,6 @@
 #include <QtGui>
 #include <QtNetwork>
 
-#include "frameworks/UBDesktopServices.h"
-
 #include "core/UBApplication.h"
 #include "core/UBApplicationController.h"
 #include "core/UBSettings.h"

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"

src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp

@@ -19,7 +19,6 @@
 
 #include <QtGui>
 
-#include "frameworks/UBDesktopServices.h"
 #include "frameworks/UBFileSystemUtils.h"
 
 #include "core/UBApplication.h"

src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp

@@ -17,7 +17,6 @@
 
 #include <QtGui>
 
-#include "frameworks/UBDesktopServices.h"
 #include "frameworks/UBFileSystemUtils.h"
 
 #include "core/UBApplication.h"

src/softwareupdate/UBSoftwareUpdateController.cpp

@@ -14,7 +14,6 @@
  */
 
 //#include "frameworks/UBVersion.h"
-//#include "frameworks/UBDesktopServices.h"
 //#include "frameworks/UBFileSystemUtils.h"
 //#include "frameworks/UBPlatformUtils.h"
 

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);

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);

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()

src/web/browser/WBDownloadManager.cpp

@@ -58,8 +58,6 @@
 #include <QtGui>
 #include <QtWebKit>
 
-#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('/');