[pim/korganizer] src: Rename multiagendaview to komultiagendaview
Allen Winter <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 457cf28557c3013778d1731ed4e90cc9e5b3b884 by Allen Winter.
Committed on 18/07/2026 at 15:25.
Pushed by winterz into branch 'master'.
Rename multiagendaview to komultiagendaview
for the sake of consistency, to follow the naming convention
of the other KOrganizer view classes.
M +3 -3 src/CMakeLists.txt
M +2 -2 src/koviewmanager.cpp
M +2 -2 src/koviewmanager.h
R +75 -74 src/views/multiagendaview/komultiagendaview.cpp [from: src/views/multiagendaview/multiagendaview.cpp - 073% similarity]
R +12 -11 src/views/multiagendaview/komultiagendaview.h [from: src/views/multiagendaview/multiagendaview.h - 083% similarity]
R +2 -2 src/views/multiagendaview/komultiagendaviewconfigwidget.ui [from: src/views/multiagendaview/multiagendaviewconfigwidget.ui - 096% similarity]
https://invent.kde.org/pim/korganizer/-/commit/457cf28557c3013778d1731ed4e90cc9e5b3b884
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1eda3dacd..5adcf3b64 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -333,7 +333,7 @@ set(korganizerprivate_LIB_SRCS
views/journalview/kojournalview.cpp
views/listview/kolistview.cpp
views/monthview/komonthview.cpp
- views/multiagendaview/multiagendaview.cpp
+ views/multiagendaview/komultiagendaview.cpp
views/timelineview/kotimelineview.cpp
views/todoview/kotodoview.cpp
views/whatsnextview/kowhatsnextview.cpp
@@ -371,7 +371,7 @@ set(korganizerprivate_LIB_SRCS
views/journalview/kojournalview.h
views/listview/kolistview.h
views/monthview/komonthview.h
- views/multiagendaview/multiagendaview.h
+ views/multiagendaview/komultiagendaview.h
views/timelineview/kotimelineview.h
views/todoview/kotodoview.h
views/whatsnextview/kowhatsnextview.h
@@ -414,7 +414,7 @@ set_property(
ki18n_wrap_ui(korganizerprivate_LIB_SRCS
ui/filteredit_base.ui
ui/kogroupwareprefspage.ui
- views/multiagendaview/multiagendaviewconfigwidget.ui
+ views/multiagendaview/komultiagendaviewconfigwidget.ui
ui/searchdialog_base.ui
views/collectionview/quickview.ui
)
diff --git a/src/koviewmanager.cpp b/src/koviewmanager.cpp
index 139fc2ea2..6aca0a4f0 100644
--- a/src/koviewmanager.cpp
+++ b/src/koviewmanager.cpp
@@ -19,7 +19,7 @@
#include "views/journalview/kojournalview.h"
#include "views/listview/kolistview.h"
#include "views/monthview/komonthview.h"
-#include "views/multiagendaview/multiagendaview.h"
+#include "views/multiagendaview/komultiagendaview.h"
#include "views/timelineview/kotimelineview.h"
#include "views/todoview/kotodoview.h"
#include "views/whatsnextview/kowhatsnextview.h"
@@ -522,7 +522,7 @@ void KOViewManager::showAgendaView()
if (showSideBySide) {
if (!mAgendaSideBySideView) {
- mAgendaSideBySideView = new MultiAgendaView(mMainView, parent);
+ mAgendaSideBySideView = new KOMultiAgendaView(mMainView, parent);
mAgendaSideBySideView->setIdentifier("DefaultAgendaSideBySideView");
mAgendaSideBySideView->setCollectionSelectionProxyModel(mMainView->calendar()->checkableProxyModel());
addView(mAgendaSideBySideView, showBoth);
diff --git a/src/koviewmanager.h b/src/koviewmanager.h
index 3889f9120..d5e767840 100644
--- a/src/koviewmanager.h
+++ b/src/koviewmanager.h
@@ -22,13 +22,13 @@ class KOAgendaView;
class KOJournalView;
class KOListView;
class KOMonthView;
+class KOMultiAgendaView;
class KOTimelineView;
class KOTodoView;
class KOWhatsNextView;
namespace KOrg
{
class BaseView;
-class MultiAgendaView;
}
namespace Akonadi
@@ -169,7 +169,7 @@ private:
QList<Akonadi::CollectionCalendar::Ptr> mCalendars;
KOAgendaView *mAgendaView = nullptr;
- KOrg::MultiAgendaView *mAgendaSideBySideView = nullptr;
+ KOMultiAgendaView *mAgendaSideBySideView = nullptr;
KOListView *mListView = nullptr;
KOTodoView *mTodoView = nullptr;
KOWhatsNextView *mWhatsNextView = nullptr;
diff --git a/src/views/multiagendaview/multiagendaview.cpp b/src/views/multiagendaview/komultiagendaview.cpp
similarity index 73%
rename from src/views/multiagendaview/multiagendaview.cpp
rename to src/views/multiagendaview/komultiagendaview.cpp
index 582e2f782..e253fdf8c 100644
--- a/src/views/multiagendaview/multiagendaview.cpp
+++ b/src/views/multiagendaview/komultiagendaview.cpp
@@ -6,12 +6,13 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include "multiagendaview.h"
+#include "komultiagendaview.h"
#include "akonadicollectionview.h"
#include "calendarview.h"
#include "koeventpopupmenu.h"
#include "prefs/koprefs.h"
-#include "ui_multiagendaviewconfigwidget.h"
+
+#include "ui_komultiagendaviewconfigwidget.h"
#include <EventViews/AgendaView>
#include <EventViews/MultiAgendaView>
@@ -59,10 +60,10 @@ private:
};
}
-class KOrg::MultiAgendaViewPrivate
+class KOMultiAgendaViewPrivate
{
public:
- MultiAgendaViewPrivate(CalendarViewBase *calendarView, MultiAgendaView *qq)
+ KOMultiAgendaViewPrivate(CalendarViewBase *calendarView, KOMultiAgendaView *qq)
: q(qq)
{
auto layout = new QHBoxLayout(q);
@@ -79,13 +80,13 @@ public:
Akonadi::Collection::Id mCollectionId = -1;
private:
- Q_DISABLE_COPY_MOVE(MultiAgendaViewPrivate)
- MultiAgendaView *const q;
+ Q_DISABLE_COPY_MOVE(KOMultiAgendaViewPrivate)
+ KOMultiAgendaView *const q;
};
-MultiAgendaView::MultiAgendaView(CalendarViewBase *calendarView, QWidget *parent)
+KOMultiAgendaView::KOMultiAgendaView(CalendarViewBase *calendarView, QWidget *parent)
: KOEventView(parent)
- , d(new MultiAgendaViewPrivate(calendarView, this))
+ , d(new KOMultiAgendaViewPrivate(calendarView, this))
{
connect(d->mMultiAgendaView, &EventViews::EventView::datesSelected, this, &KOEventView::datesSelected);
@@ -93,7 +94,7 @@ MultiAgendaView::MultiAgendaView(CalendarViewBase *calendarView, QWidget *parent
connect(d->mMultiAgendaView, &EventViews::MultiAgendaView::showIncidencePopupSignal, d->mPopup, &KOEventPopupMenu::showIncidencePopup);
- connect(d->mMultiAgendaView, &EventViews::MultiAgendaView::showNewEventPopupSignal, this, &MultiAgendaView::showNewEventPopup);
+ connect(d->mMultiAgendaView, &EventViews::MultiAgendaView::showNewEventPopupSignal, this, &KOMultiAgendaView::showNewEventPopup);
connect(d->mMultiAgendaView, &EventViews::EventView::incidenceSelected, this, &BaseView::incidenceSelected);
@@ -119,22 +120,22 @@ MultiAgendaView::MultiAgendaView(CalendarViewBase *calendarView, QWidget *parent
connect(d->mMultiAgendaView, &EventViews::EventView::dissociateOccurrencesSignal, this, &BaseView::dissociateOccurrencesSignal);
- connect(d->mMultiAgendaView, qOverload<>(&EventViews::MultiAgendaView::newEventSignal), this, qOverload<>(&KOrg::MultiAgendaView::newEventSignal));
+ connect(d->mMultiAgendaView, qOverload<>(&EventViews::MultiAgendaView::newEventSignal), this, qOverload<>(&KOMultiAgendaView::newEventSignal));
connect(d->mMultiAgendaView,
qOverload<const QDate &>(&EventViews::MultiAgendaView::newEventSignal),
this,
- qOverload<const QDate &>(&KOrg::MultiAgendaView::newEventSignal));
+ qOverload<const QDate &>(&KOMultiAgendaView::newEventSignal));
connect(d->mMultiAgendaView,
qOverload<const QDateTime &>(&EventViews::MultiAgendaView::newEventSignal),
this,
- qOverload<const QDateTime &>(&KOrg::MultiAgendaView::newEventSignal));
+ qOverload<const QDateTime &>(&KOMultiAgendaView::newEventSignal));
connect(d->mMultiAgendaView,
qOverload<const QDateTime &, const QDateTime &>(&EventViews::MultiAgendaView::newEventSignal),
this,
- qOverload<const QDateTime &, const QDateTime &>(&KOrg::MultiAgendaView::newEventSignal));
+ qOverload<const QDateTime &, const QDateTime &>(&KOMultiAgendaView::newEventSignal));
connect(d->mMultiAgendaView, &EventViews::EventView::newTodoSignal, this, &BaseView::newTodoSignal);
@@ -151,79 +152,79 @@ MultiAgendaView::MultiAgendaView(CalendarViewBase *calendarView, QWidget *parent
});
}
-MultiAgendaView::~MultiAgendaView() = default;
+KOMultiAgendaView::~KOMultiAgendaView() = default;
-void MultiAgendaView::setModel(QAbstractItemModel *model)
+void KOMultiAgendaView::setModel(QAbstractItemModel *model)
{
KOEventView::setModel(model);
d->mMultiAgendaView->setModel(model);
}
-Akonadi::Item::List MultiAgendaView::selectedIncidences()
+Akonadi::Item::List KOMultiAgendaView::selectedIncidences()
{
return d->mMultiAgendaView->selectedIncidences();
}
-KCalendarCore::DateList MultiAgendaView::selectedIncidenceDates()
+KCalendarCore::DateList KOMultiAgendaView::selectedIncidenceDates()
{
return d->mMultiAgendaView->selectedIncidenceDates();
}
-int MultiAgendaView::currentDateCount() const
+int KOMultiAgendaView::currentDateCount() const
{
return d->mMultiAgendaView->currentDateCount();
}
-void MultiAgendaView::showDates(const QDate &start, const QDate &end, const QDate &)
+void KOMultiAgendaView::showDates(const QDate &start, const QDate &end, const QDate &)
{
d->mMultiAgendaView->showDates(start, end);
}
-void MultiAgendaView::showIncidences(const Akonadi::Item::List &incidenceList, const QDate &date)
+void KOMultiAgendaView::showIncidences(const Akonadi::Item::List &incidenceList, const QDate &date)
{
d->mMultiAgendaView->showIncidences(incidenceList, date);
}
-void MultiAgendaView::updateView()
+void KOMultiAgendaView::updateView()
{
d->mMultiAgendaView->updateView();
}
-Akonadi::Collection::Id MultiAgendaView::collectionId() const
+Akonadi::Collection::Id KOMultiAgendaView::collectionId() const
{
return d->mCollectionId;
}
-void MultiAgendaView::changeIncidenceDisplay(const Akonadi::Item &, Akonadi::IncidenceChanger::ChangeType)
+void KOMultiAgendaView::changeIncidenceDisplay(const Akonadi::Item &, Akonadi::IncidenceChanger::ChangeType)
{
}
-int MultiAgendaView::maxDatesHint() const
+int KOMultiAgendaView::maxDatesHint() const
{
return EventViews::AgendaView::MAX_DAY_COUNT;
}
-void MultiAgendaView::setDateRange(const QDateTime &start, const QDateTime &end, const QDate &)
+void KOMultiAgendaView::setDateRange(const QDateTime &start, const QDateTime &end, const QDate &)
{
d->mMultiAgendaView->setDateRange(start, end);
}
-bool MultiAgendaView::eventDurationHint(QDateTime &startDt, QDateTime &endDt, bool &allDay)
+bool KOMultiAgendaView::eventDurationHint(QDateTime &startDt, QDateTime &endDt, bool &allDay)
{
return d->mMultiAgendaView->eventDurationHint(startDt, endDt, allDay);
}
-void MultiAgendaView::setIncidenceChanger(Akonadi::IncidenceChanger *changer)
+void KOMultiAgendaView::setIncidenceChanger(Akonadi::IncidenceChanger *changer)
{
d->mMultiAgendaView->setIncidenceChanger(changer);
}
-void MultiAgendaView::updateConfig()
+void KOMultiAgendaView::updateConfig()
{
d->mMultiAgendaView->updateConfig();
}
-void MultiAgendaView::setChanges(EventViews::EventView::Changes changes)
+void KOMultiAgendaView::setChanges(EventViews::EventView::Changes changes)
{
// Only ConfigChanged and FilterChanged should go from korg->AgendaView
// All other values are already detected inside AgendaView.
@@ -243,15 +244,15 @@ void MultiAgendaView::setChanges(EventViews::EventView::Changes changes)
d->mMultiAgendaView->setChanges(c | d->mMultiAgendaView->changes());
}
-bool MultiAgendaView::hasConfigurationDialog() const
+bool KOMultiAgendaView::hasConfigurationDialog() const
{
// It has. And it's implemented in korg, not libeventviews.
return true;
}
-void MultiAgendaView::showConfigurationDialog(QWidget *parent)
+void KOMultiAgendaView::showConfigurationDialog(QWidget *parent)
{
- const QPointer<MultiAgendaViewConfigDialog> dlg(new MultiAgendaViewConfigDialog(d->mCollectionSelectionModel, parent));
+ const QPointer<KOMultiAgendaViewConfigDialog> dlg(new KOMultiAgendaViewConfigDialog(d->mCollectionSelectionModel, parent));
dlg->setUseCustomColumns(d->mMultiAgendaView->customColumnSetupUsed());
dlg->setNumberOfColumns(d->mMultiAgendaView->customNumberOfColumns());
@@ -274,31 +275,31 @@ void MultiAgendaView::showConfigurationDialog(QWidget *parent)
delete dlg;
}
-KCheckableProxyModel *MultiAgendaView::takeCustomCollectionSelectionProxyModel()
+KCheckableProxyModel *KOMultiAgendaView::takeCustomCollectionSelectionProxyModel()
{
return d->mMultiAgendaView->takeCustomCollectionSelectionProxyModel();
}
-void MultiAgendaView::setCustomCollectionSelectionProxyModel(KCheckableProxyModel *model)
+void KOMultiAgendaView::setCustomCollectionSelectionProxyModel(KCheckableProxyModel *model)
{
d->mMultiAgendaView->setCustomCollectionSelectionProxyModel(model);
}
-void MultiAgendaView::setCollectionSelectionProxyModel(KCheckableProxyModel *model)
+void KOMultiAgendaView::setCollectionSelectionProxyModel(KCheckableProxyModel *model)
{
d->mCollectionSelectionModel = model;
}
-class KOrg::MultiAgendaViewConfigDialogPrivate
+class KOMultiAgendaViewConfigDialogPrivate
{
public:
- explicit MultiAgendaViewConfigDialogPrivate(QAbstractItemModel *base, MultiAgendaViewConfigDialog *qq)
+ explicit KOMultiAgendaViewConfigDialogPrivate(QAbstractItemModel *base, KOMultiAgendaViewConfigDialog *qq)
: q(qq)
, baseModel(base)
{
}
- ~MultiAgendaViewConfigDialogPrivate()
+ ~KOMultiAgendaViewConfigDialogPrivate()
{
qDeleteAll(newlyCreated);
}
@@ -306,51 +307,51 @@ public:
void setUpColumns(int n);
[[nodiscard]] AkonadiCollectionView *view(int index) const;
AkonadiCollectionView *createView(KCheckableProxyModel *model);
- MultiAgendaViewConfigDialog *const q;
+ KOMultiAgendaViewConfigDialog *const q;
QList<KCheckableProxyModel *> newlyCreated;
QList<KCheckableProxyModel *> selections;
QList<QString> titles;
- Ui::MultiAgendaViewConfigWidget ui;
+ Ui::KOMultiAgendaViewConfigWidget ui;
QStandardItemModel listModel;
QAbstractItemModel *baseModel = nullptr;
int currentColumn = 0;
};
-void MultiAgendaView::restoreConfig(const KConfigGroup &configGroup)
+void KOMultiAgendaView::restoreConfig(const KConfigGroup &configGroup)
{
d->mMultiAgendaView->restoreConfig(configGroup);
}
-void MultiAgendaView::saveConfig(KConfigGroup &configGroup)
+void KOMultiAgendaView::saveConfig(KConfigGroup &configGroup)
{
d->mMultiAgendaView->saveConfig(configGroup);
}
-void MultiAgendaView::calendarAdded(const Akonadi::CollectionCalendar::Ptr &calendar)
+void KOMultiAgendaView::calendarAdded(const Akonadi::CollectionCalendar::Ptr &calendar)
{
d->mMultiAgendaView->addCalendar(calendar);
}
-void MultiAgendaView::calendarRemoved(const Akonadi::CollectionCalendar::Ptr &calendar)
+void KOMultiAgendaView::calendarRemoved(const Akonadi::CollectionCalendar::Ptr &calendar)
{
d->mMultiAgendaView->removeCalendar(calendar);
}
-bool MultiAgendaView::showSideBar()
+bool KOMultiAgendaView::showSideBar()
{
// follow agenda view settings
return KOPrefs::instance()->agendaViewShowSidebar();
}
-void MultiAgendaView::setShowSideBar(bool show)
+void KOMultiAgendaView::setShowSideBar(bool show)
{
// follow agenda view settings
KOPrefs::instance()->setAgendaViewShowSidebar(show);
}
-MultiAgendaViewConfigDialog::MultiAgendaViewConfigDialog(QAbstractItemModel *baseModel, QWidget *parent)
+KOMultiAgendaViewConfigDialog::KOMultiAgendaViewConfigDialog(QAbstractItemModel *baseModel, QWidget *parent)
: QDialog(parent)
- , d(new MultiAgendaViewConfigDialogPrivate(baseModel, this))
+ , d(new KOMultiAgendaViewConfigDialogPrivate(baseModel, this))
{
setWindowTitle(i18nc("@title:window", "Configure Side-By-Side View"));
auto mainLayout = new QVBoxLayout(this);
@@ -360,21 +361,21 @@ MultiAgendaViewConfigDialog::MultiAgendaViewConfigDialog(QAbstractItemModel *bas
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
- connect(buttonBox, &QDialogButtonBox::accepted, this, &MultiAgendaViewConfigDialog::accept);
- connect(buttonBox, &QDialogButtonBox::rejected, this, &MultiAgendaViewConfigDialog::reject);
+ connect(buttonBox, &QDialogButtonBox::accepted, this, &KOMultiAgendaViewConfigDialog::accept);
+ connect(buttonBox, &QDialogButtonBox::rejected, this, &KOMultiAgendaViewConfigDialog::reject);
mainLayout->addWidget(buttonBox);
mainLayout->addWidget(widget);
d->ui.columnList->setModel(&d->listModel);
- connect(d->ui.columnList->selectionModel(), &QItemSelectionModel::currentChanged, this, &MultiAgendaViewConfigDialog::currentChanged);
- connect(d->ui.useCustomRB, &QAbstractButton::toggled, this, &MultiAgendaViewConfigDialog::useCustomToggled);
- connect(d->ui.columnNumberSB, &QSpinBox::valueChanged, this, &MultiAgendaViewConfigDialog::numberOfColumnsChanged);
- connect(d->ui.titleLE, &QLineEdit::textEdited, this, &MultiAgendaViewConfigDialog::titleEdited);
+ connect(d->ui.columnList->selectionModel(), &QItemSelectionModel::currentChanged, this, &KOMultiAgendaViewConfigDialog::currentChanged);
+ connect(d->ui.useCustomRB, &QAbstractButton::toggled, this, &KOMultiAgendaViewConfigDialog::useCustomToggled);
+ connect(d->ui.columnNumberSB, &QSpinBox::valueChanged, this, &KOMultiAgendaViewConfigDialog::numberOfColumnsChanged);
+ connect(d->ui.titleLE, &QLineEdit::textEdited, this, &KOMultiAgendaViewConfigDialog::titleEdited);
d->setUpColumns(d->ui.columnNumberSB->value());
useCustomToggled(false);
}
-void MultiAgendaViewConfigDialog::currentChanged(const QModelIndex &index)
+void KOMultiAgendaViewConfigDialog::currentChanged(const QModelIndex &index)
{
if (!index.isValid()) {
return;
@@ -386,7 +387,7 @@ void MultiAgendaViewConfigDialog::currentChanged(const QModelIndex &index)
d->currentColumn = idx;
}
-void MultiAgendaViewConfigDialog::useCustomToggled(bool on)
+void KOMultiAgendaViewConfigDialog::useCustomToggled(bool on)
{
d->ui.columnList->setEnabled(on);
d->ui.columnNumberLabel->setEnabled(on);
@@ -404,7 +405,7 @@ void MultiAgendaViewConfigDialog::useCustomToggled(bool on)
}
}
-AkonadiCollectionView *MultiAgendaViewConfigDialogPrivate::createView(KCheckableProxyModel *model)
+AkonadiCollectionView *KOMultiAgendaViewConfigDialogPrivate::createView(KCheckableProxyModel *model)
{
auto cview = new AkonadiCollectionView(nullptr, false, q);
cview->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
@@ -412,7 +413,7 @@ AkonadiCollectionView *MultiAgendaViewConfigDialogPrivate::createView(KCheckable
return cview;
}
-void MultiAgendaViewConfigDialogPrivate::setUpColumns(int n)
+void KOMultiAgendaViewConfigDialogPrivate::setUpColumns(int n)
{
Q_ASSERT(n > 0);
const int oldN = selections.size();
@@ -449,7 +450,7 @@ void MultiAgendaViewConfigDialogPrivate::setUpColumns(int n)
auto sortProxy = new QSortFilterProxyModel;
sortProxy->setSourceModel(baseModel);
- sortProxy->setObjectName(QStringLiteral("MultiAgendaColumnSetupProxyModel-%1").arg(i));
+ sortProxy->setObjectName(QStringLiteral("KOMultiAgendaColumnSetupProxyModel-%1").arg(i));
auto columnFilterProxy = new KRearrangeColumnsProxyModel(sortProxy);
columnFilterProxy->setSourceColumns(QList<int>() << Akonadi::ETMCalendar::CollectionTitle);
@@ -458,7 +459,7 @@ void MultiAgendaViewConfigDialogPrivate::setUpColumns(int n)
auto qsm = new QItemSelectionModel(columnFilterProxy, columnFilterProxy);
auto selection = new KCheckableProxyModel;
- selection->setObjectName(QStringLiteral("MultiAgendaColumnCheckableProxy-%1").arg(i));
+ selection->setObjectName(QStringLiteral("KOMultiAgendaColumnCheckableProxy-%1").arg(i));
selection->setSourceModel(columnFilterProxy);
selection->setSelectionModel(qsm);
@@ -472,12 +473,12 @@ void MultiAgendaViewConfigDialogPrivate::setUpColumns(int n)
}
}
-bool MultiAgendaViewConfigDialog::useCustomColumns() const
+bool KOMultiAgendaViewConfigDialog::useCustomColumns() const
{
return d->ui.useCustomRB->isChecked();
}
-void MultiAgendaViewConfigDialog::setUseCustomColumns(bool custom)
+void KOMultiAgendaViewConfigDialog::setUseCustomColumns(bool custom)
{
if (custom) {
d->ui.useCustomRB->setChecked(true);
@@ -486,18 +487,18 @@ void MultiAgendaViewConfigDialog::setUseCustomColumns(bool custom)
}
}
-int MultiAgendaViewConfigDialog::numberOfColumns() const
+int KOMultiAgendaViewConfigDialog::numberOfColumns() const
{
return d->ui.columnNumberSB->value();
}
-void MultiAgendaViewConfigDialog::setNumberOfColumns(int n)
+void KOMultiAgendaViewConfigDialog::setNumberOfColumns(int n)
{
d->ui.columnNumberSB->setValue(n);
d->setUpColumns(n);
}
-KCheckableProxyModel *MultiAgendaViewConfigDialog::takeSelectionModel(int column)
+KCheckableProxyModel *KOMultiAgendaViewConfigDialog::takeSelectionModel(int column)
{
if (column < 0 || column >= d->selections.size()) {
return nullptr;
@@ -508,12 +509,12 @@ KCheckableProxyModel *MultiAgendaViewConfigDialog::takeSelectionModel(int column
return m;
}
-AkonadiCollectionView *MultiAgendaViewConfigDialogPrivate::view(int index) const
+AkonadiCollectionView *KOMultiAgendaViewConfigDialogPrivate::view(int index) const
{
return qobject_cast<AkonadiCollectionView *>(ui.selectionStack->widget(index));
}
-void MultiAgendaViewConfigDialog::setSelectionModel(int column, KCheckableProxyModel *model)
+void KOMultiAgendaViewConfigDialog::setSelectionModel(int column, KCheckableProxyModel *model)
{
Q_ASSERT(column >= 0 && column < d->selections.size());
@@ -534,24 +535,24 @@ void MultiAgendaViewConfigDialog::setSelectionModel(int column, KCheckableProxyM
d->selections[column] = model;
}
-void MultiAgendaViewConfigDialog::titleEdited(const QString &text)
+void KOMultiAgendaViewConfigDialog::titleEdited(const QString &text)
{
d->titles[d->currentColumn] = text;
d->listModel.item(d->currentColumn)->setText(text);
}
-void MultiAgendaViewConfigDialog::numberOfColumnsChanged(int number)
+void KOMultiAgendaViewConfigDialog::numberOfColumnsChanged(int number)
{
d->setUpColumns(number);
}
-QString MultiAgendaViewConfigDialog::columnTitle(int column) const
+QString KOMultiAgendaViewConfigDialog::columnTitle(int column) const
{
Q_ASSERT(column >= 0);
return column >= d->titles.count() ? QString() : d->titles[column];
}
-void MultiAgendaViewConfigDialog::setColumnTitle(int column, const QString &title)
+void KOMultiAgendaViewConfigDialog::setColumnTitle(int column, const QString &title)
{
Q_ASSERT(column >= 0);
d->titles.resize(qMax(d->titles.size(), column + 1));
@@ -562,12 +563,12 @@ void MultiAgendaViewConfigDialog::setColumnTitle(int column, const QString &titl
// TODO update LE if item is selected
}
-void MultiAgendaViewConfigDialog::accept()
+void KOMultiAgendaViewConfigDialog::accept()
{
d->newlyCreated.clear();
QDialog::accept();
}
-MultiAgendaViewConfigDialog::~MultiAgendaViewConfigDialog() = default;
+KOMultiAgendaViewConfigDialog::~KOMultiAgendaViewConfigDialog() = default;
-#include "moc_multiagendaview.cpp"
+#include "moc_komultiagendaview.cpp"
diff --git a/src/views/multiagendaview/multiagendaview.h b/src/views/multiagendaview/komultiagendaview.h
similarity index 83%
rename from src/views/multiagendaview/multiagendaview.h
rename to src/views/multiagendaview/komultiagendaview.h
index 7170f3caf..943df387a 100644
--- a/src/views/multiagendaview/multiagendaview.h
+++ b/src/views/multiagendaview/komultiagendaview.h
@@ -21,17 +21,19 @@
namespace KOrg
{
class CalendarViewBase;
-class MultiAgendaViewPrivate;
+}
+
+class KOMultiAgendaViewPrivate;
/**
Shows one agenda for every resource side-by-side.
*/
-class MultiAgendaView : public KOEventView
+class KOMultiAgendaView : public KOEventView
{
Q_OBJECT
public:
- explicit MultiAgendaView(CalendarViewBase *calendarView, QWidget *parent = nullptr);
- ~MultiAgendaView() override;
+ explicit KOMultiAgendaView(KOrg::CalendarViewBase *calendarView, QWidget *parent = nullptr);
+ ~KOMultiAgendaView() override;
void setModel(QAbstractItemModel *model) override;
@@ -84,17 +86,17 @@ public Q_SLOTS:
void calendarRemoved(const Akonadi::CollectionCalendar::Ptr &calendar) override;
private:
- std::unique_ptr<MultiAgendaViewPrivate> const d;
+ std::unique_ptr<KOMultiAgendaViewPrivate> const d;
};
-class MultiAgendaViewConfigDialogPrivate;
+class KOMultiAgendaViewConfigDialogPrivate;
-class MultiAgendaViewConfigDialog : public QDialog, public EventViews::ConfigDialogInterface
+class KOMultiAgendaViewConfigDialog : public QDialog, public EventViews::ConfigDialogInterface
{
Q_OBJECT
public:
- explicit MultiAgendaViewConfigDialog(QAbstractItemModel *baseModel, QWidget *parent = nullptr);
- ~MultiAgendaViewConfigDialog() override;
+ explicit KOMultiAgendaViewConfigDialog(QAbstractItemModel *baseModel, QWidget *parent = nullptr);
+ ~KOMultiAgendaViewConfigDialog() override;
bool useCustomColumns() const override;
void setUseCustomColumns(bool);
@@ -120,6 +122,5 @@ private Q_SLOTS:
void titleEdited(const QString &text);
private:
- std::unique_ptr<MultiAgendaViewConfigDialogPrivate> const d;
+ std::unique_ptr<KOMultiAgendaViewConfigDialogPrivate> const d;
};
-}
diff --git a/src/views/multiagendaview/multiagendaviewconfigwidget.ui b/src/views/multiagendaview/komultiagendaviewconfigwidget.ui
similarity index 96%
rename from src/views/multiagendaview/multiagendaviewconfigwidget.ui
rename to src/views/multiagendaview/komultiagendaviewconfigwidget.ui
index f6ccc559a..fd4335304 100644
--- a/src/views/multiagendaview/multiagendaviewconfigwidget.ui
+++ b/src/views/multiagendaview/komultiagendaviewconfigwidget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MultiAgendaViewConfigWidget</class>
- <widget class="QWidget" name="MultiAgendaViewConfigWidget">
+ <class>KOMultiAgendaViewConfigWidget</class>
+ <widget class="QWidget" name="KOMultiAgendaViewConfigWidget">
<property name="geometry">
<rect>
<x>0</x>