Merge remote-tracking branch 'origin/4.0'

 Conflicts:
	src/libs/utils/tcpportsgatherer.h

Change-Id: I495f3e05789f09efb8b1e84827893423a5b5b60c

2 files changed, 18 insertions, 31 deletions

diff --git a/src/plugins/texteditor/generichighlighter/manager.cpp b/src/plugins/texteditor/generichighlighter/manager.cpp
index 2ab4e58e2b..6f32e833b9 100644
--- a/src/plugins/texteditor/generichighlighter/manager.cpp
+++ b/src/plugins/texteditor/generichighlighter/manager.cpp
@@ -248,35 +248,16 @@ bool Manager::isBuildingDefinition(const QString &id) const
     return m_isBuildingDefinition.contains(id);
 }
 
-class ManagerProcessor
-{
-public:
-    ManagerProcessor();
-    // TODO: make move-only when we can require MSVC2015
-
-    void operator()(QFutureInterface<Manager::RegisterData> &future);
-
-    QStringList m_definitionsPaths;
-    static const int kMaxProgress;
-};
+static const int kMaxProgress = 200;
 
-const int ManagerProcessor::kMaxProgress = 200;
-
-ManagerProcessor::ManagerProcessor()
-{
-    const HighlighterSettings &settings = TextEditorSettings::highlighterSettings();
-    m_definitionsPaths.append(settings.definitionFilesPath());
-    if (settings.useFallbackLocation())
-        m_definitionsPaths.append(settings.fallbackDefinitionFilesPath());
-}
-
-void ManagerProcessor::operator()(QFutureInterface<Manager::RegisterData> &future)
+static void processHighlightingFiles(QFutureInterface<Manager::RegisterData> &future,
+                                     QStringList definitionPaths)
 {
     future.setProgressRange(0, kMaxProgress);
 
     Manager::RegisterData data;
     // iterate through paths in order, high priority > low priority
-    foreach (const QString &path, m_definitionsPaths) {
+    foreach (const QString &path, definitionPaths) {
         if (path.isEmpty())
             continue;
 
@@ -322,7 +303,13 @@ void Manager::registerHighlightingFiles()
     if (!m_registeringWatcher.isRunning()) {
         clear();
 
-        QFuture<RegisterData> future = Utils::runAsync(ManagerProcessor());
+        QStringList definitionsPaths;
+        const HighlighterSettings &settings = TextEditorSettings::highlighterSettings();
+        definitionsPaths.append(settings.definitionFilesPath());
+        if (settings.useFallbackLocation())
+            definitionsPaths.append(settings.fallbackDefinitionFilesPath());
+
+        QFuture<RegisterData> future = Utils::runAsync(processHighlightingFiles, definitionsPaths);
         m_registeringWatcher.setFuture(future);
     } else {
         m_hasQueuedRegistration = true;
@@ -408,7 +395,7 @@ QList<DefinitionMetaDataPtr> Manager::parseAvailableDefinitionsList(QIODevice *d
 
 void Manager::downloadAvailableDefinitionsMetaData()
 {
-    QUrl url(QLatin1String("http://www.kate-editor.org/syntax/update-5.17.xml"));
+    QUrl url(QLatin1String("https://www.kate-editor.org/syntax/update-5.17.xml"));
     QNetworkRequest request(url);
     // Currently this takes a couple of seconds on Windows 7: QTBUG-10106.
     QNetworkReply *reply = Utils::NetworkAccessManager::instance()->get(request);
diff --git a/src/plugins/texteditor/generichighlighter/manager.h b/src/plugins/texteditor/generichighlighter/manager.h
index c6d9038ead..5b602d2e03 100644
--- a/src/plugins/texteditor/generichighlighter/manager.h
+++ b/src/plugins/texteditor/generichighlighter/manager.h
@@ -79,6 +79,12 @@ public:
 
     static DefinitionMetaDataPtr parseMetadata(const QFileInfo &fileInfo);
 
+    struct RegisterData
+    {
+        QHash<QString, QString> m_idByName;
+        QHash<QString, QString> m_idByMimeType;
+        QHash<QString, DefinitionMetaDataPtr> m_definitionsMetaData;
+    };
 private:
     void registerHighlightingFilesFinished();
     void downloadAvailableDefinitionsListFinished();
@@ -99,12 +105,6 @@ private:
     QHash<QString, QSharedPointer<HighlightDefinition> > m_definitions;
     QHash<QString, DefinitionMetaDataPtr> m_availableDefinitions;
 
-    struct RegisterData
-    {
-        QHash<QString, QString> m_idByName;
-        QHash<QString, QString> m_idByMimeType;
-        QHash<QString, DefinitionMetaDataPtr> m_definitionsMetaData;
-    };
     RegisterData m_register;
     bool m_hasQueuedRegistration;
     QFutureWatcher<RegisterData> m_registeringWatcher;