Commit fa021388 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Start to make it compile against qt5.13

parent 535d9352
......@@ -123,7 +123,7 @@ AddressLocationWidget::AddressLocationWidget(QWidget *parent)
QWidget *addButtonWidget = new QWidget(this);
QHBoxLayout *addButtonWidgetLayout = new QHBoxLayout(addButtonWidget);
addButtonWidgetLayout->setMargin(0);
addButtonWidgetLayout->setContentsMargins(0, 0, 0, 0);
mAddAddress = new QPushButton(i18n("Add Address"), this);
mAddAddress->setObjectName(QStringLiteral("addbuttonaddress"));
connect(mAddAddress, &QPushButton::clicked, this, &AddressLocationWidget::slotAddAddress);
......@@ -133,7 +133,7 @@ AddressLocationWidget::AddressLocationWidget(QWidget *parent)
QWidget *modifyButtonWidget = new QWidget(this);
QHBoxLayout *modifyButtonWidgetLayout = new QHBoxLayout(modifyButtonWidget);
modifyButtonWidgetLayout->setMargin(0);
modifyButtonWidgetLayout->setContentsMargins(0, 0, 0, 0);
mButtonStack->addWidget(modifyButtonWidget);
mModifyAddress = new QPushButton(i18n("Update Address"), this);
......
......@@ -44,7 +44,7 @@ AddressTypeDialog::AddressTypeDialog(KContacts::Address::Type type, QWidget *par
mainLayout->addWidget(page);
mainLayout->addWidget(buttonBox);
QVBoxLayout *layout = new QVBoxLayout(page);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
QGroupBox *box = new QGroupBox(i18nc("street/postal", "Address Types"), page);
mainLayout->addWidget(box);
......
......@@ -31,7 +31,7 @@ AddressLocationEditor::AddressLocationEditor(QWidget *parent, const QList<QVaria
{
QHBoxLayout *mainLayout = new QHBoxLayout(this);
mainLayout->setObjectName(QStringLiteral("mainlayout"));
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
mAddressesLocationWidget = new AddressesLocationWidget(this);
mAddressesLocationWidget->setObjectName(QStringLiteral("addresseslocationwidget"));
mainLayout->addWidget(mAddressesLocationWidget);
......
......@@ -86,7 +86,7 @@ CryptoPagePlugin::CryptoPagePlugin()
// Send preferences/sign (see kleo/kleo/enum.h)
QWidget *hbox = new QWidget(box);
QHBoxLayout *hboxHBoxLayout = new QHBoxLayout(hbox);
hboxHBoxLayout->setMargin(0);
hboxHBoxLayout->setContentsMargins(0, 0, 0, 0);
l = new QLabel(i18n("Sign:"), hbox);
hboxHBoxLayout->addWidget(l);
......@@ -104,7 +104,7 @@ CryptoPagePlugin::CryptoPagePlugin()
// Send preferences/encrypt (see kleo/kleo/enum.h)
hbox = new QWidget(box);
hboxHBoxLayout = new QHBoxLayout(hbox);
hboxHBoxLayout->setMargin(0);
hboxHBoxLayout->setContentsMargins(0, 0, 0, 0);
l = new QLabel(i18n("Encrypt:"), hbox);
hboxHBoxLayout->addWidget(l);
......
......@@ -297,7 +297,7 @@ void CSVImportDialog::initGUI()
QGridLayout *layout = new QGridLayout;
mainLayout->addLayout(layout);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
QHBoxLayout *hbox = new QHBoxLayout;
......
......@@ -31,7 +31,7 @@ VCardExportSelectionWidget::VCardExportSelectionWidget(QWidget *parent)
: QWidget(parent)
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
QGroupBox *gbox = new QGroupBox(
i18nc("@title:group", "Fields to be exported"), this);
mainLayout->addWidget(gbox);
......
......@@ -34,7 +34,7 @@ GravatarUpdateWidget::GravatarUpdateWidget(QWidget *parent)
: QWidget(parent)
{
QGridLayout *mainLayout = new QGridLayout(this);
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
QHBoxLayout *hboxEmail = new QHBoxLayout;
......
......@@ -42,7 +42,7 @@ MergeContactWidget::MergeContactWidget(QWidget *parent)
, mConflictTypes(MergeContacts::None)
{
QVBoxLayout *lay = new QVBoxLayout(this);
lay->setMargin(0);
lay->setContentsMargins(0, 0, 0, 0);
QSplitter *splitter = new QSplitter;
splitter->setObjectName(QStringLiteral("splitter"));
......
......@@ -41,7 +41,7 @@ SearchDuplicateResultWidget::SearchDuplicateResultWidget(QWidget *parent)
: QWidget(parent)
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
QSplitter *splitter = new QSplitter;
splitter->setObjectName(QStringLiteral("splitter"));
......
......@@ -34,7 +34,7 @@ MergeContactSelectInformationScrollArea::MergeContactSelectInformationScrollArea
: QWidget(parent)
{
QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->setMargin(0);
vbox->setContentsMargins(0, 0, 0, 0);
mStackWidget = new QStackedWidget;
mStackWidget->setObjectName(QStringLiteral("stackwidget"));
vbox->addWidget(mStackWidget);
......
......@@ -27,7 +27,7 @@ MergeContactSelectInformationWidget::MergeContactSelectInformationWidget(QWidget
: QWidget(parent)
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
}
MergeContactSelectInformationWidget::~MergeContactSelectInformationWidget()
......
......@@ -37,7 +37,7 @@ void MarkdownCreateLinkWidgetTest::shouldHaveDefaultValue()
QFormLayout *mainLayout = w.findChild<QFormLayout *>(QStringLiteral("mainlayout"));
QVERIFY(mainLayout);
QCOMPARE(mainLayout->margin(), 0);
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
QLineEdit *mTitle = w.findChild<QLineEdit *>(QStringLiteral("title"));
......
......@@ -30,7 +30,7 @@ MarkdownConfigureWidget::MarkdownConfigureWidget(QWidget *parent)
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setObjectName(QStringLiteral("mainlayout"));
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
mLatexSupport = new QCheckBox(i18n("Enable embedded LaTeX"), this);
mLatexSupport->setObjectName(QStringLiteral("latex"));
......
......@@ -28,7 +28,7 @@ MarkdownCreateLinkWidget::MarkdownCreateLinkWidget(QWidget *parent)
{
QFormLayout *mainLayout = new QFormLayout(this);
mainLayout->setObjectName(QStringLiteral("mainlayout"));
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
mTitle = new QLineEdit(this);
mTitle->setObjectName(QStringLiteral("title"));
......
......@@ -34,7 +34,7 @@ MarkdownPreviewWidget::MarkdownPreviewWidget(QWidget *parent)
QHBoxLayout *mainLayout = new QHBoxLayout(this);
mainLayout->setObjectName(QStringLiteral("mainLayout"));
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
MarkdownEnginePage *page = new MarkdownEnginePage(this);
mWebView = new QWebEngineView(this);
......
......@@ -30,7 +30,7 @@ ExternalComposerConfigureWidget::ExternalComposerConfigureWidget(QWidget *parent
: MessageComposer::PluginEditorInitConfigureWidget(parent)
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
mainLayout->setObjectName(QStringLiteral("mainlayout"));
mExternalEditorCheck = new QCheckBox(i18n("Use external editor instead of composer"), this);
......
......@@ -29,7 +29,7 @@ SelectMailWidget::SelectMailWidget(QWidget *parent)
{
QHBoxLayout *layout = new QHBoxLayout(this);
layout->setObjectName(QStringLiteral("mainlayout"));
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
mView = new Akonadi::EmailAddressSelectionWidget(true, nullptr, this);
mView->setObjectName(QStringLiteral("emailaddressselectionwidget"));
......
......@@ -33,7 +33,7 @@ InsertShorturlConfigureWidget::InsertShorturlConfigureWidget(QWidget *parent)
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setObjectName(QStringLiteral("mainlayout"));
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
QLabel *lab = new QLabel(i18n("Select Short URL server:"), this);
lab->setObjectName(QStringLiteral("label"));
......
......@@ -33,7 +33,7 @@ AutomaticAddContactsConfigureTab::AutomaticAddContactsConfigureTab(QWidget *pare
{
QHBoxLayout *mainLayout = new QHBoxLayout(this);
mainLayout->setObjectName(QStringLiteral("mainlayout"));
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
mTabWidget = new QTabWidget(this);
mTabWidget->setObjectName(QStringLiteral("tabwidget"));
mainLayout->addWidget(mTabWidget);
......
......@@ -29,7 +29,7 @@ AutomaticAddContactsConfigureWidget::AutomaticAddContactsConfigureWidget(QWidget
: MessageComposer::PluginEditorCheckBeforeSendConfigureWidget(parent)
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setMargin(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
mainLayout->setObjectName(QStringLiteral("mainlayout"));
mConfigureTab = new AutomaticAddContactsConfigureTab(this);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment