changes due to rename

OpenBoard.pro

@@ -22,6 +22,7 @@ macx:OSX_VERSION = "$${VERSION} (r$${SVN_VERSION})"
 VERSION_RC = $$VERSION_MAJ,$$VERSION_MIN,$$VERSION_TYPE,$$VERSION_PATCH
 VERSION_RC = $$replace(VERSION_RC, "a", "160") # 0xA0
 VERSION_RC = $$replace(VERSION_RC, "b", "176") # 0xB0
+VERSION_RC = $$replace(VERSION_RC, "rc", "192" ) # 0xC0
 VERSION_RC = $$replace(VERSION_RC, "r", "240") # 0xF0
 
 QT += webkit

plugins/cffadaptor/src/UBCFFConstants.h

@@ -118,7 +118,7 @@ const QString aIWBContent = "content";
 
 
 // Attribute values
-const QString avIWBVersionNo = "1.0"; 
+const QString avIWBVersionNo = "1.0";
 const QString avUBZText = "text";
 const QString avFalse = "false";
 const QString avTrue = "true";
@@ -126,7 +126,6 @@ const QString avTrue = "true";
 // Namespaces and prefixes
 const QString svgRequiredExtensionPrefix = "http://www.imsglobal.org/iwb/";
 const QString dcNS = "http://purl.org/dc/elements/1.1/";
-const QString ubNS = "http://uniboard.mnemis.com/document";
 const QString svgUBZNS = "http://www.imsglobal.org/xsd/iwb_v1p0";
 const QString svgIWBNS = "http://www.w3.org/2000/svg";
 const QString xlinkNS = "http://www.w3.org/1999/xlink";
@@ -138,7 +137,6 @@ http://www.imsglobal.org/profile/iwb/iwbv1p0_v1p0.xsd \
 http://www.w3.org/2000/svg http://www.imsglobal.org/profile/iwb/svgsubsetv1p0_v1p0.xsd \
 http://www.w3.org/1999/xlink http://www.imsglobal.org/xsd/w3/1999/xlink.xsd";
 const QString dcNSPrefix = "dc";
-const QString ubNSPrefix = "ub";
 const QString svgIWBNSPrefix = "svg";
 const QString xlinkNSPrefix = "xlink";
 const QString iwbNsPrefix = "iwb";

resources/OpenBoard.qrc

 <RCC>
     <qresource prefix="/">
         <file>images/OpenBoard.png</file>
-        <file>images/bigUniboard.png</file>
+        <file>images/bigOpenBoard.png</file>
         <file>images/close.svg</file>
         <file>images/increase.svg</file>
         <file>images/decrease.svg</file>

resources/forms/blackoutWidget.ui

@@ -82,7 +82,7 @@
       </size>
      </property>
      <property name="styleSheet">
-      <string notr="true">background: url(:/images/bigUniboard.png); border: none;</string>
+      <string notr="true">background: url(:/images/bigOpenBoard.png); border: none;</string>
      </property>
      <property name="text">
       <string notr="true"/>

resources/forms/documents.ui

@@ -23,7 +23,7 @@
    <enum>Qt::DefaultContextMenu</enum>
   </property>
   <property name="windowTitle">
-   <string>Uniboard Documents</string>
+   <string>OpenBoard Documents</string>
   </property>
   <property name="styleSheet">
    <string notr="true"/>

resources/forms/mainWindow.ui

@@ -590,10 +590,10 @@
      <normaloff>:/images/toolbar/menu.png</normaloff>:/images/toolbar/menu.png</iconset>
    </property>
    <property name="text">
-    <string>Open-Sankoré</string>
+    <string>OpenBoard</string>
    </property>
    <property name="toolTip">
-    <string>Open-Sankoré</string>
+    <string>OpenBoard</string>
    </property>
   </action>
   <action name="actionDesktop">
@@ -1564,10 +1564,10 @@
      <normaloff>:/images/toolbar/hide.png</normaloff>:/images/toolbar/hide.png</iconset>
    </property>
    <property name="text">
-    <string>Hide Open-Sankoré</string>
+    <string>Hide OpenBoard</string>
    </property>
    <property name="toolTip">
-    <string>Hide Open-Sankoré Application</string>
+    <string>Hide OpenBoard Application</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+H</string>

resources/forms/youTubePublishingDialog.ui

@@ -69,7 +69,7 @@
      <item row="4" column="1">
       <widget class="QLineEdit" name="keywords">
        <property name="text">
-        <string>Uniboard</string>
+        <string>OpenBoard</string>
        </property>
       </widget>
      </item>

src/adaptors/UBMetadataDcSubsetAdaptor.cpp

@@ -222,7 +222,7 @@ QMap<QString, QVariant> UBMetadataDcSubsetAdaptor::load(QString pPath)
 
             if (xml.hasError())
             {
-                qWarning() << "error parsing sankore metadata.rdf file " << xml.errorString();
+                qWarning() << "error parsing metadata.rdf file " << xml.errorString();
             }
         }
 

src/adaptors/UBSvgSubsetAdaptor.cpp

@@ -830,7 +830,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
 
     if (mXmlReader.hasError())
     {
-        qWarning() << "error parsing Sankore file " << mXmlReader.errorString();
+        qWarning() << "error parsing file " << mXmlReader.errorString();
     }
 
     qDebug() << "Number of detected strokes: " << mStrokesList.count();

src/core/UBApplication.cpp

@@ -159,7 +159,7 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing
 
     setStyle(new UBStyle()); // Style is owned and deleted by the application
 
-    QString css = UBFileSystemUtils::readTextFile(UBPlatformUtils::applicationResourcesDirectory() + "/etc/Uniboard.css");
+    QString css = UBFileSystemUtils::readTextFile(UBPlatformUtils::applicationResourcesDirectory() + "/etc/"+ qApp->applicationName()+".css");
     if (css.length() > 0)
         setStyleSheet(css);
 

src/core/UBApplicationController.cpp

@@ -507,7 +507,7 @@ void UBApplicationController::downloadJsonFinished(QString currentJson)
     UBVersion installedVersion (qApp->applicationVersion().left(4));
     UBVersion jsonVersion (scriptValue.property("version").toString().left(4));
 
-    if (installedVersion.isValid() &&  jsonVersion.isValid() && jsonVersion > installedVersion) {
+    if (jsonVersion > installedVersion) {
             if (UBApplication::mainWindow->yesNoQuestion(tr("Update available"), tr ("New update available, would you go to the web page ?"))){
                     QUrl url(scriptValue.property ("url").toString());
                     QDesktopServices::openUrl (url);

src/core/UBSettings.cpp

@@ -131,8 +131,8 @@ QSettings* UBSettings::getAppSettings()
 {
     if (!UBSettings::sAppSettings)
     {
-        QString tmpSettings = QDir::tempPath() + "/Uniboard.config";
-        QString appSettings = UBPlatformUtils::applicationResourcesDirectory() + "/etc/Uniboard.config";
+        QString tmpSettings = QDir::tempPath() + "/" + qApp->applicationName() + ".config";
+        QString appSettings = UBPlatformUtils::applicationResourcesDirectory() + "/etc/" + qApp->applicationName() + ".config";
 
         // tmpSettings exists when upgrading Uniboard on Mac (see UBPlatformUtils_mac.mm updater:willInstallUpdate:)
         if (QFile::exists(tmpSettings))
@@ -154,7 +154,7 @@ UBSettings::UBSettings(QObject *parent)
 
     mAppSettings = UBSettings::getAppSettings();
 
-    QString userSettingsFile = UBSettings::userDataDirectory() + "/UniboardUser.config";
+    QString userSettingsFile = UBSettings::userDataDirectory() + "/"+qApp->applicationName()+"User.config";
 
     mUserSettings = new QSettings(userSettingsFile, QSettings::IniFormat, parent);
 
@@ -761,7 +761,6 @@ void UBSettings::setItalicFont(bool italic)
 
 QString UBSettings::userDataDirectory()
 {
-
     static QString dataDirPath = "";
     if(dataDirPath.isEmpty()){
         if (sAppSettings && getAppSettings()->contains("App/DataDirectory")) {
@@ -775,7 +774,7 @@ QString UBSettings::userDataDirectory()
 
         }
         dataDirPath = UBFileSystemUtils::normalizeFilePath(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
-        dataDirPath.replace(qApp->organizationName() + "/" + qApp->organizationDomain(), "");
+        dataDirPath.replace(qApp->organizationName() + "/", "");
     }
     return dataDirPath;
 }

src/core/main.cpp

@@ -59,7 +59,7 @@ void ub_message_output(QtMsgType type, const char *msg) {
 #endif
 
     if (UBApplication::app() && UBApplication::app()->isVerbose()) {
-        QString logFileNamePath = UBSettings::userDataDirectory() + "/log/uniboard.log";
+        QString logFileNamePath = UBSettings::userDataDirectory() + "/log/"+ qApp->applicationName() + ".log";
         QFile logFile(logFileNamePath);
 
         if (logFile.exists() && logFile.size() > 10000000)
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
     UBApplication app("OpenBoard", argc, argv);
 
     //BUGFIX:
-    //when importing a sankore file that contains a non standard character
+    //when importing a OpenBoard file that contains a non standard character
     //the codecForLocale or the codecForCString is used to convert the file path
     //into a const char*. This is why in french windows setup the codec name shouldn't be
     //set to UTF-8. For example, setting UTF-8, will convert "Haïti" into "HaÂ-ti.

src/domain/UBGraphicsScene.cpp

@@ -694,7 +694,7 @@ void UBGraphicsScene::DisposeMagnifierQWidgets()
         magniferDisplayViewWidget = NULL;
     }
 
-    // some time have crash here on access to app (when call from destructor when close sankore app)
+    // some time have crash here on access to app (when call from destructor when close OpenBoard app)
     // so i just add try/catch section here
     try
     {

src/frameworks/UBPlatformUtils.h

@@ -127,8 +127,8 @@ struct KEYBT
     ~KEYBT()
     {}
 };
-    
-    
+
+
 
     class UBKeyboardLocale
     {
@@ -191,8 +191,6 @@ public:
         static QString translationPath(QString pFilePrefix, QString pLanguage);
         static QString systemLanguage();
         static bool hasVirtualKeyboard();
-        //static void showVirtualKeyboard();
-        static void runInstaller(const QString &installerFilePath);
         static void bringPreviousProcessToFront();
         static QString osUserLoginName();
         static void setDesktopMode(bool desktop);

src/frameworks/UBPlatformUtils_linux.cpp

@@ -86,13 +86,6 @@ QString UBPlatformUtils::systemLanguage()
     return QLocale::system().name();
 }
 
-void UBPlatformUtils::runInstaller(const QString &installerFilePath)
-{
-    // TODO UB 4.x - auto update & installer are deactivated on Linux
-    Q_UNUSED(installerFilePath);
-
-}
-
 void UBPlatformUtils::bringPreviousProcessToFront()
 {
     // Mac only

src/frameworks/UBPlatformUtils_mac.mm

@@ -32,13 +32,6 @@
 #import <Carbon/Carbon.h>
 #import <APELite.h>
 
-/*
-// commented because Sankore crashes on Java Script. It seems to backends dependencies.
-#import <WebKit/WebKit.h>
-#import <AppKit/AppKit.h>
-*/
-
-
 NSString* bundleShortVersion(NSBundle *bundle)
 {
     return [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
@@ -237,60 +230,6 @@ QString UBPlatformUtils::systemLanguage()
     return result;
 }
 
-void UBPlatformUtils::runInstaller(const QString &installerFilePath)
-{
-    UBApplication::setDisabled(true);
-
-    // Save app config file to temp directory (will be restored at launch)
-    QString appSettings = UBPlatformUtils::applicationResourcesDirectory() + "/etc/Uniboard.config";
-    QString tmpSettings = QDir::tempPath() + "/Uniboard.config";
-    QFile::remove(tmpSettings);
-    QFile::copy(appSettings, tmpSettings);
-
-    QString updateFilePath = QDir::tempPath() + "/upgrade.sh";
-
-    QFile file(":/macx/upgrade.sh");
-    QFile updateFile(updateFilePath);
-    if (file.open(QIODevice::ReadOnly) && updateFile.open(QIODevice::WriteOnly))
-    {
-        QByteArray payload = file.readAll();
-
-        updateFile.write(payload);
-        updateFile.close();
-
-        QString uniboardAndVersion = QApplication::applicationName()  + QString(" ") + QApplication::applicationVersion();
-
-        QFileInfo fi(installerFilePath);
-        uniboardAndVersion = fi.fileName().remove(".dmg");
-
-        QString bundlePath;
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-        NSString *nssBundlePath = [[NSBundle mainBundle] bundlePath];
-
-        bundlePath = QString::fromUtf8([nssBundlePath fileSystemRepresentation], strlen([nssBundlePath fileSystemRepresentation]));
-        [pool drain];
-
-        QString escaped = QString("/bin/sh \"%1\" \"%2\" \"%3\" \"%4\"")
-                .arg(updateFilePath)
-                .arg(uniboardAndVersion)
-                .arg(installerFilePath)
-                .arg(bundlePath);
-
-        qDebug() << "Installing New Version" << escaped;
-
-        QProcess process;
-        bool success = process.startDetached(escaped);
-
-        if(success)
-            return;
-    }
-
-    // did not work .. lets load the dmg ...
-    QDesktopServices::openUrl(QUrl::fromLocalFile(installerFilePath));
-
-}
-
-
 void UBPlatformUtils::bringPreviousProcessToFront()
 {
     ProcessSerialNumber previousProcessPSN = {0, kNoProcess};
@@ -580,15 +519,7 @@ void UBPlatformUtils::destroyKeyboardLayouts()
 QString UBPlatformUtils::urlFromClipboard()
 {
     QString qsRet;
-/*
-    // commented because Sankore crashes on Java Script. It seems to backends dependencies.
-    NSPasteboard* pPasteboard = [NSPasteboard pasteboardWithName:@"Apple CFPasteboard drag"];
-    WebArchive* pArchive = [[WebArchive alloc] initWithData:[pPasteboard dataForType:@"com.apple.webarchive"]];
-
-    qsRet = [[[[pArchive mainResource] URL] absoluteString] UTF8String];
 
-    [pArchive release];
-*/
     return qsRet;
 }
 

src/frameworks/UBPlatformUtils_win.cpp

@@ -88,22 +88,6 @@ QString UBPlatformUtils::systemLanguage()
     return QLocale::system().name();
 }
 
-void UBPlatformUtils::runInstaller(const QString &installerFilePath)
-{
-    QProcess process;
-
-    QString escaped = QString("\"") + installerFilePath + QString("\" /SILENT");
-
-    bool success = process.startDetached(escaped);
-    if (!success)
-    {
-        qWarning() << "Running '" << installerFilePath << "' failed (error=" << process.error() << ")";
-        QString verb = "runas";
-        ::ShellExecute(NULL, verb.utf16(), installerFilePath.utf16(), NULL, NULL, SW_HIDE);
-    }
-}
-
-
 void UBPlatformUtils::bringPreviousProcessToFront()
 {
     // Mac only

src/frameworks/UBVersion.cpp

@@ -29,159 +29,200 @@
 
 #include "core/memcheck.h"
 
-UBVersion::UBVersion()
-    : mIsValid(false)
-    , mPlatform(-1)
-    , mMajor(-1)
-    , mMinor(-1)
-{
-    // NOOP
-}
+//UBVersion::UBVersion()
+//    : mIsValid(false)
+//    , mPlatform(-1)
+//    , mMajor(-1)
+//    , mMinor(-1)
+//{
+//    // NOOP
+//}
 
 
 UBVersion::UBVersion(const QString &string)
 {
-    setString(string);
-}
-
-
-UBVersion::~UBVersion()
-{
-    // NOOP
-}
-
-
-QString UBVersion::toString() const
-{
-    return isValid() ? mString : "INVALID";
+    mString = string;
 }
 
-void UBVersion::setString(const QString &string)
+uint UBVersion::toUInt() const
 {
-    mIsValid = true;
-    mString = string;
-    QStringList versionParts = string.split(".");
-    int count = versionParts.count();
-
-    if (count <  2)
-    {
-        mIsValid = false;
-        return;
+    uint result = 0;
+    QStringList list = mString.split(".");
+    switch (list.count()) {
+    case 2:
+        //short version  1.0
+        result = (list.at(0).toUInt() * 1000000) + (list.at(1).toUInt() * 10000);
+        break;
+    case 3:
+        //release version 1.0.0
+        result = (list.at(0).toUInt() * 1000000) + (list.at(1).toUInt() * 10000) + list.at(2).toUInt();
+        break;
+    case 4:{
+        //standard version  1.0.a/b/r.0
+        uint releaseStage = list.at(2).startsWith("a") ? Alpha :(list.at(2).startsWith("b") ? Beta : ReleaseCandidate);
+        result = (list.at(0).toUInt() * 1000000) + (list.at(1).toUInt() * 10000) + (releaseStage * 100) + list.at(3).toUInt();
+        break;
     }
-
-    mPlatform = versionParts.at(0).toInt(&mIsValid);
-    if (!isValid()) return;
-    mMajor = versionParts.at(1).toInt(&mIsValid);
-    if (!isValid()) return;
-
-    if (count == 2)
-    {
-        mMinor = 0;
-        mReleaseStage = ReleaseCandidate;
-    }
-    else if (count == 3)
-    {
-        // Format 4.1.2 (implicitly release)
-        mMinor = versionParts.at(2).toInt(&mIsValid);
-        if (!isValid()) return;
-        mReleaseStage = ReleaseCandidate;
-    }
-    else if (count >= 4)
-    {
-        // Format 4.1.x.2 (where x = a|b|r|<integer>)
-        if ("a" == versionParts.at(2))
-        {
-            mReleaseStage = Alpha;
-        }
-        else if ("b" == versionParts.at(2))
-        {
-            mReleaseStage = Beta;
-        }
-        else if ("r" == versionParts.at(2))
-        {
-            mReleaseStage = ReleaseCandidate;
-        }
-        else
-        {
-            mMinor = versionParts.at(2).toInt(&mIsValid);
-            if (!isValid()) return;
-            mReleaseStage = ReleaseCandidate;
-            return;
-        }
-
-        QStringList lastParts = versionParts.at(3).split(" ");
-        mMinor = lastParts.at(0).toInt();
+    default:
+        qWarning() << "Unknown version format.";
+        break;
     }
+    return result;
 }
 
-bool UBVersion::isValid() const
-{
-    return mIsValid;
-}
-
-int UBVersion::platformNumber() const
+UBVersion::~UBVersion()
 {
-    Q_ASSERT(isValid());
-    return mPlatform;
+    // NOOP
 }
 
-int UBVersion::majorNumber() const
-{
-    Q_ASSERT(isValid());
-    return mMajor;
-}
 
-ReleaseStage UBVersion::releaseStage() const
-{
-    Q_ASSERT(isValid());
-    return mReleaseStage;
-}
+//QString UBVersion::toString() const
+//{
+//    return isValid() ? mString : "INVALID";
+//}
+
+//void UBVersion::setString(const QString &string)
+//{
+//    mIsValid = true;
+//    mString = string;
+//    QStringList versionParts = string.split(".");
+//    int count = versionParts.count();
+
+//    if (count <  2)
+//    {
+//        mIsValid = false;
+//        return;
+//    }
+
+//    mPlatform = versionParts.at(0).toInt(&mIsValid);
+//    if (!isValid()) return;
+//    mMajor = versionParts.at(1).toInt(&mIsValid);
+//    if (!isValid()) return;
+
+//    if (count == 2)
+//    {
+//        mMinor = 0;
+//        mReleaseStage = ReleaseCandidate;
+//    }
+//    else if (count == 3)
+//    {
+//        // Format 4.1.2 (implicitly release)
+//        mMinor = versionParts.at(2).toInt(&mIsValid);
+//        if (!isValid()) return;
+//        mReleaseStage = ReleaseCandidate;
+//    }
+//    else if (count >= 4)
+//    {
+//        // Format 4.1.x.2 (where x = a|b|r|<integer>)
+//        if ("a" == versionParts.at(2))
+//        {
+//            mReleaseStage = Alpha;
+//        }
+//        else if ("b" == versionParts.at(2))
+//        {
+//            mReleaseStage = Beta;
+//        }
+//        else if ("r" == versionParts.at(2))
+//        {
+//            mReleaseStage = ReleaseCandidate;
+//        }
+//        else
+//        {
+//            mMinor = versionParts.at(2).toInt(&mIsValid);
+//            if (!isValid()) return;
+//            mReleaseStage = ReleaseCandidate;
+//            return;
+//        }
+
+//        QStringList lastParts = versionParts.at(3).split(" ");
+//        mMinor = lastParts.at(0).toInt();
+//    }
+//}
+
+//bool UBVersion::isValid() const
+//{
+//    return mIsValid;
+//}
+
+//int UBVersion::platformNumber() const
+//{
+//    Q_ASSERT(isValid());
+//    return mPlatform;
+//}
+
+//int UBVersion::majorNumber() const
+//{
+//    Q_ASSERT(isValid());
+//    return mMajor;
+//}
+
+//ReleaseStage UBVersion::releaseStage() const
+//{
+//    Q_ASSERT(isValid());
+//    return mReleaseStage;
+//}
+
+//int UBVersion::minorNumber() const
+//{
+//    Q_ASSERT(isValid());
+//    return mMinor;
+//}
+
+//bool UBVersion::operator < (const UBVersion &otherVersion) const
+//{
+//    Q_ASSERT(isValid());
+//    Q_ASSERT(otherVersion.isValid());
+
+//    if (platformNumber() != otherVersion.platformNumber())
+//        return platformNumber() < otherVersion.platformNumber();
+//    if (majorNumber() != otherVersion.majorNumber())
+//        return majorNumber() < otherVersion.majorNumber();
+//    if (releaseStage() != otherVersion.releaseStage())
+//        return releaseStage() < otherVersion.releaseStage();
+//    if (minorNumber() != otherVersion.minorNumber())
+//        return minorNumber() < otherVersion.minorNumber();
+//    return false;
+//}
+
+//bool UBVersion::operator == (const UBVersion &otherVersion) const
+//{
+//    Q_ASSERT(isValid());
+//    Q_ASSERT(otherVersion.isValid());
+
+//    return (platformNumber() == otherVersion.platformNumber() &&
+//            majorNumber() == otherVersion.majorNumber() &&
+//            releaseStage() == otherVersion.releaseStage() &&
+//            minorNumber() == otherVersion.minorNumber());
+//}
+
+//bool UBVersion::operator > (const UBVersion &otherVersion) const
+//{
+//    Q_ASSERT(isValid());
+//    Q_ASSERT(otherVersion.isValid());
+
+//    if (platformNumber() != otherVersion.platformNumber())
+//        return platformNumber() > otherVersion.platformNumber();
+//    if (majorNumber() != otherVersion.majorNumber())
+//        return majorNumber() > otherVersion.majorNumber();
+//    if (releaseStage() != otherVersion.releaseStage())
+//        return releaseStage() > otherVersion.releaseStage();
+//    if (minorNumber() != otherVersion.minorNumber())
+//        return minorNumber() > otherVersion.minorNumber();
+//    return false;
+//}
 
-int UBVersion::minorNumber() const
-{
-    Q_ASSERT(isValid());
-    return mMinor;
-}
 
 bool UBVersion::operator < (const UBVersion &otherVersion) const
 {
-    Q_ASSERT(isValid());
-    Q_ASSERT(otherVersion.isValid());
-
-    if (platformNumber() != otherVersion.platformNumber())
-        return platformNumber() < otherVersion.platformNumber();
-    if (majorNumber() != otherVersion.majorNumber())
-        return majorNumber() < otherVersion.majorNumber();
-    if (releaseStage() != otherVersion.releaseStage())
-        return releaseStage() < otherVersion.releaseStage();
-    if (minorNumber() != otherVersion.minorNumber())
-        return minorNumber() < otherVersion.minorNumber();
-    return false;
+    return toUInt() < otherVersion.toUInt();
 }
 
 bool UBVersion::operator == (const UBVersion &otherVersion) const
 {
-    Q_ASSERT(isValid());
-    Q_ASSERT(otherVersion.isValid());
-
-    return (platformNumber() == otherVersion.platformNumber() &&
-            majorNumber() == otherVersion.majorNumber() &&
-            releaseStage() == otherVersion.releaseStage() &&
-            minorNumber() == otherVersion.minorNumber());
+    return toUInt() == otherVersion.toUInt();
 }
 
 bool UBVersion::operator > (const UBVersion &otherVersion) const
 {
-    Q_ASSERT(isValid());
-    Q_ASSERT(otherVersion.isValid());
-
-    if (platformNumber() != otherVersion.platformNumber())
-        return platformNumber() > otherVersion.platformNumber();
-    if (majorNumber() != otherVersion.majorNumber())
-        return majorNumber() > otherVersion.majorNumber();
-    if (releaseStage() != otherVersion.releaseStage())
-        return releaseStage() > otherVersion.releaseStage();
-    if (minorNumber() != otherVersion.minorNumber())
-        return minorNumber() > otherVersion.minorNumber();
-    return false;
+    return toUInt() > otherVersion.toUInt();
 }

src/frameworks/UBVersion.h

@@ -31,18 +31,20 @@ enum ReleaseStage { Alpha = 10, Beta = 11, ReleaseCandidate = 15 };
 class UBVersion
 {
     public:
-        UBVersion();
+//        UBVersion();
         UBVersion(const QString &string);
         virtual ~UBVersion();
 
-        void setString(const QString &string);
-        QString toString() const;
+        uint toUInt() const;
 
-        bool              isValid() const;
-        int        platformNumber() const;
-        int           majorNumber() const;
-        ReleaseStage releaseStage() const;
-        int           minorNumber() const;
+//        void setString(const QString &string);
+//        QString toString() const;
+
+//        bool              isValid() const;
+//        int        platformNumber() const;
+//        int           majorNumber() const;
+//        ReleaseStage releaseStage() const;
+//        int           minorNumber() const;
 
         bool operator < (const UBVersion &otherVersion) const;
         bool operator == (const UBVersion &otherVersion) const;
@@ -51,11 +53,11 @@ class UBVersion
     private:
 
         QString mString;
-        bool mIsValid;
-        int mPlatform;
-        int mMajor;
-        int mMinor;
-        ReleaseStage mReleaseStage;
+//        bool mIsValid;
+//        int mPlatform;
+//        int mMajor;
+//        int mMinor;
+//        ReleaseStage mReleaseStage;
 };
 
 #endif // UBVERSION_H_