Commit 85c4b2f2 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/release/20.04'

parents cc405e03 0e6dedd3
......@@ -918,14 +918,6 @@ bool ActionManager::importURL(const QUrl &url, bool merge)
bool ActionManager::saveURL()
{
QString ext;
if (mURL.isLocalFile()) {
ext = mFile.right(4);
} else {
ext = mURL.fileName().right(4);
}
if (!mCalendarView->saveCalendar(mFile)) {
qCDebug(KORGANIZER_LOG) << "calendar view save failed.";
return false;
......@@ -935,7 +927,7 @@ bool ActionManager::saveURL()
auto job = KIO::file_copy(QUrl::fromLocalFile(mFile), mURL);
KJobWidgets::setWindow(job, view());
if (!job->exec()) {
QString msg = i18n("Cannot upload calendar to '%1'",
const QString msg = i18n("Cannot upload calendar to '%1'",
mURL.toDisplayString());
KMessageBox::error(dialogParent(), msg);
return false;
......
......@@ -57,7 +57,6 @@ public:
BaseView::BaseView(QWidget *parent)
: QWidget(parent)
, mChanger(nullptr)
, d(new Private(this))
{
}
......@@ -69,9 +68,7 @@ BaseView::~BaseView()
void BaseView::setCalendar(const Akonadi::ETMCalendar::Ptr &calendar)
{
if (d->calendar != calendar) {
d->calendar = calendar;
}
d->calendar = calendar;
}
CalendarSupport::CalPrinterBase::PrintType BaseView::printType() const
......
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