Windows corrections

diff --git a/appl/rebackgui/BackupUtils.cpp b/appl/rebackgui/BackupUtils.cpp
index 2b7e5d4e6cd62e9ab5fce873238adda0d053644e..ed7a9d8e3d015630bceea3c007fb2ab16bd88afe 100644 (file)
--- a/appl/rebackgui/BackupUtils.cpp
+++ b/appl/rebackgui/BackupUtils.cpp
@@ -56,6 +56,7 @@ QString BackupUtils::findAbstractTarget(const QString& path, ReLogger* logger)
                }
        }
 #elif defined _WIN32
+       (void) logger;
        rc = ";" + path.mid(2);
 #endif
        return rc;
@@ -111,6 +112,7 @@ QString BackupUtils::findTarget(const BackupItem& item, MainWindow& mainWindow,
                }
        }
 #elif defined _WIN32
+       (void) tempoararyMounted;
        QStringList drives = ReFileUtils::findRootDirs();
        QStringList::const_iterator it;
        for (it = drives.cbegin(); it != drives.cend(); ++it){
@@ -125,7 +127,7 @@ QString BackupUtils::findTarget(const BackupItem& item, MainWindow& mainWindow,
                if (QFileInfo(markerFile).exists()){
                        if (rc.isEmpty())
                                rc = ReFileUtils::parentOf(markerFile);
-                       ReConfig config(I18N::s2b(markerFile), true, logger);
+                       ReConfig config(I18N::s2b(markerFile), true, mainWindow.logger());
                        if (! config.asString((item.m_uid + ".created").toLatin1(),
                                                                  "").isEmpty()){
                                rc =  ReFileUtils::parentOf(markerFile);
@@ -211,7 +213,8 @@ QString BackupUtils::targetDescription(const QString& backupPath, ReLogger *logg
                }
        }
 #elif defined _WIN32
-
+       (void) backupPath;
+       (void) logger;
 #endif
        return rc;
 }

diff --git a/appl/rebackgui/Configuration.cpp b/appl/rebackgui/Configuration.cpp
index 88298e1bc36f2f71daccfe86fbc720b335f3d050..ae2de1384febacfaf678ac3bf8d9e21da4e83117 100644 (file)
--- a/appl/rebackgui/Configuration.cpp
+++ b/appl/rebackgui/Configuration.cpp
@@ -205,7 +205,9 @@ ReSuccess_t Configuration::readBackupDate(BackupItem& item){
                        }
                }
        }
+#ifdef __linux__
        m_mainWindow->unmount(temporaryMounted);
+#endif
        FILETRACE_IT(s_traceConfig, (s_traceConfig.m_fp,
                "<Configuration::readBackupDate\n"));
        return rc;

diff --git a/appl/rebackgui/mainwindow.cpp b/appl/rebackgui/mainwindow.cpp
index 903063fa940283d6dac213bd79e235f887ab6979..8960a11d7f9722987d0093651949fc2fbefaafef 100644 (file)
--- a/appl/rebackgui/mainwindow.cpp
+++ b/appl/rebackgui/mainwindow.cpp
@@ -311,8 +311,10 @@ ReSuccess_t MainWindow::initializeStart(){
  * Loads the mount and block device info.
  */
 void MainWindow::loadOsInfo(){
+#ifdef __linux__
        ReMountInfo::instance(true);
        ReBlockDevices::instance(true);
+#endif
 }
 
 /**
@@ -791,7 +793,9 @@ void MainWindow::startStop(bool isStart){
                BackupEngine::m_verboseLevel = (ReVerbose_t) ui->comboBoxVerbose->currentIndex();
        if (! isStart){
                setStatusMessage(LOG_INFO, "");
+#ifdef __linux__
                unmount("");
+#endif
        }
 
 }
@@ -960,6 +964,7 @@ void MainWindow::writeTargetConfiguration(BackupItem& item, const QString& targe
        onSaveConfig();
 }
 
+#ifdef __linux__
 /**
  * Unmounts the current target device.
  *
@@ -983,4 +988,4 @@ void MainWindow::unmount(const QString& device)
                                                         .arg(QString::fromUtf8(answer)));
        }
 }
-
+#endif

diff --git a/appl/rebackgui/mainwindow.hpp b/appl/rebackgui/mainwindow.hpp
index 6714d7d920311f4b8fa20a535dc46b9000980edf..f6a2fffb595522b3c16ae716ee1cb27db329a462 100644 (file)
--- a/appl/rebackgui/mainwindow.hpp
+++ b/appl/rebackgui/mainwindow.hpp
@@ -38,7 +38,9 @@ public:
    void setLastFile(const QString& lastFile);
    void setLastFile(const QString& lastDir, const QString& lastFile);
    void saveState();
+#ifdef __linux__
    void unmount(const QString& device);
+#endif
    QString lastDirectory() const;
    void setLastTarget(const QString& lastTarget);
 

diff --git a/base/ReFileUtils.cpp b/base/ReFileUtils.cpp
index 5ba8580e19ceb533ddb5608f9e66232c216bdbcb..99a8b24e710c0856975c5e9d8e30d07bbb527b6e 100644 (file)
--- a/base/ReFileUtils.cpp
+++ b/base/ReFileUtils.cpp
@@ -24,9 +24,10 @@ enum {
 int ReFileUtils::m_maxCharSet = 128;
 bool ReFileUtils::m_ignoreSetUidError = false;
 QDateTime ReFileUtils::m_undefinedTime;
+#ifdef __linux__
 ReMountInfo* ReMountInfo::m_instance = NULL;
 ReBlockDevices* ReBlockDevices::m_instance = NULL;
-
+#endif
 /**
  * Constructor.
  */
@@ -173,6 +174,9 @@ QString ReFileUtils::copy(const QString& source, const QString& target,
                                                bool setUser){
        QString rc;
 #if defined _WIN32
+       (void) setUser;
+       (void) buffer;
+       (void) sourceInfo;
        const ushort* src = source.utf16();
        const ushort* trg = target.utf16();
        if (! CopyFile(reinterpret_cast<const WCHAR*>(src),
@@ -1184,7 +1188,7 @@ QByteArray ReFileUtils::tempFile(const char* node, const char* parent,
                _unlink(rc.constData());
        return rc;
 }
-#if 0
+#ifdef WIN32
 /**
  * Converts the unix time (milliseconds from 1.1.1970) to the WIN32 filetime.
  *

diff --git a/base/ReLogger.cpp b/base/ReLogger.cpp
index 544f304bebb5419a0adb792fdd3d286f36448992..6116a87c7b2692a539f3b4d667c8c9eb4bd31b8a 100644 (file)
--- a/base/ReLogger.cpp
+++ b/base/ReLogger.cpp
@@ -548,7 +548,7 @@ void ReFileAppender::findLastNo()
        QByteArray fullName;
        for (int ix = m_currentNo; ix > 0 && ix > m_currentNo - 10; ix--){
                fullName = nameOf(ix);
-               unlink(fullName);
+               _unlink(fullName);
        }
 }
 
@@ -581,7 +581,7 @@ void ReFileAppender::reopen(bool isFirst) {
        }
        if (m_currentNo - m_maxCount > 0){
                fullName = nameOf(m_currentNo - m_maxCount);
-               unlink(fullName.constData());
+               _unlink(fullName.constData());
        }
 }
 

diff --git a/base/ReStringUtils.cpp b/base/ReStringUtils.cpp
index 79a815d129d88c667b26ffbdae9fdfa6d669d774..de2fd59f62fbaa90148e6c59dfdedca18e31b328 100644 (file)
--- a/base/ReStringUtils.cpp
+++ b/base/ReStringUtils.cpp
@@ -232,7 +232,7 @@ bool ReStringUtils::isInList(const char* phrase, const char* list,
        while (!rc && end != NULL) {
                if (end - list == phraseLength) {
                        if (ignoreCase)
-                               rc = strnicmp(list, phrase, phraseLength) == 0;
+                               rc = _strnicmp(list, phrase, phraseLength) == 0;
                        else
                                rc = strncmp(list, phrase, end - list) == 0;
                        if (rc)
@@ -243,7 +243,7 @@ bool ReStringUtils::isInList(const char* phrase, const char* list,
        }
        if (!rc) {
                if (ignoreCase)
-                       rc = strnicmp(list, phrase, end - list) == 0;
+                       rc = _strnicmp(list, phrase, end - list) == 0;
                else
                        rc = strncmp(list, phrase, end - list) == 0;
        }

diff --git a/gui/ReSettings.hpp b/gui/ReSettings.hpp
index 135d639801f14f19e71a5d425908427697f1bc51..57341376ef6199023644c4dc56c28985d6f01612 100644 (file)
--- a/gui/ReSettings.hpp
+++ b/gui/ReSettings.hpp
@@ -71,8 +71,8 @@ typedef QMap<QByteArray, QList<ReProperty*>*> ReChapterMap;
 
 class ReSettings {
 public:
-       static QString TRUE;
-       static QString FALSE;
+       static QString sTRUE;
+       static QString sFALSE;
 public:
        ReSettings(const QString& path, const QString& prefix, ReLogger* logger);
        ~ReSettings();