From 83adc66ec7bbd098d9861c637fdb5a009260d596 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 25 Apr 2017 14:39:54 +0200
Subject: [PATCH] Ref T41, download auto info triggered in mapping tool

---
 src/swiftdata/swiftdata.cpp | 17 +----------------
 src/swiftdata/swiftdata.h   |  9 ++-------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp
index b27a9d97c..90aba6015 100644
--- a/src/swiftdata/swiftdata.cpp
+++ b/src/swiftdata/swiftdata.cpp
@@ -113,7 +113,7 @@ void CSwiftData::init()
         this->setWindowTitle(t);
     }
 
-    QTimer::singleShot(10 * 1000, this, &CSwiftData::checkNewVersion);
+    sGui->triggerNewVersionCheck(10 * 1000);
     emit sGui->startUpCompleted(true);
 }
 
@@ -151,21 +151,6 @@ void CSwiftData::performGracefulShutdown()
     // void
 }
 
-void CSwiftData::checkNewVersion()
-{
-    const QStringList channelPlatform = m_distributionSettings.get();
-    Q_ASSERT_X(channelPlatform.size() == 2, Q_FUNC_INFO, "wrong setting");
-    const QVersionNumber v = m_distributionInfo.get().getQVersionForChannelAndPlatform(channelPlatform);
-    if (v.isNull() || v.segmentCount() < 4) return;
-    const QVersionNumber vCurrent = CBuildConfig::getVersion();
-    if (v <= vCurrent) return;
-
-    // new version
-    const CStatusMessage m = CStatusMessage(this).info("New version '%1' from %2 for %3. Current version is '%4'") << v.toString() << channelPlatform.first() << channelPlatform.last() << vCurrent.toString();
-    this->displayInOverlayWindow(m, 5000);
-    CLogMessage::preformatted(m);
-}
-
 void CSwiftData::displayConsole()
 {
     ui->comp_MainInfoArea->displayConsole();
diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h
index 2ecb86b1e..814a931c6 100644
--- a/src/swiftdata/swiftdata.h
+++ b/src/swiftdata/swiftdata.h
@@ -14,9 +14,6 @@
 
 #include "blackgui/mainwindowaccess.h"
 #include "blackgui/managedstatusbar.h"
-#include "blackmisc/datacache.h"
-#include "blackmisc/db/distributionlist.h"
-#include "blackmisc/settingscache.h"
 #include "blackmisc/identifiable.h"
 #include "blackmisc/statusmessage.h"
 
@@ -69,16 +66,14 @@ private:
     void initStyleSheet();
     void initMenu();
     void initDynamicMenus();
+
     void performGracefulShutdown();
-    void checkNewVersion();
 
     void displayConsole();
     void displayLog();
 
-    QScopedPointer<Ui::CSwiftData> ui;
     BlackGui::CManagedStatusBar    m_statusBar;
-    BlackMisc::CDataReadOnly<BlackMisc::Db::TDistributionInfo> m_distributionInfo { this }; //!< version cache
-    BlackMisc::CSettingReadOnly<BlackMisc::Db::TDistributionSetting> m_distributionSettings { this }; //!< channel/platform selected
+    QScopedPointer<Ui::CSwiftData> ui;
 };
 
 #endif // guard