kdelibs4support--

antispam-virus/antispamwizard.cpp

@@ -52,7 +52,7 @@
 #include <AkonadiCore/AgentInstance>
 
 #include <qdebug.h>
-#include <kdialog.h>
+#include <QDialog>
 #include <kiconloader.h>
 #include <KLocalizedString>
 #include <KProcess>
@@ -70,6 +70,7 @@
 #include <QListWidget>
 #include <KHelpClient>
 #include <QPushButton>
+#include <KConfigGroup>
 using namespace KMail;
 using namespace MailCommon;
 
@@ -896,8 +897,8 @@ ASWizPage::ASWizPage( QWidget * parent, const QString & name,
     if ( bannerName && !bannerName->isEmpty() )
         banner = *bannerName;
     mLayout = new QHBoxLayout( this );
-    mLayout->setSpacing( KDialog::spacingHint() );
-    mLayout->setMargin( KDialog::marginHint() );
+//TODO PORT QT5     mLayout->setSpacing( QDialog::spacingHint() );
+//TODO PORT QT5     mLayout->setMargin( QDialog::marginHint() );
 
     QVBoxLayout * sideLayout = new QVBoxLayout();
     mLayout->addItem( sideLayout );
@@ -1029,7 +1030,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( QWidget * parent, const QString &name)
 
     QHBoxLayout *hLayout1 = new QHBoxLayout();
     layout->addItem( hLayout1 );
-    hLayout1->addSpacing( KDialog::spacingHint() * 3 );
+//TODO PORT QT5     hLayout1->addSpacing( QDialog::spacingHint() * 3 );
     hLayout1->addWidget( mFolderReqForSpamFolder );
 
     mMoveUnsureRules = new QCheckBox( i18n("Move &probable spam to:"), this );
@@ -1047,7 +1048,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( QWidget * parent, const QString &name)
 
     QHBoxLayout *hLayout2 = new QHBoxLayout();
     layout->addItem( hLayout2 );
-    hLayout2->addSpacing( KDialog::spacingHint() * 3 );
+//TODO PORT QT5     hLayout2->addSpacing( QDialog::spacingHint() * 3 );
     hLayout2->addWidget( mFolderReqForUnsureFolder );
 
     layout->addStretch();
@@ -1160,7 +1161,7 @@ ASWizVirusRulesPage::ASWizVirusRulesPage( QWidget * parent, const QString & name
 {
     QGridLayout *grid = new QGridLayout();
     mLayout->addItem( grid );
-    grid->setSpacing( KDialog::spacingHint() );
+//TODO PORT QT5     grid->setSpacing( QDialog::spacingHint() );
 
     mPipeRules = new QCheckBox( i18n("Check messages using the anti-virus tools"), this );
     mPipeRules->setWhatsThis(

dialog/archivefolderdialog.h

@@ -25,7 +25,6 @@
 class QCheckBox;
 class KUrlRequester;
 class KComboBox;
-class KUrl;
 class QPushButton;
 namespace Akonadi
 {