[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [eventviews] /: GIT_SILENT: coding style (silent)
From: Montel Laurent <null () kde ! org>
Date: 2017-10-31 21:32:34
Message-ID: E1e9e9C-0007GG-PD () code ! kde ! org
[Download RAW message or body]
Git commit 1a1add32bed69c9381b1d590e1557db64e753609 by Montel Laurent.
Committed on 31/10/2017 at 21:32.
Pushed by mlaurent into branch 'master'.
GIT_SILENT: coding style
M +163 -122 src/agenda/agenda.cpp
M +14 -17 src/agenda/agenda.h
M +106 -77 src/agenda/agendaitem.cpp
M +5 -14 src/agenda/agendaitem.h
M +145 -128 src/agenda/agendaview.cpp
M +12 -24 src/agenda/agendaview.h
M +5 -2 src/agenda/alternatelabel.cpp
M +1 -4 src/agenda/alternatelabel.h
M +13 -10 src/agenda/calendardecoration.cpp
M +6 -12 src/agenda/calendardecoration.h
M +18 -17 src/agenda/decorationlabel.cpp
M +3 -8 src/agenda/decorationlabel.h
M +24 -21 src/agenda/timelabels.cpp
M +3 -5 src/agenda/timelabels.h
M +4 -5 src/agenda/timelabelszone.cpp
M +1 -5 src/agenda/timelabelszone.h
M +26 -18 src/agenda/timescaleconfigdialog.cpp
M +1 -4 src/agenda/timescaleconfigdialog.h
M +2 -1 src/agenda/viewcalendar.cpp
M +2 -6 src/agenda/viewcalendar.h
M +15 -18 src/eventview.cpp
M +7 -15 src/eventview.h
M +16 -14 src/eventview_p.cpp
M +1 -4 src/eventview_p.h
M +10 -6 src/helper.cpp
M +6 -10 src/helper.h
M +10 -9 src/journal/journalframe.cpp
M +3 -6 src/journal/journalframe.h
M +6 -4 src/journal/journalview.cpp
M +8 -9 src/journal/journalview.h
M +60 -47 src/list/listview.cpp
M +3 -6 src/list/listview.h
M +23 -23 src/month/monthgraphicsitems.cpp
M +3 -4 src/month/monthgraphicsitems.h
M +74 -65 src/month/monthitem.cpp
M +11 -16 src/month/monthitem.h
M +45 -45 src/month/monthscene.cpp
M +12 -7 src/month/monthscene.h
M +46 -46 src/month/monthview.cpp
M +5 -6 src/month/monthview.h
M +4 -5 src/multiagenda/configdialoginterface.h
M +29 -23 src/multiagenda/multiagendaview.cpp
M +4 -6 src/multiagenda/multiagendaview.h
M +76 -52 src/prefs.cpp
M +1 -5 src/prefs.h
M +15 -8 src/timeline/timelineitem.cpp
M +4 -8 src/timeline/timelineitem.h
M +24 -26 src/timeline/timelineview.cpp
M +1 -5 src/timeline/timelineview.h
M +27 -23 src/timeline/timelineview_p.cpp
M +2 -7 src/timeline/timelineview_p.h
M +45 -25 src/todo/incidencetreemodel.cpp
M +3 -1 src/todo/incidencetreemodel_p.h
M +34 -51 src/todo/tododelegates.cpp
M +6 -12 src/todo/tododelegates.h
M +74 -64 src/todo/todomodel.cpp
M +2 -2 src/todo/todomodel.h
M +1 -2 src/todo/todomodel_p.h
M +117 -98 src/todo/todoview.cpp
M +11 -17 src/todo/todoview.h
M +0 -1 src/todo/todoviewquickaddline.cpp
M +3 -1 src/todo/todoviewquickaddline.h
M +10 -9 src/todo/todoviewquicksearch.cpp
M +5 -5 src/todo/todoviewquicksearch.h
M +37 -39 src/todo/todoviewsortfilterproxymodel.cpp
M +14 -12 src/todo/todoviewview.cpp
M +6 -4 src/viewerapp/main.cpp
M +7 -7 src/viewerapp/mainwindow.cpp
M +2 -4 src/viewerapp/mainwindow.h
M +31 -23 src/whatsnext/whatsnextview.cpp
M +7 -7 src/whatsnext/whatsnextview.h
M +2 -2 tests/createcolorgui_test.cpp
https://commits.kde.org/eventviews/1a1add32bed69c9381b1d590e1557db64e753609
diff --git a/src/agenda/agenda.cpp b/src/agenda/agenda.cpp
index efdc2da..063f71e 100644
--- a/src/agenda/agenda.cpp
+++ b/src/agenda/agenda.cpp
@@ -66,8 +66,11 @@ class Q_DECL_HIDDEN MarcusBains::Private
{
public:
Private(EventView *eventView, Agenda *agenda)
- : mEventView(eventView), mAgenda(agenda),
- mTimer(nullptr), mTimeBox(nullptr), mOldTodayCol(-1)
+ : mEventView(eventView)
+ , mAgenda(agenda)
+ , mTimer(nullptr)
+ , mTimeBox(nullptr)
+ , mOldTodayCol(-1)
{
}
@@ -99,7 +102,8 @@ int MarcusBains::Private::todayColumn() const
}
MarcusBains::MarcusBains(EventView *eventView, Agenda *agenda)
- : QFrame(agenda), d(new Private(eventView, agenda))
+ : QFrame(agenda)
+ , d(new Private(eventView, agenda))
{
d->mTimeBox = new QLabel(d->mAgenda);
d->mTimeBox->setAlignment(Qt::AlignRight | Qt::AlignBottom);
@@ -175,7 +179,9 @@ void MarcusBains::updateLocationRecalc(bool recalculate)
QPalette pal1 = d->mTimeBox->palette();
pal1.setColor(QPalette::WindowText, color);
d->mTimeBox->setPalette(pal1);
- d->mTimeBox->setText(QLocale::system().toString(time, showSeconds ? \
QLocale::LongFormat : QLocale::ShortFormat)); + \
d->mTimeBox->setText(QLocale::system().toString(time, + \
showSeconds ? QLocale::LongFormat : QLocale:: + \
ShortFormat)); d->mTimeBox->adjustSize();
if (y - d->mTimeBox->height() >= 0) {
y -= d->mTimeBox->height();
@@ -202,16 +208,34 @@ void MarcusBains::updateLocationRecalc(bool recalculate)
class Q_DECL_HIDDEN Agenda::Private
{
public:
- Private(AgendaView *agendaView, QScrollArea *scrollArea,
- int columns, int rows, int rowSize, bool isInteractive)
- : mAgendaView(agendaView), mScrollArea(scrollArea), mAllDayMode(false),
- mColumns(columns), mRows(rows), mGridSpacingX(0.0), \
mGridSpacingY(rowSize),
- mDesiredGridSpacingY(rowSize), mChanger(nullptr),
- mResizeBorderWidth(0), mScrollBorderWidth(0), mScrollDelay(0), \
mScrollOffset(0),
- mWorkingHoursEnable(false), mHolidayMask(nullptr), mWorkingHoursYTop(0),
- mWorkingHoursYBottom(0), mHasSelection(0), mSelectedId(-1), \
mMarcusBains(nullptr),
- mActionType(Agenda::NOP), mItemMoved(false), mOldLowerScrollValue(0),
- mOldUpperScrollValue(0), mReturnPressed(false), \
mIsInteractive(isInteractive) + Private(AgendaView *agendaView, QScrollArea \
*scrollArea, int columns, int rows, int rowSize, + bool isInteractive)
+ : mAgendaView(agendaView)
+ , mScrollArea(scrollArea)
+ , mAllDayMode(false)
+ , mColumns(columns)
+ , mRows(rows)
+ , mGridSpacingX(0.0)
+ , mGridSpacingY(rowSize)
+ , mDesiredGridSpacingY(rowSize)
+ , mChanger(nullptr)
+ , mResizeBorderWidth(0)
+ , mScrollBorderWidth(0)
+ , mScrollDelay(0)
+ , mScrollOffset(0)
+ , mWorkingHoursEnable(false)
+ , mHolidayMask(nullptr)
+ , mWorkingHoursYTop(0)
+ , mWorkingHoursYBottom(0)
+ , mHasSelection(0)
+ , mSelectedId(-1)
+ , mMarcusBains(nullptr)
+ , mActionType(Agenda::NOP)
+ , mItemMoved(false)
+ , mOldLowerScrollValue(0)
+ , mOldUpperScrollValue(0)
+ , mReturnPressed(false)
+ , mIsInteractive(isInteractive)
{
if (mGridSpacingY < 4 || mGridSpacingY > 30) {
mGridSpacingY = 10;
@@ -318,10 +342,10 @@ public:
/*
Create an agenda widget with rows rows and columns columns.
*/
-Agenda::Agenda(AgendaView *agendaView, QScrollArea *scrollArea,
- int columns, int rows, int rowSize, bool isInteractive)
- : QWidget(scrollArea),
- d(new Private(agendaView, scrollArea, columns, rows, rowSize, isInteractive))
+Agenda::Agenda(AgendaView *agendaView, QScrollArea *scrollArea, int columns, int \
rows, int rowSize, + bool isInteractive)
+ : QWidget(scrollArea)
+ , d(new Private(agendaView, scrollArea, columns, rows, rowSize, isInteractive))
{
setMouseTracking(true);
@@ -332,10 +356,10 @@ Agenda::Agenda(AgendaView *agendaView, QScrollArea *scrollArea,
Create an agenda widget with columns columns and one row. This is used for
all-day events.
*/
-Agenda::Agenda(AgendaView *agendaView, QScrollArea *scrollArea,
- int columns, bool isInteractive)
- : QWidget(scrollArea), d(new Private(agendaView, scrollArea, columns, 1, 24,
- isInteractive))
+Agenda::Agenda(AgendaView *agendaView, QScrollArea *scrollArea, int columns, bool \
isInteractive) + : QWidget(scrollArea)
+ , d(new Private(agendaView, scrollArea, columns, 1, 24,
+ isInteractive))
{
d->mAllDayMode = true;
@@ -572,7 +596,8 @@ bool Agenda::eventFilter_drag(QObject *obj, QDropEvent *de)
case QEvent::DragLeave:
return false;
break;
- case QEvent::Drop: {
+ case QEvent::Drop:
+ {
if (!CalendarSupport::canDecode(md)) {
return false;
}
@@ -597,8 +622,8 @@ bool Agenda::eventFilter_drag(QObject *obj, QDropEvent *de)
Q_EMIT droppedIncidences(incidences, gridPosition, d->mAllDayMode);
}
return true;
+ break;
}
- break;
case QEvent::DragResponse:
default:
@@ -615,7 +640,7 @@ bool Agenda::eventFilter_wheel(QObject *object, QWheelEvent *e)
bool accepted = false;
if ((e->modifiers() & Qt::ShiftModifier) == Qt::ShiftModifier) {
if (object != this) {
- viewportPos = ((QWidget *) object)->mapToParent(e->pos());
+ viewportPos = ((QWidget *)object)->mapToParent(e->pos());
} else {
viewportPos = e->pos();
}
@@ -640,6 +665,7 @@ bool Agenda::eventFilter_wheel(QObject *object, QWheelEvent *e)
}
return accepted;
}
+
#endif
bool Agenda::eventFilter_key(QObject *, QKeyEvent *ke)
@@ -656,7 +682,7 @@ bool Agenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
viewportPos = me->pos();
}
- switch (me->type()) {
+ switch (me->type()) {
case QEvent::MouseButtonPress:
if (object != this) {
if (me->button() == Qt::RightButton) {
@@ -719,7 +745,8 @@ bool Agenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
Q_EMIT mousePosSignal(gridToContents(contentsToGrid(viewportPos)));
break;
- case QEvent::MouseMove: {
+ case QEvent::MouseMove:
+ {
if (!d->mIsInteractive) {
return true;
}
@@ -729,7 +756,8 @@ bool Agenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
QPoint indicatorPos = gridToContents(contentsToGrid(viewportPos));
if (object != this) {
AgendaItem::QPtr moveItem = qobject_cast<AgendaItem *>(object);
- KCalCore::Incidence::Ptr incidence = moveItem ? moveItem->incidence() : \
KCalCore::Incidence::Ptr(); + KCalCore::Incidence::Ptr incidence
+ = moveItem ? moveItem->incidence() : KCalCore::Incidence::Ptr();
if (incidence && !incidence->isReadOnly()) {
if (!d->mActionItem) {
setNoActionCursor(moveItem, viewportPos);
@@ -743,14 +771,12 @@ bool Agenda::eventFilter_mouse(QObject *object, QMouseEvent \
*me) firstItem = d->mActionItem;
}
indicatorPos = gridToContents(
- QPoint(firstItem->cellXLeft(), \
firstItem->cellYTop()));
-
+ QPoint(firstItem->cellXLeft(), firstItem->cellYTop()));
} else if (d->mActionType == RESIZEBOTTOM) {
// RESIZETOP is handled correctly, only resizebottom works \
differently indicatorPos = gridToContents(
- QPoint(d->mActionItem->cellXLeft(), \
d->mActionItem->cellYBottom() + 1)); + \
QPoint(d->mActionItem->cellXLeft(), d->mActionItem->cellYBottom() + 1)); }
-
} // If we have an action item
} // If move item && !read only
} else {
@@ -758,9 +784,9 @@ bool Agenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
performSelectAction(viewportPos);
// show cursor at end of timespan
- if (((d->mStartCell.y() < d->mEndCell.y()) &&
- (d->mEndCell.x() >= d->mStartCell.x())) ||
- (d->mEndCell.x() > d->mStartCell.x())) {
+ if (((d->mStartCell.y() < d->mEndCell.y())
+ && (d->mEndCell.x() >= d->mStartCell.x()))
+ || (d->mEndCell.x() > d->mStartCell.x())) {
indicatorPos = gridToContents(QPoint(d->mEndCell.x(), \
d->mEndCell.y() + 1)); } else {
indicatorPos = gridToContents(d->mEndCell);
@@ -797,11 +823,11 @@ bool Agenda::ptInSelection(const QPoint &gpos) const
return false;
} else if (gpos.x() < d->mSelectionStartCell.x() || gpos.x() > \
d->mSelectionEndCell.x()) { return false;
- } else if ((gpos.x() == d->mSelectionStartCell.x()) &&
- (gpos.y() < d->mSelectionStartCell.y())) {
+ } else if ((gpos.x() == d->mSelectionStartCell.x())
+ && (gpos.y() < d->mSelectionStartCell.y())) {
return false;
- } else if ((gpos.x() == d->mSelectionEndCell.x()) &&
- (gpos.y() > d->mSelectionEndCell.y())) {
+ } else if ((gpos.x() == d->mSelectionEndCell.x())
+ && (gpos.y() > d->mSelectionEndCell.y())) {
return false;
}
return true;
@@ -815,7 +841,7 @@ void Agenda::startSelectAction(const QPoint &viewportPos)
d->mSelectionStartPoint = viewportPos;
d->mHasSelection = true;
- QPoint pos = viewportPos;
+ QPoint pos = viewportPos;
QPoint gpos = contentsToGrid(pos);
// Store new selection
@@ -834,8 +860,8 @@ void Agenda::performSelectAction(const QPoint &pos)
// Scroll if cursor was moved to upper or lower end of agenda.
if (pos.y() - contentsY() < d->mScrollBorderWidth && contentsY() > 0) {
d->mScrollUpTimer.start(d->mScrollDelay);
- } else if (contentsY() + d->mScrollArea->viewport()->height() -
- d->mScrollBorderWidth < pos.y()) {
+ } else if (contentsY() + d->mScrollArea->viewport()->height()
+ -d->mScrollBorderWidth < pos.y()) {
d->mScrollDownTimer.start(d->mScrollDelay);
} else {
d->mScrollUpTimer.stop();
@@ -844,8 +870,8 @@ void Agenda::performSelectAction(const QPoint &pos)
if (gpos != d->mEndCell) {
d->mEndCell = gpos;
- if (d->mStartCell.x() > d->mEndCell.x() ||
- (d->mStartCell.x() == d->mEndCell.x() && d->mStartCell.y() > \
d->mEndCell.y())) { + if (d->mStartCell.x() > d->mEndCell.x()
+ || (d->mStartCell.x() == d->mEndCell.x() && d->mStartCell.y() > \
d->mEndCell.y())) { // backward selection
d->mSelectionStartCell = d->mEndCell;
d->mSelectionEndCell = d->mStartCell;
@@ -868,23 +894,22 @@ void Agenda::endSelectAction(const QPoint ¤tPos)
Q_EMIT newTimeSpanSignal(d->mSelectionStartCell, d->mSelectionEndCell);
if (d->preferences()->selectionStartsEditor()) {
- if ((d->mSelectionStartPoint - currentPos).manhattanLength() >
- QApplication::startDragDistance()) {
+ if ((d->mSelectionStartPoint - currentPos).manhattanLength()
+ > QApplication::startDragDistance()) {
Q_EMIT newEventSignal();
}
}
}
-Agenda::MouseActionType Agenda::isInResizeArea(bool horizontal,
- const QPoint &pos,
- const AgendaItem::QPtr &item)
+Agenda::MouseActionType Agenda::isInResizeArea(bool horizontal, const QPoint &pos,
+ const AgendaItem::QPtr &item)
{
if (!item) {
return NOP;
}
QPoint gridpos = contentsToGrid(pos);
QPoint contpos = gridToContents(
- gridpos + QPoint((QApplication::isRightToLeft()) ? 1 : 0, \
0)); + gridpos + QPoint((QApplication::isRightToLeft()) ? 1 : 0, 0));
if (horizontal) {
int clXLeft = item->cellXLeft();
@@ -901,8 +926,8 @@ Agenda::MouseActionType Agenda::isInResizeArea(bool horizontal,
} else {
return RESIZELEFT;
}
- } else if ((d->mGridSpacingX - gridDistanceX) < d->mResizeBorderWidth &&
- clXRight == gridpos.x()) {
+ } else if ((d->mGridSpacingX - gridDistanceX) < d->mResizeBorderWidth
+ && clXRight == gridpos.x()) {
if (QApplication::isRightToLeft()) {
return RESIZELEFT;
} else {
@@ -913,11 +938,11 @@ Agenda::MouseActionType Agenda::isInResizeArea(bool horizontal,
}
} else {
int gridDistanceY = int(pos.y() - contpos.y());
- if (gridDistanceY < d->mResizeBorderWidth &&
- item->cellYTop() == gridpos.y() && !item->firstMultiItem()) {
+ if (gridDistanceY < d->mResizeBorderWidth
+ && item->cellYTop() == gridpos.y() && !item->firstMultiItem()) {
return RESIZETOP;
- } else if ((d->mGridSpacingY - gridDistanceY) < d->mResizeBorderWidth &&
- item->cellYBottom() == gridpos.y() && !item->lastMultiItem()) {
+ } else if ((d->mGridSpacingY - gridDistanceY) < d->mResizeBorderWidth
+ && item->cellYBottom() == gridpos.y() && !item->lastMultiItem()) \
{ return RESIZEBOTTOM;
} else {
return MOVE;
@@ -949,8 +974,8 @@ void Agenda::performItemAction(const QPoint &pos)
// Cursor left active agenda area.
// This starts a drag.
- if (pos.y() < 0 || pos.y() >= contentsY() + d->mScrollArea->viewport()->height() \
||
- pos.x() < 0 || pos.x() >= width()) {
+ if (pos.y() < 0 || pos.y() >= contentsY() + d->mScrollArea->viewport()->height()
+ || pos.x() < 0 || pos.x() >= width()) {
if (d->mActionType == MOVE) {
d->mScrollUpTimer.stop();
d->mScrollDownTimer.stop();
@@ -976,8 +1001,8 @@ void Agenda::performItemAction(const QPoint &pos)
const int distanceToTop = pos.y() - contentsY();
if (distanceToTop < d->mScrollBorderWidth && distanceToTop > \
-d->mScrollBorderWidth) { d->mScrollUpTimer.start(d->mScrollDelay);
- } else if (contentsY() + d->mScrollArea->viewport()->height() -
- d->mScrollBorderWidth < pos.y()) {
+ } else if (contentsY() + d->mScrollArea->viewport()->height()
+ -d->mScrollBorderWidth < pos.y()) {
d->mScrollDownTimer.start(d->mScrollDelay);
} else {
d->mScrollUpTimer.stop();
@@ -991,7 +1016,8 @@ void Agenda::performItemAction(const QPoint &pos)
KMessageBox::information(this,
i18n("Unable to lock item for modification. \
"
"You cannot make any changes."),
- i18n("Locking Failed"), \
QStringLiteral("AgendaLockingFailed")); + \
i18n("Locking Failed"), + \
QStringLiteral("AgendaLockingFailed")); d->mScrollUpTimer.stop();
d->mScrollDownTimer.stop();
d->mActionItem->resetMove();
@@ -1036,18 +1062,22 @@ void Agenda::performItemAction(const QPoint &pos)
// cell's y values are first and last cell of the bar,
// so if newY=-1, they need to be the same
if (newFirst) {
- newFirst->setCellXY(moveItem->cellXLeft() - 1, rows() + \
newY, rows() - 1); + \
newFirst->setCellXY(moveItem->cellXLeft() - 1, rows() + newY, + \
rows() - 1); d->mItems.append(newFirst);
moveItem->resize(int(d->mGridSpacingX * \
newFirst->cellWidth()),
int(d->mGridSpacingY * \
newFirst->cellHeight())); QPoint cpos = gridToContents(
- QPoint(newFirst->cellXLeft(), \
newFirst->cellYTop())); + \
QPoint(newFirst->cellXLeft(), newFirst->cellYTop())); newFirst->setParent(this);
newFirst->move(cpos.x(), cpos.y());
} else {
- newFirst = insertItem(moveItem->incidence(), \
moveItem->occurrenceDateTime(),
- moveItem->cellXLeft() - 1, rows() \
+ newY, rows() - 1,
- moveItem->itemPos(), \
moveItem->itemCount(), false); + newFirst = insertItem(
+ moveItem->incidence(), \
moveItem->occurrenceDateTime(), + \
moveItem->cellXLeft() - 1, rows() + newY, + rows() - \
1, + moveItem->itemPos(), moveItem->itemCount(),
+ false);
}
if (newFirst) {
newFirst->show();
@@ -1092,13 +1122,15 @@ void Agenda::performItemAction(const QPoint &pos)
d->mItems.append(newLast);
moveItem->resize(int(d->mGridSpacingX * \
newLast->cellWidth()),
int(d->mGridSpacingY * \
newLast->cellHeight()));
- QPoint cpos = \
gridToContents(QPoint(newLast->cellXLeft(), newLast->cellYTop())); + \
QPoint cpos + = \
gridToContents(QPoint(newLast->cellXLeft(), newLast->cellYTop())); \
newLast->setParent(this); newLast->move(cpos.x(), cpos.y());
} else {
- newLast = insertItem(moveItem->incidence(), \
moveItem->occurrenceDateTime(),
- moveItem->cellXLeft() + 1, 0, newY \
- rows() - 1,
- moveItem->itemPos(), \
moveItem->itemCount(), false); + newLast = insertItem(
+ moveItem->incidence(), \
moveItem->occurrenceDateTime(), + \
moveItem->cellXLeft() + 1, 0, newY - rows() - 1, + \
moveItem->itemPos(), moveItem->itemCount(), false); }
moveItem->appendMoveItem(newLast);
newLast->show();
@@ -1160,8 +1192,8 @@ void Agenda::endItemAction()
KCalCore::Incidence::Ptr incidence = d->mActionItem->incidence();
const auto recurrenceId = d->mActionItem->occurrenceDateTime();
- d->mItemMoved = d->mItemMoved && !(d->mStartCell.x() == d->mEndCell.x() &&
- d->mStartCell.y() == d->mEndCell.y());
+ d->mItemMoved = d->mItemMoved && !(d->mStartCell.x() == d->mEndCell.x()
+ && d->mStartCell.y() == d->mEndCell.y());
bool addIncidence = false;
if (d->mItemMoved) {
@@ -1174,7 +1206,7 @@ void Agenda::endItemAction()
if (CalendarSupport::hasEvent(incidence)) {
mainIncidence = cal->event(incidence->uid());
} else if (CalendarSupport::hasTodo(incidence)) {
- mainIncidence = cal->todo(incidence->uid());
+ mainIncidence = cal->todo(incidence->uid());
}
incidence = mainIncidence;
}
@@ -1189,7 +1221,8 @@ void Agenda::endItemAction()
modify = true;
break;
case KCalUtils::RecurrenceActions::SelectedOccurrence:
- case KCalUtils::RecurrenceActions::FutureOccurrences: {
+ case KCalUtils::RecurrenceActions::FutureOccurrences:
+ {
const bool thisAndFuture = (res == \
KCalUtils::RecurrenceActions::FutureOccurrences); modify = true;
multiModify = true;
@@ -1202,7 +1235,8 @@ void Agenda::endItemAction()
if (newItem.isValid() && newItem != item) { //it is \
not a new exception item = newItem;
- newInc->setCustomProperty("VOLATILE", "AKONADI-ID", \
QString::number(newItem.id())); + \
newInc->setCustomProperty("VOLATILE", "AKONADI-ID", + \
QString::number(newItem.id())); addIncidence = false;
} else {
addIncidence = true;
@@ -1322,7 +1356,8 @@ void Agenda::setActionCursor(int actionType, bool acting)
void Agenda::setNoActionCursor(const AgendaItem::QPtr &moveItem, const QPoint &pos)
{
- const KCalCore::Incidence::Ptr item = moveItem ? moveItem->incidence() : \
KCalCore::Incidence::Ptr(); + const KCalCore::Incidence::Ptr item
+ = moveItem ? moveItem->incidence() : KCalCore::Incidence::Ptr();
const bool noResize = CalendarSupport::hasTodo(item);
@@ -1373,7 +1408,7 @@ void Agenda::placeAgendaItem(const AgendaItem::QPtr &item, \
double subCellWidth)
QPoint pt = gridToContents(QPoint(item->cellXLeft(), item->cellYTop()));
// right lower corner
QPoint pt1 = gridToContents(
- QPoint(item->cellXLeft() + item->cellWidth(), \
item->cellYBottom() + 1)); + QPoint(item->cellXLeft() + item->cellWidth(), \
item->cellYBottom() + 1));
double subCellPos = item->subCell() * subCellWidth;
@@ -1441,7 +1476,8 @@ void Agenda::placeSubCells(const AgendaItem::QPtr &placeItem)
}
}
- QList<CalendarSupport::CellItem *> items = \
CalendarSupport::CellItem::placeItem(cells, placeItem); + \
QList<CalendarSupport::CellItem *> items + = \
CalendarSupport::CellItem::placeItem(cells, placeItem);
placeItem->setConflictItems(QList<AgendaItem::QPtr>());
double newSubCellWidth = calcSubCellWidth(placeItem);
@@ -1527,15 +1563,15 @@ void Agenda::drawContents(QPainter *p, int cx, int cy, int \
cw, int ch)
if (pt2.y() < pt1.y()) {
// overnight working hours
- if (((gxStart == 0) && \
!d->mHolidayMask->at(d->mHolidayMask->count() - 1)) ||
- ((gxStart > 0) && (gxStart < \
int(d->mHolidayMask->count())) &&
- (!d->mHolidayMask->at(gxStart - 1)))) {
+ if (((gxStart == 0) && \
!d->mHolidayMask->at(d->mHolidayMask->count() - 1)) + || \
((gxStart > 0) && (gxStart < int(d->mHolidayMask->count())) + \
&& (!d->mHolidayMask->at(gxStart - 1)))) { if (pt2.y() > cy) {
dbp.fillRect(xStart, cy, xWidth, pt2.y() - cy + 1, \
workColor); }
}
- if ((gxStart < int(d->mHolidayMask->count() - 1)) &&
- (!d->mHolidayMask->at(gxStart))) {
+ if ((gxStart < int(d->mHolidayMask->count() - 1))
+ && (!d->mHolidayMask->at(gxStart))) {
if (pt1.y() < cy + ch - 1) {
dbp.fillRect(xStart, pt1.y(), xWidth, cy + ch - pt1.y() \
+ 1, workColor); }
@@ -1543,7 +1579,8 @@ void Agenda::drawContents(QPainter *p, int cx, int cy, int cw, \
int ch) } else {
// last entry in holiday mask denotes the previous day not \
visible // (needed for overnight shifts)
- if (gxStart < int(d->mHolidayMask->count() - 1) && \
!d->mHolidayMask->at(gxStart)) { + if (gxStart < \
int(d->mHolidayMask->count() - 1) + && \
!d->mHolidayMask->at(gxStart)) {
dbp.fillRect(xStart, pt1.y(), xWidth, pt2.y() - pt1.y() + 1, \
workColor); }
}
@@ -1556,7 +1593,7 @@ void Agenda::drawContents(QPainter *p, int cx, int cy, int cw, \
int ch) if (d->preferences()->colorAgendaBusyDays() && !d->mAllDayMode) {
for (int i = 0; i < busyDayMask.count(); ++i) {
if (busyDayMask[i]) {
- const QPoint pt1(cx + d->mGridSpacingX * i, 0);
+ const QPoint pt1(cx + d->mGridSpacingX *i, 0);
// const QPoint pt2(cx + mGridSpacingX * (i+1), ch);
QColor busyColor = d->preferences()->viewBgBusyColor();
busyColor.setAlpha(EventViews::BUSY_BACKGROUND_ALPHA);
@@ -1622,8 +1659,8 @@ void Agenda::drawContents(QPainter *p, int cx, int cy, int cw, \
int ch)
*/
QPoint Agenda::contentsToGrid(const QPoint &pos) const
{
- int gx = int(QApplication::isRightToLeft() ?
- d->mColumns - pos.x() / d->mGridSpacingX : pos.x() / \
d->mGridSpacingX); + int gx = int(QApplication::isRightToLeft()
+ ? d->mColumns - pos.x() / d->mGridSpacingX : pos.x() / \
d->mGridSpacingX); int gy = int(pos.y() / d->mGridSpacingY);
return QPoint(gx, gy);
}
@@ -1633,8 +1670,8 @@ QPoint Agenda::contentsToGrid(const QPoint &pos) const
*/
QPoint Agenda::gridToContents(const QPoint &gpos) const
{
- int x = int(QApplication::isRightToLeft() ?
- (d->mColumns - gpos.x()) * d->mGridSpacingX : gpos.x() * \
d->mGridSpacingX); + int x = int(QApplication::isRightToLeft()
+ ? (d->mColumns - gpos.x()) * d->mGridSpacingX : gpos.x() * \
d->mGridSpacingX); int y = int(gpos.y() * d->mGridSpacingY);
return QPoint(x, y);
}
@@ -1645,7 +1682,6 @@ QPoint Agenda::gridToContents(const QPoint &gpos) const
*/
int Agenda::timeToY(const QTime &time) const
{
-
int minutesPerCell = 24 * 60 / d->mRows;
int timeMinutes = time.hour() * 60 + time.minute();
int Y = (timeMinutes + (minutesPerCell / 2)) / minutesPerCell;
@@ -1712,20 +1748,19 @@ QVector<int> Agenda::maxContentsY() const
void Agenda::setStartTime(const QTime &startHour)
{
- const double startPos =
- (startHour.hour() / 24. + startHour.minute() / 1440. + startHour.second() / \
86400.) *
- d->mRows * gridSpacingY();
+ const double startPos
+ = (startHour.hour() / 24. + startHour.minute() / 1440. + startHour.second() \
/ 86400.) + *d->mRows * gridSpacingY();
verticalScrollBar()->setValue(startPos);
-
}
/*
Insert AgendaItem into agenda.
*/
-AgendaItem::QPtr Agenda::insertItem(const KCalCore::Incidence::Ptr &incidence, const \
QDateTime &recurrenceId,
- int X, int YTop, int YBottom, int itemPos, int \
itemCount,
- bool isSelected)
+AgendaItem::QPtr Agenda::insertItem(const KCalCore::Incidence::Ptr &incidence,
+ const QDateTime &recurrenceId, int X, int YTop, \
int YBottom, + int itemPos, int itemCount, bool \
isSelected) {
if (d->mAllDayMode) {
qCDebug(CALENDARVIEW_LOG) << "using this in all-day mode is illegal.";
@@ -1734,7 +1769,8 @@ AgendaItem::QPtr Agenda::insertItem(const \
KCalCore::Incidence::Ptr &incidence, c
d->mActionType = NOP;
- AgendaItem::QPtr agendaItem = createAgendaItem(incidence, itemPos, itemCount, \
recurrenceId, isSelected); + AgendaItem::QPtr agendaItem = \
createAgendaItem(incidence, itemPos, itemCount, recurrenceId, + \
isSelected); if (!agendaItem) {
return AgendaItem::QPtr();
}
@@ -1744,10 +1780,10 @@ AgendaItem::QPtr Agenda::insertItem(const \
KCalCore::Incidence::Ptr &incidence, c YBottom = YTop;
}
- agendaItem->resize(int((X + 1) * d->mGridSpacingX) -
- int(X * d->mGridSpacingX),
- int(YTop * d->mGridSpacingY) -
- int((YBottom + 1) * d->mGridSpacingY));
+ agendaItem->resize(int((X + 1) * d->mGridSpacingX)
+ -int(X * d->mGridSpacingX),
+ int(YTop * d->mGridSpacingY)
+ -int((YBottom + 1) * d->mGridSpacingY));
agendaItem->setCellXY(X, YTop, YBottom);
agendaItem->setCellXRight(X);
agendaItem->setResourceColor(d->mCalendar->resourceColor(incidence));
@@ -1769,8 +1805,9 @@ AgendaItem::QPtr Agenda::insertItem(const \
KCalCore::Incidence::Ptr &incidence, c /*
Insert all-day AgendaItem into agenda.
*/
-AgendaItem::QPtr Agenda::insertAllDayItem(const KCalCore::Incidence::Ptr &incidence, \
const QDateTime &recurrenceId,
- int XBegin, int XEnd, bool isSelected)
+AgendaItem::QPtr Agenda::insertAllDayItem(const KCalCore::Incidence::Ptr &incidence,
+ const QDateTime &recurrenceId, int XBegin, \
int XEnd, + bool isSelected)
{
if (!d->mAllDayMode) {
qCCritical(CALENDARVIEW_LOG) << "using this in non all-day mode is \
illegal."; @@ -1788,8 +1825,8 @@ AgendaItem::QPtr Agenda::insertAllDayItem(const \
KCalCore::Incidence::Ptr &incide agendaItem->setCellXRight(XEnd);
const double startIt = d->mGridSpacingX * (agendaItem->cellXLeft());
- const double endIt = d->mGridSpacingX * (agendaItem->cellWidth() +
- agendaItem->cellXLeft());
+ const double endIt = d->mGridSpacingX * (agendaItem->cellWidth()
+ +agendaItem->cellXLeft());
agendaItem->resize(int(endIt) - int(startIt), int(d->mGridSpacingY));
@@ -1806,7 +1843,8 @@ AgendaItem::QPtr Agenda::insertAllDayItem(const \
KCalCore::Incidence::Ptr &incide }
AgendaItem::QPtr Agenda::createAgendaItem(const KCalCore::Incidence::Ptr &incidence, \
int itemPos,
- int itemCount, const QDateTime &recurrenceId, bool isSelected)
+ int itemCount, const QDateTime \
&recurrenceId, + bool isSelected)
{
if (!incidence) {
qCWarning(CALENDARVIEW_LOG) << "Agenda::createAgendaItem() item is \
invalid."; @@ -1814,7 +1852,8 @@ AgendaItem::QPtr Agenda::createAgendaItem(const \
KCalCore::Incidence::Ptr &incide }
AgendaItem::QPtr agendaItem = new AgendaItem(d->mAgendaView, d->mCalendar, \
incidence,
- itemPos, itemCount, recurrenceId, isSelected, this);
+ itemPos, itemCount, recurrenceId, \
isSelected, + this);
connect(agendaItem.data(), &AgendaItem::removeAgendaItem, this, \
&Agenda::removeAgendaItem);
connect(agendaItem.data(), &AgendaItem::showAgendaItem, this, \
&Agenda::showAgendaItem); @@ -1824,8 +1863,8 @@ AgendaItem::QPtr \
Agenda::createAgendaItem(const KCalCore::Incidence::Ptr &incide return agendaItem;
}
-void Agenda::insertMultiItem(const KCalCore::Incidence::Ptr &event, const QDateTime \
&recurrenceId, int XBegin,
- int XEnd, int YTop, int YBottom, bool isSelected)
+void Agenda::insertMultiItem(const KCalCore::Incidence::Ptr &event, const QDateTime \
&recurrenceId, + int XBegin, int XEnd, int YTop, int \
YBottom, bool isSelected) {
KCalCore::Event::Ptr ev = CalendarSupport::event(event);
Q_ASSERT(ev);
@@ -1859,7 +1898,8 @@ void Agenda::insertMultiItem(const KCalCore::Incidence::Ptr \
&event, const QDateT newtext = QStringLiteral("(%1/%2): ").arg(count).arg(width);
newtext.append(ev->summary());
- current = insertItem(event, recurrenceId, cellX, cellYTop, cellYBottom, \
count, width, isSelected); + current = insertItem(event, recurrenceId, \
cellX, cellYTop, cellYBottom, count, width, + \
isSelected); Q_ASSERT(current);
current->setText(newtext);
multiItems.append(current);
@@ -1893,7 +1933,8 @@ void Agenda::insertMultiItem(const KCalCore::Incidence::Ptr \
&event, const QDateT void Agenda::removeIncidence(const KCalCore::Incidence::Ptr \
&incidence) {
if (!incidence) {
- qCWarning(CALENDARVIEW_LOG) << "Agenda::removeIncidence() incidence is \
invalid" << incidence->uid(); + qCWarning(CALENDARVIEW_LOG) << \
"Agenda::removeIncidence() incidence is invalid" + \
<< incidence->uid(); return;
}
@@ -1913,7 +1954,8 @@ void Agenda::removeIncidence(const KCalCore::Incidence::Ptr \
&incidence) continue;
}
if (removeAgendaItem(agendaItem)) {
- qCWarning(CALENDARVIEW_LOG) << "Agenda::removeIncidence() Failed to \
remove " << incidence->uid(); + qCWarning(CALENDARVIEW_LOG) << \
"Agenda::removeIncidence() Failed to remove " + \
<< incidence->uid(); }
}
}
@@ -2231,13 +2273,13 @@ void Agenda::calculateWorkingHours()
d->mWorkingHoursEnable = !d->mAllDayMode;
QTime tmp = d->preferences()->workingHoursStart().time();
- d->mWorkingHoursYTop = int(4 * d->mGridSpacingY *
- (tmp.hour() + tmp.minute() / 60. +
- tmp.second() / 3600.));
+ d->mWorkingHoursYTop = int(4 * d->mGridSpacingY
+ *(tmp.hour() + tmp.minute() / 60.
+ +tmp.second() / 3600.));
tmp = d->preferences()->workingHoursEnd().time();
- d->mWorkingHoursYBottom = int(4 * d->mGridSpacingY *
- (tmp.hour() + tmp.minute() / 60. +
- tmp.second() / 3600.) - 1);
+ d->mWorkingHoursYBottom = int(4 * d->mGridSpacingY
+ *(tmp.hour() + tmp.minute() / 60.
+ +tmp.second() / 3600.) - 1);
}
void Agenda::setDateList(const KCalCore::DateList &selectedDates)
@@ -2295,8 +2337,8 @@ AgendaItem::List Agenda::agendaItems(const QString &uid) const
return d->mAgendaItemsById.values(uid);
}
-AgendaScrollArea::AgendaScrollArea(bool isAllDay, AgendaView *agendaView,
- bool isInteractive, QWidget *parent)
+AgendaScrollArea::AgendaScrollArea(bool isAllDay, AgendaView *agendaView, bool \
isInteractive, + QWidget *parent)
: QScrollArea(parent)
{
if (isAllDay) {
@@ -2322,4 +2364,3 @@ Agenda *AgendaScrollArea::agenda() const
{
return mAgenda;
}
-
diff --git a/src/agenda/agenda.h b/src/agenda/agenda.h
index 54ff2d4..dc64608 100644
--- a/src/agenda/agenda.h
+++ b/src/agenda/agenda.h
@@ -36,14 +36,11 @@
#include <QFrame>
#include <QScrollArea>
-namespace Akonadi
-{
+namespace Akonadi {
class IncidenceChanger;
}
-namespace EventViews
-{
-
+namespace EventViews {
class Agenda;
class AgendaItem;
class AgendaView;
@@ -68,8 +65,8 @@ class EVENTVIEWS_EXPORT Agenda : public QWidget
{
Q_OBJECT
public:
- Agenda(AgendaView *agendaView, QScrollArea *scrollArea,
- int columns, int rows, int rowSize, bool isInteractive);
+ Agenda(AgendaView *agendaView, QScrollArea *scrollArea, int columns, int rows, \
int rowSize, + bool isInteractive);
Agenda(AgendaView *agendaView, QScrollArea *scrollArea, int columns, bool \
isInteractive);
@@ -123,14 +120,16 @@ public:
void setStartTime(const QTime &startHour);
- AgendaItem::QPtr insertItem(const KCalCore::Incidence::Ptr &incidence, const \
QDateTime &recurrenceId, int X, int YTop,
- int YBottom, int itemPos, int itemCount, bool \
isSelected); + AgendaItem::QPtr insertItem(const KCalCore::Incidence::Ptr \
&incidence, + const QDateTime &recurrenceId, int X, \
int YTop, int YBottom, + int itemPos, int itemCount, \
bool isSelected);
- AgendaItem::QPtr insertAllDayItem(const KCalCore::Incidence::Ptr &event, const \
QDateTime &recurrenceId, int XBegin,
- int XEnd, bool isSelected);
+ AgendaItem::QPtr insertAllDayItem(const KCalCore::Incidence::Ptr &event,
+ const QDateTime &recurrenceId, int XBegin, int \
XEnd, + bool isSelected);
- void insertMultiItem(const KCalCore::Incidence::Ptr &event, const QDateTime \
&recurrenceId, int XBegin, int XEnd,
- int YTop, int YBottom, bool isSelected);
+ void insertMultiItem(const KCalCore::Incidence::Ptr &event, const QDateTime \
&recurrenceId, + int XBegin, int XEnd, int YTop, int YBottom, \
bool isSelected);
/**
Removes an event and all its multi-items from the agenda. This function
@@ -271,7 +270,8 @@ protected:
@param pos The current mouse position
@param item The affected item
*/
- MouseActionType isInResizeArea(bool horizontal, const QPoint &pos, const \
AgendaItem::QPtr &item); + MouseActionType isInResizeArea(bool horizontal, const \
QPoint &pos, + const AgendaItem::QPtr &item);
/** Return whether the cell specified by the grid point belongs to the current \
select
*/
bool ptInSelection(const QPoint &gpos) const;
@@ -351,10 +351,7 @@ public:
private:
Agenda *mAgenda = nullptr;
-
};
-
}
#endif
-
diff --git a/src/agenda/agendaitem.cpp b/src/agenda/agendaitem.cpp
index 9bd0877..0864090 100644
--- a/src/agenda/agendaitem.cpp
+++ b/src/agenda/agendaitem.cpp
@@ -68,11 +68,17 @@ QPixmap *AgendaItem::eventPxmp = nullptr;
//-----------------------------------------------------------------------------
AgendaItem::AgendaItem(EventView *eventView, const MultiViewCalendar::Ptr &calendar,
- const KCalCore::Incidence::Ptr &item,
- int itemPos, int itemCount,
+ const KCalCore::Incidence::Ptr &item, int itemPos, int \
itemCount,
const QDateTime &qd, bool isSelected, QWidget *parent)
- : QWidget(parent), mEventView(eventView), mCalendar(calendar), mIncidence(item),
- mOccurrenceDateTime(qd), mValid(true), mCloned(false), mSelected(isSelected), \
mSpecialEvent(false) + : QWidget(parent)
+ , mEventView(eventView)
+ , mCalendar(calendar)
+ , mIncidence(item)
+ , mOccurrenceDateTime(qd)
+ , mValid(true)
+ , mCloned(false)
+ , mSelected(isSelected)
+ , mSpecialEvent(false)
{
if (!mIncidence) {
mValid = false;
@@ -80,12 +86,14 @@ AgendaItem::AgendaItem(EventView *eventView, const \
MultiViewCalendar::Ptr &calen }
mIncidence = Incidence::Ptr(mIncidence->clone());
- if (mIncidence->customProperty("KABC", "BIRTHDAY") == QLatin1String("YES") ||
- mIncidence->customProperty("KABC", "ANNIVERSARY") == \
QLatin1String("YES")) {
- const int years = EventViews::yearDiff(mIncidence->dtStart().date(), \
qd.toLocalTime().date()); + if (mIncidence->customProperty("KABC", "BIRTHDAY") == \
QLatin1String("YES") + || mIncidence->customProperty("KABC", "ANNIVERSARY") == \
QLatin1String("YES")) { + const int years
+ = EventViews::yearDiff(mIncidence->dtStart().date(), \
qd.toLocalTime().date()); if (years > 0) {
mIncidence->setReadOnly(false);
- mIncidence->setSummary(i18np("%2 (1 year)", "%2 (%1 years)", years, \
mIncidence->summary())); + mIncidence->setSummary(i18np("%2 (1 year)", "%2 \
(%1 years)", years, + \
mIncidence->summary())); mIncidence->setReadOnly(true);
mCloned = true;
}
@@ -137,8 +145,8 @@ void AgendaItem::updateIcons()
mIconGroupTent = false;
mIconOrganizer = true;
} else {
- KCalCore::Attendee::Ptr me =
- mIncidence->attendeeByMails(mEventView->kcalPreferences()->allEmails());
+ KCalCore::Attendee::Ptr me
+ = mIncidence->attendeeByMails(mEventView->kcalPreferences()->allEmails());
if (me) {
if (me->status() == KCalCore::Attendee::NeedsAction && me->RSVP()) {
@@ -386,7 +394,7 @@ AgendaItem::QPtr AgendaItem::removeMoveItem(const \
AgendaItem::QPtr &e)
last->setMultiItem(last->firstMultiItem(), last->prevMultiItem(), \
nullptr, nullptr); }
- AgendaItem::QPtr tmp = first;
+ AgendaItem::QPtr tmp = first;
if (first == last) {
delete mMultiItemInfo;
tmp = nullptr;
@@ -502,7 +510,8 @@ void AgendaItem::resetMovePrivate()
mMultiItemInfo->mNextMultiItem = nullptr;
}
- if (mStartMoveInfo->mFirstMultiItem == nullptr && \
mStartMoveInfo->mLastMultiItem == nullptr) { + if \
(mStartMoveInfo->mFirstMultiItem == nullptr + && \
mStartMoveInfo->mLastMultiItem == nullptr) { // it was a single-day event before we \
started the move. delete mMultiItemInfo;
mMultiItemInfo = nullptr;
@@ -685,7 +694,8 @@ QList<AgendaItem::QPtr> &AgendaItem::conflictItems()
void AgendaItem::setConflictItems(const QList<AgendaItem::QPtr> &ci)
{
mConflictItems = ci;
- for (QList<AgendaItem::QPtr>::iterator it = mConflictItems.begin(), \
end(mConflictItems.end()); it != end; ++it) { + for \
(QList<AgendaItem::QPtr>::iterator it = mConflictItems.begin(), \
end(mConflictItems.end()); + it != end; ++it) {
(*it)->addConflictItem(this);
}
}
@@ -715,8 +725,8 @@ bool AgendaItem::overlaps(CellItem *o) const
return false;
}
-static void conditionalPaint(QPainter *p, bool condition, int &x, int y,
- int ft, const QPixmap &pxmp)
+static void conditionalPaint(QPainter *p, bool condition, int &x, int y, int ft,
+ const QPixmap &pxmp)
{
if (condition) {
p->drawPixmap(x, y, pxmp);
@@ -729,7 +739,7 @@ void AgendaItem::paintIcon(QPainter *p, int &x, int y, int ft)
QString iconName;
if (mIncidence->customProperty("KABC", "ANNIVERSARY") == QLatin1String("YES")) {
mSpecialEvent = true;
- iconName = QStringLiteral("view-calendar-wedding-anniversary");
+ iconName = QStringLiteral("view-calendar-wedding-anniversary");
} else if (mIncidence->customProperty("KABC", "BIRTHDAY") == \
QLatin1String("YES")) { mSpecialEvent = true;
// We don't draw icon. The icon is drawn already, because it's the \
Akonadi::Collection's icon @@ -750,7 +760,8 @@ void AgendaItem::paintIcons(QPainter \
*p, int &x, int y, int ft)
if (icons.contains(EventViews::EventView::CalendarCustomIcon)) {
const QString iconName = mCalendar->iconForIncidence(mIncidence);
- if (!iconName.isEmpty() && iconName != QLatin1String("view-calendar") && \
iconName != QLatin1String("office-calendar")) { + if (!iconName.isEmpty() && \
iconName != QLatin1String("view-calendar") + && iconName != \
QLatin1String("office-calendar")) {
conditionalPaint(p, true, x, y, ft, \
QIcon::fromTheme(iconName).pixmap(16, 16)); }
}
@@ -819,19 +830,26 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
// Also look at #17984
if (!alarmPxmp) {
- alarmPxmp = new \
QPixmap(QIcon::fromTheme(QStringLiteral("task-reminder")).pixmap(16, \
16));
- recurPxmp = new \
QPixmap(QIcon::fromTheme(QStringLiteral("appointment-recurring")).pixmap(16, \
16));
- readonlyPxmp = new \
QPixmap(QIcon::fromTheme(QStringLiteral("object-locked")).pixmap(16, \
16));
- replyPxmp = new \
QPixmap(QIcon::fromTheme(QStringLiteral("mail-reply-sender")).pixmap(16, \
16));
- groupPxmp = new \
QPixmap(QIcon::fromTheme(QStringLiteral("meeting-attending")).pixmap(16, \
16));
- groupPxmpTent = new \
QPixmap(QIcon::fromTheme(QStringLiteral("meeting-attending-tentative")).pixmap(16, \
16));
- organizerPxmp = new \
QPixmap(QIcon::fromTheme(QStringLiteral("meeting-organizer")).pixmap(16, 16)); + \
alarmPxmp = new QPixmap(QIcon::fromTheme(QStringLiteral("task-reminder")).pixmap(16, \
16)); + recurPxmp
+ = new QPixmap(QIcon::fromTheme(QStringLiteral("appointment-recurring")).pixmap(16, \
16)); + readonlyPxmp
+ = new QPixmap(QIcon::fromTheme(QStringLiteral("object-locked")).pixmap(16, \
16)); + replyPxmp
+ = new QPixmap(QIcon::fromTheme(QStringLiteral("mail-reply-sender")).pixmap(16, \
16)); + groupPxmp
+ = new QPixmap(QIcon::fromTheme(QStringLiteral("meeting-attending")).pixmap(16, \
16)); + groupPxmpTent = new QPixmap(QIcon::fromTheme(QStringLiteral(
+ \
"meeting-attending-tentative")).pixmap(16, + \
16)); + organizerPxmp
+ = new QPixmap(QIcon::fromTheme(QStringLiteral("meeting-organizer")).pixmap(16, \
16)); }
QColor bgColor;
- if (CalendarSupport::hasTodo(mIncidence) &&
- !mEventView->preferences()->todosUseCategoryColors()) {
+ if (CalendarSupport::hasTodo(mIncidence)
+ && !mEventView->preferences()->todosUseCategoryColors()) {
Todo::Ptr todo = CalendarSupport::todo(mIncidence);
Q_ASSERT(todo);
const QDate dueDate = todo->dtDue().toLocalTime().date();
@@ -851,8 +869,8 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
cat = categories.first();
}
- categoryColor = cat.isEmpty() ? \
CalendarSupport::KCalPrefs::instance()->unsetCategoryColor() :
- CalendarSupport::KCalPrefs::instance()->categoryColor(cat);
+ categoryColor = cat.isEmpty() ? \
CalendarSupport::KCalPrefs::instance()->unsetCategoryColor() + : \
CalendarSupport::KCalPrefs::instance()->categoryColor(cat);
QColor resourceColor = mResourceColor;
if (!resourceColor.isValid()) {
@@ -861,29 +879,33 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
QColor frameColor;
// TODO PrefsBase enums should probably be redefined in Prefs
- if (mEventView->preferences()->agendaViewColors() == PrefsBase::ResourceOnly ||
- mEventView->preferences()->agendaViewColors() == \
PrefsBase::CategoryInsideResourceOutside) { + if \
(mEventView->preferences()->agendaViewColors() == PrefsBase::ResourceOnly + || \
mEventView->preferences()->agendaViewColors() + == \
PrefsBase::CategoryInsideResourceOutside) { frameColor = bgColor.isValid() ? bgColor \
: resourceColor; } else {
frameColor = bgColor.isValid() ? bgColor : categoryColor;
}
if (!bgColor.isValid()) {
- if (mEventView->preferences()->agendaViewColors() == PrefsBase::ResourceOnly \
||
- mEventView->preferences()->agendaViewColors() == \
PrefsBase::ResourceInsideCategoryOutside) { + if \
(mEventView->preferences()->agendaViewColors() == PrefsBase::ResourceOnly + \
|| mEventView->preferences()->agendaViewColors() + == \
PrefsBase::ResourceInsideCategoryOutside) { bgColor = resourceColor;
} else {
bgColor = categoryColor;
}
}
- if (cat.isEmpty() &&
- mEventView->preferences()->agendaViewColors() == \
PrefsBase::ResourceInsideCategoryOutside) { + if (cat.isEmpty()
+ && mEventView->preferences()->agendaViewColors()
+ == PrefsBase::ResourceInsideCategoryOutside) {
frameColor = bgColor;
}
- if (cat.isEmpty() &&
- mEventView->preferences()->agendaViewColors() == \
PrefsBase::CategoryInsideResourceOutside) { + if (cat.isEmpty()
+ && mEventView->preferences()->agendaViewColors()
+ == PrefsBase::CategoryInsideResourceOutside) {
bgColor = frameColor;
}
@@ -921,25 +943,31 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
QString shortH;
QString longH;
if (!isMultiItem()) {
- shortH = QLocale().toString(mIncidence->dateTime(KCalCore::Incidence::RoleDisplayStart).toLocalTime().time(), \
QLocale::ShortFormat); + shortH = QLocale().toString(mIncidence->dateTime(
+ \
KCalCore::Incidence::RoleDisplayStart).toLocalTime().time(), + \
QLocale::ShortFormat);
if (CalendarSupport::hasEvent(mIncidence)) {
longH = i18n("%1 - %2",
shortH,
- \
QLocale().toString(mIncidence->dateTime(KCalCore::Incidence::RoleEnd).toLocalTime().time(), \
QLocale::ShortFormat)); + \
QLocale().toString(mIncidence->dateTime(KCalCore::Incidence::RoleEnd). + \
toLocalTime().time(), QLocale::ShortFormat)); } else {
longH = shortH;
}
} else if (!mMultiItemInfo->mFirstMultiItem) {
- shortH = QLocale().toString(mIncidence->dtStart().toLocalTime().time(), \
QLocale::ShortFormat); + shortH
+ = QLocale().toString(mIncidence->dtStart().toLocalTime().time(), \
QLocale::ShortFormat); longH = shortH;
} else {
- shortH = QLocale().toString(mIncidence->dateTime(KCalCore::Incidence::RoleEnd).toLocalTime().time(), \
QLocale::ShortFormat); + shortH = QLocale().toString(mIncidence->dateTime(
+ \
KCalCore::Incidence::RoleEnd).toLocalTime().time(), + \
QLocale::ShortFormat); longH = i18n("- %1", shortH);
}
KWordWrap ww = KWordWrap::formatText(
- fm, QRect(0, 0, width() - (2 * margin), -1), 0, mLabelText);
+ fm, QRect(0, 0, width() - (2 * margin), -1), 0, mLabelText);
int th = ww.boundingRect().height();
int hlHeight = qMax(fm.boundingRect(longH).height(),
@@ -948,7 +976,7 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
qMax(readonlyPxmp->height(),
qMax(replyPxmp->height(),
qMax(groupPxmp->height(),
- organizerPxmp->height()))))));
+ organizerPxmp->height()))))));
const bool completelyRenderable = th < (height() - 2 * ft - 2 - hlHeight);
@@ -959,7 +987,7 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
if ( //( singleLineHeight > height() - 4 ) ||
(width() < 16)) {
int x = qRound((width() - 16) / 2.0);
- paintIcon(&p, x/*by-ref*/, margin, ft);
+ paintIcon(&p, x /*by-ref*/, margin, ft);
return;
}
@@ -969,11 +997,11 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
if (mIncidence->allDay()) {
x += visRect.left();
- const int y = qRound((height() - 16) / 2.0);
+ const int y = qRound((height() - 16) / 2.0);
paintIcons(&p, x, y, ft);
txtWidth = visRect.right() - margin - x;
} else {
- const int y = qRound((height() - 16) / 2.0);
+ const int y = qRound((height() - 16) / 2.0);
paintIcons(&p, x, y, ft);
txtWidth = width() - margin - x;
}
@@ -985,9 +1013,9 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
// case 3: enough for 2-5 lines, but not for the header.
// Also used for the middle days in multi-events
- if (((!completelyRenderable) &&
- ((height() - (2 * margin)) <= (5 * singleLineHeight))) ||
- (isMultiItem() && mMultiItemInfo->mNextMultiItem && \
mMultiItemInfo->mFirstMultiItem)) { + if (((!completelyRenderable)
+ && ((height() - (2 * margin)) <= (5 * singleLineHeight)))
+ || (isMultiItem() && mMultiItemInfo->mNextMultiItem && \
mMultiItemInfo->mFirstMultiItem)) { int x = margin, txtWidth;
if (mIncidence->allDay()) {
@@ -1000,7 +1028,7 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
}
ww = KWordWrap::formatText(
- fm, QRect(0, 0, txtWidth, (height() - (2 * margin))), 0, \
mLabelText); + fm, QRect(0, 0, txtWidth, (height() - (2 * margin))), 0, \
mLabelText);
ww.drawText(&p, x, margin, Qt::AlignHCenter | KWordWrap::FadeOut);
return;
@@ -1022,16 +1050,18 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
if (const KCalCore::Event::Ptr event = CalendarSupport::event(mIncidence)) {
if (event->isMultiDay(QTimeZone::systemTimeZone())) {
// multi-day, all-day event
- shortH =
- i18n("%1 - %2",
- \
QLocale().toString(mIncidence->dtStart().toLocalTime().date()),
- \
QLocale().toString(mIncidence->dateTime(KCalCore::Incidence::RoleEnd).toLocalTime().date()));
+ shortH
+ = i18n("%1 - %2",
+ \
QLocale().toString(mIncidence->dtStart().toLocalTime().date()), + \
QLocale().toString(mIncidence->dateTime(KCalCore::Incidence::RoleEnd). + \
toLocalTime().date())); longH = shortH;
// paint headline
drawRoundedRect(
&p,
- QRect(fmargin, fmargin, width() - fmargin * 2, - fmargin * 2 + \
margin + hlHeight), + QRect(fmargin, fmargin,
+ width() - fmargin * 2, -fmargin * 2 + margin + hlHeight),
mSelected, frameColor, false, ft, roundTop, false);
} else {
// single-day, all-day event
@@ -1039,7 +1069,8 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
// paint headline
drawRoundedRect(
&p,
- QRect(fmargin, fmargin, width() - fmargin * 2, - fmargin * 2 + \
margin + hlHeight), + QRect(fmargin, fmargin,
+ width() - fmargin * 2, -fmargin * 2 + margin + hlHeight),
mSelected, frameColor, false, ft, roundTop, false);
}
} else {
@@ -1048,7 +1079,7 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
// paint headline
drawRoundedRect(
&p,
- QRect(fmargin, fmargin, width() - fmargin * 2, - fmargin * 2 + \
margin + hlHeight), + QRect(fmargin, fmargin, width() - fmargin * 2, \
-fmargin * 2 + margin + hlHeight), mSelected, frameColor, false, ft, roundTop, \
false); }
@@ -1061,7 +1092,7 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
// paint headline
drawRoundedRect(
&p,
- QRect(fmargin, fmargin, width() - fmargin * 2, - fmargin * 2 + margin + \
hlHeight), + QRect(fmargin, fmargin, width() - fmargin * 2, -fmargin * 2 + \
margin + hlHeight), mSelected, frameColor, false, ft, roundTop, false);
txtWidth = width() - margin - x;
@@ -1089,7 +1120,7 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
// draw event text
ww = KWordWrap::formatText(
- fm, QRect(0, 0, txtWidth, height() - margin - y), 0, mLabelText);
+ fm, QRect(0, 0, txtWidth, height() - margin - y), 0, mLabelText);
p.setBackground(QBrush(bgColor));
p.setPen(textColor);
@@ -1100,12 +1131,10 @@ void AgendaItem::paintEvent(QPaintEvent *ev)
ww.drawText(&p, eventX + (txtWidth - ww.boundingRect().width() - 2 * margin) \
/ 2, y, Qt::AlignHCenter | KWordWrap::FadeOut);
}
-
}
-void AgendaItem::drawRoundedRect(QPainter *p, const QRect &rect,
- bool selected, const QColor &bgColor,
- bool frame, int ft, bool roundTop,
+void AgendaItem::drawRoundedRect(QPainter *p, const QRect &rect, bool selected,
+ const QColor &bgColor, bool frame, int ft, bool \
roundTop, bool roundBottom)
{
Q_UNUSED(ft);
@@ -1190,9 +1219,9 @@ void AgendaItem::drawRoundedRect(QPainter *p, const QRect \
&rect,
QLinearGradient gradient(QPointF(r.x(), r.y()), QPointF(r.x(), r.height()));
if (r.height() > 50) {
- if (mIncidence->allDay() &&
- mIncidence->dtStart() == \
mIncidence->dateTime(KCalCore::Incidence::RoleEnd) &&
- CalendarSupport::hasEvent(mIncidence)) {
+ if (mIncidence->allDay()
+ && mIncidence->dtStart() == \
mIncidence->dateTime(KCalCore::Incidence::RoleEnd) + && \
CalendarSupport::hasEvent(mIncidence)) { gradient.setColorAt(0, \
bgColor.lighter(130)); qreal t = 1.0 - (r.height() - 18.0) / r.height();
gradient.setColorAt(t, bgColor.lighter(115));
@@ -1205,9 +1234,9 @@ void AgendaItem::drawRoundedRect(QPainter *p, const QRect \
&rect, }
gradient.setColorAt(1, bgColor.darker(110));
} else {
- if (mIncidence->allDay() &&
- mIncidence->dtStart() == \
mIncidence->dateTime(KCalCore::Incidence::RoleEnd) &&
- !CalendarSupport::hasTodo(mIncidence)) {
+ if (mIncidence->allDay()
+ && mIncidence->dtStart() == \
mIncidence->dateTime(KCalCore::Incidence::RoleEnd) + && \
!CalendarSupport::hasTodo(mIncidence)) { gradient.setColorAt(0, \
bgColor.lighter(130)); gradient.setColorAt(0.35, bgColor.lighter(115));
gradient.setColorAt(0.65, bgColor);
@@ -1244,11 +1273,9 @@ void AgendaItem::drawRoundedRect(QPainter *p, const QRect \
&rect, p->setBrushOrigin(r.x() + 8, r.y() + r.height() - 6);
p->fillRect(QRect(r.x() + 8, r.y() + r.height() - 6, r.width() - 16, 6),
QBrush(bottomLines));
-
}
if (r.height() - 16 > 0) {
-
QPixmap leftLines;
QString key(QStringLiteral("ko_l"));
if (!QPixmapCache::find(key, leftLines)) {
@@ -1285,7 +1312,9 @@ void AgendaItem::drawRoundedRect(QPainter *p, const QRect \
&rect, QPixmap topLeft;
QString key = roundTop ? QStringLiteral("ko_tl") : QStringLiteral("ko_rtl");
if (!QPixmapCache::find(key, topLeft)) {
- topLeft = roundTop ? QPixmap(QStringLiteral(":/roundTopLeft.png")) : \
QPixmap(QStringLiteral(":/rectangularTopLeft.png")); + topLeft
+ = roundTop ? QPixmap(QStringLiteral(":/roundTopLeft.png")) : \
QPixmap(QStringLiteral( + \
":/rectangularTopLeft.png")); QPixmapCache::insert(key, topLeft);
}
p->drawPixmap(r.x(), r.y(), topLeft, 0, 0, lw, th);
@@ -1293,7 +1322,8 @@ void AgendaItem::drawRoundedRect(QPainter *p, const QRect \
&rect, QPixmap topRight;
key = roundTop ? QStringLiteral("ko_tr") : QStringLiteral("ko_rtr");
if (!QPixmapCache::find(key, topRight)) {
- topRight = roundTop ? QPixmap(QStringLiteral(":/roundTopRight.png")) : \
QPixmap(QStringLiteral(":/rectangularTopRight.png")); + topRight = roundTop ? \
QPixmap(QStringLiteral(":/roundTopRight.png")) : QPixmap(QStringLiteral( + \
":/rectangularTopRight.png")); QPixmapCache::insert(key, topRight);
}
p->drawPixmap(r.x() + r.width() - rw, r.y(), topRight, 8 - rw, 0, rw, th);
@@ -1301,8 +1331,8 @@ void AgendaItem::drawRoundedRect(QPainter *p, const QRect \
&rect, QPixmap bottomLeft;
key = roundBottom ? QStringLiteral("ko_bl") : QStringLiteral("ko_rbl");
if (!QPixmapCache::find(key, bottomLeft)) {
- bottomLeft = roundBottom ? QPixmap(QStringLiteral(":/roundBottomLeft.png")) \
:
- QPixmap(QStringLiteral(":/rectangularBottomLeft.png"));
+ bottomLeft = roundBottom ? QPixmap(QStringLiteral(":/roundBottomLeft.png"))
+ : QPixmap(QStringLiteral(":/rectangularBottomLeft.png"));
QPixmapCache::insert(key, bottomLeft);
}
p->drawPixmap(r.x(), r.y() + r.height() - bh, bottomLeft, 0, 8 - bh, lw, bh);
@@ -1310,8 +1340,8 @@ void AgendaItem::drawRoundedRect(QPainter *p, const QRect \
&rect, QPixmap bottomRight;
key = roundBottom ? QStringLiteral("ko_br") : QStringLiteral("ko_rbr");
if (!QPixmapCache::find(key, bottomRight)) {
- bottomRight = roundBottom ? \
QPixmap(QStringLiteral(":/roundBottomRight.png")) :
- QPixmap(QStringLiteral(":/rectangularBottomRight.png"));
+ bottomRight = roundBottom ? \
QPixmap(QStringLiteral(":/roundBottomRight.png")) + : \
QPixmap(QStringLiteral(":/rectangularBottomRight.png")); QPixmapCache::insert(key, \
bottomRight); }
p->drawPixmap(r.x() + r.width() - rw, r.y() + r.height() - bh, bottomRight,
@@ -1347,4 +1377,3 @@ bool AgendaItem::event(QEvent *event)
}
return QWidget::event(event);
}
-
diff --git a/src/agenda/agendaitem.h b/src/agenda/agendaitem.h
index f52468d..08f0198 100644
--- a/src/agenda/agendaitem.h
+++ b/src/agenda/agendaitem.h
@@ -34,9 +34,7 @@
#include <QWidget>
#include <QPointer>
-namespace EventViews
-{
-
+namespace EventViews {
class AgendaItem;
class EventView;
@@ -83,14 +81,9 @@ public:
typedef QPointer<AgendaItem> QPtr;
typedef QList<QPtr> List;
- AgendaItem(EventView *eventView,
- const MultiViewCalendar::Ptr &calendar,
- const KCalCore::Incidence::Ptr &incidence,
- int itemPos,
- int itemCount,
- const QDateTime &qd,
- bool isSelected,
- QWidget *parent);
+ AgendaItem(EventView *eventView, const MultiViewCalendar::Ptr &calendar,
+ const KCalCore::Incidence::Ptr &incidence, int itemPos, int \
itemCount, + const QDateTime &qd, bool isSelected, QWidget *parent);
~AgendaItem();
int cellXLeft() const
@@ -286,8 +279,7 @@ private:
// paint all visible icons
void paintIcons(QPainter *p, int &x, int y, int ft);
- void drawRoundedRect(QPainter *p, const QRect &rect,
- bool selected, const QColor &bgcolor,
+ void drawRoundedRect(QPainter *p, const QRect &rect, bool selected, const QColor \
&bgcolor,
bool frame, int ft, bool roundTop, bool roundBottom);
int mCellXLeft, mCellXRight;
@@ -326,7 +318,6 @@ private:
static QPixmap *todoPxmp;
static QPixmap *completedPxmp;
};
-
}
#endif
diff --git a/src/agenda/agendaview.cpp b/src/agenda/agendaview.cpp
index 1497462..1f56e0c 100644
--- a/src/agenda/agendaview.cpp
+++ b/src/agenda/agendaview.cpp
@@ -77,7 +77,9 @@ class Q_DECL_HIDDEN EventIndicator::Private
public:
Private(EventIndicator *parent, EventIndicator::Location loc)
- : q(parent), mColumns(1), mLocation(loc)
+ : q(parent)
+ , mColumns(1)
+ , mLocation(loc)
{
mEnabled.resize(mColumns);
@@ -103,9 +105,9 @@ public:
rect.setWidth(q->parentWidget()->width());
rect.setHeight(q->height());
rect.setLeft(0);
- rect.setTop(mLocation == EventIndicator::Top ?
- 0 :
- q->parentWidget()->height() - rect.height());
+ rect.setTop(mLocation == EventIndicator::Top
+ ? 0
+ : q->parentWidget()->height() - rect.height());
q->setGeometry(rect);
}
@@ -117,7 +119,8 @@ public:
};
EventIndicator::EventIndicator(Location loc, QWidget *parent)
- : QFrame(parent), d(new Private(this, loc))
+ : QFrame(parent)
+ , d(new Private(this, loc))
{
setAttribute(Qt::WA_TransparentForMouseEvents);
setFixedHeight(d->mPixmap.height());
@@ -177,26 +180,26 @@ class AgendaView::Private : public \
Akonadi::ETMCalendar::CalendarObserver
public:
explicit Private(AgendaView *parent, bool isInteractive, bool isSideBySide)
- : q(parent),
- mTopDayLabels(nullptr),
- mLayoutTopDayLabels(nullptr),
- mTopDayLabelsFrame(nullptr),
- mLayoutBottomDayLabels(nullptr),
- mBottomDayLabels(nullptr),
- mBottomDayLabelsFrame(nullptr),
- mTimeBarHeaderFrame(nullptr),
- mAllDayAgenda(nullptr),
- mAgenda(nullptr),
- mTimeLabelsZone(nullptr),
- mAllowAgendaUpdate(true),
- mUpdateItem(0),
- mIsSideBySide(isSideBySide),
- mDummyAllDayLeft(nullptr),
- mUpdateAllDayAgenda(true),
- mUpdateAgenda(true),
- mIsInteractive(isInteractive),
- mUpdateEventIndicatorsScheduled(false),
- mViewCalendar(MultiViewCalendar::Ptr(new MultiViewCalendar()))
+ : q(parent)
+ , mTopDayLabels(nullptr)
+ , mLayoutTopDayLabels(nullptr)
+ , mTopDayLabelsFrame(nullptr)
+ , mLayoutBottomDayLabels(nullptr)
+ , mBottomDayLabels(nullptr)
+ , mBottomDayLabelsFrame(nullptr)
+ , mTimeBarHeaderFrame(nullptr)
+ , mAllDayAgenda(nullptr)
+ , mAgenda(nullptr)
+ , mTimeLabelsZone(nullptr)
+ , mAllowAgendaUpdate(true)
+ , mUpdateItem(0)
+ , mIsSideBySide(isSideBySide)
+ , mDummyAllDayLeft(nullptr)
+ , mUpdateAllDayAgenda(true)
+ , mUpdateAgenda(true)
+ , mIsInteractive(isInteractive)
+ , mUpdateEventIndicatorsScheduled(false)
+ , mViewCalendar(MultiViewCalendar::Ptr(new MultiViewCalendar()))
{
mViewCalendar->mAgendaView = q;
mViewCalendar->setETMCalendar(q->calendar());
@@ -257,9 +260,8 @@ public:
bool makesWholeDayBusy(const KCalCore::Incidence::Ptr &incidence) const;
CalendarDecoration::Decoration *loadCalendarDecoration(const QString &name);
void clearView();
- void setChanges(EventView::Changes changes,
- const KCalCore::Incidence::Ptr &incidence =
- KCalCore::Incidence::Ptr());
+ void setChanges(EventView::Changes changes, const KCalCore::Incidence::Ptr \
&incidence + = KCalCore::Incidence::Ptr());
/**
Returns a list of consecutive dates, starting with @p start and ending
@@ -292,18 +294,20 @@ protected:
/* reimplemented from KCalCore::Calendar::CalendarObserver */
void calendarIncidenceAdded(const KCalCore::Incidence::Ptr &incidence) override;
void calendarIncidenceChanged(const KCalCore::Incidence::Ptr &incidence) \
override;
- void calendarIncidenceDeleted(const KCalCore::Incidence::Ptr &incidence, const \
KCalCore::Calendar *calendar) override; + void calendarIncidenceDeleted(const \
KCalCore::Incidence::Ptr &incidence, + const \
KCalCore::Calendar *calendar) override; private:
//quiet --overloaded-virtual warning
using KCalCore::Calendar::CalendarObserver::calendarIncidenceDeleted;
};
-bool AgendaView::Private::datesEqual(const KCalCore::Incidence::Ptr &one, const \
KCalCore::Incidence::Ptr &two) const +bool AgendaView::Private::datesEqual(const \
KCalCore::Incidence::Ptr &one, + const \
KCalCore::Incidence::Ptr &two) const {
const auto start1 = one->dtStart();
const auto start2 = two->dtStart();
- const auto end1 = one->dateTime(KCalCore::Incidence::RoleDisplayEnd);
- const auto end2 = two->dateTime(KCalCore::Incidence::RoleDisplayEnd);
+ const auto end1 = one->dateTime(KCalCore::Incidence::RoleDisplayEnd);
+ const auto end2 = two->dateTime(KCalCore::Incidence::RoleDisplayEnd);
if (start1.isValid() ^ start2.isValid()) {
return false;
@@ -347,7 +351,8 @@ bool AgendaView::Private::mightBeVisible(const \
KCalCore::Incidence::Ptr &inciden
if (!incidence->recurs()) {
// If DTEND/DTDUE is before the 1st visible column
- if (incidence->dateTime(KCalCore::Incidence::RoleEnd).date().daysTo(mSelectedDates.first()) \
> 2) { + if (incidence->dateTime(KCalCore::Incidence::RoleEnd).date().daysTo(mSelectedDates.first())
>
+ > 2) {
return false;
}
@@ -381,8 +386,8 @@ QList<QDate> AgendaView::Private::generateDateList(const QDate \
&start, const QDa {
QList<QDate> list;
- if (start.isValid() && end.isValid() && end >= start &&
- start.daysTo(end) < AgendaView::MAX_DAY_COUNT) {
+ if (start.isValid() && end.isValid() && end >= start
+ && start.daysTo(end) < AgendaView::MAX_DAY_COUNT) {
QDate date = start;
list.reserve(start.daysTo(end) + 1);
while (date <= end) {
@@ -412,14 +417,17 @@ void AgendaView::Private::reevaluateIncidence(const \
KCalCore::Incidence::Ptr &in void AgendaView::Private::calendarIncidenceAdded(const \
KCalCore::Incidence::Ptr &incidence) {
if (!incidence || !mViewCalendar->isValid(incidence)) {
- qCCritical(CALENDARVIEW_LOG) << \
"AgendaView::Private::calendarIncidenceAdded() Invalid incidence or item:" << \
incidence; + qCCritical(CALENDARVIEW_LOG)
+ << "AgendaView::Private::calendarIncidenceAdded() Invalid incidence or \
item:" + << incidence;
Q_ASSERT(false);
return;
}
if (incidence->hasRecurrenceId() && mViewCalendar->isValid(incidence)) {
// Reevaluate the main event instead, if it was inserted before this one
- KCalCore::Incidence::Ptr mainIncidence = \
q->calendar2(incidence)->incidence(incidence->uid()); + \
KCalCore::Incidence::Ptr mainIncidence + = \
q->calendar2(incidence)->incidence(incidence->uid()); if (mainIncidence) {
reevaluateIncidence(mainIncidence);
}
@@ -432,14 +440,18 @@ void AgendaView::Private::calendarIncidenceAdded(const \
KCalCore::Incidence::Ptr void AgendaView::Private::calendarIncidenceChanged(const \
KCalCore::Incidence::Ptr &incidence) {
if (!incidence || incidence->uid().isEmpty()) {
- qCCritical(CALENDARVIEW_LOG) << "AgendaView::calendarIncidenceChanged() \
Invalid incidence or empty UID. " << incidence; + qCCritical(CALENDARVIEW_LOG)
+ << "AgendaView::calendarIncidenceChanged() Invalid incidence or empty \
UID. " + << incidence;
Q_ASSERT(false);
return;
}
AgendaItem::List agendaItems = this->agendaItems(incidence->uid());
if (agendaItems.isEmpty()) {
- qCWarning(CALENDARVIEW_LOG) << "AgendaView::calendarIncidenceChanged() \
Invalid agendaItem for incidence " << incidence->uid(); + \
qCWarning(CALENDARVIEW_LOG) + << "AgendaView::calendarIncidenceChanged() \
Invalid agendaItem for incidence " + << incidence->uid();
return;
}
@@ -459,7 +471,8 @@ void AgendaView::Private::calendarIncidenceChanged(const \
KCalCore::Incidence::Pt
if (incidence->hasRecurrenceId() && mViewCalendar->isValid(incidence)) {
// Reevaluate the main event instead, if it exists
- KCalCore::Incidence::Ptr mainIncidence = \
q->calendar2(incidence)->incidence(incidence->uid()); + \
KCalCore::Incidence::Ptr mainIncidence + = \
q->calendar2(incidence)->incidence(incidence->uid()); \
reevaluateIncidence(mainIncidence ? mainIncidence : incidence); } else {
reevaluateIncidence(incidence);
@@ -469,7 +482,8 @@ void AgendaView::Private::calendarIncidenceChanged(const \
KCalCore::Incidence::Pt // setChanges(q->changes() | IncidencesEdited, incidence);
}
-void AgendaView::Private::calendarIncidenceDeleted(const KCalCore::Incidence::Ptr \
&incidence, const KCalCore::Calendar *calendar) +void \
AgendaView::Private::calendarIncidenceDeleted(const KCalCore::Incidence::Ptr \
&incidence, + const \
KCalCore::Calendar *calendar) {
Q_UNUSED(calendar);
if (!incidence || incidence->uid().isEmpty()) {
@@ -484,7 +498,8 @@ void AgendaView::Private::calendarIncidenceDeleted(const \
KCalCore::Incidence::Pt
// Reevaluate the main event, if it exists. The exception was removed so the \
main recurrent series // will no be bigger.
if (mViewCalendar->isValid(incidence->uid())) {
- KCalCore::Incidence::Ptr mainIncidence = \
q->calendar2(incidence->uid())->incidence(incidence->uid()); + \
KCalCore::Incidence::Ptr mainIncidence = q->calendar2(incidence->uid())->incidence( + \
incidence->uid()); if (mainIncidence) {
reevaluateIncidence(mainIncidence);
}
@@ -498,7 +513,7 @@ void AgendaView::Private::calendarIncidenceDeleted(const \
KCalCore::Incidence::Pt }
void EventViews::AgendaView::Private::setChanges(EventView::Changes changes,
- const KCalCore::Incidence::Ptr &incidence)
+ const KCalCore::Incidence::Ptr \
&incidence) {
// We could just call EventView::setChanges(...) but we're going to do a little
// optimization. If only an all day item was changed, only all day agenda
@@ -535,8 +550,8 @@ void AgendaView::Private::clearView()
}
void AgendaView::Private::insertIncidence(const KCalCore::Incidence::Ptr &incidence,
- const QDateTime &recurrenceId, const QDateTime &insertAtDateTime,
- bool createSelected)
+ const QDateTime &recurrenceId,
+ const QDateTime &insertAtDateTime, bool \
createSelected) {
if (!q->filterByCollectionSelection(incidence)) {
return;
@@ -575,10 +590,10 @@ void AgendaView::Private::insertIncidence(const \
KCalCore::Incidence::Ptr &incide
const int duration = event->dtStart().toLocalTime().daysTo(event->dtEnd());
if (insertAtDate < firstVisibleDate) {
beginX = curCol + firstVisibleDate.daysTo(insertAtDate);
- endX = beginX + duration;
+ endX = beginX + duration;
} else {
beginX = curCol;
- endX = beginX + duration;
+ endX = beginX + duration;
}
} else if (todo) {
if (!todo->hasDueDate()) {
@@ -677,10 +692,10 @@ void AgendaView::Private::insertIncidence(const \
KCalCore::Incidence::Ptr &incide const int halfHour = 1800;
if (t.addSecs(-halfHour) < t) {
startY = mAgenda->timeToY(t.addSecs(-halfHour));
- endY = mAgenda->timeToY(t) - 1;
+ endY = mAgenda->timeToY(t) - 1;
} else {
startY = 0;
- endY = mAgenda->timeToY(t.addSecs(halfHour)) - 1;
+ endY = mAgenda->timeToY(t.addSecs(halfHour)) - 1;
}
}
if (endY < startY) {
@@ -699,23 +714,18 @@ void AgendaView::Private::insertIncidence(const \
KCalCore::Incidence::Ptr &incide
////////////////////////////////////////////////////////////////////////////
-AgendaView::AgendaView(const QDate &start,
- const QDate &end,
- bool isInteractive,
- bool isSideBySide,
+AgendaView::AgendaView(const QDate &start, const QDate &end, bool isInteractive, \
bool isSideBySide, QWidget *parent)
- : EventView(parent), d(new Private(this, isInteractive, isSideBySide))
+ : EventView(parent)
+ , d(new Private(this, isInteractive, isSideBySide))
{
init(start, end);
}
-AgendaView::AgendaView(const PrefsPtr &prefs,
- const QDate &start,
- const QDate &end,
- bool isInteractive,
- bool isSideBySide,
- QWidget *parent)
- : EventView(parent), d(new Private(this, isInteractive, isSideBySide))
+AgendaView::AgendaView(const PrefsPtr &prefs, const QDate &start, const QDate &end,
+ bool isInteractive, bool isSideBySide, QWidget *parent)
+ : EventView(parent)
+ , d(new Private(this, isInteractive, isSideBySide))
{
setPreferences(prefs);
init(start, end);
@@ -756,7 +766,8 @@ void AgendaView::init(const QDate &start, const QDate &end)
}
// The widget itself
- AgendaScrollArea *allDayScrollArea = new AgendaScrollArea(true, this, \
d->mIsInteractive, d->mAllDayFrame); + AgendaScrollArea *allDayScrollArea = new \
AgendaScrollArea(true, this, d->mIsInteractive, + \
d->mAllDayFrame); allDayFrameLayout->addWidget(allDayScrollArea);
d->mAllDayAgenda = allDayScrollArea->agenda();
@@ -768,7 +779,7 @@ void AgendaView::init(const QDate &start, const QDate &end)
// Create agenda
AgendaScrollArea *scrollArea = new AgendaScrollArea(false, this, \
d->mIsInteractive,
- agendaFrame);
+ agendaFrame);
d->mAgenda = scrollArea->agenda();
// Create event indicator bars
@@ -829,7 +840,8 @@ void AgendaView::init(const QDate &start, const QDate &end)
/* Connect the agendas */
- connect(d->mAllDayAgenda, &Agenda::newTimeSpanSignal, this, \
&AgendaView::newTimeSpanSelectedAllDay); + connect(d->mAllDayAgenda, \
&Agenda::newTimeSpanSignal, this, + \
&AgendaView::newTimeSpanSelectedAllDay);
connect(d->mAgenda, &Agenda::newTimeSpanSignal, this, \
&AgendaView::newTimeSpanSelected);
@@ -916,7 +928,6 @@ void AgendaView::connectAgenda(Agenda *agenda, Agenda \
*otherAgenda)
SLOT(slotIncidencesDropped(KCalCore::Incidence::List,QPoint,bool)));
connect(agenda, SIGNAL(droppedIncidences(QList<QUrl>,QPoint,bool)),
SLOT(slotIncidencesDropped(QList<QUrl>,QPoint,bool)));
-
}
void AgendaView::slotIncidenceSelected(const KCalCore::Incidence::Ptr &incidence, \
const QDate &date) @@ -927,7 +938,8 @@ void AgendaView::slotIncidenceSelected(const \
KCalCore::Incidence::Ptr &incidence }
}
-void AgendaView::slotShowIncidencePopup(const KCalCore::Incidence::Ptr &incidence, \
const QDate &date) +void AgendaView::slotShowIncidencePopup(const \
KCalCore::Incidence::Ptr &incidence, + const \
QDate &date) {
Akonadi::Item item = d->mViewCalendar->item(incidence);
//qDebug() << "wanna see the popup for " << incidence->uid() << item.id();
@@ -971,12 +983,10 @@ void AgendaView::zoomInVertically()
d->mTimeLabelsZone->updateAll();
setChanges(changes() | ZoomChanged);
updateView();
-
}
void AgendaView::zoomOutVertically()
{
-
if (preferences()->hourSize() > 4 || d->mIsSideBySide) {
if (!d->mIsSideBySide) {
preferences()->setHourSize(preferences()->hourSize() - 1);
@@ -1001,7 +1011,7 @@ void AgendaView::zoomInHorizontally(const QDate &date)
ndays = begin.daysTo(d->mSelectedDates.last());
// zoom with Action and are there a selected Incidence?, Yes, I zoom in to it.
- if (! dateToZoom.isValid()) {
+ if (!dateToZoom.isValid()) {
dateToZoom = d->mAgenda->selectedIncidenceDate();
}
@@ -1034,7 +1044,7 @@ void AgendaView::zoomOutHorizontally(const QDate &date)
ndays = begin.daysTo(d->mSelectedDates.last());
// zoom with Action and are there a selected Incidence?, Yes, I zoom out to it.
- if (! dateToZoom.isValid()) {
+ if (!dateToZoom.isValid()) {
dateToZoom = d->mAgenda->selectedIncidenceDate();
}
@@ -1093,8 +1103,7 @@ void AgendaView::zoomView(const int delta, const QPoint &pos, \
const Qt::Orientat
#ifndef EVENTVIEWS_NODECOS
-bool AgendaView::loadDecorations(const QStringList &decorations,
- DecorationList &decoList)
+bool AgendaView::loadDecorations(const QStringList &decorations, DecorationList \
&decoList) {
for (const QString &decoName : decorations) {
if (preferences()->selectedPlugins().contains(decoName)) {
@@ -1107,7 +1116,6 @@ bool AgendaView::loadDecorations(const QStringList \
&decorations, void AgendaView::placeDecorationsFrame(QFrame *frame, bool \
decorationsFound, bool isTop) {
if (decorationsFound) {
-
if (isTop) {
// inserts in the first position
d->mSplitterAgenda->insertWidget(0, frame);
@@ -1121,8 +1129,8 @@ void AgendaView::placeDecorationsFrame(QFrame *frame, bool \
decorationsFound, boo }
}
-void AgendaView::placeDecorations(DecorationList &decoList, const QDate &date,
- QWidget *labelBox, bool forWeek)
+void AgendaView::placeDecorations(DecorationList &decoList, const QDate &date, \
QWidget *labelBox, + bool forWeek)
{
foreach (CalendarDecoration::Decoration *deco, decoList) {
CalendarDecoration::Element::List elements;
@@ -1165,17 +1173,18 @@ void AgendaView::createDayLabels(bool force)
d->mTopDayLabels = new QFrame(d->mTopDayLabelsFrame);
d->mTopDayLabelsFrame->layout()->addWidget(d->mTopDayLabels);
- static_cast<QBoxLayout*>(d->mTopDayLabelsFrame->layout())->setStretchFactor(d->mTopDayLabels, \
1); + static_cast<QBoxLayout \
*>(d->mTopDayLabelsFrame->layout())->setStretchFactor(d->mTopDayLabels, + \
1); d->mLayoutTopDayLabels = new QHBoxLayout(d->mTopDayLabels);
d->mLayoutTopDayLabels->setMargin(0);
d->mLayoutTopDayLabels->setSpacing(1);
// this spacer moves the day labels over to line up with the day columns
- QSpacerItem *spacer =
- new QSpacerItem((!d->mIsSideBySide ? d->mTimeLabelsZone->width() : 0) +
- SPACING +
- d->mAllDayAgenda->scrollArea()->frameWidth(),
- 1, QSizePolicy::Fixed);
+ QSpacerItem *spacer
+ = new QSpacerItem((!d->mIsSideBySide ? d->mTimeLabelsZone->width() : 0)
+ +SPACING
+ +d->mAllDayAgenda->scrollArea()->frameWidth(),
+ 1, QSizePolicy::Fixed);
d->mLayoutTopDayLabels->addSpacerItem(spacer);
auto topWeekLabelBox = new QFrame(d->mTopDayLabels);
@@ -1189,7 +1198,8 @@ void AgendaView::createDayLabels(bool force)
d->mBottomDayLabels = new QFrame(d->mBottomDayLabelsFrame);
d->mBottomDayLabelsFrame->layout()->addWidget(d->mBottomDayLabels);
- static_cast<QBoxLayout*>(d->mBottomDayLabelsFrame->layout())->setStretchFactor(d->mBottomDayLabels, \
1); + static_cast<QBoxLayout \
*>(d->mBottomDayLabelsFrame->layout())->setStretchFactor( + \
d->mBottomDayLabels, 1); d->mLayoutBottomDayLabels = new \
QHBoxLayout(d->mBottomDayLabels); d->mLayoutBottomDayLabels->setMargin(0);
auto bottomWeekLabelBox = new QFrame(d->mBottomDayLabels);
@@ -1229,7 +1239,8 @@ void AgendaView::createDayLabels(bool force)
date.day());
QString shortstr = QString::number(date.day());
- AlternateLabel *dayLabel = new AlternateLabel(shortstr, longstr, \
veryLongStr, topDayLabelBox); + AlternateLabel *dayLabel
+ = new AlternateLabel(shortstr, longstr, veryLongStr, topDayLabelBox);
topDayLabelBoxLayout->addWidget(dayLabel);
dayLabel->useShortText(); // will be recalculated in updateDayLabelSizes() \
anyway dayLabel->setAlignment(Qt::AlignHCenter);
@@ -1244,7 +1255,8 @@ void AgendaView::createDayLabels(bool force)
for (const QString &text : texts) {
// Compute a small version of the holiday string for AlternateLabel
const KWordWrap ww = KWordWrap::formatText(fm, topDayLabelBox->rect(), \
0, text, -1);
- AlternateLabel *label = new AlternateLabel(ww.truncatedString(), text, \
text, topDayLabelBox); + AlternateLabel *label = new AlternateLabel(
+ ww.truncatedString(), text, text, topDayLabelBox);
topDayLabelBoxLayout->addWidget(label);
label->setAlignment(Qt::AlignCenter);
}
@@ -1257,7 +1269,7 @@ void AgendaView::createDayLabels(bool force)
}
QSpacerItem *rightSpacer = new \
QSpacerItem(d->mAllDayAgenda->scrollArea()->frameWidth(),
- 1, QSizePolicy::Fixed);
+ 1, QSizePolicy::Fixed);
d->mLayoutTopDayLabels->addSpacerItem(rightSpacer);
#ifndef EVENTVIEWS_NODECOS
@@ -1377,10 +1389,10 @@ bool AgendaView::selectedIsSingleCell() const
if (selectedIsAllDay()) {
int days = selectionStart().daysTo(selectionEnd());
- return (days < 1);
+ return days < 1;
} else {
int secs = selectionStart().secsTo(selectionEnd());
- return (secs <= 24 * 60 * 60 / d->mAgenda->rows());
+ return secs <= 24 * 60 * 60 / d->mAgenda->rows();
}
}
@@ -1421,8 +1433,9 @@ void AgendaView::createTimeBarHeaders()
foreach (QScrollArea *area, d->mTimeLabelsZone->timeLabels()) {
TimeLabels *timeLabel = static_cast<TimeLabels *>(area->widget());
- QLabel *label = new QLabel(timeLabel->header().replace(QLatin1Char('/'), \
QStringLiteral("/ ")),
- d->mTimeBarHeaderFrame);
+ QLabel *label
+ = new QLabel(timeLabel->header().replace(QLatin1Char('/'), \
QStringLiteral("/ ")), + d->mTimeBarHeaderFrame);
d->mTimeBarHeaderFrame->layout()->addWidget(label);
label->setFont(labelFont);
label->setAlignment(Qt::AlignBottom | Qt::AlignRight);
@@ -1502,7 +1515,8 @@ void AgendaView::updateEventDates(AgendaItem *item, bool \
addIncidence, KCalCore::Incidence::Ptr incidence = item->incidence();
Akonadi::Item aitem = d->mViewCalendar->item(incidence);
if ((!aitem.isValid() && !addIncidence) || !incidence || !changer()) {
- qCWarning(CALENDARVIEW_LOG) << "changer is " << changer() << " and incidence \
is " << incidence.data(); + qCWarning(CALENDARVIEW_LOG) << "changer is " << \
changer() << " and incidence is " + << \
incidence.data(); return;
}
@@ -1533,7 +1547,7 @@ void AgendaView::updateEventDates(AgendaItem *item, bool \
addIncidence,
endTime = incidence->dateTime(KCalCore::Incidence::RoleEnd).time();
daysLength = item->itemCount() - 1;
} else {
- endTime = d-> mAgenda->gyToTime(item->cellYBottom() + 1);
+ endTime = d->mAgenda->gyToTime(item->cellYBottom() + 1);
}
}
@@ -1656,15 +1670,16 @@ QDate AgendaView::endDate() const
void AgendaView::showDates(const QDate &start, const QDate &end, const QDate \
&preferredMonth) {
Q_UNUSED(preferredMonth);
- if (!d->mSelectedDates.isEmpty() &&
- d->mSelectedDates.first() == start &&
- d->mSelectedDates.last() == end) {
+ if (!d->mSelectedDates.isEmpty()
+ && d->mSelectedDates.first() == start
+ && d->mSelectedDates.last() == end) {
return;
}
- if (!start.isValid() || !end.isValid() || start > end ||
- start.daysTo(end) > MAX_DAY_COUNT) {
- qCWarning(CALENDARVIEW_LOG) << "got bizare parameters: " << start << end << \
" - aborting here"; + if (!start.isValid() || !end.isValid() || start > end
+ || start.daysTo(end) > MAX_DAY_COUNT) {
+ qCWarning(CALENDARVIEW_LOG) << "got bizare parameters: " << start << end
+ << " - aborting here";
return;
}
@@ -1701,7 +1716,8 @@ void AgendaView::showIncidences(const Akonadi::Item::List \
&incidences, const QDa }
QDateTime start = \
CalendarSupport::incidence(incidences.first())->dtStart().toLocalTime();
- QDateTime end = \
CalendarSupport::incidence(incidences.first())->dateTime(KCalCore::Incidence::RoleEnd).toLocalTime();
+ QDateTime end = CalendarSupport::incidence(incidences.first())->dateTime(
+ KCalCore::Incidence::RoleEnd).toLocalTime();
Akonadi::Item first = incidences.first();
Q_FOREACH (const Akonadi::Item &aitem, incidences) {
if (CalendarSupport::incidence(aitem)->dtStart().toLocalTime() < start) {
@@ -1766,11 +1782,11 @@ void AgendaView::fillAgenda()
foreach (const KCalCore::Incidence::Ptr &incidence, incidences) {
Q_ASSERT(incidence);
- const bool wasSelected = incidence->uid() == selectedAgendaId ||
- incidence->uid() == selectedAllDayAgendaId;
+ const bool wasSelected = incidence->uid() == selectedAgendaId
+ || incidence->uid() == selectedAllDayAgendaId;
- if ((incidence->allDay() && d->mUpdateAllDayAgenda) ||
- (!incidence->allDay() && d->mUpdateAgenda)) {
+ if ((incidence->allDay() && d->mUpdateAllDayAgenda)
+ || (!incidence->allDay() && d->mUpdateAgenda)) {
displayIncidence(incidence, wasSelected);
}
@@ -1796,7 +1812,7 @@ void AgendaView::fillAgenda()
}
}
-bool AgendaView::displayIncidence(const KCalCore::Incidence::Ptr &incidence, bool \
createSelected) +bool AgendaView::displayIncidence(const KCalCore::Incidence::Ptr \
&incidence, bool createSelected) {
if (!incidence || incidence->hasRecurrenceId()) {
return false;
@@ -1844,8 +1860,8 @@ bool AgendaView::displayIncidence(const \
KCalCore::Incidence::Ptr &incidence, bo while (rIt.hasNext()) {
rIt.next();
const auto occurrenceDate = rIt.occurrenceStartDate().toLocalTime();
- const bool makesDayBusy =
- preferences()->colorAgendaBusyDays() && \
makesWholeDayBusy(rIt.incidence()); + const bool makesDayBusy
+ = preferences()->colorAgendaBusyDays() && \
makesWholeDayBusy(rIt.incidence()); if (makesDayBusy) {
KCalCore::Event::List &busyEvents = \
d->mBusyDays[occurrenceDate.date()]; busyEvents.append(event);
@@ -1856,7 +1872,6 @@ bool AgendaView::displayIncidence(const \
KCalCore::Incidence::Ptr &incidence, bo }
d->insertIncidence(rIt.incidence(), rIt.recurrenceId(), occurrenceDate, \
createSelected); }
-
} else {
QDateTime dateToAdd; // date to add to our date list
QDateTime incidenceStart;
@@ -1891,10 +1906,10 @@ bool AgendaView::displayIncidence(const \
KCalCore::Incidence::Ptr &incidence, bo
// ToDo items shall be displayed today if they are overdue
const QDateTime dateTimeToday = QDateTime(today, QTime(0, 0), Qt::LocalTime);
- if (todo &&
- todo->isOverdue() &&
- dateTimeToday >= firstVisibleDateTime &&
- dateTimeToday <= lastVisibleDateTime) {
+ if (todo
+ && todo->isOverdue()
+ && dateTimeToday >= firstVisibleDateTime
+ && dateTimeToday <= lastVisibleDateTime) {
/* If there's a recurring instance showing up today don't add "today" again
* we don't want the event to appear duplicated */
if (!alreadyAddedToday) {
@@ -1916,8 +1931,8 @@ bool AgendaView::displayIncidence(const \
KCalCore::Incidence::Ptr &incidence, bo if (event && makesDayBusy && \
event->isMultiDay()) { const QDate lastVisibleDate = d->mSelectedDates.last();
for (QDate date = event->dtStart().date();
- date <= event->dtEnd().date() && date <= lastVisibleDate;
- date = date.addDays(1)) {
+ date <= event->dtEnd().date() && date <= lastVisibleDate;
+ date = date.addDays(1)) {
KCalCore::Event::List &busyEvents = d->mBusyDays[date];
busyEvents.append(event);
}
@@ -1959,9 +1974,9 @@ void AgendaView::slotIncidencesDropped(const QList<QUrl> \
&items, const QPoint &g newTime.setDateOnly(allDay);
Todo::Ptr todo = CalendarSupport::todo(todoItem);
- if (todo && dynamic_cast<Akonadi::ETMCalendar *>(calendar())) {
- const Akonadi::Item existingTodoItem =
- calendar()->itemForIncidence(calendar()->todo(todo->uid()));
+ if (todo && dynamic_cast<Akonadi::ETMCalendar *>(calendar())) {
+ const Akonadi::Item existingTodoItem
+ = calendar()->itemForIncidence(calendar()->todo(todo->uid()));
if (Todo::Ptr existingTodo = CalendarSupport::todo(existingTodoItem)) {
qCDebug(CALENDARVIEW_LOG) << "Drop existing Todo";
@@ -1999,14 +2014,16 @@ void AgendaView::slotIncidencesDropped(const \
KCalCore::Incidence::List &incidenc
const QDate day = d->mSelectedDates[gpos.x()];
QDateTime newTime(day, {}, Qt::LocalTime);
-
+
Q_FOREACH (const KCalCore::Incidence::Ptr &incidence, incidences) {
const Akonadi::Item existingItem = calendar()->item(incidence);
- const bool existsInSameCollection = existingItem.isValid() &&
- (existingItem.storageCollectionId() == \
collectionId() || collectionId() == -1); + const bool existsInSameCollection = \
existingItem.isValid() + && \
(existingItem.storageCollectionId() + \
== collectionId() || collectionId() == -1);
if (existingItem.isValid() && existsInSameCollection) {
- KCalCore::Incidence::Ptr newIncidence = \
existingItem.payload<KCalCore::Incidence::Ptr>(); + \
KCalCore::Incidence::Ptr newIncidence + = \
existingItem.payload<KCalCore::Incidence::Ptr>(); KCalCore::Incidence::Ptr \
oldIncidence(newIncidence->clone());
if (newIncidence->dtStart() == newTime && newIncidence->allDay() == \
allDay) { @@ -2113,7 +2130,7 @@ void AgendaView::setHolidayMasks()
d->mHolidayMask.resize(d->mSelectedDates.count() + 1);
const QList<QDate> workDays = \
CalendarSupport::workDays(d->mSelectedDates.first().addDays(-1),
- d->mSelectedDates.last());
+ \
d->mSelectedDates.last()); for (int i = 0; i < d->mSelectedDates.count(); ++i) {
d->mHolidayMask[i] = !workDays.contains(d->mSelectedDates[ i ]);
}
@@ -2147,10 +2164,10 @@ void AgendaView::newTimeSpanSelected(const QPoint &start, \
const QPoint &end)
d->mTimeSpanInAllDay = false;
- const QDate dayStart =
- d-> mSelectedDates[ qBound(0, start.x(), (int)d->mSelectedDates.size() - 1) \
];
- const QDate dayEnd =
- d->mSelectedDates[ qBound(0, end.x(), (int)d->mSelectedDates.size() - 1) ];
+ const QDate dayStart
+ = d->mSelectedDates[ qBound(0, start.x(), (int)d->mSelectedDates.size() - 1) \
]; + const QDate dayEnd
+ = d->mSelectedDates[ qBound(0, end.x(), (int)d->mSelectedDates.size() - 1) \
];
const QTime timeStart = d->mAgenda->gyToTime(start.y());
const QTime timeEnd = d->mAgenda->gyToTime(end.y() + 1);
@@ -2265,8 +2282,8 @@ void AgendaView::alignAgendas()
{
// resize dummy widget so the allday agenda lines up with the hourly agenda.
if (d->mDummyAllDayLeft) {
- d->mDummyAllDayLeft->setFixedWidth(-SPACING + d->mTimeLabelsZone->width() -
- d->mTimeBarHeaderFrame->width());
+ d->mDummyAllDayLeft->setFixedWidth(-SPACING + d->mTimeLabelsZone->width()
+ -d->mTimeBarHeaderFrame->width());
}
// Must be async, so they are centered
@@ -2280,8 +2297,8 @@ CalendarDecoration::Decoration \
*AgendaView::Private::loadCalendarDecoration(cons
QString constraint;
if (version >= 0) {
- constraint =
- QStringLiteral("[X-KDE-PluginInterfaceVersion] == \
%1").arg(QString::number(version)); + constraint
+ = QStringLiteral("[X-KDE-PluginInterfaceVersion] == \
%1").arg(QString::number(version)); }
KService::List list = KServiceTypeTrader::self()->query(type, constraint);
diff --git a/src/agenda/agendaview.h b/src/agenda/agendaview.h
index 26560a5..dbf2c2e 100644
--- a/src/agenda/agendaview.h
+++ b/src/agenda/agendaview.h
@@ -38,12 +38,9 @@ class KConfig;
class QSplitter;
-namespace EventViews
-{
-
+namespace EventViews {
#ifndef EVENTVIEWS_NODECOS
-namespace CalendarDecoration
-{
+namespace CalendarDecoration {
class Decoration;
}
#endif
@@ -87,18 +84,11 @@ class EVENTVIEWS_EXPORT AgendaView : public EventView
{
Q_OBJECT
public:
- explicit AgendaView(const PrefsPtr &preferences,
- const QDate &start,
- const QDate &end,
- bool isInteractive,
- bool isSideBySide = false,
- QWidget *parent = nullptr);
-
- explicit AgendaView(const QDate &start,
- const QDate &end,
- bool isInteractive,
- bool isSideBySide = false,
- QWidget *parent = nullptr);
+ explicit AgendaView(const PrefsPtr &preferences, const QDate &start, const QDate \
&end, + bool isInteractive, bool isSideBySide = false, QWidget \
*parent = nullptr); +
+ explicit AgendaView(const QDate &start, const QDate &end, bool isInteractive,
+ bool isSideBySide = false, QWidget *parent = nullptr);
virtual ~AgendaView();
@@ -116,8 +106,7 @@ public:
KCalCore::DateList selectedIncidenceDates() const override;
/** return the default start/end date/time for new events */
- virtual bool eventDurationHint(QDateTime &startDt,
- QDateTime &endDt,
+ virtual bool eventDurationHint(QDateTime &startDt, QDateTime &endDt,
bool &allDay) const override;
/** start-datetime of selection */
@@ -227,8 +216,7 @@ public Q_SLOTS:
void updateConfig() override;
/** reschedule the todo to the given x- and y- coordinates.
Third parameter determines all-day (no time specified) */
- void slotIncidencesDropped(const KCalCore::Incidence::List &incidences,
- const QPoint &, bool);
+ void slotIncidencesDropped(const KCalCore::Incidence::List &incidences, const \
QPoint &, bool);
void slotIncidencesDropped(const QList<QUrl> &incidences, const QPoint &, bool);
void startDrag(const KCalCore::Incidence::Ptr &);
@@ -259,7 +247,7 @@ private Q_SLOTS:
private:
void init(const QDate &start, const QDate &end);
- bool filterByCollectionSelection(const KCalCore::Incidence::Ptr &incidence);
+ bool filterByCollectionSelection(const KCalCore::Incidence::Ptr &incidence);
void setupTimeLabel(TimeLabels *timeLabel);
bool displayIncidence(const KCalCore::Incidence::Ptr &incidence, bool \
createSelected);
@@ -267,7 +255,8 @@ private:
typedef QList<EventViews::CalendarDecoration::Decoration *> DecorationList;
bool loadDecorations(const QStringList &decorations, DecorationList &decoList);
void placeDecorationsFrame(QFrame *frame, bool decorationsFound, bool isTop);
- void placeDecorations(EventViews::AgendaView::DecorationList &decoList, const \
QDate &date, QWidget *labelBox, bool forWeek); + void \
placeDecorations(EventViews::AgendaView::DecorationList &decoList, const QDate &date, \
+ QWidget *labelBox, bool forWeek); #endif
friend class TimeLabelsZone;
@@ -278,7 +267,6 @@ private:
class Private;
Private *const d;
};
-
}
#endif
diff --git a/src/agenda/alternatelabel.cpp b/src/agenda/alternatelabel.cpp
index d328d52..a58deab 100644
--- a/src/agenda/alternatelabel.cpp
+++ b/src/agenda/alternatelabel.cpp
@@ -26,8 +26,11 @@ using namespace EventViews;
AlternateLabel::AlternateLabel(const QString &shortlabel, const QString &longlabel,
const QString &extensivelabel, QWidget *parent)
- : QLabel(parent), mTextTypeFixed(false), mShortText(shortlabel),
- mLongText(longlabel), mExtensiveText(extensivelabel)
+ : QLabel(parent)
+ , mTextTypeFixed(false)
+ , mShortText(shortlabel)
+ , mLongText(longlabel)
+ , mExtensiveText(extensivelabel)
{
setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
if (mExtensiveText.isEmpty()) {
diff --git a/src/agenda/alternatelabel.h b/src/agenda/alternatelabel.h
index 89f0473..ac4ae02 100644
--- a/src/agenda/alternatelabel.h
+++ b/src/agenda/alternatelabel.h
@@ -25,9 +25,7 @@
#include <QLabel>
-namespace EventViews
-{
-
+namespace EventViews {
class AlternateLabel : public QLabel
{
Q_OBJECT
@@ -60,7 +58,6 @@ protected:
private:
int getIndent() const;
};
-
}
#endif
diff --git a/src/agenda/calendardecoration.cpp b/src/agenda/calendardecoration.cpp
index 19e7376..464b195 100644
--- a/src/agenda/calendardecoration.cpp
+++ b/src/agenda/calendardecoration.cpp
@@ -73,26 +73,30 @@ StoredElement::StoredElement(const QString &id) : Element(id)
}
StoredElement::StoredElement(const QString &id, const QString &shortText)
- : Element(id), mShortText(shortText)
+ : Element(id)
+ , mShortText(shortText)
{
}
-StoredElement::StoredElement(const QString &id, const QString &shortText,
- const QString &longText)
- : Element(id), mShortText(shortText), mLongText(longText)
+StoredElement::StoredElement(const QString &id, const QString &shortText, const \
QString &longText) + : Element(id)
+ , mShortText(shortText)
+ , mLongText(longText)
{
}
-StoredElement::StoredElement(const QString &id, const QString &shortText,
- const QString &longText,
+StoredElement::StoredElement(const QString &id, const QString &shortText, const \
QString &longText, const QString &extensiveText)
- : Element(id), mShortText(shortText), mLongText(longText),
- mExtensiveText(extensiveText)
+ : Element(id)
+ , mShortText(shortText)
+ , mLongText(longText)
+ , mExtensiveText(extensiveText)
{
}
StoredElement::StoredElement(const QString &id, const QPixmap &pixmap)
- : Element(id), mPixmap(pixmap)
+ : Element(id)
+ , mPixmap(pixmap)
{
}
@@ -282,4 +286,3 @@ QDate Decoration::yearDate(const QDate &date)
{
return QDate(date.year(), 1, 1);
}
-
diff --git a/src/agenda/calendardecoration.h b/src/agenda/calendardecoration.h
index a93ae11..07285c7 100644
--- a/src/agenda/calendardecoration.h
+++ b/src/agenda/calendardecoration.h
@@ -28,12 +28,8 @@
#include <QDate>
#include <QPixmap>
-namespace EventViews
-{
-
-namespace CalendarDecoration
-{
-
+namespace EventViews {
+namespace CalendarDecoration {
/**
@class Element
@@ -118,10 +114,9 @@ class EVENTVIEWS_EXPORT StoredElement : public Element
public:
explicit StoredElement(const QString &id);
StoredElement(const QString &id, const QString &shortText);
- StoredElement(const QString &id, const QString &shortText,
- const QString &longText);
- StoredElement(const QString &id, const QString &shortText,
- const QString &longText, const QString &extensiveText);
+ StoredElement(const QString &id, const QString &shortText, const QString \
&longText); + StoredElement(const QString &id, const QString &shortText, const \
QString &longText, + const QString &extensiveText);
StoredElement(const QString &id, const QPixmap &pixmap);
virtual void setShortText(const QString &t);
@@ -162,6 +157,7 @@ public:
{
return 2;
}
+
static QString serviceType()
{
return QStringLiteral("Calendar/Decoration");
@@ -265,9 +261,7 @@ class EVENTVIEWS_EXPORT DecorationFactory : public \
CalendarSupport::PluginFactor public:
Decoration *createPluginFactory() override = 0;
};
-
}
-
}
#endif
diff --git a/src/agenda/decorationlabel.cpp b/src/agenda/decorationlabel.cpp
index faa8715..7e97ee1 100644
--- a/src/agenda/decorationlabel.cpp
+++ b/src/agenda/decorationlabel.cpp
@@ -30,11 +30,13 @@
using namespace EventViews;
-DecorationLabel::DecorationLabel(CalendarDecoration::Element *e,
- QWidget *parent)
- : QLabel(parent), mAutomaticSqueeze(true), mDecorationElement(e),
- mShortText(e->shortText()), mLongText(e->longText()),
- mExtensiveText(e->extensiveText())
+DecorationLabel::DecorationLabel(CalendarDecoration::Element *e, QWidget *parent)
+ : QLabel(parent)
+ , mAutomaticSqueeze(true)
+ , mDecorationElement(e)
+ , mShortText(e->shortText())
+ , mLongText(e->longText())
+ , mExtensiveText(e->extensiveText())
{
mPixmap = e->newPixmap(size());
mUrl = e->url();
@@ -53,15 +55,15 @@ DecorationLabel::DecorationLabel(CalendarDecoration::Element *e,
squeezeContentsToLabel();
}
-DecorationLabel::DecorationLabel(const QString &shortText,
- const QString &longText,
- const QString &extensiveText,
- const QPixmap &pixmap,
- const QUrl &url,
- QWidget *parent)
- : QLabel(parent), mAutomaticSqueeze(true), mShortText(shortText),
- mLongText(longText), mExtensiveText(extensiveText),
- mPixmap(pixmap)
+DecorationLabel::DecorationLabel(const QString &shortText, const QString &longText,
+ const QString &extensiveText, const QPixmap \
&pixmap, + const QUrl &url, QWidget *parent)
+ : QLabel(parent)
+ , mAutomaticSqueeze(true)
+ , mShortText(shortText)
+ , mLongText(longText)
+ , mExtensiveText(extensiveText)
+ , mPixmap(pixmap)
{
setUrl(url);
@@ -78,7 +80,7 @@ void DecorationLabel::mouseReleaseEvent(QMouseEvent *event)
switch (event->button()) {
case Qt::LeftButton:
- if (! mUrl.isEmpty()) {
+ if (!mUrl.isEmpty()) {
QDesktopServices::openUrl(mUrl);
setForegroundRole(QPalette::LinkVisited);
}
@@ -158,7 +160,7 @@ void DecorationLabel::squeezeContentsToLabel()
int longTextWidth = fm.width(mLongText);
int extensiveTextWidth = fm.width(mExtensiveText);
- if (! mPixmap.isNull()) {
+ if (!mPixmap.isNull()) {
usePixmap(true);
} else if ((!mExtensiveText.isEmpty()) && (extensiveTextWidth <= labelWidth)) {
useExtensiveText(true);
@@ -211,4 +213,3 @@ void DecorationLabel::useShortText(bool allowAutomaticSqueeze)
QLabel::setText(mShortText);
setToolTip(mExtensiveText.isEmpty() ? mLongText : mExtensiveText);
}
-
diff --git a/src/agenda/decorationlabel.h b/src/agenda/decorationlabel.h
index cc3485e..4e3580b 100644
--- a/src/agenda/decorationlabel.h
+++ b/src/agenda/decorationlabel.h
@@ -28,22 +28,18 @@
#include <QLabel>
-namespace EventViews
-{
-
+namespace EventViews {
class DecorationLabel : public QLabel
{
Q_OBJECT
public:
- explicit DecorationLabel(EventViews::CalendarDecoration::Element *e,
- QWidget *parent = nullptr);
+ explicit DecorationLabel(EventViews::CalendarDecoration::Element *e, QWidget \
*parent = nullptr);
explicit DecorationLabel(const QString &shortText,
const QString &longText = QString(),
const QString &extensiveText = QString(),
const QPixmap &pixmap = QPixmap(),
- const QUrl &url = QUrl(),
- QWidget *parent = nullptr);
+ const QUrl &url = QUrl(), QWidget *parent = nullptr);
~DecorationLabel();
public Q_SLOTS:
@@ -69,7 +65,6 @@ protected:
QPixmap mPixmap;
QUrl mUrl;
};
-
}
#endif
diff --git a/src/agenda/timelabels.cpp b/src/agenda/timelabels.cpp
index e815edd..2bbe9f5 100644
--- a/src/agenda/timelabels.cpp
+++ b/src/agenda/timelabels.cpp
@@ -37,9 +37,9 @@
using namespace EventViews;
-TimeLabels::TimeLabels(const QTimeZone &zone, int rows, TimeLabelsZone *parent, \
Qt::WindowFlags f) :
- QFrame(parent, f),
- mTimezone(zone)
+TimeLabels::TimeLabels(const QTimeZone &zone, int rows, TimeLabelsZone *parent, \
Qt::WindowFlags f) + : QFrame(parent, f)
+ , mTimezone(zone)
{
mTimeLabelsZone = parent;
mRows = rows;
@@ -184,12 +184,13 @@ void TimeLabels::paintEvent(QPaintEvent *)
// We won't paint parts that aren't visible
const int cy = -y();// y() returns a negative value.
- const auto firstDay = QDateTime(mAgenda->dateList().first(), QTime(0,0,0), \
Qt::LocalTime).toUTC();
- const int beginning =
- !mTimezone.isValid() ?
- 0 :
- (mTimezone.offsetFromUtc(firstDay) -
- mTimeLabelsZone->preferences()->timeZone().offsetFromUtc(firstDay)) / (60 * \
60); + const auto firstDay
+ = QDateTime(mAgenda->dateList().first(), QTime(0, 0, 0), \
Qt::LocalTime).toUTC(); + const int beginning
+ = !mTimezone.isValid()
+ ? 0
+ : (mTimezone.offsetFromUtc(firstDay)
+ -mTimeLabelsZone->preferences()->timeZone().offsetFromUtc(firstDay)) / \
(60 * 60);
// bug: the parameters cx and cw are the areas that need to be
// redrawn, not the area of the widget. unfortunately, this
@@ -301,21 +302,22 @@ void TimeLabels::contextMenuEvent(QContextMenuEvent *event)
Q_UNUSED(event);
QMenu popup(this);
- QAction *editTimeZones =
- popup.addAction(QIcon::fromTheme(QStringLiteral("document-properties")), \
i18n("&Add Timezones..."));
- QAction *removeTimeZone =
- popup.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")),
- i18n("&Remove Timezone %1", \
i18n(mTimezone.id().constData())));
- if (!mTimezone.isValid() ||
- !mTimeLabelsZone->preferences()->timeScaleTimezones().count() ||
- mTimezone == mTimeLabelsZone->preferences()->timeZone()) {
+ QAction *editTimeZones
+ = popup.addAction(QIcon::fromTheme(QStringLiteral("document-properties")),
+ i18n("&Add Timezones..."));
+ QAction *removeTimeZone
+ = popup.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")),
+ i18n("&Remove Timezone %1", \
i18n(mTimezone.id().constData()))); + if (!mTimezone.isValid()
+ || !mTimeLabelsZone->preferences()->timeScaleTimezones().count()
+ || mTimezone == mTimeLabelsZone->preferences()->timeZone()) {
removeTimeZone->setEnabled(false);
}
QAction *activatedAction = popup.exec(QCursor::pos());
if (activatedAction == editTimeZones) {
- QPointer<TimeScaleConfigDialog> dialog =
- new TimeScaleConfigDialog(mTimeLabelsZone->preferences(), this);
+ QPointer<TimeScaleConfigDialog> dialog
+ = new TimeScaleConfigDialog(mTimeLabelsZone->preferences(), this);
if (dialog->exec() == QDialog::Accepted) {
mTimeLabelsZone->reset();
}
@@ -354,7 +356,9 @@ QString TimeLabels::headerToolTip() const
}
auto abbreviations = QStringLiteral(" ");
- foreach (const auto &transition, \
mTimezone.transitions(QDateTime::currentDateTime(), \
QDateTime::currentDateTime().addYears(1))) { + foreach (const auto &transition,
+ mTimezone.transitions(QDateTime::currentDateTime(),
+ QDateTime::currentDateTime().addYears(1))) {
abbreviations += transition.abbreviation;
abbreviations += QLatin1String(", ");
}
@@ -372,4 +376,3 @@ QString TimeLabels::headerToolTip() const
return toolTip;
}
-
diff --git a/src/agenda/timelabels.h b/src/agenda/timelabels.h
index 549b4ef..bba8fc6 100644
--- a/src/agenda/timelabels.h
+++ b/src/agenda/timelabels.h
@@ -28,9 +28,7 @@
#include <QFrame>
-namespace EventViews
-{
-
+namespace EventViews {
class Agenda;
class TimeLabelsZone;
@@ -43,7 +41,8 @@ class TimeLabels : public QFrame
public:
typedef QList<TimeLabels *> List;
- TimeLabels(const QTimeZone &zone, int rows, TimeLabelsZone *parent = nullptr, \
Qt::WindowFlags f = nullptr); + TimeLabels(const QTimeZone &zone, int rows, \
TimeLabelsZone *parent = nullptr, + Qt::WindowFlags f = nullptr);
/** updates widget's internal state */
void updateConfig();
@@ -92,7 +91,6 @@ private:
QFrame *mMousePos = nullptr; // shows a marker for the current mouse position \
in y direction };
-
}
#endif
diff --git a/src/agenda/timelabelszone.cpp b/src/agenda/timelabelszone.cpp
index f57cc8c..0ad65f4 100644
--- a/src/agenda/timelabelszone.cpp
+++ b/src/agenda/timelabelszone.cpp
@@ -25,7 +25,6 @@
#include "prefs.h"
#include "timelabels.h"
-
#include <QHBoxLayout>
#include <QScrollArea>
#include <QScrollBar>
@@ -33,8 +32,10 @@
using namespace EventViews;
TimeLabelsZone::TimeLabelsZone(QWidget *parent, const PrefsPtr &preferences, Agenda \
*agenda)
- : QWidget(parent), mAgenda(agenda), mPrefs(preferences),
- mParent(qobject_cast<AgendaView * >(parent))
+ : QWidget(parent)
+ , mAgenda(agenda)
+ , mPrefs(preferences)
+ , mParent(qobject_cast<AgendaView * >(parent))
{
mTimeLabelsLayout = new QHBoxLayout(this);
mTimeLabelsLayout->setMargin(0);
@@ -106,7 +107,6 @@ void TimeLabelsZone::setupTimeLabel(QScrollArea *area)
mAgenda->verticalScrollBar(), &QAbstractSlider::setValue);
area->verticalScrollBar()->setValue(mAgenda->verticalScrollBar()->value());
-
}
TimeLabels *timeLabels = static_cast<TimeLabels *>(area->widget());
@@ -177,4 +177,3 @@ void TimeLabelsZone::setPreferences(const PrefsPtr &prefs)
mPrefs = prefs;
}
}
-
diff --git a/src/agenda/timelabelszone.h b/src/agenda/timelabelszone.h
index df571bd..a79aab0 100644
--- a/src/agenda/timelabelszone.h
+++ b/src/agenda/timelabelszone.h
@@ -22,16 +22,13 @@
#ifndef EVENTVIEWS_TIMELABELSZONE_H
#define EVENTVIEWS_TIMELABELSZONE_H
-
#include <QWidget>
class QHBoxLayout;
class QScrollArea;
class QTimeZone;
-namespace EventViews
-{
-
+namespace EventViews {
class Agenda;
class AgendaView;
@@ -78,7 +75,6 @@ private:
QHBoxLayout *mTimeLabelsLayout = nullptr;
QList<QScrollArea *> mTimeLabelsList;
};
-
}
#endif
diff --git a/src/agenda/timescaleconfigdialog.cpp \
b/src/agenda/timescaleconfigdialog.cpp index c148bbe..a984e35 100644
--- a/src/agenda/timescaleconfigdialog.cpp
+++ b/src/agenda/timescaleconfigdialog.cpp
@@ -22,7 +22,6 @@
#include "timescaleconfigdialog.h"
#include "prefs.h"
-
#include <KLocalizedString>
#include <QIcon>
#include <QDialogButtonBox>
@@ -36,7 +35,8 @@ class Q_DECL_HIDDEN TimeScaleConfigDialog::Private
{
public:
Private(TimeScaleConfigDialog *parent, const PrefsPtr &preferences)
- : q(parent), mPreferences(preferences)
+ : q(parent)
+ , mPreferences(preferences)
{
}
@@ -59,14 +59,13 @@ static QString tzUTCOffsetStr(const QTimeZone &tz)
int utcOffsetMins = (currentOffset % 3600) / 60; // in minutes
QString utcStr;
if (utcOffsetMins > 0) {
- utcStr = utcOffsetHrs >= 0 ?
- QStringLiteral("+%1:%2").arg(utcOffsetHrs).arg(utcOffsetMins) :
- QStringLiteral("%1:%2").arg(utcOffsetHrs).arg(utcOffsetMins);
-
+ utcStr = utcOffsetHrs >= 0
+ ? QStringLiteral("+%1:%2").arg(utcOffsetHrs).arg(utcOffsetMins)
+ : QStringLiteral("%1:%2").arg(utcOffsetHrs).arg(utcOffsetMins);
} else {
- utcStr = utcOffsetHrs >= 0 ?
- QStringLiteral("+%1").arg(utcOffsetHrs) :
- QStringLiteral("%1").arg(utcOffsetHrs);
+ utcStr = utcOffsetHrs >= 0
+ ? QStringLiteral("+%1").arg(utcOffsetHrs)
+ : QStringLiteral("%1").arg(utcOffsetHrs);
}
return utcStr;
}
@@ -81,7 +80,8 @@ static QString tzWithUTC(const QByteArray &zoneId)
}
TimeScaleConfigDialog::TimeScaleConfigDialog(const PrefsPtr &preferences, QWidget \
*parent)
- : QDialog(parent), d(new Private(this, preferences))
+ : QDialog(parent)
+ , d(new Private(this, preferences))
{
setWindowTitle(i18n("Timezone"));
QVBoxLayout *mainLayout = new QVBoxLayout(this);
@@ -92,7 +92,8 @@ TimeScaleConfigDialog::TimeScaleConfigDialog(const PrefsPtr \
&preferences, QWidge
mainLayout->addWidget(mainwidget);
- QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel, this); + QDialogButtonBox *buttonBox = new \
QDialogButtonBox( + QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
@@ -132,8 +133,11 @@ TimeScaleConfigDialog::TimeScaleConfigDialog(const PrefsPtr \
&preferences, QWidge
connect(downButton, &QPushButton::clicked, this, &TimeScaleConfigDialog::down);
connect(okButton, &QPushButton::clicked, this, \
&TimeScaleConfigDialog::okClicked);
- connect(buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, \
this, &TimeScaleConfigDialog::reject);
- connect(listWidget, &QListWidget::currentItemChanged, this, \
&TimeScaleConfigDialog::slotUpdateButton); + connect(buttonBox->button(
+ QDialogButtonBox::Cancel), &QPushButton::clicked, this,
+ &TimeScaleConfigDialog::reject);
+ connect(listWidget, &QListWidget::currentItemChanged, this,
+ &TimeScaleConfigDialog::slotUpdateButton);
for (const TimeZoneNamePair &item : qAsConst(selList)) {
QListWidgetItem *widgetItem = new QListWidgetItem(item.first);
widgetItem->setData(TimeZoneNameRole, item.second);
@@ -152,7 +156,8 @@ void TimeScaleConfigDialog::slotUpdateButton()
removeButton->setEnabled(listWidget->currentItem());
const bool numberElementMoreThanOneElement = (listWidget->count() > 1);
upButton->setEnabled(numberElementMoreThanOneElement && \
(listWidget->currentRow() >= 1));
- downButton->setEnabled(numberElementMoreThanOneElement && \
(listWidget->currentRow() < listWidget->count() - 1)); + \
downButton->setEnabled(numberElementMoreThanOneElement + && \
(listWidget->currentRow() < listWidget->count() - 1)); }
void TimeScaleConfigDialog::okClicked()
@@ -168,13 +173,15 @@ void TimeScaleConfigDialog::add()
if (zoneCombo->currentIndex() >= 0) {
const int numberItem(listWidget->count());
for (int i = 0; i < numberItem; ++i) {
- if (listWidget->item(i)->data(TimeZoneNameRole).toString() == \
zoneCombo->itemData(zoneCombo->currentIndex(), TimeZoneNameRole).toString()) { + \
if (listWidget->item(i)->data(TimeZoneNameRole).toString() + == \
zoneCombo->itemData(zoneCombo->currentIndex(), TimeZoneNameRole).toString()) { \
return; }
}
QListWidgetItem *item = new QListWidgetItem(zoneCombo->currentText());
- item->setData(TimeZoneNameRole, \
zoneCombo->itemData(zoneCombo->currentIndex(), TimeZoneNameRole).toString()); + \
item->setData(TimeZoneNameRole, + \
zoneCombo->itemData(zoneCombo->currentIndex(), TimeZoneNameRole).toString()); \
listWidget->addItem(item); zoneCombo->removeItem(zoneCombo->currentIndex());
}
@@ -183,7 +190,9 @@ void TimeScaleConfigDialog::add()
void TimeScaleConfigDialog::remove()
{
- zoneCombo->insertItem(0, listWidget->currentItem()->text(), \
zoneCombo->itemData(zoneCombo->currentIndex(), TimeZoneNameRole).toString()); + \
zoneCombo->insertItem(0, listWidget->currentItem()->text(), + \
zoneCombo->itemData(zoneCombo->currentIndex(), + \
TimeZoneNameRole).toString()); delete \
listWidget->takeItem(listWidget->currentRow()); slotUpdateButton();
}
@@ -214,4 +223,3 @@ QStringList TimeScaleConfigDialog::zones() const
}
return list;
}
-
diff --git a/src/agenda/timescaleconfigdialog.h b/src/agenda/timescaleconfigdialog.h
index c872a7b..6557e49 100644
--- a/src/agenda/timescaleconfigdialog.h
+++ b/src/agenda/timescaleconfigdialog.h
@@ -26,9 +26,7 @@
#include <QDialog>
-namespace EventViews
-{
-
+namespace EventViews {
class Prefs;
typedef QSharedPointer<Prefs> PrefsPtr;
@@ -54,7 +52,6 @@ private:
class Private;
Private *const d;
};
-
}
#endif
diff --git a/src/agenda/viewcalendar.cpp b/src/agenda/viewcalendar.cpp
index b02fa66..8c1e8d1 100644
--- a/src/agenda/viewcalendar.cpp
+++ b/src/agenda/viewcalendar.cpp
@@ -181,7 +181,8 @@ Akonadi::Item AkonadiViewCalendar::item(const \
KCalCore::Incidence::Ptr &incidenc
if (id == -1) {
// Ok, we really don't know the ID, give up.
- qCWarning(CALENDARVIEW_LOG) << "Item is invalid. uid = " << \
incidence->instanceIdentifier(); + qCWarning(CALENDARVIEW_LOG) << "Item is \
invalid. uid = " + << \
incidence->instanceIdentifier(); return Akonadi::Item();
}
return mCalendar->item(incidence->instanceIdentifier());
diff --git a/src/agenda/viewcalendar.h b/src/agenda/viewcalendar.h
index 6fb8008..05908f9 100644
--- a/src/agenda/viewcalendar.h
+++ b/src/agenda/viewcalendar.h
@@ -32,14 +32,11 @@
#include <QColor>
#include <QList>
-namespace EventViews
-{
-
+namespace EventViews {
class AgendaView;
class EVENTVIEWS_EXPORT ViewCalendar
{
-
public:
typedef QSharedPointer<ViewCalendar> Ptr;
@@ -54,7 +51,7 @@ public:
virtual KCalCore::Calendar::Ptr getCalendar() const = 0;
};
-class AkonadiViewCalendar: public ViewCalendar
+class AkonadiViewCalendar : public ViewCalendar
{
public:
typedef QSharedPointer<AkonadiViewCalendar> Ptr;
@@ -102,7 +99,6 @@ public:
AkonadiViewCalendar::Ptr mETMCalendar;
QList<ViewCalendar::Ptr> mSubCalendars;
};
-
}
#endif
diff --git a/src/eventview.cpp b/src/eventview.cpp
index 2e95e9f..a3707c2 100644
--- a/src/eventview.cpp
+++ b/src/eventview.cpp
@@ -66,8 +66,8 @@ void \
EventView::setGlobalCollectionSelection(CalendarSupport::CollectionSelectio }
EventView::EventView(QWidget *parent)
- : QWidget(parent),
- d_ptr(new EventViewPrivate())
+ : QWidget(parent)
+ , d_ptr(new EventViewPrivate())
{
QByteArray cname = metaObject()->className();
cname.replace(':', '_');
@@ -131,7 +131,7 @@ int EventView::showMoveRecurDialog(const Incidence::Ptr &inc, \
const QDate &date) case KCalUtils::RecurrenceActions::SelectedOccurrence:
return KCalUtils::RecurrenceActions::SelectedOccurrence;
- case KCalUtils::RecurrenceActions::AllOccurrences: {
+ case KCalUtils::RecurrenceActions::AllOccurrences:
Q_ASSERT(availableOccurrences & \
KCalUtils::RecurrenceActions::SelectedOccurrence);
// if there are all kinds of ooccurrences (i.e. past present and future) the \
user might @@ -142,9 +142,8 @@ int EventView::showMoveRecurDialog(const \
Incidence::Ptr &inc, const QDate &date)
"Should the changes be applied only to this \
single occurrence, "
"also to future items, or to all items in \
the recurrence?");
return KCalUtils::RecurrenceActions::questionSelectedFutureAllCancel(
- message, caption, itemSelected, itemFuture, itemAll, this);
+ message, caption, itemSelected, itemFuture, itemAll, this);
}
- }
default:
Q_ASSERT(availableOccurrences & \
KCalUtils::RecurrenceActions::SelectedOccurrence); @@ -153,7 +152,7 @@ int \
EventView::showMoveRecurDialog(const Incidence::Ptr &inc, const QDate \
&date)
"Should the changes be applied only to this \
single occurrence "
"or to all items in the recurrence?");
return KCalUtils::RecurrenceActions::questionSelectedAllCancel(
- message, caption, itemSelected, itemAll, this);
+ message, caption, itemSelected, itemAll, this);
break;
}
@@ -462,9 +461,8 @@ void EventView::doSaveConfig(KConfigGroup &)
{
}
-QPair<QDateTime, QDateTime> EventView::actualDateRange(const QDateTime &start,
- const QDateTime &end,
- const QDate &preferredMonth) const
+QPair<QDateTime, QDateTime> EventView::actualDateRange(const QDateTime &start, const \
QDateTime &end, + const QDate \
&preferredMonth) const {
Q_UNUSED(preferredMonth);
return qMakePair(start, end);
@@ -536,7 +534,6 @@ void EventView::restoreConfig(const KConfigGroup &configGroup)
d->collectionSelectionModel = nullptr;
d->setUpModels();
} else if (useCustom) {
-
if (!d->collectionSelectionModel) {
// Sort the calendar model on calendar name
QSortFilterProxyModel *sortProxy = new QSortFilterProxyModel(this);
@@ -549,7 +546,8 @@ void EventView::restoreConfig(const KConfigGroup &configGroup)
// Only show the first column.
KRearrangeColumnsProxyModel *columnFilterProxy = new \
KRearrangeColumnsProxyModel(this);
- columnFilterProxy->setSourceColumns(QVector<int>() << \
Akonadi::ETMCalendar::CollectionTitle); + \
columnFilterProxy->setSourceColumns( + QVector<int>() << \
Akonadi::ETMCalendar::CollectionTitle); \
columnFilterProxy->setSourceModel(sortProxy);
// Make the calendar model checkable.
@@ -558,8 +556,8 @@ void EventView::restoreConfig(const KConfigGroup &configGroup)
d->setUpModels();
}
- const KConfigGroup selectionGroup =
- configGroup.config()->group(configGroup.name() + \
QLatin1String("_selectionSetup")); + const KConfigGroup selectionGroup
+ = configGroup.config()->group(configGroup.name() + \
QLatin1String("_selectionSetup"));
KViewStateMaintainer<ETMViewStateSaver> maintainer(selectionGroup);
maintainer.setSelectionModel(d->collectionSelectionModel->selectionModel());
@@ -575,8 +573,8 @@ void EventView::saveConfig(KConfigGroup &configGroup)
configGroup.writeEntry("UseCustomCollectionSelection", \
d->collectionSelectionModel != nullptr);
if (d->collectionSelectionModel) {
- KConfigGroup selectionGroup =
- configGroup.config()->group(configGroup.name() + \
QLatin1String("_selectionSetup")); + KConfigGroup selectionGroup
+ = configGroup.config()->group(configGroup.name() + \
QLatin1String("_selectionSetup"));
KViewStateMaintainer<ETMViewStateSaver> maintainer(selectionGroup);
maintainer.setSelectionModel(d->collectionSelectionModel->selectionModel());
@@ -650,8 +648,8 @@ QString EventView::iconForItem(const Akonadi::Item &item)
{
QString iconName;
Akonadi::Collection collection = item.parentCollection();
- while (collection.parentCollection().isValid() &&
- collection.parentCollection() != Akonadi::Collection::root()) {
+ while (collection.parentCollection().isValid()
+ && collection.parentCollection() != Akonadi::Collection::root()) {
collection = calendar()->collection(collection.parentCollection().id());
}
@@ -671,4 +669,3 @@ void EventView::onCollectionChanged(const Akonadi::Collection \
&collection, updateView();
}
}
-
diff --git a/src/eventview.h b/src/eventview.h
index 8734d7a..e5182c5 100644
--- a/src/eventview.h
+++ b/src/eventview.h
@@ -40,35 +40,29 @@
#include <QByteArray>
#include <QDate>
-namespace KCalCore
-{
-template <typename T> class SortableList;
+namespace KCalCore {
+template<typename T> class SortableList;
typedef SortableList<QDate> DateList;
}
-namespace KHolidays
-{
+namespace KHolidays {
class HolidayRegion;
typedef QSharedPointer<HolidayRegion> HolidayRegionPtr;
}
-namespace CalendarSupport
-{
+namespace CalendarSupport {
class CollectionSelection;
class KCalPrefs;
}
-namespace Akonadi
-{
+namespace Akonadi {
class IncidenceChanger;
}
class KCheckableProxyModel;
class KConfigGroup;
-namespace EventViews
-{
-
+namespace EventViews {
enum {
BUSY_BACKGROUND_ALPHA = 70
};
@@ -322,8 +316,7 @@ public Q_SLOTS:
@param incidenceList a list of incidences to show.
@param date is the QDate on which the incidences are being shown.
*/
- virtual void showIncidences(const Akonadi::Item::List &incidenceList,
- const QDate &date) = 0;
+ virtual void showIncidences(const Akonadi::Item::List &incidenceList, const \
QDate &date) = 0;
/**
Updates the current display to reflect changes that may have happened
@@ -529,7 +522,6 @@ private:
EventViewPrivate *const d_ptr;
Q_DECLARE_PRIVATE(EventView)
};
-
}
#endif
diff --git a/src/eventview_p.cpp b/src/eventview_p.cpp
index 63edfcc..209561b 100644
--- a/src/eventview_p.cpp
+++ b/src/eventview_p.cpp
@@ -37,19 +37,20 @@
using namespace EventViews;
EventViewPrivate::EventViewPrivate()
- : calendar(nullptr),
- customCollectionSelection(nullptr),
- collectionSelectionModel(nullptr),
- mReturnPressed(false),
- mDateRangeSelectionEnabled(true),
- mTypeAhead(false),
- mTypeAheadReceiver(nullptr),
- mPrefs(new Prefs()),
- mKCalPrefs(new CalendarSupport::KCalPrefs()),
- mChanger(nullptr),
- mChanges(EventView::DatesChanged),
- mCollectionId(-1)
-{ }
+ : calendar(nullptr)
+ , customCollectionSelection(nullptr)
+ , collectionSelectionModel(nullptr)
+ , mReturnPressed(false)
+ , mDateRangeSelectionEnabled(true)
+ , mTypeAhead(false)
+ , mTypeAheadReceiver(nullptr)
+ , mPrefs(new Prefs())
+ , mKCalPrefs(new CalendarSupport::KCalPrefs())
+ , mChanger(nullptr)
+ , mChanges(EventView::DatesChanged)
+ , mCollectionId(-1)
+{
+}
EventViewPrivate::~EventViewPrivate()
{
@@ -73,6 +74,7 @@ void EventViewPrivate::setUpModels()
delete customCollectionSelection;
customCollectionSelection = nullptr;
if (collectionSelectionModel) {
- customCollectionSelection = new \
CalendarSupport::CollectionSelection(collectionSelectionModel->selectionModel()); + \
customCollectionSelection = new CalendarSupport::CollectionSelection( + \
collectionSelectionModel->selectionModel()); }
}
diff --git a/src/eventview_p.h b/src/eventview_p.h
index 5e13ce8..3ff92f3 100644
--- a/src/eventview_p.h
+++ b/src/eventview_p.h
@@ -32,9 +32,7 @@
class KCheckableProxyModel;
-namespace EventViews
-{
-
+namespace EventViews {
class EventViewPrivate
{
public: /// Methods
@@ -80,7 +78,6 @@ public: /// Members
EventView::Changes mChanges;
Akonadi::Collection::Id mCollectionId;
};
-
} // EventViews
#endif
diff --git a/src/helper.cpp b/src/helper.cpp
index f9520ac..f4ab17f 100644
--- a/src/helper.cpp
+++ b/src/helper.cpp
@@ -37,7 +37,8 @@ QColor EventViews::getTextColor(const QColor &c)
return (luminance > 128.0) ? QColor(0, 0, 0) : QColor(255, 255, 255);
}
-void EventViews::setResourceColor(const Akonadi::Collection &coll, const QColor \
&color, const PrefsPtr &preferences) +void EventViews::setResourceColor(const \
Akonadi::Collection &coll, const QColor &color, + \
const PrefsPtr &preferences) {
if (!coll.isValid()) {
return;
@@ -45,7 +46,8 @@ void EventViews::setResourceColor(const Akonadi::Collection &coll, \
const QColor
const QString id = QString::number(coll.id());
if (coll.hasAttribute<Akonadi::CollectionColorAttribute>()) {
- Akonadi::CollectionColorAttribute *colorAttr = \
coll.attribute<Akonadi::CollectionColorAttribute>(); + \
Akonadi::CollectionColorAttribute *colorAttr + = \
coll.attribute<Akonadi::CollectionColorAttribute>();
if (colorAttr && colorAttr->color().isValid() && (colorAttr->color() == \
color)) { // It's the same color: we save an invalid color
preferences->setResourceColor(id, QColor());
@@ -55,7 +57,6 @@ void EventViews::setResourceColor(const Akonadi::Collection &coll, \
const QColor preferences->setResourceColor(id, color);
}
-
QColor EventViews::resourceColor(const Akonadi::Collection &coll, const PrefsPtr \
&preferences) {
if (!coll.isValid()) {
@@ -64,7 +65,8 @@ QColor EventViews::resourceColor(const Akonadi::Collection &coll, \
const PrefsPtr const QString id = QString::number(coll.id());
QColor color = preferences->resourceColorKnown(id);
if (!color.isValid() && coll.hasAttribute<Akonadi::CollectionColorAttribute>()) \
{
- Akonadi::CollectionColorAttribute *colorAttr = \
coll.attribute<Akonadi::CollectionColorAttribute>(); + \
Akonadi::CollectionColorAttribute *colorAttr + = \
coll.attribute<Akonadi::CollectionColorAttribute>(); if (colorAttr && \
colorAttr->color().isValid()) { color = colorAttr->color();
} else {
@@ -82,8 +84,10 @@ QColor EventViews::resourceColor(const Akonadi::Item &item, const \
PrefsPtr &pref const QString id = QString::number(item.parentCollection().id());
QColor color = preferences->resourceColorKnown(id);
- if (!color.isValid() && \
item.parentCollection().hasAttribute<Akonadi::CollectionColorAttribute>()) \
{
- Akonadi::CollectionColorAttribute *colorAttr = \
item.parentCollection().attribute<Akonadi::CollectionColorAttribute>(); + if \
(!color.isValid() + && \
item.parentCollection().hasAttribute<Akonadi::CollectionColorAttribute>()) { + \
Akonadi::CollectionColorAttribute *colorAttr + = \
item.parentCollection().attribute<Akonadi::CollectionColorAttribute>(); if \
(colorAttr && colorAttr->color().isValid()) { color = colorAttr->color();
} else {
diff --git a/src/helper.h b/src/helper.h
index 333d981..a8b6886 100644
--- a/src/helper.h
+++ b/src/helper.h
@@ -27,8 +27,7 @@
#include <QColor>
#include <QSharedPointer>
-namespace Akonadi
-{
+namespace Akonadi {
class Collection;
class Item;
}
@@ -38,9 +37,7 @@ class QDate;
// Provides static methods that are useful to all views.
-namespace EventViews
-{
-
+namespace EventViews {
class Prefs;
typedef QSharedPointer<Prefs> PrefsPtr;
@@ -62,11 +59,10 @@ QColor getTextColor(const QColor &c);
@param incidence the incidence for which the color is needed (to
determine which subresource needs to be used)
*/
-EVENTVIEWS_EXPORT QColor resourceColor(const Akonadi::Item &incidence,
- const PrefsPtr &preferences);
+EVENTVIEWS_EXPORT QColor resourceColor(const Akonadi::Item &incidence, const \
PrefsPtr &preferences);
EVENTVIEWS_EXPORT QColor resourceColor(const Akonadi::Collection &collection,
- const PrefsPtr &preferences);
+ const PrefsPtr &preferences);
/**
This method sets the resource color in the preferences, only if it is
@@ -76,8 +72,8 @@ EVENTVIEWS_EXPORT QColor resourceColor(const Akonadi::Collection \
&collection, @param color the color to stored
@param preferences a pointer to the EventViews::Prefs to use
*/
-EVENTVIEWS_EXPORT void setResourceColor(const Akonadi::Collection &collection,
- const QColor &color, const PrefsPtr \
&preferences); +EVENTVIEWS_EXPORT void setResourceColor(const Akonadi::Collection \
&collection, const QColor &color, + const \
PrefsPtr &preferences);
/**
Returns the number of years between the @p start QDate and the @p end QDate
diff --git a/src/journal/journalframe.cpp b/src/journal/journalframe.cpp
index 5656d9c..e70a5f1 100644
--- a/src/journal/journalframe.cpp
+++ b/src/journal/journalframe.cpp
@@ -28,7 +28,6 @@
#include "journalframe.h"
-
#include <CalendarSupport/Utils>
#include <KCalCore/Journal>
@@ -48,7 +47,9 @@
using namespace EventViews;
JournalDateView::JournalDateView(const Akonadi::ETMCalendar::Ptr &calendar, QWidget \
*parent)
- : QFrame(parent), mCalendar(calendar), mChanger(nullptr)
+ : QFrame(parent)
+ , mCalendar(calendar)
+ , mChanger(nullptr)
{
auto layout = new QVBoxLayout(this);
layout->setMargin(0);
@@ -84,7 +85,7 @@ void JournalDateView::addJournal(const Akonadi::Item &j)
QHBoxLayout *layout = new QHBoxLayout(container);
layout->addStretch(1);
JournalFrame *entry = new JournalFrame(j, mCalendar, this);
- layout->addWidget(entry, 3/*stretch*/);
+ layout->addWidget(entry, 3 /*stretch*/);
layout->addStretch(1);
entry->show();
@@ -148,10 +149,11 @@ void JournalDateView::journalDeleted(const Akonadi::Item \
&journal) mEntries.remove(journal.id());
}
-JournalFrame::JournalFrame(const Akonadi::Item &j,
- const Akonadi::ETMCalendar::Ptr &calendar,
+JournalFrame::JournalFrame(const Akonadi::Item &j, const Akonadi::ETMCalendar::Ptr \
&calendar, QWidget *parent)
- : QFrame(parent), mJournal(j), mCalendar(calendar)
+ : QFrame(parent)
+ , mJournal(j)
+ , mCalendar(calendar)
{
mDirty = false;
mWriteInProgress = false;
@@ -205,7 +207,8 @@ JournalFrame::JournalFrame(const Akonadi::Item &j,
mPrintPreviewButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
mPrintPreviewButton->setToolTip(i18n("Print preview this journal entry"));
buttonsLayout->addWidget(mPrintPreviewButton);
- connect(mPrintPreviewButton, &QAbstractButton::clicked, this, \
&JournalFrame::printPreviewJournal); + connect(mPrintPreviewButton, \
&QAbstractButton::clicked, this, + &JournalFrame::printPreviewJournal);
readJournal(mJournal);
mDirty = false;
@@ -333,6 +336,4 @@ void JournalFrame::readJournal(const Akonadi::Item &j)
mEditButton->setEnabled(mCalendar->hasRight(j, \
Akonadi::Collection::CanChangeItem));
mDeleteButton->setEnabled(mCalendar->hasRight(j, \
Akonadi::Collection::CanDeleteItem)); }
-
}
-
diff --git a/src/journal/journalframe.h b/src/journal/journalframe.h
index e9b9080..4dc62dd 100644
--- a/src/journal/journalframe.h
+++ b/src/journal/journalframe.h
@@ -37,17 +37,14 @@
class QTextBrowser;
class QPushButton;
-namespace EventViews
-{
-
+namespace EventViews {
class JournalFrame : public QFrame
{
Q_OBJECT
public:
typedef QList<JournalFrame *> List;
- JournalFrame(const Akonadi::Item &journal,
- const Akonadi::ETMCalendar::Ptr &calendar,
+ JournalFrame(const Akonadi::Item &journal, const Akonadi::ETMCalendar::Ptr \
&calendar, QWidget *parent);
~JournalFrame();
@@ -80,6 +77,7 @@ public Q_SLOTS:
{
mChanger = changer;
}
+
void setDate(const QDate &date);
Q_SIGNALS:
@@ -150,7 +148,6 @@ private:
Akonadi::IncidenceChanger *mChanger = nullptr;
};
-
}
#endif
diff --git a/src/journal/journalview.cpp b/src/journal/journalview.cpp
index 118ff76..e2eef7a 100644
--- a/src/journal/journalview.cpp
+++ b/src/journal/journalview.cpp
@@ -37,7 +37,8 @@
using namespace EventViews;
-JournalView::JournalView(QWidget *parent) : EventView(parent), mChanger(nullptr)
+JournalView::JournalView(QWidget *parent) : EventView(parent)
+ , mChanger(nullptr)
{
QVBoxLayout *topLayout = new QVBoxLayout(this);
topLayout->setMargin(0);
@@ -116,6 +117,7 @@ void JournalView::clearEntries()
}
mEntries.clear();
}
+
void JournalView::updateView()
{
QMap<QDate, JournalDateView *>::Iterator it = mEntries.end();
@@ -140,7 +142,8 @@ void JournalView::showDates(const QDate &start, const QDate &end, \
const QDate &) {
clearEntries();
if (end < start) {
- qCWarning(CALENDARVIEW_LOG) << "End is smaller than start. end=" << end << \
"; start=" << start; + qCWarning(CALENDARVIEW_LOG) << "End is smaller than \
start. end=" << end << "; start=" + << start;
return;
}
@@ -172,7 +175,7 @@ void JournalView::showIncidences(const Akonadi::Item::List \
&incidences, const QD }
void JournalView::changeIncidenceDisplay(const Akonadi::Item &incidence,
- Akonadi::IncidenceChanger::ChangeType changeType)
+ Akonadi::IncidenceChanger::ChangeType \
changeType) {
if (KCalCore::Journal::Ptr journal = CalendarSupport::journal(incidence)) {
switch (changeType) {
@@ -213,4 +216,3 @@ bool JournalView::eventFilter(QObject *object, QEvent *event)
return false;
}
}
-
diff --git a/src/journal/journalview.h b/src/journal/journalview.h
index 67e0d6c..6b8229e 100644
--- a/src/journal/journalview.h
+++ b/src/journal/journalview.h
@@ -38,9 +38,7 @@ class QScrollArea;
* @author Cornelius Schumacher <schumacher@kde.org>, Reinhold Kainhofer \
<reinhold@kainhofer.com>
* @see KOBaseView
*/
-namespace EventViews
-{
-
+namespace EventViews {
class JournalDateView;
class EVENTVIEWS_EXPORT JournalView : public EventView
@@ -60,19 +58,21 @@ public:
void appendJournal(const Akonadi::Item &journal, const QDate &dt);
/** documentation in baseview.h */
- void getHighlightMode(bool &highlightEvents,
- bool &highlightTodos,
- bool &highlightJournals);
+ void getHighlightMode(bool &highlightEvents, bool &highlightTodos, bool \
&highlightJournals);
bool eventFilter(QObject *, QEvent *) override;
public Q_SLOTS:
// Don't update the view when midnight passed, otherwise we'll have data loss \
(bug 79145)
- void dayPassed(const QDate &) override {}
+ void dayPassed(const QDate &) override
+ {
+ }
+
void updateView() override;
void flushView() override;
- void showDates(const QDate &start, const QDate &end, const QDate &preferredMonth \
= QDate()) override; + void showDates(const QDate &start, const QDate &end,
+ const QDate &preferredMonth = QDate()) override;
void showIncidences(const Akonadi::Item::List &incidences, const QDate &date) \
override;
void changeIncidenceDisplay(const Akonadi::Item &incidence,
@@ -96,7 +96,6 @@ private:
Akonadi::IncidenceChanger *mChanger = nullptr;
// DateList mSelectedDates; // List of dates to be displayed
};
-
}
#endif
diff --git a/src/list/listview.cpp b/src/list/listview.cpp
index 24c2779..3a30e38 100644
--- a/src/list/listview.cpp
+++ b/src/list/listview.cpp
@@ -76,7 +76,9 @@ class ListViewItem : public QTreeWidgetItem
{
public:
ListViewItem(const Akonadi::Item &incidence, QTreeWidget *parent)
- : QTreeWidgetItem(parent), mTreeWidget(parent), mIncidence(incidence)
+ : QTreeWidgetItem(parent)
+ , mTreeWidget(parent)
+ , mIncidence(incidence)
{
}
@@ -93,11 +95,10 @@ bool ListViewItem::operator<(const QTreeWidgetItem &other) const
const ListViewItem *otheritem = static_cast<const ListViewItem *>(&other);
switch (treeWidget()->sortColumn()) {
-
- case StartDateTime_Column: {
+ case StartDateTime_Column:
return otheritem->start < start;
- }
- case EndDateTime_Column: {
+ case EndDateTime_Column:
+ {
Incidence::Ptr thisInc = CalendarSupport::incidence(mIncidence);
const auto thisEnd = thisInc->dateTime(Incidence::RoleEnd).toLocalTime();
@@ -107,7 +108,7 @@ bool ListViewItem::operator<(const QTreeWidgetItem &other) const
return otherEnd < thisEnd;
}
default:
- return QTreeWidgetItem::operator < (other);
+ return QTreeWidgetItem::operator <(other);
}
}
@@ -124,10 +125,10 @@ public:
void addIncidences(const Akonadi::ETMCalendar::Ptr &calendar,
const KCalCore::Incidence::List &incidenceList, const QDate \
&date);
- void addIncidence(const Akonadi::ETMCalendar::Ptr &calendar,
- const KCalCore::Incidence::Ptr &, const QDate &date);
- void addIncidence(const Akonadi::ETMCalendar::Ptr &calendar,
- const Akonadi::Item &, const QDate &date);
+ void addIncidence(const Akonadi::ETMCalendar::Ptr &calendar, const \
KCalCore::Incidence::Ptr &, + const QDate &date);
+ void addIncidence(const Akonadi::ETMCalendar::Ptr &calendar, const Akonadi::Item \
&, + const QDate &date);
ListViewItem *getItemForIncidence(const Akonadi::Item &);
QTreeWidget *mTreeWidget = nullptr;
@@ -150,9 +151,11 @@ public:
class ListView::Private::ListItemVisitor : public KCalCore::Visitor
{
public:
- ListItemVisitor(ListViewItem *item, QDate dt) : mItem(item), mStartDate(dt)
+ ListItemVisitor(ListViewItem *item, QDate dt) : mItem(item)
+ , mStartDate(dt)
{
}
+
~ListItemVisitor()
{
}
@@ -160,7 +163,8 @@ public:
bool visit(const Event::Ptr &) override;
bool visit(const Todo::Ptr &) override;
bool visit(const Journal::Ptr &) override;
- bool visit(const FreeBusy::Ptr &) override {
+ bool visit(const FreeBusy::Ptr &) override
+ {
// to inhibit hidden virtual compile warning
return true;
}
@@ -187,7 +191,7 @@ bool ListView::Private::ListItemVisitor::visit(const Event::Ptr \
&e) mItem->end = e->dtEnd().toLocalTime();
if (e->recurs()) {
const int duration = e->dtStart().secsTo(e->dtEnd());
- QDateTime kdt(mStartDate, QTime(0,0,0));
+ QDateTime kdt(mStartDate, QTime(0, 0, 0));
kdt = kdt.addSecs(-1);
mItem->start = e->recurrence()->getNextDateTime(kdt).toLocalTime();
mItem->end = mItem->start.addSecs(duration);
@@ -197,10 +201,13 @@ bool ListView::Private::ListItemVisitor::visit(const Event::Ptr \
&e) mItem->setText(Summary_Column, cleanSummary(e->summary(), next));
if (e->allDay()) {
- mItem->setText(StartDateTime_Column, QLocale().toString(mItem->start.date(), \
QLocale::ShortFormat));
- mItem->setText(EndDateTime_Column, QLocale().toString(mItem->end.date(), \
QLocale::ShortFormat)); + mItem->setText(StartDateTime_Column,
+ QLocale().toString(mItem->start.date(), \
QLocale::ShortFormat)); + mItem->setText(EndDateTime_Column,
+ QLocale().toString(mItem->end.date(), QLocale::ShortFormat));
} else {
- mItem->setText(StartDateTime_Column, QLocale().toString(mItem->start, \
QLocale::ShortFormat)); + mItem->setText(StartDateTime_Column,
+ QLocale().toString(mItem->start, QLocale::ShortFormat));
mItem->setText(EndDateTime_Column, QLocale().toString(mItem->end, \
QLocale::ShortFormat)); }
@@ -216,19 +223,27 @@ bool ListView::Private::ListItemVisitor::visit(const Todo::Ptr \
&t)
mItem->setText(Summary_Column, cleanSummary(t->summary(), QDateTime()));
if (t->hasStartDate()) {
- if (t->allDay())
- mItem->setText(StartDateTime_Column, \
QLocale().toString(t->dtStart().toLocalTime().date(), \
QLocale::ShortFormat));
- else
- mItem->setText(StartDateTime_Column, \
QLocale().toString(t->dtStart().toLocalTime(), QLocale::ShortFormat)); + if \
(t->allDay()) { + mItem->setText(StartDateTime_Column,
+ QLocale().toString(t->dtStart().toLocalTime().date(),
+ QLocale::ShortFormat));
+ } else {
+ mItem->setText(StartDateTime_Column,
+ QLocale().toString(t->dtStart().toLocalTime(), \
QLocale::ShortFormat)); + }
} else {
mItem->setText(StartDateTime_Column, QStringLiteral("---"));
}
if (t->hasDueDate()) {
- if (t->allDay())
- mItem->setText(EndDateTime_Column, \
QLocale().toString(t->dtDue().toLocalTime().date(), \
QLocale::ShortFormat));
- else
- mItem->setText(EndDateTime_Column, \
QLocale().toString(t->dtDue().toLocalTime(), QLocale::ShortFormat)); + if \
(t->allDay()) { + mItem->setText(EndDateTime_Column,
+ QLocale().toString(t->dtDue().toLocalTime().date(),
+ QLocale::ShortFormat));
+ } else {
+ mItem->setText(EndDateTime_Column,
+ QLocale().toString(t->dtDue().toLocalTime(), \
QLocale::ShortFormat)); + }
} else {
mItem->setText(EndDateTime_Column, QStringLiteral("---"));
}
@@ -248,17 +263,20 @@ bool ListView::Private::ListItemVisitor::visit(const \
Journal::Ptr &j) } else {
mItem->setText(Summary_Column, cleanSummary(j->summary(), QDateTime()));
}
- if (j->allDay())
- mItem->setText(StartDateTime_Column, \
QLocale().toString(j->dtStart().toLocalTime().date(), \
QLocale::ShortFormat));
- else
- mItem->setText(StartDateTime_Column, \
QLocale().toString(j->dtStart().toLocalTime(), QLocale::ShortFormat)); + if \
(j->allDay()) { + mItem->setText(StartDateTime_Column,
+ QLocale().toString(j->dtStart().toLocalTime().date(), \
QLocale::ShortFormat)); + } else {
+ mItem->setText(StartDateTime_Column,
+ QLocale().toString(j->dtStart().toLocalTime(), \
QLocale::ShortFormat)); + }
return true;
}
-ListView::ListView(const Akonadi::ETMCalendar::Ptr &calendar,
- QWidget *parent, bool nonInteractive)
- : EventView(parent), d(new Private())
+ListView::ListView(const Akonadi::ETMCalendar::Ptr &calendar, QWidget *parent, bool \
nonInteractive) + : EventView(parent)
+ , d(new Private())
{
setCalendar(calendar);
d->mActiveItem = nullptr;
@@ -309,8 +327,8 @@ int ListView::currentDateCount() const
Akonadi::Item::List ListView::selectedIncidences() const
{
Akonadi::Item::List eventList;
- QTreeWidgetItem *item = d->mTreeWidget->selectedItems().isEmpty() ? nullptr :
- d->mTreeWidget->selectedItems().first();
+ QTreeWidgetItem *item = d->mTreeWidget->selectedItems().isEmpty() ? nullptr
+ : d->mTreeWidget->selectedItems().first();
if (item) {
ListViewItem *i = static_cast<ListViewItem *>(item);
eventList.append(i->mIncidence);
@@ -379,8 +397,7 @@ void ListView::Private::addIncidences(const \
Akonadi::ETMCalendar::Ptr &calendar, }
void ListView::Private::addIncidence(const Akonadi::ETMCalendar::Ptr &calendar,
- const Akonadi::Item &item,
- const QDate &date)
+ const Akonadi::Item &item, const QDate &date)
{
Q_ASSERT(calendar);
if (item.isValid() && item.hasPayload<KCalCore::Incidence::Ptr>()) {
@@ -389,8 +406,7 @@ void ListView::Private::addIncidence(const \
Akonadi::ETMCalendar::Ptr &calendar, }
void ListView::Private::addIncidence(const Akonadi::ETMCalendar::Ptr &calendar,
- const KCalCore::Incidence::Ptr &incidence,
- const QDate &date)
+ const KCalCore::Incidence::Ptr &incidence, \
const QDate &date) {
if (!incidence) {
return;
@@ -406,8 +422,8 @@ void ListView::Private::addIncidence(const \
Akonadi::ETMCalendar::Ptr &calendar, mItems.insert(aitem.id(), aitem);
Incidence::Ptr tinc = incidence;
- if (tinc->customProperty("KABC", "BIRTHDAY") == QLatin1String("YES") ||
- tinc->customProperty("KABC", "ANNIVERSARY") == QLatin1String("YES")) {
+ if (tinc->customProperty("KABC", "BIRTHDAY") == QLatin1String("YES")
+ || tinc->customProperty("KABC", "ANNIVERSARY") == QLatin1String("YES")) {
const int years = EventViews::yearDiff(tinc->dtStart().date(), mEndDate);
if (years > 0) {
tinc = Incidence::Ptr(incidence->clone());
@@ -423,7 +439,8 @@ void ListView::Private::addIncidence(const \
Akonadi::ETMCalendar::Ptr &calendar, for (int col = 0; col < Dummy_EOF_Column; \
++col) { item->setToolTip(col,
IncidenceFormatter::toolTipStr(
- CalendarSupport::displayName(calendar.data(), \
aitem.parentCollection()), + \
CalendarSupport::displayName(calendar.data(), + \
aitem.parentCollection()), incidence));
}
@@ -461,13 +478,12 @@ void ListView::changeIncidenceDisplay(const Akonadi::Item \
&aitem, int action) }
switch (action) {
- case Akonadi::IncidenceChanger::ChangeTypeCreate: {
+ case Akonadi::IncidenceChanger::ChangeTypeCreate:
if (date >= f && date <= l) {
d->addIncidence(calendar(), aitem, date);
}
break;
- }
- case Akonadi::IncidenceChanger::ChangeTypeModify: {
+ case Akonadi::IncidenceChanger::ChangeTypeModify:
item = d->getItemForIncidence(aitem);
if (item) {
delete item;
@@ -478,12 +494,10 @@ void ListView::changeIncidenceDisplay(const Akonadi::Item \
&aitem, int action) d->addIncidence(calendar(), aitem, date);
}
break;
- }
- case Akonadi::IncidenceChanger::ChangeTypeDelete: {
+ case Akonadi::IncidenceChanger::ChangeTypeDelete:
item = d->getItemForIncidence(aitem);
delete item;
break;
- }
default:
qCDebug(CALENDARVIEW_LOG) << "Illegal action" << action;
}
@@ -588,4 +602,3 @@ QSize ListView::sizeHint() const
return QSize(s.width() + style()->pixelMetric(QStyle::PM_ScrollBarExtent) + 1,
s.height());
}
-
diff --git a/src/list/listview.h b/src/list/listview.h
index 93fc6f4..21790b6 100644
--- a/src/list/listview.h
+++ b/src/list/listview.h
@@ -41,15 +41,13 @@ class QModelIndex;
@see KOBaseView, KODayListView
*/
-namespace EventViews
-{
-
+namespace EventViews {
class EVENTVIEWS_EXPORT ListView : public EventView
{
Q_OBJECT
public:
- explicit ListView(const Akonadi::ETMCalendar::Ptr &calendar,
- QWidget *parent = nullptr, bool nonInteractive = false);
+ explicit ListView(const Akonadi::ETMCalendar::Ptr &calendar, QWidget *parent = \
nullptr, + bool nonInteractive = false);
~ListView();
int currentDateCount() const override;
@@ -93,7 +91,6 @@ private:
class Private;
Private *const d;
};
-
}
#endif
diff --git a/src/month/monthgraphicsitems.cpp b/src/month/monthgraphicsitems.cpp
index 9212c5f..c76e558 100644
--- a/src/month/monthgraphicsitems.cpp
+++ b/src/month/monthgraphicsitems.cpp
@@ -43,7 +43,7 @@ ScrollIndicator::ScrollIndicator(ScrollIndicator::ArrowDirection \
dir)
QRectF ScrollIndicator::boundingRect() const
{
- return QRectF(- mWidth / 2, - mHeight / 2, mWidth, mHeight);
+ return QRectF(-mWidth / 2, -mHeight / 2, mWidth, mHeight);
}
void ScrollIndicator::paint(QPainter *painter, const QStyleOptionGraphicsItem \
*option, @@ -56,12 +56,12 @@ void ScrollIndicator::paint(QPainter *painter, const \
QStyleOptionGraphicsItem *o
QPolygon arrow(3);
if (mDirection == ScrollIndicator::UpArrow) {
- arrow.setPoint(0, 0, - mHeight / 2);
+ arrow.setPoint(0, 0, -mHeight / 2);
arrow.setPoint(1, mWidth / 2, mHeight / 2);
- arrow.setPoint(2, - mWidth / 2, mHeight / 2);
+ arrow.setPoint(2, -mWidth / 2, mHeight / 2);
} else if (mDirection == ScrollIndicator::DownArrow) { // down
- arrow.setPoint(1, mWidth / 2, - mHeight / 2);
- arrow.setPoint(2, - mWidth / 2, - mHeight / 2);
+ arrow.setPoint(1, mWidth / 2, -mHeight / 2);
+ arrow.setPoint(2, -mWidth / 2, -mHeight / 2);
arrow.setPoint(0, 0, mHeight / 2);
}
QColor color(Qt::black);
@@ -73,7 +73,9 @@ void ScrollIndicator::paint(QPainter *painter, const \
QStyleOptionGraphicsItem *o
//-------------------------------------------------------------
MonthCell::MonthCell(int id, const QDate &date, QGraphicsScene *scene)
- : mId(id), mDate(date), mScene(scene)
+ : mId(id)
+ , mDate(date)
+ , mScene(scene)
{
mUpArrow = new ScrollIndicator(ScrollIndicator::UpArrow);
mDownArrow = new ScrollIndicator(ScrollIndicator::DownArrow);
@@ -132,8 +134,8 @@ int MonthCell::firstFreeSpace()
static const int ft = 2; // frame thickness
MonthGraphicsItem::MonthGraphicsItem(MonthItem *manager)
- : QGraphicsItem(nullptr),
- mMonthItem(manager)
+ : QGraphicsItem(nullptr)
+ , mMonthItem(manager)
{
manager->monthScene()->addItem(this);
QTransform transform;
@@ -216,7 +218,7 @@ QPainterPath MonthGraphicsItem::widgetPath(bool border) const
QRectF MonthGraphicsItem::boundingRect() const
{
// width - 2 because of the cell-dividing line with width == 1 at beginning and \
end
- return QRectF(0, 0, (daySpan() + 1) * mMonthItem->monthScene()->columnWidth() - \
2, + return QRectF(0, 0, (daySpan() + 1) * mMonthItem->monthScene()->columnWidth() \
- 2, mMonthItem->monthScene()->itemHeight());
}
@@ -233,11 +235,11 @@ void MonthGraphicsItem::paint(QPainter *p, const \
QStyleOptionGraphicsItem *, QWi int textMargin = 7;
QColor bgColor = mMonthItem->bgColor();
- bgColor = mMonthItem->selected() ?
- bgColor.lighter(EventView::BRIGHTNESS_FACTOR) : bgColor;
+ bgColor = mMonthItem->selected()
+ ? bgColor.lighter(EventView::BRIGHTNESS_FACTOR) : bgColor;
QColor frameColor = mMonthItem->frameColor();
- frameColor = mMonthItem->selected() ?
- frameColor.lighter(EventView::BRIGHTNESS_FACTOR) : frameColor;
+ frameColor = mMonthItem->selected()
+ ? frameColor.lighter(EventView::BRIGHTNESS_FACTOR) : frameColor;
QColor textColor = EventViews::getTextColor(bgColor);
// make moving or resizing items translucent
@@ -327,7 +329,6 @@ void MonthGraphicsItem::paint(QPainter *p, const \
QStyleOptionGraphicsItem *, QWi
text = p->fontMetrics().elidedText(text, Qt::ElideRight, textRect.width());
p->drawText(textRect, alignFlag, text);
}
-
}
void MonthGraphicsItem::setStartDate(const QDate &date)
@@ -357,7 +358,7 @@ int MonthGraphicsItem::daySpan() const
void MonthGraphicsItem::updateGeometry()
{
- MonthCell *cell = mMonthItem->monthScene()->mMonthCellMap.value(startDate());
+ MonthCell *cell = mMonthItem->monthScene()->mMonthCellMap.value(startDate());
// If the item is moving and this one is moved outside the view,
// cell will be null
@@ -373,16 +374,16 @@ void MonthGraphicsItem::updateGeometry()
int beginX = 1 + mMonthItem->monthScene()->cellHorizontalPos(cell);
int beginY = 1 + cell->topMargin() + \
mMonthItem->monthScene()->cellVerticalPos(cell);
- beginY += mMonthItem->position() *
- mMonthItem->monthScene()->itemHeightIncludingSpacing() -
- mMonthItem->monthScene()->startHeight() *
- mMonthItem->monthScene()->itemHeightIncludingSpacing(); // scrolling
+ beginY += mMonthItem->position()
+ *mMonthItem->monthScene()->itemHeightIncludingSpacing()
+ -mMonthItem->monthScene()->startHeight()
+ *mMonthItem->monthScene()->itemHeightIncludingSpacing(); // scrolling
setPos(beginX, beginY);
- if (mMonthItem->position() < mMonthItem->monthScene()->startHeight() ||
- mMonthItem->position() - mMonthItem->monthScene()->startHeight() >=
- mMonthItem->monthScene()->maxRowCount()) {
+ if (mMonthItem->position() < mMonthItem->monthScene()->startHeight()
+ || mMonthItem->position() - mMonthItem->monthScene()->startHeight()
+ >= mMonthItem->monthScene()->maxRowCount()) {
hide();
} else {
show();
@@ -394,4 +395,3 @@ QString MonthGraphicsItem::getToolTip() const
{
return mMonthItem->toolTipText(mStartDate);
}
-
diff --git a/src/month/monthgraphicsitems.h b/src/month/monthgraphicsitems.h
index 88a2991..4d6e9e2 100644
--- a/src/month/monthgraphicsitems.h
+++ b/src/month/monthgraphicsitems.h
@@ -27,9 +27,7 @@
#include <QDate>
#include <QGraphicsItem>
-namespace EventViews
-{
-
+namespace EventViews {
class MonthItem;
/**
@@ -85,6 +83,7 @@ public:
{
return mId;
}
+
QDate date() const
{
return mDate;
@@ -109,6 +108,7 @@ public:
{
return mUpArrow;
}
+
ScrollIndicator *downArrow() const
{
return mDownArrow;
@@ -218,7 +218,6 @@ private:
// The current item is part of a MonthItem
MonthItem *mMonthItem = nullptr;
};
-
}
#endif
diff --git a/src/month/monthitem.cpp b/src/month/monthitem.cpp
index 3f160ab..7a17e7b 100644
--- a/src/month/monthitem.cpp
+++ b/src/month/monthitem.cpp
@@ -42,10 +42,10 @@ using namespace EventViews;
using namespace KCalCore;
MonthItem::MonthItem(MonthScene *monthScene)
- : mMonthScene(monthScene),
- mSelected(false),
- mMoving(false),
- mResizing(false)
+ : mMonthScene(monthScene)
+ , mSelected(false)
+ , mMoving(false)
+ , mResizing(false)
{
}
@@ -77,7 +77,7 @@ void MonthItem::updateMonthGraphicsItems()
// For each row of the month view, create an item to build the whole
// MonthItem's MonthGraphicsItems.
for (QDate d = mMonthScene->mMonthView->actualStartDateTime().date();
- d < mMonthScene->mMonthView->actualEndDateTime().date(); d = \
d.addDays(7)) { + d < mMonthScene->mMonthView->actualEndDateTime().date(); d \
= d.addDays(7)) { QDate end = d.addDays(6);
int span;
@@ -245,7 +245,7 @@ bool MonthItem::greaterThan(const MonthItem *e1, const MonthItem \
*e2) }
return e1->greaterThanFallback(e2);
} else {
- return leftDaySpan > rightDaySpan;
+ return leftDaySpan > rightDaySpan;
}
}
@@ -301,17 +301,18 @@ IncidenceMonthItem::IncidenceMonthItem(MonthScene *monthScene,
const Akonadi::Item &aitem,
const KCalCore::Incidence::Ptr &incidence,
const QDate &recurStartDate)
- : MonthItem(monthScene), mCalendar(calendar),
- mIncidence(incidence),
- mAkonadiItemId(aitem.id())
+ : MonthItem(monthScene)
+ , mCalendar(calendar)
+ , mIncidence(incidence)
+ , mAkonadiItemId(aitem.id())
{
mIsEvent = CalendarSupport::hasEvent(aitem);
mIsJournal = CalendarSupport::hasJournal(aitem);
mIsTodo = CalendarSupport::hasTodo(aitem);
KCalCore::Incidence::Ptr inc = mIncidence;
- if (inc->customProperty("KABC", "BIRTHDAY") == QLatin1String("YES") ||
- inc->customProperty("KABC", "ANNIVERSARY") == QLatin1String("YES")) {
+ if (inc->customProperty("KABC", "BIRTHDAY") == QLatin1String("YES")
+ || inc->customProperty("KABC", "ANNIVERSARY") == QLatin1String("YES")) {
const int years = EventViews::yearDiff(inc->dtStart().date(), \
recurStartDate); if (years > 0) {
inc = KCalCore::Incidence::Ptr(inc->clone());
@@ -327,8 +328,8 @@ IncidenceMonthItem::IncidenceMonthItem(MonthScene *monthScene,
// first set to 0, because it's used in startDate()
mRecurDayOffset = 0;
- if ((mIncidence->recurs() || mIncidence->recurrenceId().isValid()) &&
- startDate().isValid() && recurStartDate.isValid()) {
+ if ((mIncidence->recurs() || mIncidence->recurrenceId().isValid())
+ && startDate().isValid() && recurStartDate.isValid()) {
mRecurDayOffset = startDate().daysTo(recurStartDate);
}
}
@@ -339,7 +340,6 @@ IncidenceMonthItem::~IncidenceMonthItem()
bool IncidenceMonthItem::greaterThanFallback(const MonthItem *other) const
{
-
const IncidenceMonthItem *o = qobject_cast<const IncidenceMonthItem *>(other);
if (!o) {
return MonthItem::greaterThanFallback(other);
@@ -369,6 +369,7 @@ QDate IncidenceMonthItem::realStartDate() const
return start.addDays(mRecurDayOffset);
}
+
QDate IncidenceMonthItem::realEndDate() const
{
if (!mIncidence) {
@@ -380,6 +381,7 @@ QDate IncidenceMonthItem::realEndDate() const
return end.addDays(mRecurDayOffset);
}
+
bool IncidenceMonthItem::allDay() const
{
return mIncidence->allDay();
@@ -388,12 +390,14 @@ bool IncidenceMonthItem::allDay() const
bool IncidenceMonthItem::isMoveable() const
{
return monthScene()->mMonthView->calendar()->hasRight(akonadiItem(),
- Akonadi::Collection::CanChangeItem);
+ \
Akonadi::Collection::CanChangeItem); }
+
bool IncidenceMonthItem::isResizable() const
{
- return mIsEvent && monthScene()->mMonthView->calendar()->hasRight(akonadiItem(),
- Akonadi::Collection::CanChangeItem);
+ return mIsEvent && monthScene()->mMonthView->calendar()->hasRight(
+ akonadiItem(),
+ Akonadi::Collection::CanChangeItem);
}
void IncidenceMonthItem::finalizeMove(const QDate &newStartDate)
@@ -405,13 +409,13 @@ void IncidenceMonthItem::finalizeMove(const QDate \
&newStartDate) startDate().daysTo(newStartDate));
}
}
-void IncidenceMonthItem::finalizeResize(const QDate &newStartDate,
- const QDate &newEndDate)
+
+void IncidenceMonthItem::finalizeResize(const QDate &newStartDate, const QDate \
&newEndDate) {
Q_ASSERT(isResizable());
- if (startDate().isValid() && endDate().isValid() &&
- newStartDate.isValid() && newEndDate.isValid()) {
+ if (startDate().isValid() && endDate().isValid()
+ && newStartDate.isValid() && newEndDate.isValid()) {
updateDates(startDate().daysTo(newStartDate),
endDate().daysTo(newEndDate));
}
@@ -430,7 +434,8 @@ void IncidenceMonthItem::updateDates(int startOffset, int \
endOffset) if (mIncidence->recurs()) {
const int res = monthScene()->mMonthView->showMoveRecurDialog(mIncidence, \
startDate()); switch (res) {
- case KCalUtils::RecurrenceActions::AllOccurrences: {
+ case KCalUtils::RecurrenceActions::AllOccurrences:
+ {
// All occurrences
KCalCore::Incidence::Ptr oldIncidence(mIncidence->clone());
setNewDates(mIncidence, startOffset, endOffset);
@@ -438,12 +443,13 @@ void IncidenceMonthItem::updateDates(int startOffset, int \
endOffset) break;
}
case KCalUtils::RecurrenceActions::SelectedOccurrence: // Just this \
occurrence
- case KCalUtils::RecurrenceActions::FutureOccurrences: { // All future \
occurrences + case KCalUtils::RecurrenceActions::FutureOccurrences:
+ { // All future \
occurrences
const bool thisAndFuture = (res == \
KCalUtils::RecurrenceActions::FutureOccurrences); QDateTime \
occurrenceDate(mIncidence->dtStart()); occurrenceDate.setDate(startDate());
KCalCore::Incidence::Ptr \
newIncidence(KCalCore::Calendar::createException(
- mIncidence, occurrenceDate, thisAndFuture));
+ mIncidence, occurrenceDate, \
thisAndFuture)); if (newIncidence) {
changer->startAtomicOperation(i18n("Move occurrence(s)"));
setNewDates(newIncidence, startOffset, endOffset);
@@ -475,7 +481,8 @@ void IncidenceMonthItem::updateSelection(const Akonadi::Item \
&incidence, const Q QString IncidenceMonthItem::text(bool end) const
{
QString ret = mIncidence->summary();
- if (!allDay() && !mIsJournal && \
monthScene()->monthView()->preferences()->showTimeInMonthView()) { + if (!allDay() \
&& !mIsJournal + && \
monthScene()->monthView()->preferences()->showTimeInMonthView()) { // Prepend the \
time str to the text QString timeStr;
if (mIsTodo) {
@@ -486,14 +493,15 @@ QString IncidenceMonthItem::text(bool end) const
QTime time;
if (mIncidence->recurs()) {
const auto start = \
mIncidence->dtStart().addDays(mRecurDayOffset).addSecs(-1);
- time = \
mIncidence->recurrence()->getNextDateTime(start).toLocalTime().time(); + \
time = mIncidence->recurrence()->getNextDateTime(start).toLocalTime().time(); } else \
{ time = mIncidence->dtStart().toLocalTime().time();
}
timeStr = QLocale().toString(time, QLocale::ShortFormat);
} else {
KCalCore::Event::Ptr event = mIncidence.staticCast<Event>();
- timeStr = QLocale().toString(event->dtEnd().toLocalTime().time(), \
QLocale::ShortFormat); + timeStr = QLocale().toString(
+ event->dtEnd().toLocalTime().time(), QLocale::ShortFormat);
}
}
if (!timeStr.isEmpty()) {
@@ -511,8 +519,8 @@ QString IncidenceMonthItem::text(bool end) const
QString IncidenceMonthItem::toolTipText(const QDate &date) const
{
return KCalUtils::IncidenceFormatter::toolTipStr(
- CalendarSupport::displayName(mCalendar.data(), \
akonadiItem().parentCollection()),
- mIncidence, date, true);
+ CalendarSupport::displayName(mCalendar.data(), \
akonadiItem().parentCollection()), + mIncidence, date, true);
}
QVector<QPixmap> IncidenceMonthItem::icons() const
@@ -526,13 +534,14 @@ QVector<QPixmap> IncidenceMonthItem::icons() const
bool specialEvent = false;
Akonadi::Item item = akonadiItem();
- const QSet<EventView::ItemIcon> icons =
- monthScene()->monthView()->preferences()->monthViewIcons();
+ const QSet<EventView::ItemIcon> icons
+ = monthScene()->monthView()->preferences()->monthViewIcons();
QString customIconName;
if (icons.contains(EventViews::EventView::CalendarCustomIcon)) {
const QString iconName = monthScene()->monthView()->iconForItem(item);
- if (!iconName.isEmpty() && iconName != QLatin1String("view-calendar") && \
iconName != QLatin1String("office-calendar")) { + if (!iconName.isEmpty() && \
iconName != QLatin1String("view-calendar") + && iconName != \
QLatin1String("office-calendar")) { customIconName = iconName;
ret << QPixmap(cachedSmallIcon(iconName));
}
@@ -557,10 +566,9 @@ QVector<QPixmap> IncidenceMonthItem::icons() const
// from event's much easier.
// ret << monthScene()->eventPixmap();
-
- } else if ((mIsTodo || mIsJournal) && icons.contains(mIsTodo ?
- EventView::TaskIcon :
- EventView::JournalIcon)) {
+ } else if ((mIsTodo || mIsJournal) && icons.contains(mIsTodo
+ ? EventView::TaskIcon
+ : EventView::JournalIcon)) \
{
QDateTime occurrenceDateTime = \
mIncidence->dateTime(Incidence::RoleRecurrenceStart); \
occurrenceDateTime.setDate(realStartDate());
@@ -570,20 +578,20 @@ QVector<QPixmap> IncidenceMonthItem::icons() const
}
}
- if (icons.contains(EventView::ReadOnlyIcon) &&
- !monthScene()->mMonthView->calendar()->hasRight(item, \
Akonadi::Collection::CanChangeItem) &&
- !specialEvent) {
+ if (icons.contains(EventView::ReadOnlyIcon)
+ && !monthScene()->mMonthView->calendar()->hasRight(item, \
Akonadi::Collection::CanChangeItem) + && !specialEvent) {
ret << monthScene()->readonlyPixmap();
}
/* sorry, this looks too cluttered. disable until we can
make something prettier; no idea at this time -- allen */
- if (icons.contains(EventView::ReminderIcon) &&
- mIncidence->hasEnabledAlarms() && !specialEvent) {
+ if (icons.contains(EventView::ReminderIcon)
+ && mIncidence->hasEnabledAlarms() && !specialEvent) {
ret << monthScene()->alarmPixmap();
}
- if (icons.contains(EventView::RecurringIcon) &&
- mIncidence->recurs() && !specialEvent) {
+ if (icons.contains(EventView::RecurringIcon)
+ && mIncidence->recurs() && !specialEvent) {
ret << monthScene()->recurPixmap();
}
//TODO: check what to do with Reply
@@ -600,8 +608,8 @@ QColor IncidenceMonthItem::catColor() const
cat = categories.at(0);
}
- return cat.isEmpty() ? \
CalendarSupport::KCalPrefs::instance()->unsetCategoryColor() :
- CalendarSupport::KCalPrefs::instance()->categoryColor(cat);
+ return cat.isEmpty() ? \
CalendarSupport::KCalPrefs::instance()->unsetCategoryColor() + : \
CalendarSupport::KCalPrefs::instance()->categoryColor(cat); }
QColor IncidenceMonthItem::bgColor() const
@@ -613,20 +621,21 @@ QColor IncidenceMonthItem::bgColor() const
Todo::Ptr todo = CalendarSupport::todo(akonadiItem());
Q_ASSERT(todo);
if (todo) {
- const QDate dtRecurrence = // this is dtDue if there's no dtRecurrence
- todo->dtRecurrence().toLocalTime().date();
+ const QDate dtRecurrence // this is dtDue if there's no dtRecurrence
+ = todo->dtRecurrence().toLocalTime().date();
const QDate today = QDate::currentDate();
if (todo->isOverdue() && today > startDate() && startDate() >= \
dtRecurrence) { bgColor = prefs->todoOverdueColor();
- } else if (today == startDate() && !todo->isCompleted() && startDate() \
>= dtRecurrence) { + } else if (today == startDate() && \
> !todo->isCompleted()
+ && startDate() >= dtRecurrence) {
bgColor = prefs->todoDueTodayColor();
}
}
}
if (!bgColor.isValid()) {
- if (prefs->monthViewColors() == PrefsBase::MonthItemResourceOnly ||
- prefs->monthViewColors() == \
PrefsBase::MonthItemResourceInsideCategoryOutside) { + if \
(prefs->monthViewColors() == PrefsBase::MonthItemResourceOnly + || \
prefs->monthViewColors() == PrefsBase::MonthItemResourceInsideCategoryOutside) { \
bgColor = EventViews::resourceColor(akonadiItem(), prefs); } else {
bgColor = catColor();
@@ -645,10 +654,10 @@ QColor IncidenceMonthItem::frameColor() const
QColor frameColor;
PrefsPtr prefs = monthScene()->monthView()->preferences();
- if (prefs->monthViewColors() == PrefsBase::MonthItemResourceOnly ||
- prefs->monthViewColors() == \
PrefsBase::MonthItemCategoryInsideResourceOutside ||
- (mIncidence->categories().isEmpty() && prefs->monthViewColors() ==
- PrefsBase::MonthItemResourceInsideCategoryOutside)) {
+ if (prefs->monthViewColors() == PrefsBase::MonthItemResourceOnly
+ || prefs->monthViewColors() == \
PrefsBase::MonthItemCategoryInsideResourceOutside + || \
(mIncidence->categories().isEmpty() && prefs->monthViewColors() + == \
PrefsBase::MonthItemResourceInsideCategoryOutside)) { Q_ASSERT(mIncidence);
frameColor = EventViews::resourceColor(akonadiItem(), prefs);
} else {
@@ -677,18 +686,17 @@ Akonadi::Item::Id IncidenceMonthItem::akonadiItemId() const
return mAkonadiItemId;
}
-void IncidenceMonthItem::setNewDates(const KCalCore::Incidence::Ptr &incidence,
- int startOffset, int endOffset)
+void IncidenceMonthItem::setNewDates(const KCalCore::Incidence::Ptr &incidence, int \
startOffset, + int endOffset)
{
if (mIsTodo) {
-
// For to-dos endOffset is ignored because it will always be == to \
startOffset because we only
// support moving to-dos, not resizing them. There are no multi-day to-dos.
// Lets just call it offset to reduce confusion.
const int offset = startOffset;
KCalCore::Todo::Ptr todo = incidence.staticCast<Todo>();
- QDateTime due = todo->dtDue();
+ QDateTime due = todo->dtDue();
QDateTime start = todo->dtStart();
if (due.isValid()) { // Due has priority over start.
// We will only move the due date, unlike events where we move both.
@@ -705,7 +713,8 @@ void IncidenceMonthItem::setNewDates(const \
KCalCore::Incidence::Ptr &incidence, todo->setDtStart(start);
} else {
// This never happens
- qCWarning(CALENDARVIEW_LOG) << "Move what? uid:" << todo->uid() << "; \
summary=" << todo->summary(); + qCWarning(CALENDARVIEW_LOG) << "Move what? \
uid:" << todo->uid() << "; summary=" + << \
todo->summary(); }
} else {
incidence->setDtStart(incidence->dtStart().addDays(startOffset));
@@ -718,9 +727,10 @@ void IncidenceMonthItem::setNewDates(const \
KCalCore::Incidence::Ptr &incidence,
//-----------------------------------------------------------------
// HOLIDAYMONTHITEM
-HolidayMonthItem::HolidayMonthItem(MonthScene *monthScene, const QDate &date,
- const QString &name)
- : MonthItem(monthScene), mDate(date), mName(name)
+HolidayMonthItem::HolidayMonthItem(MonthScene *monthScene, const QDate &date, const \
QString &name) + : MonthItem(monthScene)
+ , mDate(date)
+ , mName(name)
{
}
@@ -744,8 +754,8 @@ void HolidayMonthItem::finalizeMove(const QDate &newStartDate)
Q_UNUSED(newStartDate);
Q_ASSERT(false);
}
-void HolidayMonthItem::finalizeResize(const QDate &newStartDate,
- const QDate &newEndDate)
+
+void HolidayMonthItem::finalizeResize(const QDate &newStartDate, const QDate \
&newEndDate) {
Q_UNUSED(newStartDate);
Q_UNUSED(newEndDate);
@@ -772,4 +782,3 @@ QColor HolidayMonthItem::frameColor() const
{
return Qt::black;
}
-
diff --git a/src/month/monthitem.h b/src/month/monthitem.h
index f670652..d676626 100644
--- a/src/month/monthitem.h
+++ b/src/month/monthitem.h
@@ -32,9 +32,7 @@
#include <QDate>
#include <QObject>
-namespace EventViews
-{
-
+namespace EventViews {
class MonthGraphicsItem;
class MonthScene;
@@ -262,8 +260,7 @@ protected:
/**
Called after a resize operation.
*/
- virtual void finalizeResize(const QDate &newStartDate,
- const QDate &newEndDate) = 0;
+ virtual void finalizeResize(const QDate &newStartDate, const QDate &newEndDate) \
= 0;
private:
/**
@@ -289,10 +286,8 @@ class EVENTVIEWS_EXPORT IncidenceMonthItem : public MonthItem
Q_OBJECT
public:
- IncidenceMonthItem(MonthScene *monthScene,
- const Akonadi::ETMCalendar::Ptr &calendar,
- const Akonadi::Item &item,
- const KCalCore::Incidence::Ptr &incidence,
+ IncidenceMonthItem(MonthScene *monthScene, const Akonadi::ETMCalendar::Ptr \
&calendar, + const Akonadi::Item &item, const \
KCalCore::Incidence::Ptr &incidence, const QDate &recurStartDate = QDate());
virtual ~IncidenceMonthItem();
@@ -320,8 +315,7 @@ public:
protected:
void finalizeMove(const QDate &newStartDate) override;
- virtual void finalizeResize(const QDate &newStartDate,
- const QDate &newEndDate) override;
+ virtual void finalizeResize(const QDate &newStartDate, const QDate &newEndDate) \
override;
protected Q_SLOTS:
/**
@@ -334,8 +328,7 @@ protected Q_SLOTS:
private:
void updateDates(int startOffset, int endOffset);
- void setNewDates(const KCalCore::Incidence::Ptr &incidence,
- int startOffset, int endOffset);
+ void setNewDates(const KCalCore::Incidence::Ptr &incidence, int startOffset, int \
endOffset);
/**
Returns the category color for this incidence.
@@ -363,10 +356,12 @@ public:
{
return mDate;
}
+
QDate realEndDate() const override
{
return mDate;
}
+
bool allDay() const override
{
return true;
@@ -376,6 +371,7 @@ public:
{
return false;
}
+
bool isResizable() const override
{
return false;
@@ -386,6 +382,7 @@ public:
Q_UNUSED(end);
return mName;
}
+
QString toolTipText(const QDate &) const override
{
return mName;
@@ -398,14 +395,12 @@ public:
protected:
void finalizeMove(const QDate &newStartDate) override;
- virtual void finalizeResize(const QDate &newStartDate,
- const QDate &newEndDate) override;
+ virtual void finalizeResize(const QDate &newStartDate, const QDate &newEndDate) \
override;
private:
QDate mDate;
QString mName;
};
-
}
#endif
diff --git a/src/month/monthscene.cpp b/src/month/monthscene.cpp
index 295ba9b..fb59484 100644
--- a/src/month/monthscene.cpp
+++ b/src/month/monthscene.cpp
@@ -26,7 +26,6 @@
#include "monthview.h"
#include "prefs.h"
-
#include <CalendarSupport/Utils>
#include <QGraphicsSceneMouseEvent>
@@ -40,26 +39,27 @@ static const int AUTO_REPEAT_DELAY = 600;
using namespace EventViews;
MonthScene::MonthScene(MonthView *parent)
- : QGraphicsScene(parent),
- mMonthView(parent),
- mInitialized(false),
- mClickedItem(nullptr),
- mActionItem(nullptr),
- mActionInitiated(false),
- mSelectedItem(nullptr),
- mStartCell(nullptr),
- mPreviousCell(nullptr),
- mActionType(None),
- mStartHeight(0),
- mCurrentIndicator(nullptr)
-{
- mBirthdayPixmap = \
QIcon::fromTheme(QStringLiteral("view-calendar-birthday")).pixmap(16, \
16);
- mAnniversaryPixmap = \
QIcon::fromTheme(QStringLiteral("view-calendar-wedding-anniversary")).pixmap(16, \
16);
- mAlarmPixmap = \
QIcon::fromTheme(QStringLiteral("appointment-reminder")).pixmap(16, \
16);
- mRecurPixmap = \
QIcon::fromTheme(QStringLiteral("appointment-recurring")).pixmap(16, \
16);
- mReadonlyPixmap = QIcon::fromTheme(QStringLiteral("object-locked")).pixmap(16, \
16);
- mReplyPixmap = \
QIcon::fromTheme(QStringLiteral("mail-reply-sender")).pixmap(16, 16);
- mHolidayPixmap = \
QIcon::fromTheme(QStringLiteral("view-calendar-holiday")).pixmap(16, 16); + : \
QGraphicsScene(parent) + , mMonthView(parent)
+ , mInitialized(false)
+ , mClickedItem(nullptr)
+ , mActionItem(nullptr)
+ , mActionInitiated(false)
+ , mSelectedItem(nullptr)
+ , mStartCell(nullptr)
+ , mPreviousCell(nullptr)
+ , mActionType(None)
+ , mStartHeight(0)
+ , mCurrentIndicator(nullptr)
+{
+ mBirthdayPixmap = \
QIcon::fromTheme(QStringLiteral("view-calendar-birthday")).pixmap(16, 16); + \
mAnniversaryPixmap + = \
QIcon::fromTheme(QStringLiteral("view-calendar-wedding-anniversary")).pixmap(16, 16); \
+ mAlarmPixmap = QIcon::fromTheme(QStringLiteral("appointment-reminder")).pixmap(16, \
16); + mRecurPixmap = \
QIcon::fromTheme(QStringLiteral("appointment-recurring")).pixmap(16, 16); + \
mReadonlyPixmap = QIcon::fromTheme(QStringLiteral("object-locked")).pixmap(16, 16); + \
mReplyPixmap = QIcon::fromTheme(QStringLiteral("mail-reply-sender")).pixmap(16, 16); \
+ mHolidayPixmap = \
QIcon::fromTheme(QStringLiteral("view-calendar-holiday")).pixmap(16, 16);
setSceneRect(0, 0, parent->width(), parent->height());
}
@@ -194,7 +194,7 @@ void MonthGraphicsView::drawBackground(QPainter *p, const QRectF \
&rect) font.setPointSize(15);
p->setFont(font);
const int dayLabelsHeight = 20;
- p->drawText(QRect(0, 0, // top right
+ p->drawText(QRect(0, 0, // top right
static_cast<int>(mScene->sceneRect().width()),
static_cast<int>(mScene->headerHeight() - dayLabelsHeight)),
Qt::AlignCenter,
@@ -209,7 +209,7 @@ void MonthGraphicsView::drawBackground(QPainter *p, const QRectF \
&rect) const QDate end = mMonthView->actualEndDateTime().date();
for (QDate d = start;
- d <= start.addDays(6); d = d.addDays(1)) {
+ d <= start.addDays(6); d = d.addDays(1)) {
MonthCell *cell = mScene->mMonthCellMap.value(d);
if (!cell) {
@@ -232,8 +232,9 @@ void MonthGraphicsView::drawBackground(QPainter *p, const QRectF \
&rect) int columnWidth = mScene->columnWidth();
int rowHeight = mScene->rowHeight();
- const QList<QDate> workDays = \
CalendarSupport::workDays(mMonthView->actualStartDateTime().date(),
- mMonthView->actualEndDateTime().date());
+ const QList<QDate> workDays = CalendarSupport::workDays(
+ mMonthView->actualStartDateTime().date(),
+ mMonthView->actualEndDateTime().date());
for (QDate d = start; d <= end; d = d.addDays(1)) {
if (!mScene->mMonthCellMap.contains(d)) {
@@ -294,11 +295,11 @@ void MonthGraphicsView::drawBackground(QPainter *p, const \
QRectF &rect)
p->setFont(font);
- QPen oldPen = mMonthView->preferences()->monthGridBackgroundColor().darker(150);
+ QPen oldPen = mMonthView->preferences()->monthGridBackgroundColor().darker(150);
// Draw dates
for (QDate d = mMonthView->actualStartDateTime().date();
- d <= mMonthView->actualEndDateTime().date(); d = d.addDays(1)) {
+ d <= mMonthView->actualEndDateTime().date(); d = d.addDays(1)) {
MonthCell *cell = mScene->mMonthCellMap.value(d);
QFont font = p->font();
@@ -333,8 +334,8 @@ void MonthGraphicsView::drawBackground(QPainter *p, const QRectF \
&rect) if (!mScene->lastItemFit(cell)) {
cell->downArrow()->setPos(
mScene->cellHorizontalPos(cell) + columnWidth / 2,
- mScene->cellVerticalPos(cell) + rowHeight -
- cell->downArrow()->boundingRect().height() / 2 - 2);
+ mScene->cellVerticalPos(cell) + rowHeight
+ -cell->downArrow()->boundingRect().height() / 2 - 2);
cell->downArrow()->show();
} else {
cell->downArrow()->hide();
@@ -342,8 +343,8 @@ void MonthGraphicsView::drawBackground(QPainter *p, const QRectF \
&rect)
QString dayText;
// Prepend month name if d is the first or last day of month
- if (d.day() == 1 || // d is the first day of month
- d.addDays(1).day() == 1) { // d is the last day of month
+ if (d.day() == 1 // d is the first day of month
+ || d.addDays(1).day() == 1) { // d is the last day of month
dayText = i18nc("'Month day' for month view cells", "%1 %2",
QLocale::system().monthName(d.month(), \
QLocale::ShortFormat), d.day());
@@ -398,7 +399,7 @@ int MonthScene::totalHeight()
{
int max = 0;
for (QDate d = mMonthView->actualStartDateTime().date();
- d <= mMonthView->actualEndDateTime().date(); d = d.addDays(1)) {
+ d <= mMonthView->actualEndDateTime().date(); d = d.addDays(1)) {
int c = mMonthCellMap[ d ]->firstFreeSpace();
if (c > max) {
max = c;
@@ -518,12 +519,12 @@ void MonthScene::mouseMoveEvent(QGraphicsSceneMouseEvent \
*mouseEvent) if (mActionType == None) {
MonthGraphicsItem *iItem = dynamic_cast<MonthGraphicsItem *>(itemAt(pos, \
{})); if (iItem) {
- if (iItem->monthItem()->isResizable() &&
- iItem->isBeginItem() && iItem->mapFromScene(pos).x() <= 10) {
+ if (iItem->monthItem()->isResizable()
+ && iItem->isBeginItem() && iItem->mapFromScene(pos).x() <= 10) {
view->setActionCursor(Resize);
- } else if (iItem->monthItem()->isResizable() &&
- iItem->isEndItem() &&
- iItem->mapFromScene(pos).x() >= iItem->boundingRect().width() \
- 10) { + } else if (iItem->monthItem()->isResizable()
+ && iItem->isEndItem()
+ && iItem->mapFromScene(pos).x() >= \
iItem->boundingRect().width() - 10) { view->setActionCursor(Resize);
} else {
view->setActionCursor(None);
@@ -552,7 +553,6 @@ void MonthScene::mouseMoveEvent(QGraphicsSceneMouseEvent \
*mouseEvent)
// Move or resize action
if (currentCell && currentCell != mPreviousCell) {
-
bool ok = true;
if (mActionType == Move) {
mActionItem->moveBy(mPreviousCell->date().daysTo(currentCell->date()));
@@ -597,13 +597,13 @@ void MonthScene::mousePressEvent(QGraphicsSceneMouseEvent \
*mouseEvent) mActionInitiated = false;
// Move or resize ?
- if (iItem->monthItem()->isResizable() &&
- iItem->isBeginItem() && iItem->mapFromScene(pos).x() <= 10) {
+ if (iItem->monthItem()->isResizable()
+ && iItem->isBeginItem() && iItem->mapFromScene(pos).x() <= 10) {
mActionType = Resize;
mResizeType = ResizeLeft;
- } else if (iItem->monthItem()->isResizable() &&
- iItem->isEndItem() &&
- iItem->mapFromScene(pos).x() >= iItem->boundingRect().width() \
- 10) { + } else if (iItem->monthItem()->isResizable()
+ && iItem->isEndItem()
+ && iItem->mapFromScene(pos).x() >= \
iItem->boundingRect().width() - 10) { mActionType = Resize;
mResizeType = ResizeRight;
} else if (iItem->monthItem()->isMoveable()) {
@@ -765,7 +765,8 @@ void MonthScene::removeIncidence(const QString &uid)
//----------------------------------------------------------
MonthGraphicsView::MonthGraphicsView(MonthView *parent)
- : QGraphicsView(parent), mMonthView(parent)
+ : QGraphicsView(parent)
+ , mMonthView(parent)
{
setMouseTracking(true);
}
@@ -801,4 +802,3 @@ void MonthGraphicsView::resizeEvent(QResizeEvent *event)
mScene->setSceneRect(0, 0, event->size().width(), event->size().height());
mScene->updateGeometry();
}
-
diff --git a/src/month/monthscene.h b/src/month/monthscene.h
index d69f600..9aefb76 100644
--- a/src/month/monthscene.h
+++ b/src/month/monthscene.h
@@ -32,14 +32,11 @@
#include <QGraphicsView>
#include <QMap>
-namespace Akonadi
-{
+namespace Akonadi {
class IncidenceChanger;
}
-namespace EventViews
-{
-
+namespace EventViews {
class MonthCell;
class MonthItem;
class MonthView;
@@ -78,16 +75,19 @@ public:
{
return mMonthView;
}
+
QMap<QDate, MonthCell *> mMonthCellMap;
bool initialized()
{
return mInitialized;
}
+
void setInitialized(bool i)
{
mInitialized = i;
}
+
void resetAll();
Akonadi::IncidenceChanger *incidenceChanger() const;
@@ -175,26 +175,32 @@ public:
{
return mBirthdayPixmap;
}
+
QPixmap anniversaryPixmap() const
{
return mAnniversaryPixmap;
}
+
QPixmap alarmPixmap() const
{
return mAlarmPixmap;
}
+
QPixmap recurPixmap() const
{
return mRecurPixmap;
}
+
QPixmap readonlyPixmap() const
{
return mReadonlyPixmap;
}
+
QPixmap replyPixmap() const
{
- return mReplyPixmap;
+ return mReplyPixmap;
}
+
QPixmap holidayPixmap() const
{
return mHolidayPixmap;
@@ -345,7 +351,6 @@ private:
MonthScene *mScene = nullptr;
MonthView *mMonthView = nullptr;
};
-
}
#endif
diff --git a/src/month/monthview.cpp b/src/month/monthview.cpp
index 70dc391..86e2e1e 100644
--- a/src/month/monthview.cpp
+++ b/src/month/monthview.cpp
@@ -47,9 +47,7 @@
using namespace EventViews;
-namespace EventViews
-{
-
+namespace EventViews {
class MonthViewPrivate : public Akonadi::ETMCalendar::CalendarObserver
{
MonthView *q;
@@ -63,12 +61,12 @@ public: /// Methods
void triggerDelayedReload(EventView::Change reason);
public: /// Members
- QTimer reloadTimer;
- MonthScene *scene = nullptr;
- QDate selectedItemDate;
- Akonadi::Item::Id selectedItemId;
- MonthGraphicsView *view = nullptr;
- QToolButton *fullView = nullptr;
+ QTimer reloadTimer;
+ MonthScene *scene = nullptr;
+ QDate selectedItemDate;
+ Akonadi::Item::Id selectedItemId;
+ MonthGraphicsView *view = nullptr;
+ QToolButton *fullView = nullptr;
// List of uids for QDate
QMap<QDate, QStringList > mBusyDays;
@@ -77,20 +75,20 @@ protected:
/* reimplemented from KCalCore::Calendar::CalendarObserver */
void calendarIncidenceAdded(const KCalCore::Incidence::Ptr &incidence) override;
void calendarIncidenceChanged(const KCalCore::Incidence::Ptr &incidence) \
override;
- void calendarIncidenceDeleted(const KCalCore::Incidence::Ptr &incidence, const \
KCalCore::Calendar *calendar) override; + void calendarIncidenceDeleted(const \
KCalCore::Incidence::Ptr &incidence, + const \
KCalCore::Calendar *calendar) override; private:
//quiet --overloaded-virtual warning
using KCalCore::Calendar::CalendarObserver::calendarIncidenceDeleted;
};
-
}
MonthViewPrivate::MonthViewPrivate(MonthView *qq)
- : q(qq),
- scene(new MonthScene(qq)),
- selectedItemId(-1),
- view(new MonthGraphicsView(qq)),
- fullView(nullptr)
+ : q(qq)
+ , scene(new MonthScene(qq))
+ , selectedItemId(-1)
+ , view(new MonthGraphicsView(qq))
+ , fullView(nullptr)
{
reloadTimer.setSingleShot(true);
view->setScene(scene);
@@ -150,7 +148,8 @@ void MonthViewPrivate::calendarIncidenceChanged(const \
KCalCore::Incidence::Ptr & triggerDelayedReload(MonthView::IncidencesEdited);
}
-void MonthViewPrivate::calendarIncidenceDeleted(const KCalCore::Incidence::Ptr \
&incidence, const KCalCore::Calendar *calendar) +void \
MonthViewPrivate::calendarIncidenceDeleted(const KCalCore::Incidence::Ptr &incidence, \
+ const KCalCore::Calendar *calendar) \
{ Q_UNUSED(calendar);
Q_ASSERT(!incidence->uid().isEmpty());
@@ -160,7 +159,8 @@ void MonthViewPrivate::calendarIncidenceDeleted(const \
KCalCore::Incidence::Ptr & /// MonthView
MonthView::MonthView(NavButtonsVisibility visibility, QWidget *parent)
- : EventView(parent), d(new MonthViewPrivate(this))
+ : EventView(parent)
+ , d(new MonthViewPrivate(this))
{
QHBoxLayout *topLayout = new QHBoxLayout(this);
topLayout->addWidget(d->view);
@@ -179,11 +179,11 @@ MonthView::MonthView(NavButtonsVisibility visibility, QWidget \
*parent) d->fullView->setAutoRaise(true);
d->fullView->setCheckable(true);
d->fullView->setChecked(preferences()->fullViewMonth());
- d->fullView->isChecked() ?
- d->fullView->setToolTip(i18nc("@info:tooltip",
- "Display calendar in a normal size")) :
- d->fullView->setToolTip(i18nc("@info:tooltip",
- "Display calendar in a full window"));
+ d->fullView->isChecked()
+ ? d->fullView->setToolTip(i18nc("@info:tooltip",
+ "Display calendar in a normal size"))
+ : d->fullView->setToolTip(i18nc("@info:tooltip",
+ "Display calendar in a full window"));
d->fullView->setWhatsThis(
i18nc("@info:whatsthis",
"Click this button and the month view will be enlarged to fill the \
" @@ -374,6 +374,7 @@ void MonthView::wheelEvent(QWheelEvent *event)
// call accept in every case, we do not want anybody else to react
event->accept();
}
+
#endif
void MonthView::keyPressEvent(QKeyEvent *event)
@@ -447,9 +448,8 @@ void MonthView::showDates(const QDate &start, const QDate &end, \
const QDate &pre d->triggerDelayedReload(DatesChanged);
}
-QPair<QDateTime, QDateTime> MonthView::actualDateRange(const QDateTime &start,
- const QDateTime &,
- const QDate &preferredMonth) const
+QPair<QDateTime, QDateTime> MonthView::actualDateRange(const QDateTime &start, const \
QDateTime &, + const QDate \
&preferredMonth) const {
QDateTime dayOne = preferredMonth.isValid() ? QDateTime(preferredMonth) : start;
dayOne.setDate(QDate(dayOne.date().year(), dayOne.date().month(), 1));
@@ -499,9 +499,9 @@ void MonthView::reloadIncidences()
// build monthcells hash
int i = 0;
for (QDate date = actualStartDateTime().date();
- date <= actualEndDateTime().date(); date = date.addDays(1)) {
+ date <= actualEndDateTime().date(); date = date.addDays(1)) {
d->scene->mMonthCellMap[ date ] = new MonthCell(i, date, d->scene);
- i ++;
+ i++;
}
// build global event list
@@ -512,12 +512,12 @@ void MonthView::reloadIncidences()
occurIter.next();
// Remove the two checks when filtering is done through a proxyModel, when \
using calendar search
- if (!preferences()->showTodosMonthView() &&
- occurIter.incidence()->type() == KCalCore::Incidence::TypeTodo) {
+ if (!preferences()->showTodosMonthView()
+ && occurIter.incidence()->type() == KCalCore::Incidence::TypeTodo) {
continue;
}
- if (!preferences()->showJournalsMonthView() &&
- occurIter.incidence()->type() == KCalCore::Incidence::TypeJournal) {
+ if (!preferences()->showJournalsMonthView()
+ && occurIter.incidence()->type() == KCalCore::Incidence::TypeJournal) {
continue;
}
@@ -534,13 +534,13 @@ void MonthView::reloadIncidences()
Q_ASSERT(item.isValid());
Q_ASSERT(item.hasPayload());
MonthItem *manager = new IncidenceMonthItem(d->scene,
- calendar(),
- item,
- occurIter.incidence(),
- occurIter.occurrenceStartDate().toLocalTime().date());
+ calendar(),
+ item,
+ occurIter.incidence(),
+ \
occurIter.occurrenceStartDate().toLocalTime().date()); d->scene->mManagerList << \
manager;
- if (d->selectedItemId == item.id() &&
- manager->realStartDate() == d->selectedItemDate) {
+ if (d->selectedItemId == item.id()
+ && manager->realStartDate() == d->selectedItemDate) {
// only select it outside the loop because we are still creating items
itemToReselect = manager;
}
@@ -552,16 +552,16 @@ void MonthView::reloadIncidences()
// add holidays
const QList<QDate> workDays = \
CalendarSupport::workDays(actualStartDateTime().date(),
- actualEndDateTime().date());
+ \
actualEndDateTime().date());
for (QDate date = actualStartDateTime().date();
- date <= actualEndDateTime().date(); date = date.addDays(1)) {
+ date <= actualEndDateTime().date(); date = date.addDays(1)) {
// Only call CalendarSupport::holiday() if it's not a workDay, saves come \
cpu cicles. if (!workDays.contains(date)) {
QStringList holidays(CalendarSupport::holiday(date));
if (!holidays.isEmpty()) {
- MonthItem *holidayItem =
- new HolidayMonthItem(
+ MonthItem *holidayItem
+ = new HolidayMonthItem(
d->scene, date,
holidays.join(i18nc("@item:intext delimiter for joining holiday \
names", ","))); d->scene->mManagerList << holidayItem;
@@ -571,13 +571,13 @@ void MonthView::reloadIncidences()
// sort it
std::sort(d->scene->mManagerList.begin(),
- d->scene->mManagerList.end(),
- MonthItem::greaterThan);
+ d->scene->mManagerList.end(),
+ MonthItem::greaterThan);
// build each month's cell event list
foreach (MonthItem *manager, d->scene->mManagerList) {
for (QDate date = manager->startDate();
- date <= manager->endDate(); date = date.addDays(1)) {
+ date <= manager->endDate(); date = date.addDays(1)) {
MonthCell *cell = d->scene->mMonthCellMap.value(date);
if (cell) {
cell->mMonthItemList << manager;
@@ -608,7 +608,7 @@ void MonthView::calendarReset()
QDate MonthView::averageDate() const
{
return actualStartDateTime().date().addDays(
- actualStartDateTime().date().daysTo(actualEndDateTime().date()) / 2);
+ actualStartDateTime().date().daysTo(actualEndDateTime().date()) / 2);
}
int MonthView::currentMonth() const
diff --git a/src/month/monthview.h b/src/month/monthview.h
index c2a7470..3172482 100644
--- a/src/month/monthview.h
+++ b/src/month/monthview.h
@@ -29,9 +29,7 @@
class QModelIndex;
-namespace EventViews
-{
-
+namespace EventViews {
class MonthViewPrivate;
/**
@@ -115,7 +113,8 @@ protected:
void keyReleaseEvent(QKeyEvent *event) override;
QPair<QDateTime, QDateTime> actualDateRange(
- const QDateTime &start, const QDateTime &end, const QDate &preferredMonth = \
QDate()) const override; + const QDateTime &start, const QDateTime &end,
+ const QDate &preferredMonth = QDate()) const override;
// Compute and update the whole view
void reloadIncidences();
@@ -124,14 +123,14 @@ protected:
/**
* @deprecated
*/
- void showDates(const QDate &start, const QDate &end, const QDate &preferedMonth \
= QDate()) override; + void showDates(const QDate &start, const QDate &end,
+ const QDate &preferedMonth = QDate()) override;
private:
MonthViewPrivate *const d;
friend class MonthViewPrivate;
friend class MonthScene;
};
-
}
#endif
diff --git a/src/multiagenda/configdialoginterface.h \
b/src/multiagenda/configdialoginterface.h index e722686..da9ce4e 100644
--- a/src/multiagenda/configdialoginterface.h
+++ b/src/multiagenda/configdialoginterface.h
@@ -22,13 +22,13 @@
class KCheckableProxyModel;
-namespace EventViews
-{
-
+namespace EventViews {
class ConfigDialogInterface
{
public:
- virtual ~ConfigDialogInterface() { };
+ virtual ~ConfigDialogInterface()
+ {
+ }
virtual int numberOfColumns() const = 0;
virtual bool useCustomColumns() const = 0;
@@ -36,7 +36,6 @@ public:
virtual KCheckableProxyModel *takeSelectionModel(int column) = 0;
};
-
}
#endif
diff --git a/src/multiagenda/multiagendaview.cpp \
b/src/multiagenda/multiagendaview.cpp index 23589ab..9d9faa2 100644
--- a/src/multiagenda/multiagendaview.cpp
+++ b/src/multiagenda/multiagendaview.cpp
@@ -97,10 +97,12 @@ static QString generateColumnLabel(int c)
class Q_DECL_HIDDEN MultiAgendaView::Private
{
private:
- class ElidedLabel: public QFrame
+ class ElidedLabel : public QFrame
{
public:
- ElidedLabel(const QString &text): mText(text) {}
+ ElidedLabel(const QString &text) : mText(text)
+ {
+ }
QSize minimumSizeHint() const override;
@@ -112,12 +114,12 @@ private:
};
public:
- Private(MultiAgendaView *qq) :
- q(qq),
- mUpdateOnShow(true),
- mPendingChanges(true),
- mCustomColumnSetupUsed(false),
- mCustomNumberOfColumns(2)
+ Private(MultiAgendaView *qq)
+ : q(qq)
+ , mUpdateOnShow(true)
+ , mPendingChanges(true)
+ , mCustomColumnSetupUsed(false)
+ , mCustomNumberOfColumns(2)
{
}
@@ -153,12 +155,12 @@ public:
int mCustomNumberOfColumns;
QLabel *mLabel = nullptr;
QWidget *mRightDummyWidget = nullptr;
- QHash<QString, KViewStateMaintainer<ETMViewStateSaver>* > mSelectionSavers;
+ QHash<QString, KViewStateMaintainer<ETMViewStateSaver> * > mSelectionSavers;
};
MultiAgendaView::MultiAgendaView(QWidget *parent)
- : EventView(parent), d(new Private(this))
-
+ : EventView(parent)
+ , d(new Private(this))
{
QHBoxLayout *topLevelLayout = new QHBoxLayout(this);
topLevelLayout->setSpacing(0);
@@ -248,7 +250,8 @@ void MultiAgendaView::setCalendar(const Akonadi::ETMCalendar::Ptr \
&calendar) proxy->setSourceModel(calendar->entityTreeModel());
}
- disconnect(nullptr, \
SIGNAL(selectionChanged(Akonadi::Collection::List,Akonadi::Collection::List)), + \
disconnect(nullptr, SIGNAL(selectionChanged(Akonadi::Collection::List, + \
Akonadi::Collection::List)), this, SLOT(forceRecreateViews()));
connect(collectionSelection(), \
&CalendarSupport::CollectionSelection::selectionChanged, @@ -459,8 +462,7 @@ void \
MultiAgendaView::slotSelectionChanged() }
}
-bool MultiAgendaView::eventDurationHint(QDateTime &startDt, QDateTime &endDt,
- bool &allDay) const
+bool MultiAgendaView::eventDurationHint(QDateTime &startDt, QDateTime &endDt, bool \
&allDay) const {
foreach (AgendaView *agenda, d->mAgendaViews) {
bool valid = agenda->eventDurationHint(startDt, endDt, allDay);
@@ -544,8 +546,8 @@ void MultiAgendaView::resizeEvent(QResizeEvent *ev)
void MultiAgendaView::Private::resizeScrollView(const QSize &size)
{
- const int widgetWidth = size.width() - mTimeLabelsZone->width() -
- mScrollBar->width();
+ const int widgetWidth = size.width() - mTimeLabelsZone->width()
+ -mScrollBar->width();
int height = size.height();
if (mScrollArea->horizontalScrollBar()->isVisible()) {
@@ -675,7 +677,6 @@ void MultiAgendaView::collectionSelectionChanged()
bool MultiAgendaView::hasConfigurationDialog() const
{
-
/** The wrapper in korg has the dialog. Too complicated to move to \
CalendarViews.
Depends on korg/AkonadiCollectionView, and will be refactored some day
to get rid of CollectionSelectionProxyModel/EntityStateSaver */
@@ -692,7 +693,7 @@ void MultiAgendaView::doRestoreConfig(const KConfigGroup \
&configGroup)
d->mCustomColumnSetupUsed = configGroup.readEntry("UseCustomColumnSetup", \
false);
d->mCustomNumberOfColumns = configGroup.readEntry("CustomNumberOfColumns", 2);
- d->mCustomColumnTitles = configGroup.readEntry("ColumnTitles", QStringList());
+ d->mCustomColumnTitles = configGroup.readEntry("ColumnTitles", QStringList());
if (d->mCustomColumnTitles.size() != d->mCustomNumberOfColumns) {
const int orig = d->mCustomColumnTitles.size();
d->mCustomColumnTitles.reserve(d->mCustomNumberOfColumns);
@@ -715,7 +716,8 @@ void MultiAgendaView::doRestoreConfig(const KConfigGroup \
&configGroup)
// Only show the first column
KRearrangeColumnsProxyModel *columnFilterProxy = new \
KRearrangeColumnsProxyModel(this);
- columnFilterProxy->setSourceColumns(QVector<int>() << \
Akonadi::ETMCalendar::CollectionTitle); + \
columnFilterProxy->setSourceColumns( + QVector<int>() << \
Akonadi::ETMCalendar::CollectionTitle); \
columnFilterProxy->setSourceModel(sortProxy);
// Keep track of selection.
@@ -725,11 +727,13 @@ void MultiAgendaView::doRestoreConfig(const KConfigGroup \
&configGroup)
KCheckableProxyModel *checkableProxy = new KCheckableProxyModel(this);
checkableProxy->setSourceModel(columnFilterProxy);
checkableProxy->setSelectionModel(qsm);
- const QString groupName = configGroup.name() + \
QLatin1String("_subView_") + QString::number(i); + const QString groupName \
= configGroup.name() + QLatin1String("_subView_") + \
+ QString::number(i);
const KConfigGroup group = configGroup.config()->group(groupName);
if (!d->mSelectionSavers.contains(groupName)) {
- d->mSelectionSavers.insert(groupName, new \
KViewStateMaintainer<ETMViewStateSaver>(group)); + \
d->mSelectionSavers.insert(groupName, + new \
KViewStateMaintainer<ETMViewStateSaver>(group));
d->mSelectionSavers[groupName]->setSelectionModel(checkableProxy->selectionModel());
}
@@ -750,13 +754,15 @@ void MultiAgendaView::doSaveConfig(KConfigGroup &configGroup)
configGroup.writeEntry("ColumnTitles", d->mCustomColumnTitles);
int idx = 0;
foreach (KCheckableProxyModel *checkableProxyModel, \
d->mCollectionSelectionModels) {
- const QString groupName = configGroup.name() + QLatin1String("_subView_") + \
QString::number(idx); + const QString groupName = configGroup.name() + \
QLatin1String("_subView_") + QString::number( + idx);
KConfigGroup group = configGroup.config()->group(groupName);
++idx;
//TODO never used ?
KViewStateMaintainer<ETMViewStateSaver> saver(group);
if (!d->mSelectionSavers.contains(groupName)) {
- d->mSelectionSavers.insert(groupName, new \
KViewStateMaintainer<ETMViewStateSaver>(group)); + \
d->mSelectionSavers.insert(groupName, + new \
KViewStateMaintainer<ETMViewStateSaver>(group));
d->mSelectionSavers[groupName]->setSelectionModel(checkableProxyModel->selectionModel());
}
d->mSelectionSavers[groupName]->saveState();
diff --git a/src/multiagenda/multiagendaview.h b/src/multiagenda/multiagendaview.h
index c76d3e2..f920118 100644
--- a/src/multiagenda/multiagendaview.h
+++ b/src/multiagenda/multiagendaview.h
@@ -25,9 +25,7 @@
#include <QDateTime>
-namespace EventViews
-{
-
+namespace EventViews {
class ConfigDialogInterface;
/**
@@ -56,7 +54,7 @@ public:
bool customColumnSetupUsed() const;
int customNumberOfColumns() const;
QStringList customColumnTitles() const;
- QVector<KCheckableProxyModel *>collectionSelectionModels() const;
+ QVector<KCheckableProxyModel *> collectionSelectionModels() const;
void setPreferences(const PrefsPtr &prefs) override;
@@ -68,7 +66,8 @@ public Q_SLOTS:
void customCollectionsChanged(ConfigDialogInterface *dlg);
- void showDates(const QDate &start, const QDate &end, const QDate &preferredMonth \
= QDate()) override; + void showDates(const QDate &start, const QDate &end,
+ const QDate &preferredMonth = QDate()) override;
void showIncidences(const Akonadi::Item::List &incidenceList, const QDate &date) \
override; void updateView() override;
void updateConfig() override;
@@ -102,7 +101,6 @@ private:
class Private;
Private *const d;
};
-
}
#endif
diff --git a/src/prefs.cpp b/src/prefs.cpp
index 7cded2a..8d94241 100644
--- a/src/prefs.cpp
+++ b/src/prefs.cpp
@@ -65,12 +65,12 @@ QByteArray agendaViewIconDefaults()
QByteArray iconDefaults;
iconDefaults[EventViews::EventView::CalendarCustomIcon] = 1;
- iconDefaults[EventViews::EventView::TaskIcon] = 1;
- iconDefaults[EventViews::EventView::JournalIcon] = 1;
- iconDefaults[EventViews::EventView::RecurringIcon] = 1;
- iconDefaults[EventViews::EventView::ReminderIcon] = 1;
- iconDefaults[EventViews::EventView::ReadOnlyIcon] = 1;
- iconDefaults[EventViews::EventView::ReplyIcon] = 0;
+ iconDefaults[EventViews::EventView::TaskIcon] = 1;
+ iconDefaults[EventViews::EventView::JournalIcon] = 1;
+ iconDefaults[EventViews::EventView::RecurringIcon] = 1;
+ iconDefaults[EventViews::EventView::ReminderIcon] = 1;
+ iconDefaults[EventViews::EventView::ReadOnlyIcon] = 1;
+ iconDefaults[EventViews::EventView::ReplyIcon] = 0;
return iconDefaults;
}
@@ -80,12 +80,12 @@ QByteArray monthViewIconDefaults()
QByteArray iconDefaults;
iconDefaults[EventViews::EventView::CalendarCustomIcon] = 1;
- iconDefaults[EventViews::EventView::TaskIcon] = 1;
- iconDefaults[EventViews::EventView::JournalIcon] = 1;
- iconDefaults[EventViews::EventView::RecurringIcon] = 0;
- iconDefaults[EventViews::EventView::ReminderIcon] = 0;
- iconDefaults[EventViews::EventView::ReadOnlyIcon] = 1;
- iconDefaults[EventViews::EventView::ReplyIcon] = 0;
+ iconDefaults[EventViews::EventView::TaskIcon] = 1;
+ iconDefaults[EventViews::EventView::JournalIcon] = 1;
+ iconDefaults[EventViews::EventView::RecurringIcon] = 0;
+ iconDefaults[EventViews::EventView::ReminderIcon] = 0;
+ iconDefaults[EventViews::EventView::ReadOnlyIcon] = 1;
+ iconDefaults[EventViews::EventView::ReplyIcon] = 0;
return iconDefaults;
}
@@ -180,8 +180,8 @@ void BaseConfig::usrRead()
#if 0
config()->setGroup("FreeBusy");
if (mRememberRetrievePw) {
- mRetrievePassword =
- KStringHandler::obscure(config()->readEntry("Retrieve Server \
Password")); + mRetrievePassword
+ = KStringHandler::obscure(config()->readEntry("Retrieve Server \
Password")); }
#endif
@@ -190,10 +190,10 @@ void BaseConfig::usrRead()
KConfigGroup monthViewConfig(config(), "Month View");
KConfigGroup agendaViewConfig(config(), "Agenda View");
- const QByteArray agendaIconArray =
- agendaViewConfig.readEntry<QByteArray>("agendaViewItemIcons", \
agendaViewIconDefaults());
- const QByteArray monthIconArray =
- monthViewConfig.readEntry<QByteArray>("monthViewItemIcons", \
monthViewIconDefaults()); + const QByteArray agendaIconArray
+ = agendaViewConfig.readEntry<QByteArray>("agendaViewItemIcons", \
agendaViewIconDefaults()); + const QByteArray monthIconArray
+ = monthViewConfig.readEntry<QByteArray>("monthViewItemIcons", \
monthViewIconDefaults());
mAgendaViewIcons = iconArrayToSet(agendaIconArray);
mMonthViewIcons = iconArrayToSet(monthIconArray);
@@ -238,9 +238,16 @@ bool BaseConfig::usrSave()
class Q_DECL_HIDDEN Prefs::Private
{
public:
- Private(Prefs *parent) : mAppConfig(nullptr), q(parent) {}
+ Private(Prefs *parent) : mAppConfig(nullptr)
+ , q(parent)
+ {
+ }
+
Private(Prefs *parent, KCoreConfigSkeleton *appConfig)
- : mAppConfig(appConfig), q(parent) {}
+ : mAppConfig(appConfig)
+ , q(parent)
+ {
+ }
KConfigSkeletonItem *appConfigItem(const KConfigSkeletonItem *baseConfigItem) \
const;
@@ -290,11 +297,13 @@ void Prefs::Private::setBool(KCoreConfigSkeleton::ItemBool \
*baseConfigItem, bool {
KConfigSkeletonItem *appItem = appConfigItem(baseConfigItem);
if (appItem) {
- KCoreConfigSkeleton::ItemBool *item = \
dynamic_cast<KCoreConfigSkeleton::ItemBool *>(appItem); + \
KCoreConfigSkeleton::ItemBool *item + = \
dynamic_cast<KCoreConfigSkeleton::ItemBool *>(appItem); if (item) {
item->setValue(value);
} else {
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << \
appItem->name() << "is not of type Bool"; + qCCritical(CALENDARVIEW_LOG) \
<< "Application config item" << appItem->name() + \
<< "is not of type Bool"; }
} else {
baseConfigItem->setValue(value);
@@ -305,11 +314,13 @@ bool Prefs::Private::getBool(const \
KCoreConfigSkeleton::ItemBool *baseConfigItem {
KConfigSkeletonItem *appItem = appConfigItem(baseConfigItem);
if (appItem) {
- KCoreConfigSkeleton::ItemBool *item = \
dynamic_cast<KCoreConfigSkeleton::ItemBool *>(appItem); + \
KCoreConfigSkeleton::ItemBool *item + = \
dynamic_cast<KCoreConfigSkeleton::ItemBool *>(appItem); if (item) {
return item->value();
}
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << appItem->name() \
<< "is not of type Bool"; + qCCritical(CALENDARVIEW_LOG) << "Application \
config item" << appItem->name() + << "is not of \
type Bool"; }
return baseConfigItem->value();
}
@@ -322,7 +333,8 @@ void Prefs::Private::setInt(KCoreConfigSkeleton::ItemInt \
*baseConfigItem, int va if (item) {
item->setValue(value);
} else {
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << \
appItem->name() << "is not of type Int"; + qCCritical(CALENDARVIEW_LOG) << \
"Application config item" << appItem->name() + \
<< "is not of type Int"; }
} else {
baseConfigItem->setValue(value);
@@ -337,7 +349,8 @@ int Prefs::Private::getInt(const KCoreConfigSkeleton::ItemInt \
*baseConfigItem) c if (item) {
return item->value();
}
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << appItem->name() \
<< "is not of type Int"; + qCCritical(CALENDARVIEW_LOG) << "Application config \
item" << appItem->name() + << "is not of type \
Int"; }
return baseConfigItem->value();
}
@@ -347,13 +360,14 @@ void Prefs::Private::setString(KCoreConfigSkeleton::ItemString \
*baseConfigItem, {
KConfigSkeletonItem *appItem = appConfigItem(baseConfigItem);
if (appItem) {
- KCoreConfigSkeleton::ItemString *item =
- dynamic_cast<KCoreConfigSkeleton::ItemString *>(appItem);
+ KCoreConfigSkeleton::ItemString *item
+ = dynamic_cast<KCoreConfigSkeleton::ItemString *>(appItem);
if (item) {
item->setValue(value);
} else {
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << \
appItem->name() << "is not of type String"; + qCCritical(CALENDARVIEW_LOG) \
<< "Application config item" << appItem->name() + \
<< "is not of type String"; }
} else {
baseConfigItem->setValue(value);
@@ -364,13 +378,14 @@ QString Prefs::Private::getString(const \
KCoreConfigSkeleton::ItemString *baseCon {
KConfigSkeletonItem *appItem = appConfigItem(baseConfigItem);
if (appItem) {
- KCoreConfigSkeleton::ItemString *item =
- dynamic_cast<KCoreConfigSkeleton::ItemString *>(appItem);
+ KCoreConfigSkeleton::ItemString *item
+ = dynamic_cast<KCoreConfigSkeleton::ItemString *>(appItem);
if (item) {
return item->value();
}
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << appItem->name() \
<< "is not of type String"; + qCCritical(CALENDARVIEW_LOG) << "Application \
config item" << appItem->name() + << "is not of \
type String"; }
return baseConfigItem->value();
}
@@ -380,13 +395,14 @@ void \
Prefs::Private::setDateTime(KCoreConfigSkeleton::ItemDateTime *baseConfigIt {
KConfigSkeletonItem *appItem = appConfigItem(baseConfigItem);
if (appItem) {
- KCoreConfigSkeleton::ItemDateTime *item =
- dynamic_cast<KCoreConfigSkeleton::ItemDateTime *>(appItem);
+ KCoreConfigSkeleton::ItemDateTime *item
+ = dynamic_cast<KCoreConfigSkeleton::ItemDateTime *>(appItem);
if (item) {
item->setValue(value);
} else {
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << \
appItem->name() << "is not of type DateTime"; + \
qCCritical(CALENDARVIEW_LOG) << "Application config item" << appItem->name() + \
<< "is not of type DateTime"; }
} else {
baseConfigItem->setValue(value);
@@ -398,13 +414,14 @@ QDateTime Prefs::Private::getDateTime(
{
KConfigSkeletonItem *appItem = appConfigItem(baseConfigItem);
if (appItem) {
- KCoreConfigSkeleton::ItemDateTime *item =
- dynamic_cast<KCoreConfigSkeleton::ItemDateTime *>(appItem);
+ KCoreConfigSkeleton::ItemDateTime *item
+ = dynamic_cast<KCoreConfigSkeleton::ItemDateTime *>(appItem);
if (item) {
return item->value();
}
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << appItem->name() \
<< "is not of type DateTime"; + qCCritical(CALENDARVIEW_LOG) << "Application \
config item" << appItem->name() + << "is not of \
type DateTime"; }
return baseConfigItem->value();
}
@@ -414,13 +431,14 @@ void \
Prefs::Private::setStringList(KCoreConfigSkeleton::ItemStringList *baseConf {
KConfigSkeletonItem *appItem = appConfigItem(baseConfigItem);
if (appItem) {
- KCoreConfigSkeleton::ItemStringList *item =
- dynamic_cast<KCoreConfigSkeleton::ItemStringList *>(appItem);
+ KCoreConfigSkeleton::ItemStringList *item
+ = dynamic_cast<KCoreConfigSkeleton::ItemStringList *>(appItem);
if (item) {
item->setValue(value);
} else {
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << \
appItem->name() << "is not of type StringList"; + \
qCCritical(CALENDARVIEW_LOG) << "Application config item" << appItem->name() + \
<< "is not of type StringList"; }
} else {
baseConfigItem->setValue(value);
@@ -432,13 +450,14 @@ QStringList Prefs::Private::getStringList(
{
KConfigSkeletonItem *appItem = appConfigItem(baseConfigItem);
if (appItem) {
- KCoreConfigSkeleton::ItemStringList *item =
- dynamic_cast<KCoreConfigSkeleton::ItemStringList *>(appItem);
+ KCoreConfigSkeleton::ItemStringList *item
+ = dynamic_cast<KCoreConfigSkeleton::ItemStringList *>(appItem);
if (item) {
return item->value();
}
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << appItem->name() \
<< "is not of type StringList"; + qCCritical(CALENDARVIEW_LOG) << "Application \
config item" << appItem->name() + << "is not of \
type StringList"; }
return baseConfigItem->value();
}
@@ -451,7 +470,8 @@ void Prefs::Private::setColor(KConfigSkeleton::ItemColor \
*baseConfigItem, const if (item) {
item->setValue(value);
} else {
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << \
appItem->name() << "is not of type Color"; + qCCritical(CALENDARVIEW_LOG) \
<< "Application config item" << appItem->name() + \
<< "is not of type Color"; }
} else {
baseConfigItem->setValue(value);
@@ -466,7 +486,8 @@ QColor Prefs::Private::getColor(const KConfigSkeleton::ItemColor \
*baseConfigItem if (item) {
return item->value();
}
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << appItem->name() \
<< "is not of type Color"; + qCCritical(CALENDARVIEW_LOG) << "Application \
config item" << appItem->name() + << "is not of \
type Color"; }
return baseConfigItem->value();
}
@@ -479,7 +500,8 @@ void Prefs::Private::setFont(KConfigSkeleton::ItemFont \
*baseConfigItem, const QF if (item) {
item->setValue(value);
} else {
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << \
appItem->name() << "is not of type Font"; + qCCritical(CALENDARVIEW_LOG) \
<< "Application config item" << appItem->name() + \
<< "is not of type Font"; }
} else {
baseConfigItem->setValue(value);
@@ -494,7 +516,8 @@ QFont Prefs::Private::getFont(const KConfigSkeleton::ItemFont \
*baseConfigItem) c if (item) {
return item->value();
}
- qCCritical(CALENDARVIEW_LOG) << "Application config item" << appItem->name() \
<< "is not of type Font"; + qCCritical(CALENDARVIEW_LOG) << "Application \
config item" << appItem->name() + << "is not of \
type Font"; }
return baseConfigItem->value();
}
@@ -921,6 +944,7 @@ void Prefs::setResourceColor(const QString &cal, const QColor \
&color) {
d->mBaseConfig.setResourceColor(cal, color);
}
+
#define USE_RANDOM
void Prefs::createNewColor(QColor &defColor, int seed)
{
@@ -940,8 +964,8 @@ void Prefs::createNewColor(QColor &defColor, int seed)
QColor Prefs::resourceColorKnown(const QString &cal) const
{
QColor color;
- if (!cal.isEmpty() &&
- d->mBaseConfig.mResourceColors.contains(cal)) {
+ if (!cal.isEmpty()
+ && d->mBaseConfig.mResourceColors.contains(cal)) {
color = d->mBaseConfig.mResourceColors.value(cal);
}
return color;
@@ -956,8 +980,8 @@ QColor Prefs::resourceColor(const QString &cal)
QColor color = resourceColorKnown(cal);
// assign default color if enabled
- if (!color.isValid() &&
- d->getBool(d->mBaseConfig.assignDefaultResourceColorsItem())) {
+ if (!color.isValid()
+ && d->getBool(d->mBaseConfig.assignDefaultResourceColorsItem())) {
QColor defColor(0x37, 0x7A, 0xBC);
const int seed = d->getInt(d->mBaseConfig.defaultResourceColorSeedItem());
const QStringList colors = \
d->getStringList(d->mBaseConfig.defaultResourceColorsItem());
diff --git a/src/prefs.h b/src/prefs.h
index cf01f90..903eab2 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -31,9 +31,7 @@
#include <KConfigSkeleton>
#include <QTimeZone>
-namespace EventViews
-{
-
+namespace EventViews {
class EVENTVIEWS_EXPORT Prefs
{
public:
@@ -221,8 +219,6 @@ private:
};
typedef QSharedPointer<Prefs> PrefsPtr;
-
}
#endif
-
diff --git a/src/timeline/timelineitem.cpp b/src/timeline/timelineitem.cpp
index e9ef5b4..4224c20 100644
--- a/src/timeline/timelineitem.cpp
+++ b/src/timeline/timelineitem.cpp
@@ -33,7 +33,10 @@ using namespace EventViews;
TimelineItem::TimelineItem(const Akonadi::ETMCalendar::Ptr &calendar, uint index,
QStandardItemModel *model, QObject *parent)
- : QObject(parent), mCalendar(calendar), mModel(model), mIndex(index)
+ : QObject(parent)
+ , mCalendar(calendar)
+ , mModel(model)
+ , mIndex(index)
{
mModel->removeRow(mIndex);
QStandardItem *dummyItem = new QStandardItem;
@@ -41,8 +44,8 @@ TimelineItem::TimelineItem(const Akonadi::ETMCalendar::Ptr \
&calendar, uint index mModel->insertRow(mIndex, dummyItem);
}
-void TimelineItem::insertIncidence(const Akonadi::Item &aitem,
- const QDateTime &_start, const QDateTime &_end)
+void TimelineItem::insertIncidence(const Akonadi::Item &aitem, const QDateTime \
&_start, + const QDateTime &_end)
{
const Incidence::Ptr incidence = CalendarSupport::incidence(aitem);
QDateTime start(_start);
@@ -60,8 +63,8 @@ void TimelineItem::insertIncidence(const Akonadi::Item &aitem,
typedef QList<QStandardItem *> ItemList;
ItemList list = mItemMap.value(aitem.id());
for (ItemList::ConstIterator it = list.constBegin(); it != list.constEnd(); \
++it) {
- if (static_cast<TimelineSubItem *>(*it)->startTime() == start &&
- static_cast<TimelineSubItem *>(*it)->endTime() == end) {
+ if (static_cast<TimelineSubItem *>(*it)->startTime() == start
+ && static_cast<TimelineSubItem *>(*it)->endTime() == end) {
return;
}
}
@@ -109,8 +112,11 @@ void TimelineItem::setColor(const QColor &color)
TimelineSubItem::TimelineSubItem(const Akonadi::ETMCalendar::Ptr &calendar,
const Akonadi::Item &incidence, TimelineItem \
*parent)
- : QStandardItem(), mCalendar(calendar), mIncidence(incidence),
- mParent(parent), mToolTipNeedsUpdate(true)
+ : QStandardItem()
+ , mCalendar(calendar)
+ , mIncidence(incidence)
+ , mParent(parent)
+ , mToolTipNeedsUpdate(true)
{
setData(KGantt::TypeTask, KGantt::ItemTypeRole);
if (!CalendarSupport::incidence(incidence)->isReadOnly()) {
@@ -152,5 +158,6 @@ void TimelineSubItem::updateToolTip()
setData(IncidenceFormatter::toolTipStr(
CalendarSupport::displayName(mCalendar.data(), \
mIncidence.parentCollection()),
- CalendarSupport::incidence(mIncidence), originalStart().date(), \
true), Qt::ToolTipRole); + CalendarSupport::incidence(mIncidence),
+ originalStart().date(), true), Qt::ToolTipRole);
}
diff --git a/src/timeline/timelineitem.h b/src/timeline/timelineitem.h
index 05ed1d5..cf1623c 100644
--- a/src/timeline/timelineitem.h
+++ b/src/timeline/timelineitem.h
@@ -31,9 +31,7 @@
#include <QList>
#include <QStandardItemModel>
-namespace EventViews
-{
-
+namespace EventViews {
class TimelineSubItem;
class TimelineItem : public QObject
@@ -44,8 +42,7 @@ public:
QObject *parent);
void insertIncidence(const Akonadi::Item &incidence,
- const QDateTime &start = QDateTime(),
- const QDateTime &end = QDateTime());
+ const QDateTime &start = QDateTime(), const QDateTime &end \
= QDateTime()); void removeIncidence(const Akonadi::Item &incidence);
void moveItems(const Akonadi::Item &incidence, int delta, int duration);
@@ -63,8 +60,8 @@ private:
class TimelineSubItem : public QStandardItem
{
public:
- TimelineSubItem(const Akonadi::ETMCalendar::Ptr &calendar,
- const Akonadi::Item &incidence, TimelineItem *parent);
+ TimelineSubItem(const Akonadi::ETMCalendar::Ptr &calendar, const Akonadi::Item \
&incidence, + TimelineItem *parent);
~TimelineSubItem();
Akonadi::Item incidence() const
@@ -102,7 +99,6 @@ private:
TimelineItem *mParent = nullptr;
bool mToolTipNeedsUpdate;
};
-
}
#endif
diff --git a/src/timeline/timelineview.cpp b/src/timeline/timelineview.cpp
index 7378276..9d98b43 100644
--- a/src/timeline/timelineview.cpp
+++ b/src/timeline/timelineview.cpp
@@ -55,8 +55,7 @@
using namespace KCalCore;
using namespace EventViews;
-namespace EventViews
-{
+namespace EventViews {
class RowController : public KGantt::AbstractRowController
{
private:
@@ -150,12 +149,11 @@ public:
};
class GanttItemDelegate : public KGantt::ItemDelegate
{
- void paintGanttItem(QPainter *painter,
- const KGantt::StyleOptionGanttItem &opt,
- const QModelIndex &idx) override {
+ void paintGanttItem(QPainter *painter, const KGantt::StyleOptionGanttItem &opt,
+ const QModelIndex &idx) override
+ {
painter->setRenderHints(QPainter::Antialiasing);
- if (!idx.isValid())
- {
+ if (!idx.isValid()) {
return;
}
KGantt::ItemType type = static_cast<KGantt::ItemType>(
@@ -168,10 +166,9 @@ class GanttItemDelegate : public KGantt::ItemDelegate
boundingRect.setHeight(itemRect.height());
QBrush brush = defaultBrush(type);
- if (opt.state & QStyle::State_Selected)
- {
+ if (opt.state & QStyle::State_Selected) {
QLinearGradient selectedGrad(0., 0., 0.,
- QApplication::fontMetrics().height());
+ QApplication::fontMetrics().height());
selectedGrad.setColorAt(0., Qt::red);
selectedGrad.setColorAt(1., Qt::darkRed);
@@ -184,8 +181,7 @@ class GanttItemDelegate : public KGantt::ItemDelegate
painter->setPen(defaultPen(type));
painter->setBrushOrigin(itemRect.topLeft());
- switch (type)
- {
+ switch (type) {
case KGantt::TypeTask:
if (itemRect.isValid()) {
QRectF r = itemRect;
@@ -217,11 +213,11 @@ class GanttItemDelegate : public KGantt::ItemDelegate
}
}
};
-
}
TimelineView::TimelineView(QWidget *parent)
- : EventView(parent), d(new Private(this))
+ : EventView(parent)
+ , d(new Private(this))
{
QVBoxLayout *vbox = new QVBoxLayout(this);
QSplitter *splitter = new QSplitter(Qt::Horizontal, this);
@@ -243,7 +239,8 @@ TimelineView::TimelineView(QWidget *parent)
QStyleOptionViewItem opt;
opt.initFrom(d->mLeftView);
- const auto h = d->mLeftView->style()->sizeFromContents(QStyle::CT_ItemViewItem, \
&opt, QSize(), d->mLeftView).height(); + const auto h = \
d->mLeftView->style()->sizeFromContents(QStyle::CT_ItemViewItem, &opt, + \
QSize(), d->mLeftView).height(); d->mRowController->setRowHeight(h);
d->mRowController->setModel(model);
@@ -319,7 +316,6 @@ void TimelineView::showDates(const QDate &start, const QDate \
&end, const QDate & d->mGantt);
d->mLeftView->addTopLevelItem(new QTreeWidgetItem(QStringList() << \
i18n("Calendar"))); d->mCalendarItemMap.insert(-1, item);
-
} else {
const CalendarSupport::CollectionSelection *colSel = collectionSelection();
const Akonadi::Collection::List collections = colSel->selectedCollections();
@@ -332,14 +328,17 @@ void TimelineView::showDates(const QDate &start, const QDate \
&end, const QDate & d->mGantt);
d->mLeftView->addTopLevelItem(
new QTreeWidgetItem(
- QStringList() << \
CalendarSupport::displayName(calendar().data(), collection))); + \
QStringList() << CalendarSupport::displayName( + \
calendar().data(), collection)));
const QColor resourceColor = EventViews::resourceColor(collection, \
preferences()); if (resourceColor.isValid()) {
item->setColor(resourceColor);
}
qCDebug(CALENDARVIEW_LOG) << "Created item " << item
- << " (" << \
CalendarSupport::displayName(calendar().data(), collection) << ") "
- << "with index " << index - 1 << " from \
collection " << collection.id(); + << " (" \
<< CalendarSupport::displayName( + calendar().data(), collection) \
<< ") " + << "with index " << index - 1 << \
" from collection " + << collection.id();
d->mCalendarItemMap.insert(collection.id(), item);
}
}
@@ -403,8 +402,7 @@ void TimelineView::changeIncidenceDisplay(const Akonadi::Item \
&incidence, int mo }
}
-bool TimelineView::eventDurationHint(QDateTime &startDt, QDateTime &endDt,
- bool &allDay) const
+bool TimelineView::eventDurationHint(QDateTime &startDt, QDateTime &endDt, bool \
&allDay) const {
startDt = QDateTime(d->mHintDate);
endDt = QDateTime(d->mHintDate.addSecs(2 * 60 * 60));
@@ -432,11 +430,12 @@ bool TimelineView::eventFilter(QObject *object, QEvent *event)
KGantt::GraphicsItem *graphicsItem = \
static_cast<KGantt::GraphicsItem *>(item); const QModelIndex itemIndex = \
graphicsItem->index();
- QStandardItemModel *itemModel =
- qobject_cast<QStandardItemModel *>(d->mGantt->model());
+ QStandardItemModel *itemModel
+ = qobject_cast<QStandardItemModel *>(d->mGantt->model());
- TimelineSubItem *timelineItem =
- dynamic_cast<TimelineSubItem *>(itemModel->item(itemIndex.row(), \
itemIndex.column())); + TimelineSubItem *timelineItem
+ = dynamic_cast<TimelineSubItem \
*>(itemModel->item(itemIndex.row(), + \
itemIndex.column()));
if (timelineItem) {
timelineItem->updateToolTip();
@@ -447,4 +446,3 @@ bool TimelineView::eventFilter(QObject *object, QEvent *event)
return EventView::eventFilter(object, event);
}
-
diff --git a/src/timeline/timelineview.h b/src/timeline/timelineview.h
index 7f8612e..54864b2 100644
--- a/src/timeline/timelineview.h
+++ b/src/timeline/timelineview.h
@@ -30,9 +30,7 @@
#include <QDateTime>
-namespace EventViews
-{
-
+namespace EventViews {
/**
This class provides a view ....
*/
@@ -70,9 +68,7 @@ protected:
private:
class Private;
Private *const d;
-
};
-
} // namespace EventViews
#endif
diff --git a/src/timeline/timelineview_p.cpp b/src/timeline/timelineview_p.cpp
index 1034074..e0b708b 100644
--- a/src/timeline/timelineview_p.cpp
+++ b/src/timeline/timelineview_p.cpp
@@ -41,8 +41,8 @@
using namespace KCalCore;
using namespace EventViews;
-TimelineView::Private::Private(TimelineView *parent) :
- q(parent)
+TimelineView::Private::Private(TimelineView *parent)
+ : q(parent)
{
}
@@ -57,9 +57,9 @@ void TimelineView::Private::splitterMoved()
void TimelineView::Private::itemSelected(const QModelIndex &index)
{
- TimelineSubItem *tlitem =
- dynamic_cast<TimelineSubItem *>(static_cast<QStandardItemModel *>(
- mGantt->model())->item(index.row(), \
index.column())); + TimelineSubItem *tlitem
+ = dynamic_cast<TimelineSubItem *>(static_cast<QStandardItemModel *>(
+ mGantt->model())->item(index.row(), \
index.column())); if (tlitem) {
Q_EMIT q->incidenceSelected(tlitem->incidence(), \
tlitem->originalStart().date()); }
@@ -67,9 +67,9 @@ void TimelineView::Private::itemSelected(const QModelIndex &index)
void TimelineView::Private::itemDoubleClicked(const QModelIndex &index)
{
- TimelineSubItem *tlitem =
- dynamic_cast<TimelineSubItem *>(static_cast<QStandardItemModel *>(
- mGantt->model())->item(index.row(), \
index.column())); + TimelineSubItem *tlitem
+ = dynamic_cast<TimelineSubItem *>(static_cast<QStandardItemModel *>(
+ mGantt->model())->item(index.row(), \
index.column())); if (tlitem) {
Q_EMIT q->editIncidenceSignal(tlitem->incidence());
}
@@ -79,9 +79,9 @@ void TimelineView::Private::contextMenuRequested(const QPoint \
&point) {
QPersistentModelIndex index = mGantt->indexAt(point);
// mHintDate = QDateTime( mGantt->getDateTimeForCoordX( QCursor::pos().x(), true \
) );
- TimelineSubItem *tlitem =
- dynamic_cast<TimelineSubItem *>(static_cast<QStandardItemModel *>(
- mGantt->model())->item(index.row(), \
index.column())); + TimelineSubItem *tlitem
+ = dynamic_cast<TimelineSubItem *>(static_cast<QStandardItemModel *>(
+ mGantt->model())->item(index.row(), \
index.column())); if (!tlitem) {
Q_EMIT q->showNewEventPopupSignal();
mSelectedItemList = Akonadi::Item::List();
@@ -124,17 +124,22 @@ void TimelineView::Private::insertIncidence(const Akonadi::Item \
&aitem, const QD }
if (incidence->recurs()) {
- KCalCore::OccurrenceIterator occurIter(*(q->calendar()), incidence, \
QDateTime(day, QTime(0, 0, 0)), QDateTime(day, QTime(23, 59, 59))); + \
KCalCore::OccurrenceIterator occurIter(*(q->calendar()), incidence, QDateTime(day, \
QTime(0, + \
0, + \
0)), QDateTime( + day, QTime(23, \
59, 59))); while (occurIter.hasNext()) {
occurIter.next();
const Akonadi::Item akonadiItem = \
q->calendar()->item(occurIter.incidence());
const QDateTime startOfOccurrence = occurIter.occurrenceStartDate();
- const QDateTime endOfOccurrence = \
occurIter.incidence()->endDateForStart(startOfOccurrence);
- item->insertIncidence(akonadiItem, startOfOccurrence.toLocalTime(), \
endOfOccurrence.toLocalTime()); + const QDateTime endOfOccurrence = \
occurIter.incidence()->endDateForStart( + startOfOccurrence);
+ item->insertIncidence(akonadiItem,
+ startOfOccurrence.toLocalTime(), \
endOfOccurrence.toLocalTime()); }
} else {
- if (incidence->dtStart().date() == day ||
- incidence->dtStart().date() < mStartDate) {
+ if (incidence->dtStart().date() == day
+ || incidence->dtStart().date() < mStartDate) {
item->insertIncidence(aitem);
}
}
@@ -153,9 +158,9 @@ void TimelineView::Private::insertIncidence(const Akonadi::Item \
&incidence)
for (QDate day = mStartDate; day <= mEndDate; day = day.addDays(1)) {
KCalCore::Event::List events = q->calendar()->events(day,
- QTimeZone::systemTimeZone(),
- KCalCore::EventSortStartDate,
- KCalCore::SortDirectionAscending);
+ \
QTimeZone::systemTimeZone(), + \
KCalCore::EventSortStartDate, + \
KCalCore::SortDirectionAscending); if (events.contains(event)) {
//PENDING(AKONADI_PORT) check if correct. also check the original if,
//was inside the for loop (unnecessarily)
@@ -174,13 +179,13 @@ void TimelineView::Private::removeIncidence(const Akonadi::Item \
&incidence) item->removeIncidence(incidence);
} else {
#if 0 //AKONADI_PORT_DISABLED
- // try harder, the incidence might already be removed from the resource
+ // try harder, the incidence might already be removed from the resource
typedef QMap<QString, KOrg::TimelineItem *> M2_t;
typedef QMap<KCalCore::ResourceCalendar *, M2_t> M1_t;
for (M1_t::ConstIterator it1 = d->mCalendarItemMap.constBegin();
- it1 != mCalendarItemMap.constEnd(); ++it1) {
+ it1 != mCalendarItemMap.constEnd(); ++it1) {
for (M2_t::ConstIterator it2 = it1.value().constBegin();
- it2 != it1.value().constEnd(); ++it2) {
+ it2 != it1.value().constEnd(); ++it2) {
if (it2.value()) {
it2.value()->removeIncidence(incidence);
}
@@ -223,4 +228,3 @@ void TimelineView::Private::itemChanged(QStandardItem *item)
TimelineItem *parent = tlit->parent();
parent->moveItems(i, tlit->originalStart().secsTo(newStart), duration + \
allDayOffset); }
-
diff --git a/src/timeline/timelineview_p.h b/src/timeline/timelineview_p.h
index 8279b84..23057c8 100644
--- a/src/timeline/timelineview_p.h
+++ b/src/timeline/timelineview_p.h
@@ -35,15 +35,11 @@
class QStandardItem;
class QTreeWidget;
-namespace KGantt
-{
+namespace KGantt {
class GraphicsView;
}
-
-namespace EventViews
-{
-
+namespace EventViews {
class TimelineItem;
class RowController;
@@ -80,7 +76,6 @@ public:
private:
TimelineView *const q;
};
-
} // namespace EventViews
#endif
diff --git a/src/todo/incidencetreemodel.cpp b/src/todo/incidencetreemodel.cpp
index 8fd67ef..c7ad57c 100644
--- a/src/todo/incidencetreemodel.cpp
+++ b/src/todo/incidencetreemodel.cpp
@@ -89,7 +89,6 @@ IncidenceTreeModel::Private::Private(IncidenceTreeModel *qq,
const QStringList &mimeTypes) : QObject()
, m_mimeTypes(mimeTypes)
, q(qq)
-
{
}
@@ -144,8 +143,10 @@ void IncidenceTreeModel::Private::reset(bool silent)
const int sourceCount = q->sourceModel()->rowCount();
for (int i = 0; i < sourceCount; ++i) {
PreNode::Ptr prenode = prenodeFromSourceRow(i);
- if (prenode && (m_mimeTypes.isEmpty() || \
m_mimeTypes.contains(prenode->incidence->mimeType()))) {
- insertNode(prenode, /**silent=*/true);
+ if (prenode
+ && (m_mimeTypes.isEmpty()
+ || m_mimeTypes.contains(prenode->incidence->mimeType()))) {
+ insertNode(prenode, /**silent=*/ true);
}
}
}
@@ -154,7 +155,8 @@ void IncidenceTreeModel::Private::reset(bool silent)
}
}
-void IncidenceTreeModel::Private::onHeaderDataChanged(Qt::Orientation orientation, \
int first, int last) +void \
IncidenceTreeModel::Private::onHeaderDataChanged(Qt::Orientation orientation, int \
first, + int last)
{
Q_EMIT q->headerDataChanged(orientation, first, last);
}
@@ -184,12 +186,15 @@ void IncidenceTreeModel::Private::onDataChanged(const \
QModelIndex &begin, const
Node::Ptr node = m_uidMap.value(rawNode->uid); // Looks hackish but \
it's safe Q_ASSERT(node);
Node::Ptr oldParentNode = node->parentNode;
- Akonadi::Item item = q->data(index, \
Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>(); + \
Akonadi::Item item = q->data(index, + \
Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>(); \
Q_ASSERT(item.isValid());
- KCalCore::Incidence::Ptr incidence = \
!item.hasPayload<KCalCore::Incidence::Ptr>() ? \
KCalCore::Incidence::Ptr() :
- \
item.payload<KCalCore::Incidence::Ptr>(); + KCalCore::Incidence::Ptr \
incidence + = !item.hasPayload<KCalCore::Incidence::Ptr>() ? \
KCalCore::Incidence::Ptr() + : \
item.payload<KCalCore::Incidence::Ptr>(); if (!incidence) {
- qCCritical(CALENDARVIEW_LOG) << "Incidence shouldn't be invalid." << \
item.hasPayload() << item.id(); + qCCritical(CALENDARVIEW_LOG) << \
"Incidence shouldn't be invalid." + << \
item.hasPayload() << item.id(); Q_ASSERT(false);
return;
}
@@ -221,8 +226,8 @@ void IncidenceTreeModel::Private::onDataChanged(const QModelIndex \
&begin, const toRow = m_toplevelNodeList.count();
}
- const bool res = q->beginMoveRows(/**fromParent*/index.parent(), \
fromRow,
- fromRow, newParentIndex, toRow);
+ const bool res = q->beginMoveRows(/**fromParent*/ index.parent(), \
fromRow, + fromRow, \
newParentIndex, toRow); Q_ASSERT(res);
Q_UNUSED(res);
@@ -277,7 +282,8 @@ PreNode::Ptr \
IncidenceTreeModel::Private::prenodeFromSourceRow(int row) const node->sourceIndex = \
q->sourceModel()->index(row, 0, QModelIndex()); \
Q_ASSERT(node->sourceIndex.isValid()); Q_ASSERT(node->sourceIndex.model() == \
q->sourceModel());
- const Akonadi::Item item = \
node->sourceIndex.data(EntityTreeModel::ItemRole).value<Akonadi::Item>(); + const \
Akonadi::Item item + = \
node->sourceIndex.data(EntityTreeModel::ItemRole).value<Akonadi::Item>();
if (!item.isValid()) {
// It's a Collection, ignore that, we only want items.
@@ -302,7 +308,8 @@ void IncidenceTreeModel::Private::onRowsInserted(const \
QModelIndex &parent, int for (int i = begin; i <= end; ++i) {
PreNode::Ptr node = prenodeFromSourceRow(i);
// if m_mimeTypes is empty, we ignore this feature
- if (!node || (!m_mimeTypes.isEmpty() && \
!m_mimeTypes.contains(node->incidence->mimeType()))) { + if (!node
+ || (!m_mimeTypes.isEmpty() && \
!m_mimeTypes.contains(node->incidence->mimeType()))) { continue;
}
nodes << node;
@@ -333,12 +340,16 @@ void IncidenceTreeModel::Private::insertNode(const PreNode::Ptr \
&prenode, bool s
//qCDebug(CALENDARVIEW_LOG) << "New node " << node.data() << node->uid << \
node->id; node->parentUid = incidence->relatedTo();
if (node->uid == node->parentUid) {
- qCWarning(CALENDARVIEW_LOG) << "Incidence with itself as parent!" << \
node->uid << "Akonadi item" << item.id() << "remoteId=" << item.remoteId(); + \
qCWarning(CALENDARVIEW_LOG) << "Incidence with itself as parent!" << node->uid + \
<< "Akonadi item" << item.id() << "remoteId=" + << \
item.remoteId(); node->parentUid.clear();
}
if (m_uidMap.contains(node->uid)) {
- qCWarning(CALENDARVIEW_LOG) << "Duplicate incidence detected. File a bug \
against the resource. collection=" << item.storageCollectionId(); + \
qCWarning(CALENDARVIEW_LOG) + << "Duplicate incidence detected. File a bug \
against the resource. collection=" + << item.storageCollectionId();
return;
}
@@ -440,7 +451,8 @@ Node::List IncidenceTreeModel::Private::sorted(const Node::List \
&nodes) const return sorted;
}
-void IncidenceTreeModel::Private::onRowsAboutToBeRemoved(const QModelIndex &parent, \
int begin, int end) +void IncidenceTreeModel::Private::onRowsAboutToBeRemoved(const \
QModelIndex &parent, int begin, + \
int end) {
//QElapsedTimer timer;
//timer.start();
@@ -552,7 +564,7 @@ void IncidenceTreeModel::Private::onModelAboutToBeReset()
void IncidenceTreeModel::Private::onModelReset()
{
- reset(/**silent=*/false);
+ reset(/**silent=*/ false);
q->endResetModel();
}
@@ -564,12 +576,13 @@ void IncidenceTreeModel::Private::onLayoutAboutToBeChanged()
void IncidenceTreeModel::Private::onLayoutChanged()
{
- reset(/**silent=*/true);
+ reset(/**silent=*/ true);
Q_ASSERT(q->persistentIndexList().isEmpty());
Q_EMIT q->layoutChanged();
}
-void IncidenceTreeModel::Private::onRowsMoved(const QModelIndex &, int, int, const \
QModelIndex &, int) +void IncidenceTreeModel::Private::onRowsMoved(const QModelIndex \
&, int, int, const QModelIndex &, + int)
{
// Not implemented yet
Q_ASSERT(false);
@@ -613,7 +626,8 @@ int IncidenceTreeModel::rowCount(const QModelIndex &parent) const
Node *parentNode = reinterpret_cast<Node *>(parent.internalPointer());
Q_ASSERT(parentNode);
d->assert_and_dump(!d->m_removedNodes.contains(parentNode),
- QString::number((quintptr)parentNode, 16) + \
QLatin1String(" was already deleted")); + \
QString::number((quintptr)parentNode, + 16) \
+ QLatin1String(" was already deleted"));
const int count = parentNode->directChilds.count();
return count;
@@ -710,14 +724,15 @@ void IncidenceTreeModel::setSourceModel(QAbstractItemModel \
*model) d, SLOT(onLayoutChanged()));
}
- d->reset(/**silent=*/true);
+ d->reset(/**silent=*/ true);
endResetModel();
}
QModelIndex IncidenceTreeModel::mapFromSource(const QModelIndex &sourceIndex) const
{
if (!sourceIndex.isValid()) {
- qCWarning(CALENDARVIEW_LOG) << "IncidenceTreeModel::mapFromSource() source \
index is invalid"; + qCWarning(CALENDARVIEW_LOG)
+ << "IncidenceTreeModel::mapFromSource() source index is invalid";
// Q_ASSERT( false );
return QModelIndex();
}
@@ -727,7 +742,8 @@ QModelIndex IncidenceTreeModel::mapFromSource(const QModelIndex \
&sourceIndex) co }
Q_ASSERT(sourceIndex.column() < sourceModel()->columnCount());
Q_ASSERT(sourceModel() == sourceIndex.model());
- const Akonadi::Item::Id id = \
sourceIndex.data(Akonadi::EntityTreeModel::ItemIdRole).toLongLong(); + const \
Akonadi::Item::Id id + = \
sourceIndex.data(Akonadi::EntityTreeModel::ItemIdRole).toLongLong();
if (id == -1 || !d->m_nodeMap.contains(id)) {
return QModelIndex();
@@ -765,7 +781,8 @@ QModelIndex IncidenceTreeModel::mapToSource(const QModelIndex \
&proxyIndex) const QModelIndex index = indexes.first();*/
QModelIndex index = node->sourceIndex;
if (!index.isValid()) {
- qCWarning(CALENDARVIEW_LOG) << "IncidenceTreeModel::mapToSource(): \
sourceModelIndex is invalid"; + qCWarning(CALENDARVIEW_LOG)
+ << "IncidenceTreeModel::mapToSource(): sourceModelIndex is invalid";
Q_ASSERT(false);
return QModelIndex();
}
@@ -829,7 +846,8 @@ QModelIndex IncidenceTreeModel::index(int row, int column, const \
QModelIndex &pa
Node *parentNode = reinterpret_cast<Node *>(parent.internalPointer());
if (row >= parentNode->directChilds.count()) {
- qCCritical(CALENDARVIEW_LOG) << "IncidenceTreeModel::index() row=" << \
row << "; column=" << column; + qCCritical(CALENDARVIEW_LOG) << \
"IncidenceTreeModel::index() row=" << row + \
<< "; column=" << column; Q_ASSERT(false);
return QModelIndex();
}
@@ -882,7 +900,9 @@ QDebug operator<<(QDebug s, const Node::Ptr &node)
static int level = 0;
++level;
QString padding = QString(level - 1, QLatin1Char(' '));
- s << padding + QLatin1String("node") << node.data() << QStringLiteral(";uid=") \
<< node->uid << QStringLiteral(";id=") << node->id << QStringLiteral(";parentUid=") \
<< node->parentUid << QStringLiteral(";parentNode=") << (void \
*)(node->parentNode.data()) << '\n'; + s << padding + QLatin1String("node") << \
node.data() << QStringLiteral(";uid=") << node->uid + << QStringLiteral(";id=") \
<< node->id << QStringLiteral(";parentUid=") << node->parentUid + << \
QStringLiteral(";parentNode=") << (void *)(node->parentNode.data()) << '\n';
foreach (const Node::Ptr &child, node->directChilds) {
s << child;
diff --git a/src/todo/incidencetreemodel_p.h b/src/todo/incidencetreemodel_p.h
index 7d4a38f..c073e05 100644
--- a/src/todo/incidencetreemodel_p.h
+++ b/src/todo/incidencetreemodel_p.h
@@ -61,7 +61,9 @@ struct PreNode {
QPersistentModelIndex sourceIndex;
Akonadi::Item item;
int depth;
- PreNode() : depth(-1) {}
+ PreNode() : depth(-1)
+ {
+ }
};
class IncidenceTreeModel::Private : public QObject
diff --git a/src/todo/tododelegates.cpp b/src/todo/tododelegates.cpp
index 75ce357..4ca0680 100644
--- a/src/todo/tododelegates.cpp
+++ b/src/todo/tododelegates.cpp
@@ -56,8 +56,7 @@ TodoCompleteDelegate::~TodoCompleteDelegate()
{
}
-void TodoCompleteDelegate::paint(QPainter *painter,
- const QStyleOptionViewItem &option,
+void TodoCompleteDelegate::paint(QPainter *painter, const QStyleOptionViewItem \
&option, const QModelIndex &index) const
{
QStyleOptionViewItem opt = option;
@@ -103,8 +102,7 @@ QSize TodoCompleteDelegate::sizeHint(const QStyleOptionViewItem \
&option, }
void TodoCompleteDelegate::initStyleOptionProgressBar(
- QStyleOptionProgressBar *option,
- const QModelIndex &index) const
+ QStyleOptionProgressBar *option, const QModelIndex &index) const
{
option->rect.adjust(0, 1, 0, -1);
option->maximum = 100;
@@ -115,9 +113,8 @@ void TodoCompleteDelegate::initStyleOptionProgressBar(
option->textVisible = true;
}
-QWidget *TodoCompleteDelegate::createEditor(QWidget *parent,
- const QStyleOptionViewItem &option,
- const QModelIndex &index) const
+QWidget *TodoCompleteDelegate::createEditor(QWidget *parent, const \
QStyleOptionViewItem &option, + const \
QModelIndex &index) const {
Q_UNUSED(option);
Q_UNUSED(index);
@@ -130,16 +127,14 @@ QWidget *TodoCompleteDelegate::createEditor(QWidget *parent,
return slider;
}
-void TodoCompleteDelegate::setEditorData(QWidget *editor,
- const QModelIndex &index) const
+void TodoCompleteDelegate::setEditorData(QWidget *editor, const QModelIndex &index) \
const {
QSlider *slider = static_cast<QSlider *>(editor);
slider->setValue(index.data(Qt::EditRole).toInt());
}
-void TodoCompleteDelegate::setModelData(QWidget *editor,
- QAbstractItemModel *model,
+void TodoCompleteDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index) const
{
QSlider *slider = static_cast<QSlider *>(editor);
@@ -147,9 +142,8 @@ void TodoCompleteDelegate::setModelData(QWidget *editor,
model->setData(index, slider->value());
}
-void TodoCompleteDelegate::updateEditorGeometry(QWidget *editor,
- const QStyleOptionViewItem &option,
- const QModelIndex &index) const
+void TodoCompleteDelegate::updateEditorGeometry(QWidget *editor, const \
QStyleOptionViewItem &option, + const \
QModelIndex &index) const {
Q_UNUSED(index);
@@ -185,9 +179,8 @@ TodoPriorityDelegate::~TodoPriorityDelegate()
{
}
-QWidget *TodoPriorityDelegate::createEditor(QWidget *parent,
- const QStyleOptionViewItem &option,
- const QModelIndex &index) const
+QWidget *TodoPriorityDelegate::createEditor(QWidget *parent, const \
QStyleOptionViewItem &option, + const \
QModelIndex &index) const {
Q_UNUSED(option);
Q_UNUSED(index);
@@ -208,16 +201,14 @@ QWidget *TodoPriorityDelegate::createEditor(QWidget *parent,
return combo;
}
-void TodoPriorityDelegate::setEditorData(QWidget *editor,
- const QModelIndex &index) const
+void TodoPriorityDelegate::setEditorData(QWidget *editor, const QModelIndex &index) \
const {
KComboBox *combo = static_cast<KComboBox *>(editor);
combo->setCurrentIndex(index.data(Qt::EditRole).toInt());
}
-void TodoPriorityDelegate::setModelData(QWidget *editor,
- QAbstractItemModel *model,
+void TodoPriorityDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index) const
{
KComboBox *combo = static_cast<KComboBox *>(editor);
@@ -225,9 +216,8 @@ void TodoPriorityDelegate::setModelData(QWidget *editor,
model->setData(index, combo->currentIndex());
}
-void TodoPriorityDelegate::updateEditorGeometry(QWidget *editor,
- const QStyleOptionViewItem &option,
- const QModelIndex &index) const
+void TodoPriorityDelegate::updateEditorGeometry(QWidget *editor, const \
QStyleOptionViewItem &option, + const \
QModelIndex &index) const {
Q_UNUSED(index);
@@ -246,9 +236,8 @@ TodoDueDateDelegate::~TodoDueDateDelegate()
{
}
-QWidget *TodoDueDateDelegate::createEditor(QWidget *parent,
- const QStyleOptionViewItem &option,
- const QModelIndex &index) const
+QWidget *TodoDueDateDelegate::createEditor(QWidget *parent, const \
QStyleOptionViewItem &option, + const \
QModelIndex &index) const {
Q_UNUSED(option);
Q_UNUSED(index);
@@ -258,16 +247,14 @@ QWidget *TodoDueDateDelegate::createEditor(QWidget *parent,
return dateEdit;
}
-void TodoDueDateDelegate::setEditorData(QWidget *editor,
- const QModelIndex &index) const
+void TodoDueDateDelegate::setEditorData(QWidget *editor, const QModelIndex &index) \
const {
KDateComboBox *dateEdit = static_cast<KDateComboBox *>(editor);
dateEdit->setDate(index.data(Qt::EditRole).toDate());
}
-void TodoDueDateDelegate::setModelData(QWidget *editor,
- QAbstractItemModel *model,
+void TodoDueDateDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index) const
{
KDateComboBox *dateEdit = static_cast<KDateComboBox *>(editor);
@@ -275,9 +262,8 @@ void TodoDueDateDelegate::setModelData(QWidget *editor,
model->setData(index, dateEdit->date());
}
-void TodoDueDateDelegate::updateEditorGeometry(QWidget *editor,
- const QStyleOptionViewItem &option,
- const QModelIndex &index) const
+void TodoDueDateDelegate::updateEditorGeometry(QWidget *editor, const \
QStyleOptionViewItem &option, + const \
QModelIndex &index) const {
Q_UNUSED(index);
editor->setGeometry(QStyle::alignedRect(QApplication::layoutDirection(), \
Qt::AlignCenter, @@ -288,7 +274,8 @@ void \
TodoDueDateDelegate::updateEditorGeometry(QWidget *editor, // \
---------------------------------------------------------------
TodoCategoriesDelegate::TodoCategoriesDelegate(QObject *parent)
- : QStyledItemDelegate(parent), mCalendar(nullptr)
+ : QStyledItemDelegate(parent)
+ , mCalendar(nullptr)
{
}
@@ -296,9 +283,8 @@ TodoCategoriesDelegate::~TodoCategoriesDelegate()
{
}
-QWidget *TodoCategoriesDelegate::createEditor(QWidget *parent,
- const QStyleOptionViewItem &option,
- const QModelIndex &index) const
+QWidget *TodoCategoriesDelegate::createEditor(QWidget *parent, const \
QStyleOptionViewItem &option, + const \
QModelIndex &index) const {
Q_UNUSED(option);
Q_UNUSED(index);
@@ -306,17 +292,15 @@ QWidget *TodoCategoriesDelegate::createEditor(QWidget *parent,
return new KPIM::TagSelectionCombo(parent);
}
-void TodoCategoriesDelegate::setEditorData(QWidget *editor,
- const QModelIndex &index) const
+void TodoCategoriesDelegate::setEditorData(QWidget *editor, const QModelIndex \
&index) const {
KPIM::KCheckComboBox *combo = static_cast<KPIM::KCheckComboBox *>(editor);
combo->setCheckedItems(index.data(Qt::EditRole).toStringList(), Qt::UserRole);
}
-void TodoCategoriesDelegate::setModelData(QWidget *editor,
- QAbstractItemModel *model,
- const QModelIndex &index) const
+void TodoCategoriesDelegate::setModelData(QWidget *editor, QAbstractItemModel \
*model, + const QModelIndex &index) const
{
KPIM::KCheckComboBox *combo = static_cast<KPIM::KCheckComboBox *>(editor);
@@ -324,8 +308,8 @@ void TodoCategoriesDelegate::setModelData(QWidget *editor,
}
void TodoCategoriesDelegate::updateEditorGeometry(QWidget *editor,
- const QStyleOptionViewItem &option,
- const QModelIndex &index) const
+ const QStyleOptionViewItem \
&option, + const QModelIndex &index) \
const {
Q_UNUSED(index);
@@ -350,8 +334,7 @@ TodoRichTextDelegate::~TodoRichTextDelegate()
{
}
-void TodoRichTextDelegate::paint(QPainter *painter,
- const QStyleOptionViewItem &option,
+void TodoRichTextDelegate::paint(QPainter *painter, const QStyleOptionViewItem \
&option, const QModelIndex &index) const
{
if (index.data(TodoModel::IsRichTextRole).toBool()) {
@@ -369,8 +352,8 @@ void TodoRichTextDelegate::paint(QPainter *painter,
style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, widget);
// draw the text (rich text)
- QPalette::ColorGroup cg = (opt.state & QStyle::State_Enabled) ?
- QPalette::Normal : QPalette::Disabled;
+ QPalette::ColorGroup cg = (opt.state & QStyle::State_Enabled)
+ ? QPalette::Normal : QPalette::Disabled;
if (cg == QPalette::Normal && !(opt.state & QStyle::State_Active)) {
cg = QPalette::Inactive;
}
@@ -422,7 +405,7 @@ QSize TodoRichTextDelegate::sizeHint(const QStyleOptionViewItem \
&option, }
// This row might not have a checkbox, so give it more height so it appears the \
same size as other rows.
- const int checkboxHeight = \
QApplication::style()->sizeFromContents(QStyle::CT_CheckBox, &option, \
QSize()).height(); + const int checkboxHeight = \
QApplication::style()->sizeFromContents(QStyle::CT_CheckBox, &option, + \
QSize()).height(); return QSize(ret.width(), qMax(ret.height(), checkboxHeight));
}
-
diff --git a/src/todo/tododelegates.h b/src/todo/tododelegates.h
index 5d5547d..74a32a6 100644
--- a/src/todo/tododelegates.h
+++ b/src/todo/tododelegates.h
@@ -50,16 +50,14 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option,
const QModelIndex &index) const override;
- QSize sizeHint(const QStyleOptionViewItem &option,
- const QModelIndex &index) const override;
+ QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) \
const override;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
const QModelIndex &index) const override;
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index) const override;
- void updateEditorGeometry(QWidget *editor,
- const QStyleOptionViewItem &option,
+ void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option,
const QModelIndex &index) const override;
private:
@@ -98,8 +96,7 @@ public:
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index) const override;
- void updateEditorGeometry(QWidget *editor,
- const QStyleOptionViewItem &option,
+ void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option,
const QModelIndex &index) const override;
};
@@ -123,8 +120,7 @@ public:
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index) const override;
- void updateEditorGeometry(QWidget *editor,
- const QStyleOptionViewItem &option,
+ void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option,
const QModelIndex &index) const override;
};
@@ -148,8 +144,7 @@ public:
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index) const override;
- void updateEditorGeometry(QWidget *editor,
- const QStyleOptionViewItem &option,
+ void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option,
const QModelIndex &index) const override;
void setCalendar(const Akonadi::ETMCalendar::Ptr &cal);
@@ -173,8 +168,7 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option,
const QModelIndex &index) const override;
- QSize sizeHint(const QStyleOptionViewItem &option,
- const QModelIndex &index) const override;
+ QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) \
const override; private:
QTextDocument *m_textDoc = nullptr;
};
diff --git a/src/todo/todomodel.cpp b/src/todo/todomodel.cpp
index 03f7f28..40d5c89 100644
--- a/src/todo/todomodel.cpp
+++ b/src/todo/todomodel.cpp
@@ -47,7 +47,10 @@
struct SourceModelIndex {
SourceModelIndex(int _r, int _c, void *_p, QAbstractItemModel *_m)
- : r(_r), c(_c), p(_p), m(_m)
+ : r(_r)
+ , c(_c)
+ , p(_p)
+ , m(_m)
{
}
@@ -66,15 +69,14 @@ static bool isDueToday(const KCalCore::Todo::Ptr &todo)
return !todo->isCompleted() && todo->dtDue().date() == QDate::currentDate();
}
-TodoModel::Private::Private(const EventViews::PrefsPtr &preferences,
- TodoModel *qq) : QObject(), m_changer(nullptr)
+TodoModel::Private::Private(const EventViews::PrefsPtr &preferences, TodoModel *qq) \
: QObject() + , m_changer(nullptr)
, m_preferences(preferences)
, q(qq)
{
}
-Akonadi::Item TodoModel::Private::findItemByUid(const QString &uid,
- const QModelIndex &parent) const
+Akonadi::Item TodoModel::Private::findItemByUid(const QString &uid, const \
QModelIndex &parent) const {
Q_ASSERT(!uid.isEmpty());
IncidenceTreeModel *treeModel = qobject_cast<IncidenceTreeModel \
*>(q->sourceModel()); @@ -144,11 +146,9 @@ void \
TodoModel::Private::onRowsRemoved(const QModelIndex &, int, int) q->endRemoveRows();
}
-void TodoModel::Private::onRowsAboutToBeMoved(const QModelIndex &sourceParent,
- int sourceStart,
- int sourceEnd,
- const QModelIndex &destinationParent,
- int destinationRow)
+void TodoModel::Private::onRowsAboutToBeMoved(const QModelIndex &sourceParent, int \
sourceStart, + int sourceEnd, const \
QModelIndex &destinationParent, + int \
destinationRow) {
Q_UNUSED(sourceParent);
Q_UNUSED(sourceStart);
@@ -201,10 +201,10 @@ void TodoModel::Private::onLayoutChanged()
QModelIndex newIndex_col0 = \
q->mapFromSource(m_layoutChangePersistentIndexes.at(i)); \
Q_ASSERT(newIndex_col0.isValid()); const int column = m_columns.at(i);
- QModelIndex newIndex =
- column == 0 ?
- newIndex_col0 :
- q->createIndex(newIndex_col0.row(), column, \
newIndex_col0.internalPointer()); + QModelIndex newIndex
+ = column == 0
+ ? newIndex_col0
+ : q->createIndex(newIndex_col0.row(), column, \
newIndex_col0.internalPointer()); \
q->changePersistentIndex(m_persistentIndexes.at(i), newIndex); }
@@ -215,7 +215,8 @@ void TodoModel::Private::onLayoutChanged()
}
TodoModel::TodoModel(const EventViews::PrefsPtr &preferences, QObject *parent)
- : QAbstractProxyModel(parent), d(new Private(preferences, this))
+ : QAbstractProxyModel(parent)
+ , d(new Private(preferences, this))
{
setObjectName(QStringLiteral("TodoModel"));
}
@@ -237,8 +238,8 @@ QVariant TodoModel::data(const QModelIndex &index, int role) \
const return QVariant();
}
Q_ASSERT(sourceIndex.isValid());
- const Akonadi::Item item =
- sourceIndex.data(Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>();
+ const Akonadi::Item item
+ = sourceIndex.data(Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>();
if (!item.isValid()) {
qCWarning(CALENDARVIEW_LOG) << "Invalid index: " << sourceIndex;
//Q_ASSERT( false );
@@ -280,20 +281,24 @@ QVariant TodoModel::data(const QModelIndex &index, int role) \
const case PercentColumn:
return QVariant(todo->percentComplete());
case StartDateColumn:
- return todo->hasStartDate() ? \
QLocale().toString(todo->dtStart().toLocalTime().date(), QLocale::ShortFormat) + \
return todo->hasStartDate() ? QLocale().toString( + \
todo->dtStart().toLocalTime().date(), QLocale::ShortFormat) : QVariant(QString());
case DueDateColumn:
- return todo->hasDueDate() ? \
QLocale().toString(todo->dtDue().toLocalTime().date(), QLocale::ShortFormat) + \
return todo->hasDueDate() ? QLocale().toString( + \
todo->dtDue().toLocalTime().date(), QLocale::ShortFormat) : QVariant(QString());
- case CategoriesColumn: {
+ case CategoriesColumn:
+ {
QString categories = todo->categories().join(
- i18nc("delimiter for joining category names", \
",")); + i18nc("delimiter for joining category names", ","));
return QVariant(categories);
}
case DescriptionColumn:
return QVariant(todo->description());
case CalendarColumn:
- return QVariant(CalendarSupport::displayName(d->m_calendar.data(), \
item.parentCollection())); + return \
QVariant(CalendarSupport::displayName(d->m_calendar.data(), + \
item.parentCollection())); }
return QVariant();
}
@@ -317,7 +322,8 @@ QVariant TodoModel::data(const QModelIndex &index, int role) \
const case DescriptionColumn:
return QVariant(todo->description());
case CalendarColumn:
- return QVariant(CalendarSupport::displayName(d->m_calendar.data(), \
item.parentCollection())); + return \
QVariant(CalendarSupport::displayName(d->m_calendar.data(), + \
item.parentCollection())); }
return QVariant();
}
@@ -326,7 +332,8 @@ QVariant TodoModel::data(const QModelIndex &index, int role) \
const if (role == Qt::ToolTipRole) {
if (d->m_preferences->enableToolTips()) {
return QVariant(KCalUtils::IncidenceFormatter::toolTipStr(
- CalendarSupport::displayName(d->m_calendar.data(), \
item.parentCollection()), + \
CalendarSupport::displayName(d->m_calendar.data(), + \
item.parentCollection()), todo, QDate(), true));
} else {
return QVariant();
@@ -337,16 +344,15 @@ QVariant TodoModel::data(const QModelIndex &index, int role) \
const if (role == Qt::BackgroundRole) {
if (todo->isOverdue()) {
return QVariant(
- QBrush(d->m_preferences->todoOverdueColor()));
+ QBrush(d->m_preferences->todoOverdueColor()));
} else if (isDueToday(todo)) {
return QVariant(
- QBrush(d->m_preferences->todoDueTodayColor()));
+ QBrush(d->m_preferences->todoDueTodayColor()));
}
}
// indicate if a row is checked (=completed) only in the first column
if (role == Qt::CheckStateRole && index.column() == 0) {
-
if (hasChildren(index) && !index.parent().isValid()) {
return QVariant();
}
@@ -370,9 +376,9 @@ QVariant TodoModel::data(const QModelIndex &index, int role) \
const // category colour
if (role == Qt::DecorationRole && index.column() == SummaryColumn) {
QStringList categories = todo->categories();
- return categories.isEmpty() ?
- QVariant() :
- QVariant(CalendarSupport::KCalPrefs::instance()->categoryColor(categories.first()));
+ return categories.isEmpty()
+ ? QVariant()
+ : QVariant(CalendarSupport::KCalPrefs::instance()->categoryColor(categories.first()));
} else if (role == Qt::DecorationRole) {
return QVariant();
}
@@ -427,12 +433,13 @@ bool TodoModel::setData(const QModelIndex &index, const \
QVariant &value, int rol return true;
}
- const Akonadi::Item item =
- data(index, Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>();
+ const Akonadi::Item item
+ = data(index, Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>();
const KCalCore::Todo::Ptr todo = CalendarSupport::todo(item);
if (!item.isValid() || !todo) {
- qCWarning(CALENDARVIEW_LOG) << "TodoModel::setData() called, bug item is \
invalid or doesn't have payload"; + qCWarning(CALENDARVIEW_LOG)
+ << "TodoModel::setData() called, bug item is invalid or doesn't have \
payload"; Q_ASSERT(false);
return false;
}
@@ -461,18 +468,20 @@ bool TodoModel::setData(const QModelIndex &index, const \
QVariant &value, int rol case PercentColumn:
todo->setPercentComplete(value.toInt());
break;
- case StartDateColumn: {
+ case StartDateColumn:
+ {
QDateTime tmp = todo->dtStart();
tmp.setDate(value.toDate());
todo->setDtStart(tmp);
+ break;
}
- break;
- case DueDateColumn: {
+ case DueDateColumn:
+ {
QDateTime tmp = todo->dtDue();
tmp.setDate(value.toDate());
todo->setDtDue(tmp);
+ break;
}
- break;
case CategoriesColumn:
todo->setCategories(value.toStringList());
break;
@@ -679,8 +688,8 @@ QMimeData *TodoModel::mimeData(const QModelIndexList &indexes) \
const {
Akonadi::Item::List items;
for (const QModelIndex &index : indexes) {
- const Akonadi::Item item =
- this->data(index, \
Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>(); + const \
Akonadi::Item item + = this->data(index, \
Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>(); if (item.isValid() && \
!items.contains(item)) { items.push_back(item);
}
@@ -688,8 +697,8 @@ QMimeData *TodoModel::mimeData(const QModelIndexList &indexes) \
const return CalendarSupport::createMimeData(items);
}
-bool TodoModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
- int row, int column, const QModelIndex &parent)
+bool TodoModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, \
int column, + const QModelIndex &parent)
{
Q_UNUSED(row);
Q_UNUSED(column);
@@ -699,8 +708,8 @@ bool TodoModel::dropMimeData(const QMimeData *data, \
Qt::DropAction action, return false;
}
- if (d->m_calendar && d->m_changer &&
- (KCalUtils::ICalDrag::canDecode(data) || \
KCalUtils::VCalDrag::canDecode(data))) { + if (d->m_calendar && d->m_changer
+ && (KCalUtils::ICalDrag::canDecode(data) || \
KCalUtils::VCalDrag::canDecode(data))) { KCalUtils::DndFactory \
dndFactory(d->m_calendar); KCalCore::Todo::Ptr t = dndFactory.createDropTodo(data);
KCalCore::Event::Ptr e = dndFactory.createDropEvent(data);
@@ -712,8 +721,8 @@ bool TodoModel::dropMimeData(const QMimeData *data, \
Qt::DropAction action, KCalCore::Todo::Ptr todo = CalendarSupport::todo(item);
KCalCore::Todo::Ptr destTodo;
if (parent.isValid()) {
- const Akonadi::Item parentItem =
- this->data(parent, \
Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>(); + const \
Akonadi::Item parentItem + = this->data(parent, \
Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>(); if \
(parentItem.isValid()) { destTodo = CalendarSupport::todo(parentItem);
}
@@ -744,7 +753,6 @@ bool TodoModel::dropMimeData(const QMimeData *data, \
Qt::DropAction action,
qCDebug(CALENDARVIEW_LOG) << "Todo's with recurring id can't have \
child todos yet."; return false;
}
-
} else if (e) {
// TODO: Implement dropping an event onto a to-do: Generate a \
relationship to the event! } else {
@@ -754,8 +762,8 @@ bool TodoModel::dropMimeData(const QMimeData *data, \
Qt::DropAction action, return false;
}
- const Akonadi::Item parentItem =
- this->data(parent, \
Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>(); + const \
Akonadi::Item parentItem + = this->data(parent, \
Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>();
KCalCore::Todo::Ptr destTodo = CalendarSupport::todo(parentItem);
if (data->hasText()) {
@@ -764,14 +772,15 @@ bool TodoModel::dropMimeData(const QMimeData *data, \
Qt::DropAction action,
KCalCore::Todo::Ptr oldTodo = \
KCalCore::Todo::Ptr(destTodo->clone());
if (text.startsWith(QStringLiteral("file:"))) {
- destTodo->addAttachment(KCalCore::Attachment::Ptr(new \
KCalCore::Attachment(text))); + \
destTodo->addAttachment(KCalCore::Attachment::Ptr(new KCalCore::Attachment( + \
text))); } else {
QStringList emails = KEmailAddress::splitAddressList(text);
for (QStringList::ConstIterator it = emails.constBegin();
- it != emails.constEnd(); ++it) {
+ it != emails.constEnd(); ++it) {
QString name, email, comment;
- if (KEmailAddress::splitAddress(*it, name, email, comment) \
==
- KEmailAddress::AddressOk) {
+ if (KEmailAddress::splitAddress(*it, name, email, comment)
+ == KEmailAddress::AddressOk) {
destTodo->addAttendee(
KCalCore::Attendee::Ptr(new KCalCore::Attendee(name, \
email))); }
@@ -794,8 +803,8 @@ Qt::ItemFlags TodoModel::flags(const QModelIndex &index) const
Qt::ItemFlags ret = QAbstractItemModel::flags(index);
- const Akonadi::Item item =
- data(index, Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>();
+ const Akonadi::Item item
+ = data(index, Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>();
if (!item.isValid()) {
Q_ASSERT(mapToSource(index).isValid());
@@ -831,8 +840,8 @@ Qt::ItemFlags TodoModel::flags(const QModelIndex &index) const
// whole rows should have checkboxes, so append the flag for the
// first item of every row only. Also, only the first item of every
// row should be used as a target for a drag and drop operation.
- ret |= Qt::ItemIsUserCheckable |
- Qt::ItemIsDropEnabled;
+ ret |= Qt::ItemIsUserCheckable
+ |Qt::ItemIsDropEnabled;
}
return ret;
}
@@ -855,7 +864,8 @@ QModelIndex TodoModel::mapToSource(const QModelIndex &proxyIndex) \
const }
if (proxyIndex.column() != 0) {
- qCCritical(CALENDARVIEW_LOG) << "Map to source called with column>0, but \
source model only has 1 column"; + qCCritical(CALENDARVIEW_LOG)
+ << "Map to source called with column>0, but source model only has 1 \
column"; Q_ASSERT(false);
}
@@ -863,7 +873,7 @@ QModelIndex TodoModel::mapToSource(const QModelIndex &proxyIndex) \
const
// we convert to column 0
const QModelIndex sourceIndex = SourceModelIndex(proxyIndex.row(), 0,
- proxyIndex.internalPointer(), sourceModel());
+ proxyIndex.internalPointer(), \
sourceModel());
return sourceIndex;
}
@@ -875,14 +885,14 @@ QModelIndex TodoModel::index(int row, int column, const \
QModelIndex &parent) con }
Q_ASSERT(!parent.isValid() || parent.internalPointer());
- QModelIndex parent_col0 =
- parent.isValid() ?
- createIndex(parent.row(), 0, parent.internalPointer()) :
- QModelIndex();
+ QModelIndex parent_col0
+ = parent.isValid()
+ ? createIndex(parent.row(), 0, parent.internalPointer())
+ : QModelIndex();
// Lets preserve the original internalPointer
- const QModelIndex index =
- mapFromSource(sourceModel()->index(row, 0, mapToSource(parent_col0)));
+ const QModelIndex index
+ = mapFromSource(sourceModel()->index(row, 0, mapToSource(parent_col0)));
Q_ASSERT(!index.isValid() || index.internalPointer());
diff --git a/src/todo/todomodel.h b/src/todo/todomodel.h
index 9ccceb7..1238f15 100644
--- a/src/todo/todomodel.h
+++ b/src/todo/todomodel.h
@@ -84,8 +84,8 @@ public:
QMimeData *mimeData(const QModelIndexList &indexes) const override;
- bool dropMimeData(const QMimeData *data, Qt::DropAction action,
- int row, int column, const QModelIndex &parent) override;
+ bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int \
column, + const QModelIndex &parent) override;
QStringList mimeTypes() const override;
diff --git a/src/todo/todomodel_p.h b/src/todo/todomodel_p.h
index 0520305..7cc21f7 100644
--- a/src/todo/todomodel_p.h
+++ b/src/todo/todomodel_p.h
@@ -32,8 +32,7 @@
#include <QModelIndex>
#include <QString>
-namespace Akonadi
-{
+namespace Akonadi {
class IncidenceChanger;
}
diff --git a/src/todo/todoview.cpp b/src/todo/todoview.cpp
index de624a4..a01e8ab 100644
--- a/src/todo/todoview.cpp
+++ b/src/todo/todoview.cpp
@@ -68,19 +68,18 @@ Q_DECLARE_METATYPE(QPointer<QMenu>)
using namespace EventViews;
using namespace KCalCore;
-namespace EventViews
-{
+namespace EventViews {
// We share this struct between all views, for performance and memory purposes
class ModelStack
{
public:
ModelStack(const EventViews::PrefsPtr &preferences, QObject *parent_)
- : todoModel(new TodoModel(preferences)),
- parent(parent_),
- calendar(nullptr),
- todoTreeModel(nullptr),
- todoFlatModel(nullptr),
- prefs(preferences)
+ : todoModel(new TodoModel(preferences))
+ , parent(parent_)
+ , calendar(nullptr)
+ , todoTreeModel(nullptr)
+ , todoFlatModel(nullptr)
+ , prefs(preferences)
{
}
@@ -108,7 +107,7 @@ public:
foreach (TodoView *view, views) {
// In flatview dropping confuses users and it's very easy to drop \
into a child item
view->mView->setDragDropMode(QAbstractItemView::DragOnly);
- view->setFlatView(flat, /**propagate=*/false); // So other views \
update their toggle icon + view->setFlatView(flat, /**propagate=*/ \
false); // So other views update their toggle icon
if (todoTreeModel) {
view->saveViewState(); // Save the tree state before it's gone
@@ -127,10 +126,12 @@ public:
delete todoTreeModel;
todoTreeModel = new IncidenceTreeModel(QStringList() << todoMimeType, \
parent); foreach (TodoView *view, views) {
- QObject::connect(todoTreeModel, \
&IncidenceTreeModel::indexChangedParent, view, \
&TodoView::expandIndex);
- QObject::connect(todoTreeModel, \
&IncidenceTreeModel::batchInsertionFinished, view, &TodoView::restoreViewState); + \
QObject::connect(todoTreeModel, &IncidenceTreeModel::indexChangedParent, view, + \
&TodoView::expandIndex); + QObject::connect(todoTreeModel, \
&IncidenceTreeModel::batchInsertionFinished, view, + \
&TodoView::restoreViewState);
view->mView->setDragDropMode(QAbstractItemView::DragDrop);
- view->setFlatView(flat, /**propagate=*/false); // So other views \
update their toggle icon + view->setFlatView(flat, /**propagate=*/ \
false); // So other views update their toggle icon }
todoTreeModel->setSourceModel(calendar ? calendar->model() : nullptr);
todoModel->setSourceModel(todoTreeModel);
@@ -179,8 +180,7 @@ public:
// Don't use K_GLOBAL_STATIC, see QTBUG-22667
static ModelStack *sModels = nullptr;
-TodoView::TodoView(const EventViews::PrefsPtr &prefs,
- bool sidebarView, QWidget *parent)
+TodoView::TodoView(const EventViews::PrefsPtr &prefs, bool sidebarView, QWidget \
*parent) : EventView(parent)
, mQuickSearch(nullptr)
, mQuickAdd(nullptr)
@@ -205,18 +205,24 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs,
mProxyModel->setFilterKeyColumn(TodoModel::SummaryColumn);
mProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
mProxyModel->setSortRole(Qt::EditRole);
- connect(mProxyModel, &TodoViewSortFilterProxyModel::rowsInserted, this, \
&TodoView::onRowsInserted); + connect(mProxyModel, \
&TodoViewSortFilterProxyModel::rowsInserted, this, + \
&TodoView::onRowsInserted);
if (!mSidebarView) {
mQuickSearch = new TodoViewQuickSearch(calendar(), this);
mQuickSearch->setVisible(prefs->enableTodoQuickSearch());
connect(mQuickSearch, SIGNAL(searchTextChanged(QString)),
mProxyModel, SLOT(setFilterRegExp(QString)));
- connect(mQuickSearch, &TodoViewQuickSearch::searchTextChanged, this, \
&TodoView::restoreViewState);
- connect(mQuickSearch, &TodoViewQuickSearch::filterCategoryChanged, \
mProxyModel, &TodoViewSortFilterProxyModel::setCategoryFilter);
- connect(mQuickSearch, &TodoViewQuickSearch::filterCategoryChanged, this, \
&TodoView::restoreViewState);
- connect(mQuickSearch, &TodoViewQuickSearch::filterPriorityChanged, \
mProxyModel, &TodoViewSortFilterProxyModel::setPriorityFilter);
- connect(mQuickSearch, &TodoViewQuickSearch::filterPriorityChanged, this, \
&TodoView::restoreViewState); + connect(mQuickSearch, \
&TodoViewQuickSearch::searchTextChanged, this, + \
&TodoView::restoreViewState); + connect(mQuickSearch, \
&TodoViewQuickSearch::filterCategoryChanged, mProxyModel, + \
&TodoViewSortFilterProxyModel::setCategoryFilter); + connect(mQuickSearch, \
&TodoViewQuickSearch::filterCategoryChanged, this, + \
&TodoView::restoreViewState); + connect(mQuickSearch, \
&TodoViewQuickSearch::filterPriorityChanged, mProxyModel, + \
&TodoViewSortFilterProxyModel::setPriorityFilter); + connect(mQuickSearch, \
&TodoViewQuickSearch::filterPriorityChanged, this, + \
&TodoView::restoreViewState); }
mView = new TodoViewView(this);
@@ -230,10 +236,11 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs,
mView->setDragDropMode(QAbstractItemView::DragDrop);
mView->setExpandsOnDoubleClick(false);
- mView->setEditTriggers(QAbstractItemView::SelectedClicked |
- QAbstractItemView::EditKeyPressed);
+ mView->setEditTriggers(QAbstractItemView::SelectedClicked
+ |QAbstractItemView::EditKeyPressed);
- connect(mView->header(), &QHeaderView::geometriesChanged, this, \
&TodoView::scheduleResizeColumns); + connect(mView->header(), \
&QHeaderView::geometriesChanged, this, + \
&TodoView::scheduleResizeColumns);
connect(mView, &TodoViewView::visibleColumnCountChanged, this, \
&TodoView::resizeColumns);
TodoRichTextDelegate *richTextDelegate = new TodoRichTextDelegate(mView);
@@ -258,7 +265,9 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs,
connect(mView, &TodoViewView::customContextMenuRequested, this, \
&TodoView::contextMenu);
connect(mView, &TodoViewView::doubleClicked, this, \
&TodoView::itemDoubleClicked);
- connect(mView->selectionModel(), &QItemSelectionModel::selectionChanged, this, \
&TodoView::selectionChanged); + connect(
+ mView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
+ &TodoView::selectionChanged);
mQuickAdd = new TodoViewQuickAddLine(this);
mQuickAdd->setClearButtonEnabled(true);
@@ -308,7 +317,7 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs,
// Dummy layout just to add a few px of right margin so the checkbox is aligned
// with the QAbstractItemView's viewport.
QHBoxLayout *dummyLayout = new QHBoxLayout();
- dummyLayout->setContentsMargins(0, 0, mView->frameWidth()/*right*/, 0);
+ dummyLayout->setContentsMargins(0, 0, mView->frameWidth() /*right*/, 0);
if (!mSidebarView) {
QFrame *f = new QFrame(this);
f->setFrameShape(QFrame::VLine);
@@ -324,30 +333,31 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs,
mItemPopupMenu = new QMenu(this);
mItemPopupMenuItemOnlyEntries << mItemPopupMenu->addAction(
- i18nc("@action:inmenu show the to-do", \
"&Show"),
- this, SLOT(showTodo()));
+ i18nc("@action:inmenu show the to-do", "&Show"),
+ this, SLOT(showTodo()));
QAction *a = mItemPopupMenu->addAction(
- i18nc("@action:inmenu edit the to-do", "&Edit..."),
- this, SLOT(editTodo()));
+ i18nc("@action:inmenu edit the to-do", "&Edit..."),
+ this, SLOT(editTodo()));
mItemPopupMenuReadWriteEntries << a;
mItemPopupMenuItemOnlyEntries << a;
mItemPopupMenu->addSeparator();
mItemPopupMenuItemOnlyEntries << mItemPopupMenu->addAction(
- \
QIcon::fromTheme(QStringLiteral("document-print")),
- i18nc("@action:inmenu print the to-do", \
"&Print..."),
- this, SIGNAL(printTodo()));
+ QIcon::fromTheme(QStringLiteral("document-print")),
+ i18nc("@action:inmenu print the to-do", "&Print..."),
+ this, SIGNAL(printTodo()));
mItemPopupMenuItemOnlyEntries << mItemPopupMenu->addAction(
- \
QIcon::fromTheme(QStringLiteral("document-print-preview")),
- i18nc("@action:inmenu print preview the \
to-do", "Print Previe&w..."),
- this, SIGNAL(printPreviewTodo()));
+ QIcon::fromTheme(QStringLiteral("document-print-preview")),
+ i18nc("@action:inmenu print preview the to-do", "Print Previe&w..."),
+ this, SIGNAL(printPreviewTodo()));
mItemPopupMenu->addSeparator();
a = mItemPopupMenu->addAction(
- KIconLoader::global()->loadIcon(QStringLiteral("edit-delete"), \
KIconLoader::NoGroup, KIconLoader::SizeSmall),
- i18nc("@action:inmenu delete the to-do", "&Delete"),
- this, SLOT(deleteTodo()));
+ KIconLoader::global()->loadIcon(QStringLiteral("edit-delete"), \
KIconLoader::NoGroup, + \
KIconLoader::SizeSmall), + i18nc("@action:inmenu delete the to-do", \
"&Delete"), + this, SLOT(deleteTodo()));
mItemPopupMenuReadWriteEntries << a;
mItemPopupMenuItemOnlyEntries << a;
@@ -360,19 +370,19 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs,
this, SLOT(newTodo()));
a = mItemPopupMenu->addAction(
- i18nc("@action:inmenu create a new sub-to-do", "New Su&b-to-do..."),
- this, SLOT(newSubTodo()));
+ i18nc("@action:inmenu create a new sub-to-do", "New Su&b-to-do..."),
+ this, SLOT(newSubTodo()));
mItemPopupMenuReadWriteEntries << a;
mItemPopupMenuItemOnlyEntries << a;
mMakeTodoIndependent = mItemPopupMenu->addAction(
- i18nc("@action:inmenu", "&Make this To-do \
Independent"),
- this, SIGNAL(unSubTodoSignal()));
+ i18nc("@action:inmenu", "&Make this To-do Independent"),
+ this, SIGNAL(unSubTodoSignal()));
- mMakeSubtodosIndependent =
- mItemPopupMenu->addAction(
- i18nc("@action:inmenu", "Make all Sub-to-dos &Independent"),
- this, SIGNAL(unAllSubTodoSignal()));
+ mMakeSubtodosIndependent
+ = mItemPopupMenu->addAction(
+ i18nc("@action:inmenu", "Make all Sub-to-dos &Independent"),
+ this, SIGNAL(unAllSubTodoSignal()));
mItemPopupMenuItemOnlyEntries << mMakeTodoIndependent;
mItemPopupMenuItemOnlyEntries << mMakeSubtodosIndependent;
@@ -382,38 +392,44 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs,
mItemPopupMenu->addSeparator();
- a = mItemPopupMenu->addAction(KIconLoader::global()->loadIcon(QStringLiteral("appointment-new"), \
KIconLoader::NoGroup, KIconLoader::SizeSmall),
- i18n("Create Event"),
- this, SLOT(createEvent()));
+ a
+ = mItemPopupMenu->addAction(KIconLoader::global()->loadIcon(QStringLiteral("appointment-new"),
+ \
KIconLoader::NoGroup, + \
KIconLoader::SizeSmall), + i18n("Create Event"),
+ this, SLOT(createEvent()));
a->setObjectName(QStringLiteral("createevent"));
mItemPopupMenuReadWriteEntries << a;
mItemPopupMenuItemOnlyEntries << a;
- a = mItemPopupMenu->addAction(KIconLoader::global()->loadIcon(QStringLiteral("view-pim-notes"), \
KIconLoader::NoGroup, KIconLoader::SizeSmall),
- i18n("Create Note"),
- this, SLOT(createNote()));
+ a
+ = mItemPopupMenu->addAction(KIconLoader::global()->loadIcon(QStringLiteral("view-pim-notes"),
+ \
KIconLoader::NoGroup, + \
KIconLoader::SizeSmall), + i18n("Create Note"),
+ this, SLOT(createNote()));
a->setObjectName(QStringLiteral("createnote"));
mItemPopupMenuReadWriteEntries << a;
mItemPopupMenuItemOnlyEntries << a;
mItemPopupMenu->addSeparator();
- mCopyPopupMenu =
- new KPIM::KDatePickerPopup(KPIM::KDatePickerPopup::NoDate |
- KPIM::KDatePickerPopup::DatePicker |
- KPIM::KDatePickerPopup::Words,
- QDate::currentDate(), this);
+ mCopyPopupMenu
+ = new KPIM::KDatePickerPopup(KPIM::KDatePickerPopup::NoDate
+ |KPIM::KDatePickerPopup::DatePicker
+ |KPIM::KDatePickerPopup::Words,
+ QDate::currentDate(), this);
mCopyPopupMenu->setTitle(i18nc("@title:menu", "&Copy To"));
connect(mCopyPopupMenu, &KPIM::KDatePickerPopup::dateChanged, this, \
&TodoView::copyTodoToDate);
connect(mCopyPopupMenu, &KPIM::KDatePickerPopup::dateChanged, mItemPopupMenu, \
&QMenu::hide);
- mMovePopupMenu =
- new KPIM:: KDatePickerPopup(KPIM::KDatePickerPopup::NoDate |
- KPIM::KDatePickerPopup::DatePicker |
- KPIM::KDatePickerPopup::Words,
- QDate::currentDate(), this);
+ mMovePopupMenu
+ = new KPIM:: KDatePickerPopup(KPIM::KDatePickerPopup::NoDate
+ |KPIM::KDatePickerPopup::DatePicker
+ |KPIM::KDatePickerPopup::Words,
+ QDate::currentDate(), this);
mMovePopupMenu->setTitle(i18nc("@title:menu", "&Move To"));
connect(mMovePopupMenu, &KPIM::KDatePickerPopup::dateChanged, this, \
&TodoView::setNewDate); @@ -580,14 +596,13 @@ void TodoView::restoreLayout(KConfig \
*config, const QString &group, bool minimal
// We don't have any incidences (content) yet, so we delay resizing
QTimer::singleShot(0, this, &TodoView::resizeColumns);
-
} else {
for (int i = 0;
- i < header->count() &&
- i < columnOrder.size() &&
- i < columnWidths.size() &&
- i < columnVisibility.size();
- i++) {
+ i < header->count()
+ && i < columnOrder.size()
+ && i < columnWidths.size()
+ && i < columnVisibility.size();
+ i++) {
bool visible = columnVisibility[i].toBool();
int width = columnWidths[i].toInt();
int order = columnOrder[i].toInt();
@@ -657,8 +672,7 @@ void TodoView::clearSelection()
mView->selectionModel()->clearSelection();
}
-void TodoView::addTodo(const QString &summary,
- const Akonadi::Item &parentItem,
+void TodoView::addTodo(const QString &summary, const Akonadi::Item &parentItem,
const QStringList &categories)
{
const QString summaryTrimmed = summary.trimmed();
@@ -694,9 +708,9 @@ void TodoView::addTodo(const QString &summary,
void TodoView::addQuickTodo(Qt::KeyboardModifiers modifiers)
{
if (modifiers == Qt::NoModifier) {
- /*const QModelIndex index = */ addTodo(mQuickAdd->text(), Akonadi::Item(),
- mProxyModel->categories());
-
+ /*const QModelIndex index = */
+ addTodo(mQuickAdd->text(), Akonadi::Item(),
+ mProxyModel->categories());
} else if (modifiers == Qt::ControlModifier) {
QModelIndexList selection = mView->selectionModel()->selectedRows();
if (selection.count() != 1) {
@@ -706,7 +720,8 @@ void TodoView::addQuickTodo(Qt::KeyboardModifiers modifiers)
const QModelIndex idx = mProxyModel->mapToSource(selection[0]);
mView->expand(selection[0]);
const Akonadi::Item parent = sModels->todoModel->data(idx,
- \
Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>(); + \
Akonadi::EntityTreeModel::ItemRole). + \
value<Akonadi::Item>(); addTodo(mQuickAdd->text(), parent, \
mProxyModel->categories()); } else {
return;
@@ -734,11 +749,11 @@ void TodoView::contextMenu(const QPoint &pos)
// Action isn't RO, it can change the incidence, "Edit" for example.
const bool actionIsRw = \
mItemPopupMenuReadWriteEntries.contains(entry);
- const bool incidenceIsRO = !calendar()->hasRight(item, \
Akonadi::Collection::CanChangeItem);
-
- enable = hasItem && (!actionIsRw ||
- !incidenceIsRO);
+ const bool incidenceIsRO = !calendar()->hasRight(item,
+ \
Akonadi::Collection::CanChangeItem);
+ enable = hasItem && (!actionIsRw
+ || !incidenceIsRO);
}
} else {
enable = false;
@@ -753,7 +768,9 @@ void TodoView::contextMenu(const QPoint &pos)
if (incidencePtr) {
const bool hasRecId = incidencePtr->hasRecurrenceId();
if (calendar()) {
- mMakeSubtodosIndependent->setEnabled(!hasRecId && \
!calendar()->childItems(incidencePtr->uid()).isEmpty()); + \
mMakeSubtodosIndependent->setEnabled(!hasRecId + \
&& !calendar()->childItems( + \
incidencePtr->uid()).isEmpty()); }
mMakeTodoIndependent->setEnabled(!hasRecId && \
!incidencePtr->relatedTo().isEmpty()); }
@@ -781,8 +798,7 @@ void TodoView::contextMenu(const QPoint &pos)
}
}
-void TodoView::selectionChanged(const QItemSelection &selected,
- const QItemSelection &deselected)
+void TodoView::selectionChanged(const QItemSelection &selected, const QItemSelection \
&deselected) {
Q_UNUSED(deselected);
QModelIndexList selection = selected.indexes();
@@ -827,8 +843,8 @@ void TodoView::deleteTodo()
{
QModelIndexList selection = mView->selectionModel()->selectedRows();
if (selection.size() == 1) {
- const Akonadi::Item todoItem =
- selection[0].data(TodoModel::TodoRole).value<Akonadi::Item>();
+ const Akonadi::Item todoItem
+ = selection[0].data(TodoModel::TodoRole).value<Akonadi::Item>();
if (!changer()->deletedRecently(todoItem.id())) {
Q_EMIT deleteIncidenceSignal(todoItem);
@@ -845,8 +861,8 @@ void TodoView::newSubTodo()
{
QModelIndexList selection = mView->selectionModel()->selectedRows();
if (selection.size() == 1) {
- const Akonadi::Item todoItem =
- selection[0].data(TodoModel::TodoRole).value<Akonadi::Item>();
+ const Akonadi::Item todoItem
+ = selection[0].data(TodoModel::TodoRole).value<Akonadi::Item>();
Q_EMIT newSubTodoSignal(todoItem);
} else {
@@ -869,9 +885,9 @@ void TodoView::copyTodoToDate(const QDate &date)
const QModelIndex origIndex = mProxyModel->mapToSource(selection[0]);
Q_ASSERT(origIndex.isValid());
- const Akonadi::Item origItem =
- sModels->todoModel->data(origIndex,
- \
Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>(); + const Akonadi::Item \
origItem + = sModels->todoModel->data(origIndex,
+ \
Akonadi::EntityTreeModel::ItemRole).value<Akonadi::Item>();
const KCalCore::Todo::Ptr orig = CalendarSupport::todo(origItem);
if (!orig) {
@@ -1114,7 +1130,8 @@ void TodoView::onRowsInserted(const QModelIndex &parent, int \
start, int end) return;
}
- const bool isPopulated = \
calendar()->entityTreeModel()->isCollectionPopulated(item.storageCollectionId()); + \
const bool isPopulated = calendar()->entityTreeModel()->isCollectionPopulated( + \
item.storageCollectionId()); if (!isPopulated) {
return;
}
@@ -1126,9 +1143,11 @@ void TodoView::onRowsInserted(const QModelIndex &parent, int \
start, int end)
// don't destroy complex selections, not applicable now (only single
// selection allowed), but for the future...
int colCount = static_cast<int>(TodoModel::ColumnCount);
- mView->selectionModel()->select(QItemSelection(idx, \
mView->model()->index(start, colCount - 1)),
- QItemSelectionModel::ClearAndSelect |
- QItemSelectionModel::Rows);
+ mView->selectionModel()->select(QItemSelection(idx,
+ \
mView->model()->index(start, + \
colCount - 1)), + \
QItemSelectionModel::ClearAndSelect + \
|QItemSelectionModel::Rows); }
return;
}
@@ -1146,12 +1165,11 @@ void TodoView::onRowsInserted(const QModelIndex &parent, int \
start, int end) }
}
-void TodoView::getHighlightMode(bool &highlightEvents,
- bool &highlightTodos,
+void TodoView::getHighlightMode(bool &highlightEvents, bool &highlightTodos,
bool &highlightJournals)
{
- highlightTodos = preferences()->highlightTodos();
- highlightEvents = !highlightTodos;
+ highlightTodos = preferences()->highlightTodos();
+ highlightEvents = !highlightTodos;
highlightJournals = false;
}
@@ -1174,12 +1192,13 @@ void TodoView::resizeColumns()
// We have 3 columns that should stretch: summary, description and categories.
// Summary is always visible.
const bool descriptionVisible = \
!mView->isColumnHidden(TodoModel::DescriptionColumn);
- const bool categoriesVisible = \
!mView->isColumnHidden(TodoModel::CategoriesColumn); + const bool \
categoriesVisible = !mView->isColumnHidden(TodoModel::CategoriesColumn);
// Calculate size of non-stretchable columns:
int size = 0;
for (int i = 0; i < TodoModel::ColumnCount; ++i) {
- if (!mView->isColumnHidden(i) && i != TodoModel::SummaryColumn && i != \
TodoModel::DescriptionColumn && i != TodoModel::CategoriesColumn) { + if \
(!mView->isColumnHidden(i) && i != TodoModel::SummaryColumn + && i != \
TodoModel::DescriptionColumn && i != TodoModel::CategoriesColumn) { size += \
mView->columnWidth(i); }
}
diff --git a/src/todo/todoview.h b/src/todo/todoview.h
index 5084bb9..cc9ebd3 100644
--- a/src/todo/todoview.h
+++ b/src/todo/todoview.h
@@ -41,13 +41,11 @@ class TodoViewQuickSearch;
class TodoViewSortFilterProxyModel;
class TodoViewView;
-namespace KPIM
-{
+namespace KPIM {
class KDatePickerPopup;
}
-namespace Akonadi
-{
+namespace Akonadi {
class ETMViewStateSaver;
}
@@ -57,9 +55,7 @@ class QModelIndex;
class QToolButton;
class QTimer;
-namespace EventViews
-{
-
+namespace EventViews {
class EVENTVIEWS_EXPORT TodoView : public EventViews::EventView
{
Q_OBJECT
@@ -78,16 +74,16 @@ public:
return 0;
}
- void setDocumentId(const QString &) {}
+ void setDocumentId(const QString &)
+ {
+ }
void saveLayout(KConfig *config, const QString &group) const;
void restoreLayout(KConfig *config, const QString &group, bool minimalDefaults);
/** documentation in baseview.h */
- void getHighlightMode(bool &highlightEvents,
- bool &highlightTodos,
- bool &highlightJournals);
+ void getHighlightMode(bool &highlightEvents, bool &highlightTodos, bool \
&highlightJournals);
bool usesFullWindow();
@@ -102,7 +98,8 @@ public Q_SLOTS:
const QDate &preferredMonth = QDate()) override;
void showIncidences(const Akonadi::Item::List &incidenceList, const QDate &date) \
override; void updateView() override;
- virtual void changeIncidenceDisplay(const Akonadi::Item &incidence, \
Akonadi::IncidenceChanger::ChangeType changeType); + virtual void \
changeIncidenceDisplay(const Akonadi::Item &incidence, + \
Akonadi::IncidenceChanger::ChangeType changeType); void updateConfig() override;
void clearSelection() override;
void expandIndex(const QModelIndex &index);
@@ -118,8 +115,7 @@ protected Q_SLOTS:
void contextMenu(const QPoint &pos);
- void selectionChanged(const QItemSelection &selected,
- const QItemSelection &deselected);
+ void selectionChanged(const QItemSelection &selected, const QItemSelection \
&deselected);
// slots used by popup-menus
void showTodo();
@@ -161,8 +157,7 @@ private:
QString stateSaverGroup() const;
/** Creates a new todo with the given text as summary under the given parent */
- void addTodo(const QString &summary,
- const Akonadi::Item &parentItem,
+ void addTodo(const QString &summary, const Akonadi::Item &parentItem,
const QStringList &categories = QStringList());
TodoViewView *mView = nullptr;
@@ -193,7 +188,6 @@ private:
bool mResizeColumnsScheduled;
QTimer *mResizeColumnsTimer = nullptr;
};
-
}
#endif
diff --git a/src/todo/todoviewquickaddline.cpp b/src/todo/todoviewquickaddline.cpp
index ff7866a..699622c 100644
--- a/src/todo/todoviewquickaddline.cpp
+++ b/src/todo/todoviewquickaddline.cpp
@@ -65,4 +65,3 @@ void TodoViewQuickAddLine::resizeEvent(QResizeEvent *event)
Qt::ElideRight,
width() - clearButtonUsedSize().width()));
}
-
diff --git a/src/todo/todoviewquickaddline.h b/src/todo/todoviewquickaddline.h
index 7ae6afd..39cbce2 100644
--- a/src/todo/todoviewquickaddline.h
+++ b/src/todo/todoviewquickaddline.h
@@ -33,7 +33,9 @@ class TodoViewQuickAddLine : public KLineEdit
public:
explicit TodoViewQuickAddLine(QWidget *parent);
- ~TodoViewQuickAddLine() {}
+ ~TodoViewQuickAddLine()
+ {
+ }
protected:
void keyPressEvent(QKeyEvent *event) override;
diff --git a/src/todo/todoviewquicksearch.cpp b/src/todo/todoviewquicksearch.cpp
index 745604f..3fe7815 100644
--- a/src/todo/todoviewquicksearch.cpp
+++ b/src/todo/todoviewquicksearch.cpp
@@ -43,9 +43,9 @@
#include <QHBoxLayout>
-TodoViewQuickSearch::TodoViewQuickSearch(const Akonadi::ETMCalendar::Ptr &calendar,
- QWidget *parent)
- : QWidget(parent), mCalendar(calendar)
+TodoViewQuickSearch::TodoViewQuickSearch(const Akonadi::ETMCalendar::Ptr &calendar, \
QWidget *parent) + : QWidget(parent)
+ , mCalendar(calendar)
{
QHBoxLayout *layout = new QHBoxLayout(this);
// no special margin because it is added by the view
@@ -74,7 +74,8 @@ TodoViewQuickSearch::TodoViewQuickSearch(const \
Akonadi::ETMCalendar::Ptr &calend mCategoryCombo->setDefaultText(defaultText);
mCategoryCombo->setSeparator(i18nc("@item:intext delimiter for joining category \
names", ","));
- connect(mCategoryCombo, &KPIM::TagSelectionCombo::checkedItemsChanged, this, \
&TodoViewQuickSearch::emitFilterCategoryChanged); + connect(mCategoryCombo, \
&KPIM::TagSelectionCombo::checkedItemsChanged, this, + \
&TodoViewQuickSearch::emitFilterCategoryChanged);
layout->addWidget(mCategoryCombo, 1);
@@ -86,9 +87,9 @@ TodoViewQuickSearch::TodoViewQuickSearch(const \
Akonadi::ETMCalendar::Ptr &calend
const int currentPreferedWidth = \
mCategoryCombo->lineEdit()->sizeHint().width();
// Calculate a nice size for "Select Categories"
- const int newPreferedWidth = currentPreferedWidth -
- fm.width(QLatin1Char('x')) * 17 +
- fm.width(defaultText);
+ const int newPreferedWidth = currentPreferedWidth
+ -fm.width(QLatin1Char('x')) * 17
+ +fm.width(defaultText);
const int pixelsToAdd = newPreferedWidth - \
mCategoryCombo->lineEdit()->width();
mCategoryCombo->setMinimumWidth(mCategoryCombo->width() + pixelsToAdd);
@@ -102,7 +103,8 @@ TodoViewQuickSearch::TodoViewQuickSearch(const \
Akonadi::ETMCalendar::Ptr &calend "Use this combobox to filter the to-dos that are \
shown by " "a list of selected priorities."));
mPriorityCombo->setDefaultText(i18nc("@item:inlistbox", "Select Priority"));
- connect(mPriorityCombo, &KPIM::KCheckComboBox::checkedItemsChanged, this, \
&TodoViewQuickSearch::emitFilterPriorityChanged); + connect(mPriorityCombo, \
&KPIM::KCheckComboBox::checkedItemsChanged, this, + \
&TodoViewQuickSearch::emitFilterPriorityChanged);
layout->addWidget(mPriorityCombo, 1);
fillPriorities();
@@ -149,4 +151,3 @@ void TodoViewQuickSearch::emitFilterPriorityChanged()
{
Q_EMIT filterPriorityChanged(mPriorityCombo->checkedItems(Qt::UserRole));
}
-
diff --git a/src/todo/todoviewquicksearch.h b/src/todo/todoviewquicksearch.h
index 6c3c6b9..0597590 100644
--- a/src/todo/todoviewquicksearch.h
+++ b/src/todo/todoviewquicksearch.h
@@ -30,8 +30,7 @@
#include <Akonadi/Calendar/ETMCalendar>
#include <QWidget>
-namespace KPIM
-{
+namespace KPIM {
class KCheckComboBox;
class TagSelectionCombo;
}
@@ -42,9 +41,10 @@ class TodoViewQuickSearch : public QWidget
{
Q_OBJECT
public:
- TodoViewQuickSearch(const Akonadi::ETMCalendar::Ptr &calendar,
- QWidget *parent);
- ~TodoViewQuickSearch() {}
+ TodoViewQuickSearch(const Akonadi::ETMCalendar::Ptr &calendar, QWidget *parent);
+ ~TodoViewQuickSearch()
+ {
+ }
void setCalendar(const Akonadi::ETMCalendar::Ptr &calendar);
diff --git a/src/todo/todoviewsortfilterproxymodel.cpp \
b/src/todo/todoviewsortfilterproxymodel.cpp index d9ad503..6ac93ea 100644
--- a/src/todo/todoviewsortfilterproxymodel.cpp
+++ b/src/todo/todoviewsortfilterproxymodel.cpp
@@ -31,7 +31,7 @@
#include <KLocalizedString>
TodoViewSortFilterProxyModel::TodoViewSortFilterProxyModel(const \
EventViews::PrefsPtr &prefs,
- QObject *parent)
+ QObject *parent)
: QSortFilterProxyModel(parent)
, mSortOrder(Qt::AscendingOrder)
, mPreferences(prefs)
@@ -45,21 +45,21 @@ void TodoViewSortFilterProxyModel::sort(int column, Qt::SortOrder \
order) }
bool TodoViewSortFilterProxyModel::filterAcceptsRow(int source_row,
- const QModelIndex &source_parent) const
+ const QModelIndex \
&source_parent) const {
bool ret = QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent);
bool returnValue = true;
if (ret && !mPriorities.isEmpty()) {
- QString priorityValue =
- sourceModel()->index(source_row, TodoModel::PriorityColumn, \
source_parent).
- data(Qt::EditRole).toString();
+ QString priorityValue
+ = sourceModel()->index(source_row, TodoModel::PriorityColumn, \
source_parent). + data(Qt::EditRole).toString();
returnValue = mPriorities.contains(priorityValue);
}
if (ret && !mCategories.isEmpty()) {
- const QStringList categories =
- sourceModel()->index(source_row, TodoModel::CategoriesColumn, \
source_parent).
- data(Qt::EditRole).toStringList();
+ const QStringList categories
+ = sourceModel()->index(source_row, TodoModel::CategoriesColumn, \
source_parent). + data(Qt::EditRole).toStringList();
for (const QString &category : categories) {
if (mCategories.contains(category)) {
@@ -82,19 +82,18 @@ bool TodoViewSortFilterProxyModel::filterAcceptsRow(int \
source_row, return ret && returnValue;
}
-bool TodoViewSortFilterProxyModel::lessThan(const QModelIndex &left,
- const QModelIndex &right) const
+bool TodoViewSortFilterProxyModel::lessThan(const QModelIndex &left, const \
QModelIndex &right) const {
- if (mPreferences->sortCompletedTodosSeparately() &&
- left.column() != TodoModel::PercentColumn) {
+ if (mPreferences->sortCompletedTodosSeparately()
+ && left.column() != TodoModel::PercentColumn) {
QModelIndex cLeft = left.sibling(left.row(), TodoModel::PercentColumn);
QModelIndex cRight = right.sibling(right.row(), TodoModel::PercentColumn);
- if (cRight.data(Qt::EditRole).toInt() == 100 &&
- cLeft.data(Qt::EditRole).toInt() != 100) {
+ if (cRight.data(Qt::EditRole).toInt() == 100
+ && cLeft.data(Qt::EditRole).toInt() != 100) {
return mSortOrder == Qt::AscendingOrder ? true : false;
- } else if (cRight.data(Qt::EditRole).toInt() != 100 &&
- cLeft.data(Qt::EditRole).toInt() == 100) {
+ } else if (cRight.data(Qt::EditRole).toInt() != 100
+ && cLeft.data(Qt::EditRole).toInt() == 100) {
return mSortOrder == Qt::AscendingOrder ? false : true;
}
}
@@ -117,7 +116,6 @@ bool TodoViewSortFilterProxyModel::lessThan(const QModelIndex \
&left, return fallbackComparison == 1;
}
}
-
} else if (right.column() == TodoModel::StartDateColumn) {
return compareStartDates(left, right) == -1;
} else if (right.column() == TodoModel::PriorityColumn) {
@@ -154,9 +152,9 @@ bool TodoViewSortFilterProxyModel::lessThan(const QModelIndex \
&left,
// This patch is not about fallingback to the SummaryColumn for sorting.
// It's about avoiding jumping due to random reasons.
// That's why we ignore the sort direction...
- return mSortOrder == Qt::AscendingOrder ?
- QSortFilterProxyModel::lessThan(leftSummaryIndex, rightSummaryIndex) \
:
- QSortFilterProxyModel::lessThan(rightSummaryIndex, leftSummaryIndex);
+ return mSortOrder == Qt::AscendingOrder
+ ? QSortFilterProxyModel::lessThan(leftSummaryIndex, \
rightSummaryIndex) + : \
QSortFilterProxyModel::lessThan(rightSummaryIndex, leftSummaryIndex);
// ...so, if you have 4 to-dos, all with CompletionColumn = "55%",
// and click the header multiple times, nothing will happen because
@@ -187,23 +185,23 @@ void TodoViewSortFilterProxyModel::setPriorityFilter(const \
QStringList &prioriti }
int TodoViewSortFilterProxyModel::compareStartDates(const QModelIndex &left,
- const QModelIndex &right) const
+ const QModelIndex &right) const
{
Q_ASSERT(left.column() == TodoModel::StartDateColumn);
Q_ASSERT(right.column() == TodoModel::StartDateColumn);
// The due date column is a QString so fetch the akonadi item
// We can't compare QStrings because it won't work if the format is MM/DD/YYYY
- const KCalCore::Todo::Ptr leftTodo =
- CalendarSupport::todo(left.data(TodoModel::TodoRole).value<Akonadi::Item>());
- const KCalCore::Todo::Ptr rightTodo =
- CalendarSupport::todo(right.data(TodoModel::TodoRole). \
value<Akonadi::Item>()); + const KCalCore::Todo::Ptr leftTodo
+ = CalendarSupport::todo(left.data(TodoModel::TodoRole).value<Akonadi::Item>());
+ const KCalCore::Todo::Ptr rightTodo
+ = CalendarSupport::todo(right.data(TodoModel::TodoRole).value<Akonadi::Item>());
if (!leftTodo || !rightTodo) {
return 0;
}
- const bool leftIsEmpty = !leftTodo->hasStartDate();
+ const bool leftIsEmpty = !leftTodo->hasStartDate();
const bool rightIsEmpty = !rightTodo->hasStartDate();
if (leftIsEmpty != rightIsEmpty) { // One of them doesn't have a start date
@@ -234,23 +232,23 @@ void TodoViewSortFilterProxyModel::setCategoryFilter(const \
QStringList &categori
* 1 - bigger than
*/
int TodoViewSortFilterProxyModel::compareDueDates(const QModelIndex &left,
- const QModelIndex &right) const
+ const QModelIndex &right) const
{
Q_ASSERT(left.column() == TodoModel::DueDateColumn);
Q_ASSERT(right.column() == TodoModel::DueDateColumn);
// The due date column is a QString so fetch the akonadi item
// We can't compare QStrings because it won't work if the format is MM/DD/YYYY
- const KCalCore::Todo::Ptr leftTodo =
- CalendarSupport::todo(left.data(TodoModel::TodoRole).value<Akonadi::Item>());
- const KCalCore::Todo::Ptr rightTodo =
- CalendarSupport::todo(right.data(TodoModel::TodoRole). \
value<Akonadi::Item>()); + const KCalCore::Todo::Ptr leftTodo
+ = CalendarSupport::todo(left.data(TodoModel::TodoRole).value<Akonadi::Item>());
+ const KCalCore::Todo::Ptr rightTodo
+ = CalendarSupport::todo(right.data(TodoModel::TodoRole).value<Akonadi::Item>());
if (!leftTodo || !rightTodo) {
return 0;
}
- const bool leftIsEmpty = !leftTodo->hasDueDate();
+ const bool leftIsEmpty = !leftTodo->hasDueDate();
const bool rightIsEmpty = !rightTodo->hasDueDate();
if (leftIsEmpty != rightIsEmpty) { // One of them doesn't have a due date
@@ -275,7 +273,7 @@ int TodoViewSortFilterProxyModel::compareDueDates(const \
QModelIndex &left,
* 1 - bigger than
*/
int TodoViewSortFilterProxyModel::compareCompletion(const QModelIndex &left,
- const QModelIndex &right) const
+ const QModelIndex &right) const
{
Q_ASSERT(left.column() == TodoModel::PercentColumn);
Q_ASSERT(right.column() == TodoModel::PercentColumn);
@@ -285,10 +283,10 @@ int TodoViewSortFilterProxyModel::compareCompletion(const \
QModelIndex &left,
if (leftValue == 100 && rightValue == 100) {
// Untie with the completion date
- const KCalCore::Todo::Ptr leftTodo =
- CalendarSupport::todo(left.data(TodoModel::TodoRole).value<Akonadi::Item>());
- const KCalCore::Todo::Ptr rightTodo =
- CalendarSupport::todo(right.data(TodoModel::TodoRole). \
value<Akonadi::Item>()); + const KCalCore::Todo::Ptr leftTodo
+ = CalendarSupport::todo(left.data(TodoModel::TodoRole).value<Akonadi::Item>());
+ const KCalCore::Todo::Ptr rightTodo
+ = CalendarSupport::todo(right.data(TodoModel::TodoRole).value<Akonadi::Item>());
if (!leftTodo || !rightTodo) {
return 0;
@@ -305,7 +303,7 @@ int TodoViewSortFilterProxyModel::compareCompletion(const \
QModelIndex &left,
* 1 - bigger than
*/
int TodoViewSortFilterProxyModel::comparePriorities(const QModelIndex &left,
- const QModelIndex &right) const
+ const QModelIndex &right) const
{
Q_ASSERT(left.column() == TodoModel::PriorityColumn);
Q_ASSERT(right.column() == TodoModel::PriorityColumn);
@@ -313,7 +311,7 @@ int TodoViewSortFilterProxyModel::comparePriorities(const \
QModelIndex &left, const QVariant leftValue = sourceModel()->data(left);
const QVariant rightValue = sourceModel()->data(right);
- const bool leftIsString = sourceModel()->data(left).type() == QVariant::String;
+ const bool leftIsString = sourceModel()->data(left).type() == QVariant::String;
const bool rightIsString = sourceModel()->data(right).type() == \
QVariant::String;
// unspecified priority is a low priority, so, if we don't have two \
QVariant:Ints
diff --git a/src/todo/todoviewview.cpp b/src/todo/todoviewview.cpp
index 6a99cc5..b2e2f9d 100644
--- a/src/todo/todoviewview.cpp
+++ b/src/todo/todoviewview.cpp
@@ -35,7 +35,9 @@
#include <QMouseEvent>
TodoViewView::TodoViewView(QWidget *parent)
- : QTreeView(parent), mHeaderPopup(nullptr), mIgnoreNextMouseRelease(false)
+ : QTreeView(parent)
+ , mHeaderPopup(nullptr)
+ , mIgnoreNextMouseRelease(false)
{
header()->installEventFilter(this);
setAlternatingRowColors(true);
@@ -46,8 +48,8 @@ TodoViewView::TodoViewView(QWidget *parent)
bool TodoViewView::isEditing(const QModelIndex &index) const
{
- return state() & QAbstractItemView::EditingState &&
- currentIndex() == index;
+ return state() & QAbstractItemView::EditingState
+ && currentIndex() == index;
}
bool TodoViewView::eventFilter(QObject *watched, QEvent *event)
@@ -61,8 +63,8 @@ bool TodoViewView::eventFilter(QObject *watched, QEvent *event)
mHeaderPopup->setTitle(i18n("View Columns"));
// First entry can't be disabled
for (int i = 1; i < model()->columnCount(); ++i) {
- QAction *tmp =
- mHeaderPopup->addAction(model()->headerData(i, \
Qt::Horizontal).toString()); + QAction *tmp
+ = mHeaderPopup->addAction(model()->headerData(i, \
Qt::Horizontal).toString()); tmp->setData(QVariant(i));
tmp->setCheckable(true);
mColumnActions << tmp;
@@ -94,8 +96,7 @@ void TodoViewView::toggleColumnHidden(QAction *action)
Q_EMIT visibleColumnCountChanged();
}
-QModelIndex TodoViewView::moveCursor(CursorAction cursorAction,
- Qt::KeyboardModifiers modifiers)
+QModelIndex TodoViewView::moveCursor(CursorAction cursorAction, \
Qt::KeyboardModifiers modifiers) {
QModelIndex current = currentIndex();
if (!current.isValid()) {
@@ -103,10 +104,11 @@ QModelIndex TodoViewView::moveCursor(CursorAction cursorAction,
}
switch (cursorAction) {
- case MoveNext: {
+ case MoveNext:
+ {
// try to find an editable item right of the current one
QModelIndex tmp = getNextEditableIndex(
- current.sibling(current.row(), current.column() + 1), \
1); + current.sibling(current.row(), current.column() + 1), 1);
if (tmp.isValid()) {
return tmp;
}
@@ -137,10 +139,11 @@ QModelIndex TodoViewView::moveCursor(CursorAction cursorAction,
}
return QModelIndex();
}
- case MovePrevious: {
+ case MovePrevious:
+ {
// try to find an editable item left of the current one
QModelIndex tmp = getNextEditableIndex(
- current.sibling(current.row(), current.column() - 1), \
-1); + current.sibling(current.row(), current.column() - 1), -1);
if (tmp.isValid()) {
return tmp;
}
@@ -232,4 +235,3 @@ void TodoViewView::expandParent()
QTreeView::keyPressEvent(&keyEvent);
}
}
-
diff --git a/src/viewerapp/main.cpp b/src/viewerapp/main.cpp
index 17950e4..4c399e3 100644
--- a/src/viewerapp/main.cpp
+++ b/src/viewerapp/main.cpp
@@ -29,9 +29,11 @@ static const char description[] = I18N_NOOP("A test app for \
embedding calendarvi
int main(int argc, char **argv)
{
- KAboutData about(QStringLiteral("viewerapp"), i18n("ViewerApp"), \
QStringLiteral("0.1"), i18n(description), + KAboutData \
about(QStringLiteral("viewerapp"), i18n("ViewerApp"), QStringLiteral("0.1"), i18n( + \
description), KAboutLicense::GPL,
- i18n("Copyright (C) 2010 Klarälvdalens Datakonsult AB, a KDAB \
Group company, info@kdab.net")); + i18n(
+ "Copyright (C) 2010 Klarälvdalens Datakonsult AB, a KDAB \
Group company, info@kdab.net"));
about.addAuthor(i18n("Kevin Krammer"), QString(), \
QStringLiteral("krake@kdab.com"));
QCommandLineParser parser;
@@ -41,7 +43,8 @@ int main(int argc, char **argv)
about.setupCommandLine(&parser);
parser.process(app);
about.processCommandLine(&parser);
- parser.addOption(QCommandLineOption(QStringList() << \
QStringLiteral("+[viewname]"), i18n("Optional list of view names to instantiate"))); \
+ parser.addOption(QCommandLineOption(QStringList() << \
QStringLiteral("+[viewname]"), + i18n("Optional list of view names to \
instantiate")));
QStringList viewNames;
for (int i = 0; i < parser.positionalArguments().count(); ++i) {
@@ -54,4 +57,3 @@ int main(int argc, char **argv)
return app.exec();
}
-
diff --git a/src/viewerapp/mainwindow.cpp b/src/viewerapp/mainwindow.cpp
index 8a45898..25f7228 100644
--- a/src/viewerapp/mainwindow.cpp
+++ b/src/viewerapp/mainwindow.cpp
@@ -43,11 +43,11 @@ using namespace CalendarSupport;
using namespace EventViews;
MainWindow::MainWindow(const QStringList &viewNames)
- : QMainWindow(),
- mViewNames(viewNames),
- mIncidenceChanger(0),
- mSettings(0),
- mViewPreferences(0)
+ : QMainWindow()
+ , mViewNames(viewNames)
+ , mIncidenceChanger(0)
+ , mSettings(0)
+ , mViewPreferences(0)
{
mUi.setupUi(this);
mUi.tabWidget->clear();
@@ -108,7 +108,8 @@ void MainWindow::delayedInit()
KCheckableProxyModel *checkableProxy = mCalendar->checkableProxyModel();
QItemSelectionModel *selectionModel = checkableProxy->selectionModel();
- CalendarSupport::CollectionSelection *collectionSelection = new \
CalendarSupport::CollectionSelection(selectionModel); + \
CalendarSupport::CollectionSelection *collectionSelection + = new \
CalendarSupport::CollectionSelection(selectionModel);
EventViews::EventView::setGlobalCollectionSelection(collectionSelection);
mIncidenceChanger = new IncidenceChanger(this);
@@ -125,4 +126,3 @@ void MainWindow::addViewTriggered(QAction *action)
viewName.remove(QLatin1Char('&'));
addView(viewName);
}
-
diff --git a/src/viewerapp/mainwindow.h b/src/viewerapp/mainwindow.h
index cb5985c..07f8ad6 100644
--- a/src/viewerapp/mainwindow.h
+++ b/src/viewerapp/mainwindow.h
@@ -25,13 +25,11 @@
#include <Akonadi/Calendar/ETMCalendar>
#include <QMainWindow>
-namespace Akonadi
-{
+namespace Akonadi {
class IncidenceChanger;
}
-namespace EventViews
-{
+namespace EventViews {
class Prefs;
typedef QSharedPointer<Prefs> PrefsPtr;
}
diff --git a/src/whatsnext/whatsnextview.cpp b/src/whatsnext/whatsnextview.cpp
index f1631dd..dce6b1c 100644
--- a/src/whatsnext/whatsnextview.cpp
+++ b/src/whatsnext/whatsnextview.cpp
@@ -101,9 +101,9 @@ void WhatsNextView::updateView()
mText += QLocale::system().toString(mStartDate);
} else {
mText += i18nc(
- "date from - to", "%1 - %2",
- QLocale::system().toString(mStartDate),
- QLocale::system().toString(mEndDate));
+ "date from - to", "%1 - %2",
+ QLocale::system().toString(mStartDate),
+ QLocale::system().toString(mEndDate));
}
mText += QLatin1String("</h2>\n");
@@ -127,7 +127,8 @@ void WhatsNextView::updateView()
} else {
KCalCore::Recurrence *recur = ev->recurrence();
int duration = ev->dtStart().secsTo(ev->dtEnd());
- QDateTime start = recur->getPreviousDateTime(QDateTime(mStartDate, \
QTime(), Qt::LocalTime)); + QDateTime start
+ = recur->getPreviousDateTime(QDateTime(mStartDate, QTime(), \
Qt::LocalTime)); QDateTime end = start.addSecs(duration);
QDateTime endDate(mEndDate, QTime(23, 59, 59), Qt::LocalTime);
if (end.date() >= mStartDate) {
@@ -143,7 +144,7 @@ void WhatsNextView::updateView()
if (!times[count - 1].isValid()) {
--count; // list overflow
}
- for (; i < count && times[i].date() <= mEndDate; ++i) {
+ for (; i < count && times[i].date() <= mEndDate; ++i) {
appendEvent(ev, times[i].toLocalTime());
}
}
@@ -154,7 +155,7 @@ void WhatsNextView::updateView()
mTodos.clear();
KCalCore::Todo::List todos = calendar()->todos(KCalCore::TodoSortDueDate,
- KCalCore::SortDirectionAscending);
+ \
KCalCore::SortDirectionAscending); if (!todos.isEmpty()) {
bool taskHeaderWasCreated = false;
Q_FOREACH (const KCalCore::Todo::Ptr &todo, todos) {
@@ -188,7 +189,8 @@ void WhatsNextView::updateView()
QStringList myEmails(CalendarSupport::KCalPrefs::instance()->allEmails());
int replies = 0;
- events = calendar()->events(QDate::currentDate(), QDate(2975, 12, 6), \
QTimeZone::systemTimeZone()); + events = calendar()->events(QDate::currentDate(), \
QDate(2975, 12, 6), + QTimeZone::systemTimeZone());
Q_FOREACH (const KCalCore::Event::Ptr &ev, events) {
KCalCore::Attendee::Ptr me = ev->attendeeByMails(myEmails);
if (me != nullptr) {
@@ -200,7 +202,8 @@ void WhatsNextView::updateView()
mText += QLatin1String("<h2><img src=\"");
mText += ipath;
mText += QLatin1String("\" width=\"22\" height=\"22\">");
- mText += i18n("Events and to-dos that need a reply:") + \
QLatin1String("</h2>\n"); + mText += i18n("Events and to-dos that \
need a reply:") + + QLatin1String("</h2>\n");
mText += QLatin1String("<table>\n");
}
replies++;
@@ -220,7 +223,8 @@ void WhatsNextView::updateView()
mText += QLatin1String("<h2><img src=\"");
mText += ipath;
mText += QLatin1String("\" width=\"22\" height=\"22\">");
- mText += i18n("Events and to-dos that need a reply:") + \
QLatin1String("</h2>\n"); + mText += i18n("Events and to-dos that \
need a reply:") + + QLatin1String("</h2>\n");
mText += QLatin1String("<table>\n");
}
replies++;
@@ -235,7 +239,6 @@ void WhatsNextView::updateView()
mText += QLatin1String("</td></tr>\n</table>\n");
mView->setText(mText);
-
}
void WhatsNextView::showDates(const QDate &start, const QDate &end, const QDate &)
@@ -252,7 +255,7 @@ void WhatsNextView::showIncidences(const Akonadi::Item::List \
&incidenceList, con }
void WhatsNextView::changeIncidenceDisplay(const Akonadi::Item &,
- Akonadi::IncidenceChanger::ChangeType)
+ Akonadi::IncidenceChanger::ChangeType)
{
updateView();
}
@@ -272,20 +275,26 @@ void WhatsNextView::appendEvent(const KCalCore::Incidence::Ptr \
&incidence, const }
if (starttime.date().daysTo(endtime.date()) >= 1) {
- if (event->allDay())
- mText += i18nc("date from - to", "%1 - %2", \
QLocale().toString(starttime.date(), QLocale::ShortFormat),
- QLocale().toString(endtime.date(), \
QLocale::ShortFormat));
- else
- mText += i18nc("date from - to", "%1 - %2", \
QLocale().toString(starttime, QLocale::ShortFormat),
- QLocale().toString(endtime, QLocale::ShortFormat));
+ if (event->allDay()) {
+ mText
+ += i18nc("date from - to", "%1 - %2",
+ QLocale().toString(starttime.date(), \
QLocale::ShortFormat), + \
QLocale().toString(endtime.date(), QLocale::ShortFormat)); + } else {
+ mText
+ += i18nc("date from - to", "%1 - %2", \
QLocale().toString(starttime, + \
QLocale::ShortFormat), + QLocale().toString(endtime, \
QLocale::ShortFormat)); + }
} else {
- if (event->allDay())
+ if (event->allDay()) {
mText += QLocale().toString(starttime.date(), QLocale::ShortFormat);
- else
+ } else {
mText += i18nc("date, from - to", "%1, %2 - %3",
- QLocale().toString(starttime.date(), QLocale::ShortFormat),
- QLocale().toString(starttime.time(), QLocale::ShortFormat),
- QLocale().toString(endtime.time(), QLocale::ShortFormat));
+ QLocale().toString(starttime.date(), \
QLocale::ShortFormat), + \
QLocale().toString(starttime.time(), QLocale::ShortFormat), + \
QLocale().toString(endtime.time(), QLocale::ShortFormat)); + }
}
}
mText += QLatin1String("</b></td><td><a ");
@@ -340,4 +349,3 @@ void WhatsNextView::showIncidence(const QString &uid)
Q_EMIT showIncidenceSignal(item);
}
}
-
diff --git a/src/whatsnext/whatsnextview.h b/src/whatsnext/whatsnextview.h
index c089c14..60250cf 100644
--- a/src/whatsnext/whatsnextview.h
+++ b/src/whatsnext/whatsnextview.h
@@ -31,14 +31,15 @@
#include <QTextBrowser>
#include <kiconloader.h>
-namespace EventViews
-{
-
+namespace EventViews {
class WhatsNextTextBrowser : public QTextBrowser
{
Q_OBJECT
public:
- explicit WhatsNextTextBrowser(QWidget *parent) : QTextBrowser(parent) {}
+ explicit WhatsNextTextBrowser(QWidget *parent) : QTextBrowser(parent)
+ {
+ }
+
/** Reimplemented from QTextBrowser to handle links. */
void setSource(const QUrl &name) override;
@@ -61,6 +62,7 @@ public:
{
return Akonadi::Item::List();
}
+
KCalCore::DateList selectedIncidenceDates() const override
{
return KCalCore::DateList();
@@ -80,8 +82,7 @@ public Q_SLOTS:
protected:
void appendEvent(const KCalCore::Incidence::Ptr &,
- const QDateTime &start = QDateTime(),
- const QDateTime &end = QDateTime());
+ const QDateTime &start = QDateTime(), const QDateTime &end = \
QDateTime()); void appendTodo(const KCalCore::Incidence::Ptr &);
private Q_SLOTS:
@@ -96,7 +97,6 @@ private:
Akonadi::Item::List mTodos;
};
-
}
#endif
diff --git a/tests/createcolorgui_test.cpp b/tests/createcolorgui_test.cpp
index d5ca89a..0bb2ea4 100644
--- a/tests/createcolorgui_test.cpp
+++ b/tests/createcolorgui_test.cpp
@@ -37,7 +37,6 @@ CreateColorGui_test::CreateColorGui_test(QWidget *parent)
CreateColorGui_test::~CreateColorGui_test()
{
-
}
void CreateColorGui_test::createListWidgetItem()
@@ -56,7 +55,8 @@ void CreateColorGui_test::createListWidgetItem()
int main(int argc, char **argv)
{
QApplication app(argc, argv);
- KAboutData aboutData(QStringLiteral("CreateColorGui_test"), \
i18n("CreateColorGui_test"), QStringLiteral("1.0")); + KAboutData \
aboutData(QStringLiteral("CreateColorGui_test"), i18n( + \
"CreateColorGui_test"), QStringLiteral("1.0")); \
aboutData.setShortDescription(i18n("Test creating color")); QCommandLineParser \
parser; KAboutData::setApplicationData(aboutData);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic