Move to importmailjobinterfaceimpl directly

core/mail/importmailjobinterface.cpp

@@ -198,18 +198,6 @@ void ImportMailJobInterface::restoreTransports()
     QTimer::singleShot(0, this, &ImportMailJobInterface::slotNextStep);
 }
 
-void ImportMailJobInterface::addMailTransport(MailTransport::Transport *mt, int defaultTransport, int transportId)
-{
-    mt->forceUniqueName();
-    mt->save();
-    MailTransport::TransportManager::self()->addTransport(mt);
-    if (transportId == defaultTransport) {
-        MailTransport::TransportManager::self()->setDefaultTransport(mt->id());
-    }
-    mHashTransport.insert(transportId, mt->id());
-    qDebug() << " void ImportMailJobInterface::addMailTransport(MailTransport::Transport *mt, int defaultTransport, int transportId)" << transportId;
-}
-
 void ImportMailJobInterface::restoreResources()
 {
     increaseProgressDialog();

core/mail/importmailjobinterface.h

@@ -61,9 +61,9 @@ protected:
     virtual void addNewIdentity(const QString &name, KConfigGroup &group, int defaultIdentities, int oldUid) = 0;
     virtual void importCustomMailTransport(const QString &identifierValue, const KConfigGroup &group, int defaultTransport, int transportId) = 0;
     virtual void importSmtpMailTransport(const KConfigGroup &group, int defaultTransport, int transportId) = 0;
-    void addMailTransport(MailTransport::Transport *mt, int defaultTransport, int transportId);
 
     QHash<int, uint> mHashIdentity;
+    QHash<int, int> mHashTransport;
 
 private:
     void restoreTransports();
@@ -87,7 +87,6 @@ private:
     void mergeSieveTemplate(const KArchiveFile *archivefile, const QString &filename, const QString &prefix);
     void importSimpleFilesInDirectory(const QString &relativePath);
 
-    QHash<int, int> mHashTransport;
     QHash<QString, QString> mHashResources;
     QStringList mFileList;
 };

core/mail/importmailjobinterfaceimpl.cpp

@@ -199,3 +199,15 @@ void ImportMailJobInterfaceImpl::importSmtpMailTransport(const KConfigGroup &gro
     }
     addMailTransport(mt, defaultTransport, transportId);
 }
+
+void ImportMailJobInterfaceImpl::addMailTransport(MailTransport::Transport *mt, int defaultTransport, int transportId)
+{
+    mt->forceUniqueName();
+    mt->save();
+    MailTransport::TransportManager::self()->addTransport(mt);
+    if (transportId == defaultTransport) {
+        MailTransport::TransportManager::self()->setDefaultTransport(mt->id());
+    }
+    mHashTransport.insert(transportId, mt->id());
+    qDebug() << " void ImportMailJobInterface::addMailTransport(MailTransport::Transport *mt, int defaultTransport, int transportId)" << transportId;
+}

core/mail/importmailjobinterfaceimpl.h

@@ -50,6 +50,7 @@ protected:
     void addNewIdentity(const QString &name, KConfigGroup &group, int defaultIdentities, int oldUid) override;
     void importCustomMailTransport(const QString &identifierValue, const KConfigGroup &group, int defaultTransport, int transportId) override;
     void importSmtpMailTransport(const KConfigGroup &group, int defaultTransport, int transportId) override;
+    void addMailTransport(MailTransport::Transport *mt, int defaultTransport, int transportId);
 private:
     Q_REQUIRED_RESULT QString uniqueIdentityName(const QString &name);
 };