From kde-commits  Thu Jul 31 21:09:59 2014
From: Montel Laurent <montel () kde ! org>
Date: Thu, 31 Jul 2014 21:09:59 +0000
To: kde-commits
Subject: [kdepim/frameworks] /: KDialog--
Message-Id: <E1XCxbr-000416-Gf () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=140684100817878

Git commit cb6f2a8b31b268189cc62fba7d880d975917666d by Montel Laurent.
Committed on 31/07/2014 at 21:09.
Pushed by mlaurent into branch 'frameworks'.

KDialog--

M  +9    -9    korganizer/koprefsdialog.cpp
M  +2    -2    libkdepim/multiplyingline/multiplyinglineeditor.cpp

http://commits.kde.org/kdepim/cb6f2a8b31b268189cc62fba7d880d975917666d

diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index b078974..b307557 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -29,7 +29,7 @@
 #include "koglobals.h"
 #include "koprefs.h"
 #include "ui_kogroupwareprefspage.h"
-#include <KDialog>
+#include <QDialog>
 =

 #include <calendarsupport/kcalprefs.h>
 #include <calendarsupport/categoryconfig.h>
@@ -189,8 +189,8 @@ KOPrefsDialogMain::KOPrefsDialogMain( const KComponentD=
ata &inst, QWidget *paren
 =

   mAccountsCalendar.setupUi( calendarFrame );
 =

-  mAccountsCalendar.vlay->setSpacing( KDialog::spacingHint() );
-  mAccountsCalendar.vlay->setMargin( KDialog::marginHint() );
+//TODO PORT QT5   mAccountsCalendar.vlay->setSpacing( QDialog::spacingHint=
() );
+//TODO PORT QT5   mAccountsCalendar.vlay->setMargin( QDialog::marginHint()=
 );
 =

   mAccountsCalendar.mAccountList->agentFilterProxyModel()->
     addMimeTypeFilter( QLatin1String("text/calendar") );
@@ -316,7 +316,7 @@ class KOPrefsDialogTime : public KPIM::KPrefsModule
                          i18nc( "@title:tab", "Regional" ) );
 =

       QGridLayout *regionalLayout =3D new QGridLayout( regionalPage );
-      regionalLayout->setSpacing( KDialog::spacingHint() );
+//TODO PORT QT5       regionalLayout->setSpacing( QDialog::spacingHint() );
 =

       QGroupBox *datetimeGroupBox =3D
         new QGroupBox( i18nc( "@title:group", "General Time and Date" ), r=
egionalPage );
@@ -441,7 +441,7 @@ class KOPrefsDialogTime : public KPIM::KPrefsModule
       tabWidget->addTab( defaultPage, QIcon::fromTheme( QLatin1String("dra=
w-eraser") ),
                          i18nc( "@title:tab", "Default Values" ) );
       QGridLayout *defaultLayout =3D new QGridLayout( defaultPage );
-      defaultLayout->setSpacing( KDialog::spacingHint() );
+//TODO PORT QT5       defaultLayout->setSpacing( QDialog::spacingHint() );
 =

       QGroupBox *timesGroupBox =3D
         new QGroupBox( i18nc( "@title:group", "Appointments" ), defaultPag=
e );
@@ -817,7 +817,7 @@ KOPrefsDialogColorsAndFonts::KOPrefsDialogColorsAndFont=
s( const KComponentData &
   QWidget *colorFrame =3D new QWidget( this );
   topTopLayout->addWidget( colorFrame );
   QGridLayout *colorLayout =3D new QGridLayout(colorFrame);
-  colorLayout->setSpacing( KDialog::spacingHint() );
+//TODO PORT QT5   colorLayout->setSpacing( QDialog::spacingHint() );
   tabWidget->addTab( colorFrame, QIcon::fromTheme( QLatin1String("preferen=
ces-desktop-color") ),
                      i18nc( "@title:tab", "Colors" ) );
 =

@@ -935,7 +935,7 @@ KOPrefsDialogColorsAndFonts::KOPrefsDialogColorsAndFont=
s( const KComponentData &
                      i18nc( "@title:tab", "Fonts" ) );
 =

   QGridLayout *fontLayout =3D new QGridLayout( fontFrame );
-  fontLayout->setSpacing( KDialog::spacingHint() );
+//TODO PORT QT5   fontLayout->setSpacing( QDialog::spacingHint() );
 =

   KPIM::KPrefsWidFont *timeBarFont =3D
      addWidFont( KOPrefs::instance()->agendaTimeLabelsFontItem(), fontFram=
e,
@@ -1080,7 +1080,7 @@ KOPrefsDialogGroupScheduling::KOPrefsDialogGroupSched=
uling( const KComponentData
   topTopLayout->addWidget( topFrame );
 =

   QGridLayout *topLayout =3D new QGridLayout( topFrame );
-  topLayout->setSpacing( KDialog::spacingHint() );
+//TODO PORT QT5   topLayout->setSpacing( QDialog::spacingHint() );
 =

   KPIM::KPrefsWidBool *useGroupwareBool =3D
     addWidBool( CalendarSupport::KCalPrefs::instance()->useGroupwareCommun=
icationItem(), topFrame );
@@ -1284,7 +1284,7 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( const KCo=
mponentData &inst, QWidget
   QWidget *topFrame =3D new QWidget( this );
   topTopLayout->addWidget( topFrame );
   QBoxLayout *topLayout =3D new QVBoxLayout( topFrame );
-  topLayout->setSpacing( KDialog::spacingHint() );
+//TODO PORT QT5   topLayout->setSpacing( QDialog::spacingHint() );
 =

   mTreeWidget =3D new QTreeWidget( topFrame );
   mTreeWidget->setColumnCount( 1 );
diff --git a/libkdepim/multiplyingline/multiplyinglineeditor.cpp b/libkdepi=
m/multiplyingline/multiplyinglineeditor.cpp
index 06c3f14..e38f84b 100644
--- a/libkdepim/multiplyingline/multiplyinglineeditor.cpp
+++ b/libkdepim/multiplyingline/multiplyinglineeditor.cpp
@@ -25,7 +25,7 @@
 #include "multiplyinglineeditor.h"
 #include "multiplyinglineview_p.h"
 =

-#include <KDialog>
+#include <QDialog>
 =

 #include <QHBoxLayout>
 using namespace KPIM;
@@ -33,7 +33,7 @@ MultiplyingLineEditor::MultiplyingLineEditor( Multiplying=
LineFactory* factory, Q
     : QWidget( parent ), mModified( false ), mMultiplyingLineFactory( fact=
ory )
 {
     QBoxLayout *topLayout =3D new QHBoxLayout();
-    topLayout->setSpacing( KDialog::spacingHint() );
+//TODO PORT QT5     topLayout->setSpacing( QDialog::spacingHint() );
     topLayout->setMargin( 0 );
     setLayout( topLayout );
 =