Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 088f776a authored by Jonathan Marten's avatar Jonathan Marten

Fix compile with Qt 5.13 and QT_DISABLE_DEPRECATED_BEFORE=0x060000

Differential Revision: https://phabricator.kde.org/D19356
parent c7cd52ff
......@@ -267,7 +267,7 @@ AlarmDialog::AlarmDialog(const Akonadi::ETMCalendar::Ptr &calendar, QWidget *par
QWidget *suspendBox = new QWidget(topBox);
QHBoxLayout *suspendBoxHBoxLayout = new QHBoxLayout(suspendBox);
suspendBoxHBoxLayout->setMargin(0);
suspendBoxHBoxLayout->setContentsMargins(0, 0, 0, 0);
topLayout->addWidget(suspendBox);
QLabel *l = new QLabel(i18nc("@label:spinbox", "Suspend &duration:"), suspendBox);
......
......@@ -530,7 +530,7 @@ AkonadiCollectionView::AkonadiCollectionView(CalendarView *view, bool hasContext
mManagerShowCollectionProperties = new ManageShowCollectionProperties(this, this);
QVBoxLayout *topLayout = new QVBoxLayout(this);
topLayout->setMargin(0);
topLayout->setContentsMargins(0, 0, 0, 0);
QLineEdit *searchCol = new QLineEdit(this);
searchCol->setToolTip(i18nc("info:tooltip", "Set search keyword"));
......
......@@ -148,7 +148,7 @@ CalendarView::CalendarView(QWidget *parent)
mDateChecker = new DateChecker(this);
QVBoxLayout *topLayout = new QVBoxLayout(this);
topLayout->setMargin(0);
topLayout->setContentsMargins(0, 0, 0, 0);
// create the main layout frames.
mPanner = new QSplitter(Qt::Horizontal, this);
......@@ -170,15 +170,15 @@ CalendarView::CalendarView(QWidget *parent)
mEventViewerBox = new QWidget(mLeftSplitter);
QVBoxLayout *mEventViewerBoxVBoxLayout = new QVBoxLayout(mEventViewerBox);
mEventViewerBoxVBoxLayout->setMargin(0);
mEventViewerBoxVBoxLayout->setMargin(0);
mEventViewerBoxVBoxLayout->setContentsMargins(0, 0, 0, 0);
mEventViewerBoxVBoxLayout->setContentsMargins(0, 0, 0, 0);
mEventViewer = new CalendarSupport::IncidenceViewer(mCalendar.data(), mEventViewerBox);
mEventViewer->setObjectName(QStringLiteral("EventViewer"));
mEventViewerBoxVBoxLayout->addWidget(mEventViewer);
QWidget *rightBox = new QWidget(mPanner);
QVBoxLayout *rightBoxVBoxLayout = new QVBoxLayout(rightBox);
rightBoxVBoxLayout->setMargin(0);
rightBoxVBoxLayout->setContentsMargins(0, 0, 0, 0);
mNavigatorBar = new NavigatorBar(rightBox);
rightBoxVBoxLayout->addWidget(mNavigatorBar);
mRightFrame = new QStackedWidget(rightBox);
......
......@@ -66,9 +66,9 @@ NoteEditDialog::NoteEditDialog(QWidget *parent)
mOkButton->setEnabled(false);
QGridLayout *layout = new QGridLayout(mainWidget);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
QHBoxLayout *hbox = new QHBoxLayout;
hbox->setMargin(0);
hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(2);
mNoteTitle = new QLineEdit;
......
......@@ -66,7 +66,7 @@ SearchDialog::SearchDialog(CalendarView *calendarview)
// Results list view
QVBoxLayout *layout = new QVBoxLayout;
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
listView = new EventViews::ListView(m_calendarview->calendar(), this);
layout->addWidget(listView);
m_ui->listViewFrame->setLayout(layout);
......
......@@ -295,7 +295,7 @@ void KCMDesignerFields::defaults()
void KCMDesignerFields::initGUI()
{
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
bool noDesigner = QStandardPaths::findExecutable(QStringLiteral("designer")).isEmpty();
......
......@@ -58,7 +58,7 @@ ApptSummaryWidget::ApptSummaryWidget(KOrganizerPlugin *plugin, QWidget *parent)
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setSpacing(3);
mainLayout->setMargin(3);
mainLayout->setContentsMargins(3, 3, 3, 3);
QWidget *header = createHeader(
this, QStringLiteral("view-calendar-upcoming-events"), i18n("Upcoming Events"));
......
......@@ -58,7 +58,7 @@ TodoSummaryWidget::TodoSummaryWidget(TodoPlugin *plugin, QWidget *parent)
{
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setSpacing(3);
mainLayout->setMargin(3);
mainLayout->setContentsMargins(3, 3, 3, 3);
QWidget *header = createHeader(this, QStringLiteral("korg-todo"), i18n("Pending To-dos"));
mainLayout->addWidget(header);
......
......@@ -120,7 +120,7 @@ SDSummaryWidget::SDSummaryWidget(KontactInterface::Plugin *plugin, QWidget *pare
// Create the Summary Layout
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setSpacing(3);
mainLayout->setMargin(3);
mainLayout->setContentsMargins(3, 3, 3, 3);
QWidget *header = createHeader(this,
QStringLiteral("view-calendar-special-occasion"),
......
......@@ -77,7 +77,7 @@ KOrganizerPart::KOrganizerPart(QWidget *parentWidget, QObject *parent, const QVa
QVBoxLayout *topLayout = new QVBoxLayout(canvas);
topLayout->addWidget(mView);
topLayout->setMargin(0);
topLayout->setContentsMargins(0, 0, 0, 0);
connect(mView, &CalendarView::incidenceSelected, this, &KOrganizerPart::slotChangeInfo);
......
......@@ -249,7 +249,7 @@ public:
// holiday region selection
QWidget *holidayRegBox = new QWidget(regionalPage);
QHBoxLayout *holidayRegBoxHBoxLayout = new QHBoxLayout(holidayRegBox);
holidayRegBoxHBoxLayout->setMargin(0);
holidayRegBoxHBoxLayout->setContentsMargins(0, 0, 0, 0);
holidaysLayout->addWidget(holidayRegBox, 1, 0, 1, 2);
QLabel *holidayLabel = new QLabel(i18nc("@label", "Use holiday region:"), holidayRegBox);
......@@ -1046,7 +1046,7 @@ KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling(QWidget *parent)
topTopLayout->addWidget(topFrame);
QGridLayout *topLayout = new QGridLayout(topFrame);
topLayout->setMargin(0);
topLayout->setContentsMargins(0, 0, 0, 0);
KPIM::KPrefsWidBool *useGroupwareBool
= addWidBool(
......@@ -1273,7 +1273,7 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins(QWidget *parent)
QWidget *buttonRow = new QWidget(this);
QBoxLayout *buttonRowLayout = new QHBoxLayout(buttonRow);
buttonRowLayout->setMargin(0);
buttonRowLayout->setContentsMargins(0, 0, 0, 0);
mConfigureButton = new QPushButton(buttonRow);
KGuiItem::assign(mConfigureButton, KGuiItem(i18nc("@action:button", "Configure &Plugin..."),
QStringLiteral("configure"), QString(),
......
......@@ -62,7 +62,7 @@ KOAgendaView::KOAgendaView(QWidget *parent, bool isSideBySide)
, d(new Private(isSideBySide, this))
{
QHBoxLayout *layout = new QHBoxLayout(this);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(d->mAgendaView);
connect(d->mAgendaView, &EventViews::AgendaView::zoomViewHorizontally,
......
......@@ -37,7 +37,7 @@ MonthView::MonthView(QWidget *parent)
: KOEventView(parent)
{
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
mMonthView = new EventViews::MonthView(EventViews::MonthView::Visible, this);
mMonthView->setPreferences(KOPrefs::instance()->eventViewsPreferences());
layout->addWidget(mMonthView);
......
......@@ -36,7 +36,7 @@ KOTimelineView::KOTimelineView(QWidget *parent)
: KOEventView(parent)
{
QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->setMargin(0);
vbox->setContentsMargins(0, 0, 0, 0);
mTimeLineView = new EventViews::TimelineView(this);
vbox->addWidget(mTimeLineView);
mEventPopup = eventPopup();
......
......@@ -41,7 +41,7 @@ KDateNavigator::KDateNavigator(QWidget *parent)
, mBaseDate(1970, 1, 1)
{
QGridLayout *topLayout = new QGridLayout(this);
topLayout->setMargin(0);
topLayout->setContentsMargins(0, 0, 0, 0);
topLayout->setSpacing(0);
mNavigatorBar = new NavigatorBar(this);
......
......@@ -81,7 +81,7 @@ NavigatorBar::NavigatorBar(QWidget *parent) : QWidget(parent)
// set up control frame layout
QHBoxLayout *ctrlLayout = new QHBoxLayout(this);
ctrlLayout->setMargin(0);
ctrlLayout->setContentsMargins(0, 0, 0, 0);
ctrlLayout->addWidget(mPrevYear);
ctrlLayout->addWidget(mPrevMonth);
ctrlLayout->addStretch();
......
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