From 2b5436ca040b98eaa3896acac02a0efd2d32df86 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 3 May 2017 08:22:25 +0200 Subject: [PATCH] Remove deprecated method --- CMakeLists.txt | 2 +- src/autotests/koeventpopupmenutest.cpp | 16 ++++++++-------- src/kcmdesignerfields.cpp | 2 +- src/views/collectionview/autotests/modeltest.cpp | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3ce128fa..fe6720ecf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,7 +129,7 @@ configure_file(korganizer-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/korganizer add_definitions( -DQT_NO_CAST_FROM_ASCII ) add_definitions( -DQT_NO_CAST_TO_ASCII ) add_definitions( -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT ) - +add_definitions( -DQT_DISABLE_DEPRECATED_BEFORE=0x060000 ) add_subdirectory(src) add_subdirectory(korgac) diff --git a/src/autotests/koeventpopupmenutest.cpp b/src/autotests/koeventpopupmenutest.cpp index b77010862..987ea3f8b 100644 --- a/src/autotests/koeventpopupmenutest.cpp +++ b/src/autotests/koeventpopupmenutest.cpp @@ -100,9 +100,9 @@ void KoEventPopupMenuTest::createEventFromTodo() menu.showIncidencePopup(item, QDate()); QAction *createevent = menu.findChild(QStringLiteral("createevent")); createevent->trigger(); - IncidenceEditorNG::IncidenceDialog *dlg = qFindChild(&menu); + IncidenceEditorNG::IncidenceDialog *dlg = menu.findChild(); QVERIFY(dlg); - IncidenceEditorNG::IncidenceEditor *editor = qFindChild(&menu); + IncidenceEditorNG::IncidenceEditor *editor = menu.findChild(); QVERIFY(editor); KCalCore::Event::Ptr event(editor->incidence()); QVERIFY(event->uid() != todo->uid()); @@ -134,9 +134,9 @@ void KoEventPopupMenuTest::createTodoFromEvent() menu.showIncidencePopup(item, QDate()); QAction *createtodo = menu.findChild(QStringLiteral("createtodo")); createtodo->trigger(); - IncidenceEditorNG::IncidenceDialog *dlg = qFindChild(&menu); + IncidenceEditorNG::IncidenceDialog *dlg = menu.findChild(); QVERIFY(dlg); - IncidenceEditorNG::IncidenceEditor *editor = qFindChild(&menu); + IncidenceEditorNG::IncidenceEditor *editor = menu.findChild(); QVERIFY(editor); KCalCore::Todo::Ptr todo(editor->incidence()); QVERIFY(todo->uid() != event->uid()); @@ -169,10 +169,10 @@ void KoEventPopupMenuTest::createNoteFromEvent() menu.setCalendar(calendar); menu.showIncidencePopup(item, QDate()); QAction *createnote = menu.findChild(QStringLiteral("createnote")); - NoteEditDialog *noteedit = qFindChild(&menu); + NoteEditDialog *noteedit = menu.findChild(); QVERIFY(!noteedit); createnote->trigger(); - noteedit = qFindChild(&menu); + noteedit = menu.findChild(); QVERIFY(noteedit); Akonadi::NoteUtils::NoteMessageWrapper note(noteedit->note()); QCOMPARE(note.title(), summary); @@ -208,10 +208,10 @@ void KoEventPopupMenuTest::createNoteFromTodo() menu.showIncidencePopup(item, QDate()); QAction *createnote = menu.findChild(QStringLiteral("createnote")); - NoteEditDialog *noteedit = qFindChild(&menu); + NoteEditDialog *noteedit = menu.findChild(); QVERIFY(!noteedit); createnote->trigger(); - noteedit = qFindChild(&menu); + noteedit = menu.findChild(); QVERIFY(noteedit); Akonadi::NoteUtils::NoteMessageWrapper note(noteedit->note()); QCOMPARE(note.title(), summary); diff --git a/src/kcmdesignerfields.cpp b/src/kcmdesignerfields.cpp index 5f89edad2..dbef11058 100644 --- a/src/kcmdesignerfields.cpp +++ b/src/kcmdesignerfields.cpp @@ -310,7 +310,7 @@ void KCMDesignerFields::initGUI() mPageView->setHeaderLabel(i18n("Available Pages")); mPageView->setRootIsDecorated(true); mPageView->setAllColumnsShowFocus(true); - mPageView->header()->setResizeMode(QHeaderView::Stretch); + mPageView->header()->setSectionResizeMode(QHeaderView::Stretch); hbox->addWidget(mPageView); QGroupBox *box = new QGroupBox(i18n("Preview of Selected Page"), this); diff --git a/src/views/collectionview/autotests/modeltest.cpp b/src/views/collectionview/autotests/modeltest.cpp index bad2bc18a..a2ddcd92d 100644 --- a/src/views/collectionview/autotests/modeltest.cpp +++ b/src/views/collectionview/autotests/modeltest.cpp @@ -435,27 +435,27 @@ void ModelTest::data() // General Purpose roles that should return a QString QVariant variant = model->data(model->index(0, 0), Qt::ToolTipRole); if (variant.isValid()) { - Q_ASSERT(qVariantCanConvert (variant)); + Q_ASSERT(variant.canConvert()); } variant = model->data(model->index(0, 0), Qt::StatusTipRole); if (variant.isValid()) { - Q_ASSERT(qVariantCanConvert (variant)); + Q_ASSERT(variant.canConvert()); } variant = model->data(model->index(0, 0), Qt::WhatsThisRole); if (variant.isValid()) { - Q_ASSERT(qVariantCanConvert (variant)); + Q_ASSERT(variant.canConvert()); } // General Purpose roles that should return a QSize variant = model->data(model->index(0, 0), Qt::SizeHintRole); if (variant.isValid()) { - Q_ASSERT(qVariantCanConvert (variant)); + Q_ASSERT(variant.canConvert()); } // General Purpose roles that should return a QFont QVariant fontVariant = model->data(model->index(0, 0), Qt::FontRole); if (fontVariant.isValid()) { - Q_ASSERT(qVariantCanConvert (fontVariant)); + Q_ASSERT(variant.canConvert()); } // Check that the alignment is one we know about @@ -469,12 +469,12 @@ void ModelTest::data() // General Purpose roles that should return a QColor QVariant colorVariant = model->data(model->index(0, 0), Qt::BackgroundColorRole); if (colorVariant.isValid()) { - Q_ASSERT(qVariantCanConvert (colorVariant)); + Q_ASSERT(colorVariant.canConvert()); } colorVariant = model->data(model->index(0, 0), Qt::TextColorRole); if (colorVariant.isValid()) { - Q_ASSERT(qVariantCanConvert (colorVariant)); + Q_ASSERT(colorVariant.canConvert()); } // Check that the "check state" is one we know about. -- GitLab