diff --git a/src/widgets/editorview.h b/src/widgets/editorview.h --- a/src/widgets/editorview.h +++ b/src/widgets/editorview.h @@ -27,7 +27,7 @@ #include -#include +#include #include @@ -68,8 +68,8 @@ signals: void textChanged(const QString &text); void titleChanged(const QString &title); - void startDateChanged(const QDateTime &start); - void dueDateChanged(const QDateTime &due); + void startDateChanged(const QDate &start); + void dueDateChanged(const QDate &due); void doneChanged(bool done); void recurrenceChanged(Domain::Task::Recurrence recurrence); diff --git a/src/widgets/editorview.cpp b/src/widgets/editorview.cpp --- a/src/widgets/editorview.cpp +++ b/src/widgets/editorview.cpp @@ -163,16 +163,16 @@ this, SLOT(onHasTaskPropertiesChanged())); connect(m_model, SIGNAL(titleChanged(QString)), this, SLOT(onTextOrTitleChanged())); connect(m_model, SIGNAL(textChanged(QString)), this, SLOT(onTextOrTitleChanged())); - connect(m_model, SIGNAL(startDateChanged(QDateTime)), this, SLOT(onStartDateChanged())); - connect(m_model, SIGNAL(dueDateChanged(QDateTime)), this, SLOT(onDueDateChanged())); + connect(m_model, SIGNAL(startDateChanged(QDate)), this, SLOT(onStartDateChanged())); + connect(m_model, SIGNAL(dueDateChanged(QDate)), this, SLOT(onDueDateChanged())); connect(m_model, SIGNAL(doneChanged(bool)), this, SLOT(onDoneChanged())); connect(m_model, SIGNAL(recurrenceChanged(Domain::Task::Recurrence)), this, SLOT(onRecurrenceChanged())); connect(m_model, SIGNAL(delegateTextChanged(QString)), this, SLOT(onDelegateTextChanged())); connect(this, SIGNAL(titleChanged(QString)), m_model, SLOT(setTitle(QString))); connect(this, SIGNAL(textChanged(QString)), m_model, SLOT(setText(QString))); - connect(this, SIGNAL(startDateChanged(QDateTime)), m_model, SLOT(setStartDate(QDateTime))); - connect(this, SIGNAL(dueDateChanged(QDateTime)), m_model, SLOT(setDueDate(QDateTime))); + connect(this, SIGNAL(startDateChanged(QDate)), m_model, SLOT(setStartDate(QDate))); + connect(this, SIGNAL(dueDateChanged(QDate)), m_model, SLOT(setDueDate(QDate))); connect(this, SIGNAL(doneChanged(bool)), m_model, SLOT(setDone(bool))); connect(this, SIGNAL(recurrenceChanged(Domain::Task::Recurrence)), m_model, SLOT(setRecurrence(Domain::Task::Recurrence))); } @@ -226,12 +226,12 @@ void EditorView::onStartDateChanged() { - ui->startDateEdit->setDate(m_model->property("startDate").toDateTime().date()); + ui->startDateEdit->setDate(m_model->property("startDate").toDate()); } void EditorView::onDueDateChanged() { - ui->dueDateEdit->setDate(m_model->property("dueDate").toDateTime().date()); + ui->dueDateEdit->setDate(m_model->property("dueDate").toDate()); } void EditorView::onDoneChanged() @@ -277,12 +277,12 @@ void EditorView::onStartEditEntered(const QDate &start) { - emit startDateChanged(QDateTime(start, QTime(), Qt::UTC)); + emit startDateChanged(start); } void EditorView::onDueEditEntered(const QDate &due) { - emit dueDateChanged(QDateTime(due, QTime(), Qt::UTC)); + emit dueDateChanged(due); } void EditorView::onDoneButtonChanged(bool checked) @@ -294,7 +294,7 @@ { QDate today(QDate::currentDate()); ui->startDateEdit->setDate(today); - emit startDateChanged(QDateTime(today, QTime(), Qt::UTC)); + emit startDateChanged(today); } void EditorView::onRecurrenceComboChanged(int index) diff --git a/tests/units/widgets/editorviewtest.cpp b/tests/units/widgets/editorviewtest.cpp --- a/tests/units/widgets/editorviewtest.cpp +++ b/tests/units/widgets/editorviewtest.cpp @@ -67,9 +67,9 @@ else if (name == "done") emit doneChanged(value.toBool()); else if (name == "startDate") - emit startDateChanged(value.toDateTime()); + emit startDateChanged(value.toDate()); else if (name == "dueDate") - emit dueDateChanged(value.toDateTime()); + emit dueDateChanged(value.toDate()); else if (name == "recurrence") emit recurrenceChanged(value.value()); else if (name == "delegateText") @@ -85,8 +85,8 @@ void setTitle(const QString &title) { setPropertyAndSignal("title", title); } void setText(const QString &text) { setPropertyAndSignal("text", text); } void setDone(bool done) { setPropertyAndSignal("done", done); } - void setStartDate(const QDateTime &start) { setPropertyAndSignal("startDate", start); } - void setDueDate(const QDateTime &due) { setPropertyAndSignal("dueDate", due); } + void setStartDate(const QDate &start) { setPropertyAndSignal("startDate", start); } + void setDueDate(const QDate &due) { setPropertyAndSignal("dueDate", due); } void setRecurrence(Domain::Task::Recurrence recurrence) { setPropertyAndSignal("recurrence", QVariant::fromValue(recurrence)); } void setDelegateText(const QString &text) { setPropertyAndSignal("delegateText", text); } void makeTaskAvailable() { setArtifact(Domain::Artifact::Ptr(new Domain::Task)); } @@ -115,8 +115,8 @@ void textChanged(const QString &text); void titleChanged(const QString &title); void doneChanged(bool done); - void startDateChanged(const QDateTime &date); - void dueDateChanged(const QDateTime &due); + void startDateChanged(const QDate &date); + void dueDateChanged(const QDate &due); void recurrenceChanged(Domain::Task::Recurrence recurrence); void delegateTextChanged(const QString &delegateText); @@ -386,8 +386,8 @@ model.setProperty("hasTaskProperties", true); model.setProperty("title", "My title"); model.setProperty("text", "\nMy text"); - model.setProperty("startDate", QDateTime::currentDateTime()); - model.setProperty("dueDate", QDateTime::currentDateTime().addDays(2)); + model.setProperty("startDate", QDate::currentDate()); + model.setProperty("dueDate", QDate::currentDate().addDays(2)); model.setProperty("recurrence", QVariant::fromValue(Domain::Task::RecursWeekly)); model.setProperty("done", true); @@ -404,8 +404,8 @@ QCOMPARE(textEdit->toPlainText(), QString(model.property("title").toString() + '\n' + model.property("text").toString())); - QCOMPARE(startDateEdit->date(), model.property("startDate").toDateTime().date()); - QCOMPARE(dueDateEdit->date(), model.property("dueDate").toDateTime().date()); + QCOMPARE(startDateEdit->date(), model.property("startDate").toDate()); + QCOMPARE(dueDateEdit->date(), model.property("dueDate").toDate()); QCOMPARE(recurrenceCombo->currentData().value(), model.property("recurrence").value()); QCOMPARE(doneButton->isChecked(), model.property("done").toBool()); } @@ -418,8 +418,8 @@ model.makeTaskAvailable(); model.setProperty("title", "My title"); model.setProperty("text", "\nMy text"); - model.setProperty("startDate", QDateTime::currentDateTime()); - model.setProperty("dueDate", QDateTime::currentDateTime().addDays(2)); + model.setProperty("startDate", QDate::currentDate()); + model.setProperty("dueDate", QDate::currentDate().addDays(2)); model.setProperty("recurrence", QVariant::fromValue(Domain::Task::RecursWeekly)); model.setProperty("done", true); editor.setModel(&model); @@ -442,9 +442,9 @@ model.setTitle("New title"); model.setText("New text"); startDateEdit->setFocus(); - model.setStartDate(QDateTime::currentDateTime().addDays(1)); + model.setStartDate(QDate::currentDate().addDays(1)); dueDateEdit->setFocus(); - model.setDueDate(QDateTime::currentDateTime().addDays(3)); + model.setDueDate(QDate::currentDate().addDays(3)); recurrenceCombo->setFocus(); model.setRecurrence(Domain::Task::RecursDaily); doneButton->setFocus(); @@ -471,8 +471,8 @@ model.makeTaskAvailable(); model.setProperty("title", "My title"); model.setProperty("text", "\nMy text"); - model.setProperty("startDate", QDateTime::currentDateTime()); - model.setProperty("dueDate", QDateTime::currentDateTime().addDays(2)); + model.setProperty("startDate", QDate::currentDate()); + model.setProperty("dueDate", QDate::currentDate().addDays(2)); model.setProperty("done", true); editor.setModel(&model); @@ -495,8 +495,8 @@ model.makeTaskAvailable(); model.setProperty("title", "My title"); model.setProperty("text", "\nMy text"); - model.setProperty("startDate", QDateTime::currentDateTime()); - model.setProperty("dueDate", QDateTime::currentDateTime().addDays(2)); + model.setProperty("startDate", QDate::currentDate()); + model.setProperty("dueDate", QDate::currentDate().addDays(2)); model.setProperty("done", true); editor.setModel(&model); @@ -550,8 +550,8 @@ model.makeTaskAvailable(); model.setProperty("title", "My title"); model.setProperty("text", "\nMy text"); - model.setProperty("startDate", QDateTime::currentDateTime()); - model.setProperty("dueDate", QDateTime::currentDateTime().addDays(2)); + model.setProperty("startDate", QDate::currentDate()); + model.setProperty("dueDate", QDate::currentDate().addDays(2)); model.setProperty("done", false); editor.setModel(&model); @@ -590,18 +590,18 @@ model.makeTaskAvailable(); model.setProperty("title", "My title"); model.setProperty("text", "\nMy text"); - model.setProperty("startDate", QDateTime::currentDateTime()); - model.setProperty("dueDate", QDateTime::currentDateTime().addDays(2)); + model.setProperty("startDate", QDate::currentDate()); + model.setProperty("dueDate", QDate::currentDate().addDays(2)); model.setProperty("done", false); editor.setModel(&model); auto startDateEdit = editor.findChild(QStringLiteral("startDateEdit")); // WHEN - model.setPropertyAndSignal("startDate", QDateTime::currentDateTime().addDays(-2)); + model.setPropertyAndSignal("startDate", QDate::currentDate().addDays(-2)); // THEN - QCOMPARE(startDateEdit->date(), model.property("startDate").toDateTime().date()); + QCOMPARE(startDateEdit->date(), model.property("startDate").toDate()); } void shouldApplyStartDateEditChanges() @@ -620,9 +620,8 @@ QTest::keyClick(startDateEdit, Qt::Key_Enter); // THEN - const QDateTime newStartDateTime = model.property("startDate").toDateTime(); - QCOMPARE(newStartDateTime.date(), today); - QCOMPARE(newStartDateTime.timeSpec(), Qt::UTC); + const QDate newStartDate = model.property("startDate").toDate(); + QCOMPARE(newStartDate, today); } void shouldReactToDueDateChanges() @@ -632,18 +631,18 @@ EditorModelStub model; model.setProperty("title", "My title"); model.setProperty("text", "\nMy text"); - model.setProperty("startDate", QDateTime::currentDateTime()); - model.setProperty("dueDate", QDateTime::currentDateTime().addDays(2)); + model.setProperty("startDate", QDate::currentDate()); + model.setProperty("dueDate", QDate::currentDate().addDays(2)); model.setProperty("done", false); editor.setModel(&model); auto dueDateEdit = editor.findChild(QStringLiteral("dueDateEdit")); // WHEN - model.setPropertyAndSignal("dueDate", QDateTime::currentDateTime().addDays(-2)); + model.setPropertyAndSignal("dueDate", QDate::currentDate().addDays(-2)); // THEN - QCOMPARE(dueDateEdit->date(), model.property("dueDate").toDateTime().date()); + QCOMPARE(dueDateEdit->date(), model.property("dueDate").toDate()); } void shouldApplyDueDateEditChanges() @@ -663,7 +662,7 @@ QTest::keyClick(dueDateEdit, Qt::Key_Enter); // THEN - QCOMPARE(model.property("dueDate").toDateTime().date(), today); + QCOMPARE(model.property("dueDate").toDate(), today); } void shouldApplyStartTodayChanges() @@ -685,7 +684,7 @@ // THEN QCOMPARE(startDateEdit->currentText(), today.toString(QStringLiteral("dd/MM/yyyy"))); - QCOMPARE(model.property("startDate").toDateTime().date(), today); + QCOMPARE(model.property("startDate").toDate(), today); } void shouldReactToRecurrenceChanges() @@ -696,8 +695,8 @@ model.makeTaskAvailable(); model.setProperty("title", "My title"); model.setProperty("text", "\nMy text"); - model.setProperty("startDate", QDateTime::currentDateTime()); - model.setProperty("dueDate", QDateTime::currentDateTime().addDays(2)); + model.setProperty("startDate", QDate::currentDate()); + model.setProperty("dueDate", QDate::currentDate().addDays(2)); model.setProperty("recurrence", QVariant::fromValue(Domain::Task::RecursWeekly)); model.setProperty("done", false); editor.setModel(&model);