Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
PIM Calendar Support
Commits
816bc638
Commit
816bc638
authored
Jun 10, 2021
by
Laurent Montel
😁
Browse files
Fix clazy warning
parent
c6209c33
Pipeline
#65015
passed with stage
in 6 minutes and 57 seconds
Changes
14
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/eventarchiver.cpp
View file @
816bc638
...
...
@@ -61,7 +61,7 @@ EventArchiver::~EventArchiver()
{
}
void
EventArchiver
::
runOnce
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
Akonadi
::
IncidenceChanger
*
changer
,
const
QDate
&
limitDate
,
QWidget
*
widget
)
void
EventArchiver
::
runOnce
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
Akonadi
::
IncidenceChanger
*
changer
,
QDate
limitDate
,
QWidget
*
widget
)
{
run
(
calendar
,
changer
,
limitDate
,
widget
,
true
,
true
);
}
...
...
@@ -88,7 +88,7 @@ void EventArchiver::runAuto(const Akonadi::ETMCalendar::Ptr &calendar, Akonadi::
void
EventArchiver
::
run
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
Akonadi
::
IncidenceChanger
*
changer
,
const
QDate
&
limitDate
,
QDate
limitDate
,
QWidget
*
widget
,
bool
withGUI
,
bool
errorIfNone
)
...
...
@@ -140,11 +140,7 @@ void EventArchiver::run(const Akonadi::ETMCalendar::Ptr &calendar,
}
}
void
EventArchiver
::
deleteIncidences
(
Akonadi
::
IncidenceChanger
*
changer
,
const
QDate
&
limitDate
,
QWidget
*
widget
,
const
Akonadi
::
Item
::
List
&
items
,
bool
withGUI
)
void
EventArchiver
::
deleteIncidences
(
Akonadi
::
IncidenceChanger
*
changer
,
QDate
limitDate
,
QWidget
*
widget
,
const
Akonadi
::
Item
::
List
&
items
,
bool
withGUI
)
{
QStringList
incidenceStrs
;
Akonadi
::
Item
::
List
::
ConstIterator
it
;
...
...
@@ -175,7 +171,7 @@ void EventArchiver::deleteIncidences(Akonadi::IncidenceChanger *changer,
void
EventArchiver
::
archiveIncidences
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
Akonadi
::
IncidenceChanger
*
changer
,
const
QDate
&
limitDate
,
QDate
limitDate
,
QWidget
*
widget
,
const
KCalendarCore
::
Incidence
::
List
&
incidences
,
bool
withGUI
)
...
...
@@ -304,7 +300,7 @@ void EventArchiver::archiveIncidences(const Akonadi::ETMCalendar::Ptr &calendar,
Q_EMIT
eventsDeleted
();
}
bool
EventArchiver
::
isSubTreeComplete
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
const
Todo
::
Ptr
&
todo
,
const
QDate
&
limitDate
,
QStringList
checkedUids
)
const
bool
EventArchiver
::
isSubTreeComplete
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
const
Todo
::
Ptr
&
todo
,
QDate
limitDate
,
QStringList
checkedUids
)
const
{
if
(
!
todo
->
isCompleted
()
||
todo
->
completed
().
date
()
>=
limitDate
)
{
return
false
;
...
...
src/eventarchiver.h
View file @
816bc638
...
...
@@ -49,7 +49,7 @@ public:
* @param widget parent widget for message boxes
* Confirmation and "no events to process" dialogs will be shown
*/
void
runOnce
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
Akonadi
::
IncidenceChanger
*
changer
,
const
QDate
&
limitDate
,
QWidget
*
widget
);
void
runOnce
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
Akonadi
::
IncidenceChanger
*
changer
,
QDate
limitDate
,
QWidget
*
widget
);
/**
* Delete or archive events. This is called regularly, when auto-archiving
...
...
@@ -66,14 +66,13 @@ Q_SIGNALS:
void
eventsDeleted
();
private:
void
run
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
Akonadi
::
IncidenceChanger
*
changer
,
const
QDate
&
limitDate
,
QWidget
*
widget
,
bool
withGUI
,
bool
errorIfNone
);
void
run
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
Akonadi
::
IncidenceChanger
*
changer
,
QDate
limitDate
,
QWidget
*
widget
,
bool
withGUI
,
bool
errorIfNone
);
void
deleteIncidences
(
Akonadi
::
IncidenceChanger
*
changer
,
const
QDate
&
limitDate
,
QWidget
*
widget
,
const
Akonadi
::
Item
::
List
&
items
,
bool
withGUI
);
void
deleteIncidences
(
Akonadi
::
IncidenceChanger
*
changer
,
QDate
limitDate
,
QWidget
*
widget
,
const
Akonadi
::
Item
::
List
&
items
,
bool
withGUI
);
void
archiveIncidences
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
Akonadi
::
IncidenceChanger
*
changer
,
const
QDate
&
limitDate
,
QDate
limitDate
,
QWidget
*
widget
,
const
KCalendarCore
::
Incidence
::
List
&
incidences
,
bool
withGUI
);
...
...
@@ -87,7 +86,7 @@ private:
*/
bool
isSubTreeComplete
(
const
Akonadi
::
ETMCalendar
::
Ptr
&
calendar
,
const
KCalendarCore
::
Todo
::
Ptr
&
todo
,
const
QDate
&
limitDate
,
QDate
limitDate
,
QStringList
checkedUids
=
QStringList
())
const
;
};
}
...
...
src/kdatepickerpopup.cpp
View file @
816bc638
...
...
@@ -57,7 +57,7 @@ public:
void
buildMenu
();
void
slotDateChanged
(
const
QDate
&
);
void
slotDateChanged
(
QDate
);
void
slotToday
();
void
slotTomorrow
();
void
slotNextWeek
();
...
...
@@ -111,7 +111,7 @@ void KDatePickerPopup::Private::buildMenu()
}
}
void
KDatePickerPopup
::
Private
::
slotDateChanged
(
const
QDate
&
date
)
void
KDatePickerPopup
::
Private
::
slotDateChanged
(
QDate
date
)
{
Q_EMIT
q
->
dateChanged
(
date
);
q
->
hide
();
...
...
@@ -142,7 +142,7 @@ void KDatePickerPopup::Private::slotNextMonth()
Q_EMIT
q
->
dateChanged
(
QDate
::
currentDate
().
addMonths
(
1
));
}
KDatePickerPopup
::
KDatePickerPopup
(
Modes
modes
,
const
QDate
&
date
,
QWidget
*
parent
)
KDatePickerPopup
::
KDatePickerPopup
(
Modes
modes
,
QDate
date
,
QWidget
*
parent
)
:
QMenu
(
parent
)
,
d
(
new
Private
(
this
))
{
...
...
@@ -151,10 +151,10 @@ KDatePickerPopup::KDatePickerPopup(Modes modes, const QDate &date, QWidget *pare
d
->
mDatePicker
=
new
KDatePicker
(
this
);
d
->
mDatePicker
->
setCloseButton
(
false
);
connect
(
d
->
mDatePicker
,
&
KDatePicker
::
dateEntered
,
this
,
[
this
](
const
QDate
&
date
)
{
connect
(
d
->
mDatePicker
,
&
KDatePicker
::
dateEntered
,
this
,
[
this
](
QDate
date
)
{
d
->
slotDateChanged
(
date
);
});
connect
(
d
->
mDatePicker
,
&
KDatePicker
::
dateSelected
,
this
,
[
this
](
const
QDate
&
date
)
{
connect
(
d
->
mDatePicker
,
&
KDatePicker
::
dateSelected
,
this
,
[
this
](
QDate
date
)
{
d
->
slotDateChanged
(
date
);
});
...
...
src/kdatepickerpopup.h
View file @
816bc638
...
...
@@ -57,7 +57,7 @@ public:
* @param date The initial date of date picker widget.
* @param parent The parent object.
*/
explicit
KDatePickerPopup
(
Modes
modes
=
DatePicker
,
const
QDate
&
date
=
QDate
::
currentDate
(),
QWidget
*
parent
=
nullptr
);
explicit
KDatePickerPopup
(
Modes
modes
=
DatePicker
,
QDate
date
=
QDate
::
currentDate
(),
QWidget
*
parent
=
nullptr
);
/**
* Destroys the date picker popup.
...
...
src/next/incidenceviewer.cpp
View file @
816bc638
...
...
@@ -192,7 +192,7 @@ void IncidenceViewer::setHeaderText(const QString &text)
d
->
mHeaderText
=
text
;
}
void
IncidenceViewer
::
setIncidence
(
const
Akonadi
::
Item
&
incidence
,
const
QDate
&
date
)
void
IncidenceViewer
::
setIncidence
(
const
Akonadi
::
Item
&
incidence
,
QDate
date
)
{
d
->
mDate
=
date
;
ItemMonitor
::
setItem
(
incidence
);
...
...
src/next/incidenceviewer.h
View file @
816bc638
...
...
@@ -116,7 +116,7 @@ public Q_SLOTS:
* @param activeDate The active date is used to calculate the actual date of
* the selected incidence in case of recurring incidences.
*/
void
setIncidence
(
const
Akonadi
::
Item
&
incidence
,
const
QDate
&
activeDate
=
QDate
());
void
setIncidence
(
const
Akonadi
::
Item
&
incidence
,
QDate
activeDate
=
QDate
());
protected:
/**
...
...
src/printing/calprintdefaultplugins.cpp
View file @
816bc638
...
...
@@ -187,12 +187,7 @@ protected:
}
};
int
CalPrintIncidence
::
printCaptionAndText
(
QPainter
&
p
,
const
QRect
&
box
,
const
QString
&
caption
,
const
QString
&
text
,
const
QFont
&
captionFont
,
const
QFont
&
textFont
)
int
CalPrintIncidence
::
printCaptionAndText
(
QPainter
&
p
,
QRect
box
,
const
QString
&
caption
,
const
QString
&
text
,
const
QFont
&
captionFont
,
const
QFont
&
textFont
)
{
QFontMetrics
captionFM
(
captionFont
);
int
textWd
=
captionFM
.
boundingRect
(
caption
).
width
();
...
...
src/printing/calprintdefaultplugins.h
View file @
816bc638
...
...
@@ -66,7 +66,7 @@ public:
void
saveConfig
()
override
;
protected:
int
printCaptionAndText
(
QPainter
&
p
,
const
QRect
&
box
,
const
QString
&
caption
,
const
QString
&
text
,
const
QFont
&
captionFont
,
const
QFont
&
textFont
);
int
printCaptionAndText
(
QPainter
&
p
,
QRect
box
,
const
QString
&
caption
,
const
QString
&
text
,
const
QFont
&
captionFont
,
const
QFont
&
textFont
);
bool
mShowOptions
;
bool
mShowSubitemsNotes
;
...
...
src/printing/calprinter.cpp
View file @
816bc638
...
...
@@ -72,7 +72,7 @@ void CalPrinter::init(const Akonadi::ETMCalendar::Ptr &calendar)
}
}
void
CalPrinter
::
setDateRange
(
const
QDate
&
fd
,
const
QDate
&
td
)
void
CalPrinter
::
setDateRange
(
QDate
fd
,
QDate
td
)
{
PrintPlugin
::
List
::
Iterator
it
=
mPrintPlugins
.
begin
();
const
PrintPlugin
::
List
::
Iterator
end
=
mPrintPlugins
.
end
();
...
...
@@ -81,7 +81,7 @@ void CalPrinter::setDateRange(const QDate &fd, const QDate &td)
}
}
void
CalPrinter
::
print
(
int
type
,
const
QDate
&
fd
,
const
QDate
&
td
,
const
KCalendarCore
::
Incidence
::
List
&
selectedIncidences
,
bool
preview
)
void
CalPrinter
::
print
(
int
type
,
QDate
fd
,
QDate
td
,
const
KCalendarCore
::
Incidence
::
List
&
selectedIncidences
,
bool
preview
)
{
PrintPlugin
::
List
::
Iterator
it
;
const
PrintPlugin
::
List
::
Iterator
end
=
mPrintPlugins
.
end
();
...
...
src/printing/calprinter.h
View file @
816bc638
...
...
@@ -48,7 +48,7 @@ public:
\param start Start date
\param end End date
*/
void
setDateRange
(
const
QDate
&
start
,
const
QDate
&
end
);
void
setDateRange
(
QDate
start
,
QDate
end
);
public
Q_SLOTS
:
void
updateConfig
();
...
...
@@ -57,11 +57,7 @@ private Q_SLOTS:
void
doPrint
(
CalendarSupport
::
PrintPlugin
*
selectedStyle
,
CalendarSupport
::
CalPrinter
::
ePrintOrientation
dlgorientation
,
bool
preview
=
false
);
public:
void
print
(
int
type
,
const
QDate
&
fd
,
const
QDate
&
td
,
const
KCalendarCore
::
Incidence
::
List
&
selectedIncidences
=
KCalendarCore
::
Incidence
::
List
(),
bool
preview
=
false
);
void
print
(
int
type
,
QDate
fd
,
QDate
td
,
const
KCalendarCore
::
Incidence
::
List
&
selectedIncidences
=
KCalendarCore
::
Incidence
::
List
(),
bool
preview
=
false
);
Akonadi
::
ETMCalendar
::
Ptr
calendar
()
const
;
KConfig
*
config
()
const
;
...
...
src/printing/calprintpluginbase.cpp
View file @
816bc638
...
...
@@ -45,7 +45,7 @@ static QString cleanStr(const QString &instr)
class
CalPrintPluginBase
::
TodoParentStart
{
public:
TodoParentStart
(
const
QRect
&
pt
=
QRect
(),
bool
hasLine
=
false
,
bool
page
=
true
)
TodoParentStart
(
QRect
pt
=
QRect
(),
bool
hasLine
=
false
,
bool
page
=
true
)
:
mRect
(
pt
)
,
mHasLine
(
hasLine
)
,
mSamePage
(
page
)
...
...
@@ -292,13 +292,13 @@ QColor CalPrintPluginBase::categoryBgColor(const KCalendarCore::Incidence::Ptr &
}
}
QString
CalPrintPluginBase
::
holidayString
(
const
QDate
&
date
)
const
QString
CalPrintPluginBase
::
holidayString
(
QDate
date
)
const
{
QStringList
lst
=
holiday
(
date
);
const
QStringList
lst
=
holiday
(
date
);
return
lst
.
join
(
i18nc
(
"@item:intext delimiter for joining holiday names"
,
","
));
}
KCalendarCore
::
Event
::
Ptr
CalPrintPluginBase
::
holidayEvent
(
const
QDate
&
date
)
const
KCalendarCore
::
Event
::
Ptr
CalPrintPluginBase
::
holidayEvent
(
QDate
date
)
const
{
QString
hstring
(
holidayString
(
date
));
if
(
hstring
.
isEmpty
())
{
...
...
@@ -393,7 +393,7 @@ void CalPrintPluginBase::setBorderWidth(const int borderwidth)
mBorder
=
borderwidth
;
}
void
CalPrintPluginBase
::
drawBox
(
QPainter
&
p
,
int
linewidth
,
const
QRect
&
rect
)
void
CalPrintPluginBase
::
drawBox
(
QPainter
&
p
,
int
linewidth
,
QRect
rect
)
{
QPen
pen
(
p
.
pen
());
QPen
oldpen
(
pen
);
...
...
@@ -408,7 +408,7 @@ void CalPrintPluginBase::drawBox(QPainter &p, int linewidth, const QRect &rect)
p
.
setPen
(
oldpen
);
}
void
CalPrintPluginBase
::
drawShadedBox
(
QPainter
&
p
,
int
linewidth
,
const
QBrush
&
brush
,
const
QRect
&
rect
)
void
CalPrintPluginBase
::
drawShadedBox
(
QPainter
&
p
,
int
linewidth
,
const
QBrush
&
brush
,
QRect
rect
)
{
QBrush
oldbrush
(
p
.
brush
());
p
.
setBrush
(
brush
);
...
...
@@ -416,19 +416,14 @@ void CalPrintPluginBase::drawShadedBox(QPainter &p, int linewidth, const QBrush
p
.
setBrush
(
oldbrush
);
}
void
CalPrintPluginBase
::
printEventString
(
QPainter
&
p
,
const
QRect
&
box
,
const
QString
&
str
,
int
flags
)
void
CalPrintPluginBase
::
printEventString
(
QPainter
&
p
,
QRect
box
,
const
QString
&
str
,
int
flags
)
{
QRect
newbox
(
box
);
newbox
.
adjust
(
3
,
1
,
-
1
,
-
1
);
p
.
drawText
(
newbox
,
(
flags
==
-
1
)
?
(
Qt
::
AlignTop
|
Qt
::
AlignLeft
|
Qt
::
TextWordWrap
)
:
flags
,
str
);
}
void
CalPrintPluginBase
::
showEventBox
(
QPainter
&
p
,
int
linewidth
,
const
QRect
&
box
,
const
KCalendarCore
::
Incidence
::
Ptr
&
incidence
,
const
QString
&
str
,
int
flags
)
void
CalPrintPluginBase
::
showEventBox
(
QPainter
&
p
,
int
linewidth
,
QRect
box
,
const
KCalendarCore
::
Incidence
::
Ptr
&
incidence
,
const
QString
&
str
,
int
flags
)
{
QPen
oldpen
(
p
.
pen
());
QBrush
oldbrush
(
p
.
brush
());
...
...
@@ -447,7 +442,7 @@ void CalPrintPluginBase::showEventBox(QPainter &p,
p
.
setBrush
(
oldbrush
);
}
void
CalPrintPluginBase
::
drawSubHeaderBox
(
QPainter
&
p
,
const
QString
&
str
,
const
QRect
&
box
)
void
CalPrintPluginBase
::
drawSubHeaderBox
(
QPainter
&
p
,
const
QString
&
str
,
QRect
box
)
{
drawShadedBox
(
p
,
BOX_BORDER_WIDTH
,
QColor
(
232
,
232
,
232
),
box
);
QFont
oldfont
(
p
.
font
());
...
...
@@ -456,7 +451,7 @@ void CalPrintPluginBase::drawSubHeaderBox(QPainter &p, const QString &str, const
p
.
setFont
(
oldfont
);
}
void
CalPrintPluginBase
::
drawVerticalBox
(
QPainter
&
p
,
int
linewidth
,
const
QRect
&
box
,
const
QString
&
str
,
int
flags
)
void
CalPrintPluginBase
::
drawVerticalBox
(
QPainter
&
p
,
int
linewidth
,
QRect
box
,
const
QString
&
str
,
int
flags
)
{
p
.
save
();
p
.
rotate
(
-
90
);
...
...
@@ -471,7 +466,7 @@ void CalPrintPluginBase::drawVerticalBox(QPainter &p, int linewidth, const QRect
* of the printed contents inside the box.
*/
int
CalPrintPluginBase
::
drawBoxWithCaption
(
QPainter
&
p
,
const
QRect
&
allbox
,
QRect
allbox
,
const
QString
&
caption
,
const
QString
&
contents
,
bool
sameLine
,
...
...
@@ -550,13 +545,7 @@ int CalPrintPluginBase::drawBoxWithCaption(QPainter &p,
}
}
int
CalPrintPluginBase
::
drawHeader
(
QPainter
&
p
,
const
QString
&
title
,
const
QDate
&
month1
,
const
QDate
&
month2
,
const
QRect
&
allbox
,
bool
expand
,
QColor
backColor
)
int
CalPrintPluginBase
::
drawHeader
(
QPainter
&
p
,
const
QString
&
title
,
QDate
month1
,
QDate
month2
,
QRect
allbox
,
bool
expand
,
QColor
backColor
)
{
// print previous month for month view, print current for to-do, day and week
int
smallMonthWidth
=
(
allbox
.
width
()
/
4
)
-
10
;
...
...
@@ -627,7 +616,7 @@ int CalPrintPluginBase::drawHeader(QPainter &p,
return
textRect
.
bottom
();
}
int
CalPrintPluginBase
::
drawFooter
(
QPainter
&
p
,
const
QRect
&
footbox
)
int
CalPrintPluginBase
::
drawFooter
(
QPainter
&
p
,
QRect
footbox
)
{
QFont
oldfont
(
p
.
font
());
p
.
setFont
(
QFont
(
QStringLiteral
(
"sans-serif"
),
6
));
...
...
@@ -638,7 +627,7 @@ int CalPrintPluginBase::drawFooter(QPainter &p, const QRect &footbox)
return
footbox
.
bottom
();
}
void
CalPrintPluginBase
::
drawSmallMonth
(
QPainter
&
p
,
const
QDate
&
qd
,
const
QRect
&
box
)
void
CalPrintPluginBase
::
drawSmallMonth
(
QPainter
&
p
,
QDate
qd
,
QRect
box
)
{
int
weekdayCol
=
weekdayColumn
(
qd
.
dayOfWeek
());
int
month
=
qd
.
month
();
...
...
@@ -694,7 +683,7 @@ void CalPrintPluginBase::drawSmallMonth(QPainter &p, const QDate &qd, const QRec
* This routine draws a header box over the main part of the calendar
* containing the days of the week.
*/
void
CalPrintPluginBase
::
drawDaysOfWeek
(
QPainter
&
p
,
const
QDate
&
fromDate
,
const
QDate
&
toDate
,
const
QRect
&
box
)
void
CalPrintPluginBase
::
drawDaysOfWeek
(
QPainter
&
p
,
const
QDate
&
fromDate
,
QDate
toDate
,
QRect
box
)
{
double
cellWidth
=
double
(
box
.
width
())
/
double
(
fromDate
.
daysTo
(
toDate
)
+
1
);
QDate
cellDate
(
fromDate
);
...
...
@@ -710,12 +699,12 @@ void CalPrintPluginBase::drawDaysOfWeek(QPainter &p, const QDate &fromDate, cons
}
}
void
CalPrintPluginBase
::
drawDaysOfWeekBox
(
QPainter
&
p
,
const
QDate
&
qd
,
const
QRect
&
box
)
void
CalPrintPluginBase
::
drawDaysOfWeekBox
(
QPainter
&
p
,
QDate
qd
,
QRect
box
)
{
drawSubHeaderBox
(
p
,
QLocale
::
system
().
dayName
(
qd
.
dayOfWeek
()),
box
);
}
void
CalPrintPluginBase
::
drawTimeLine
(
QPainter
&
p
,
const
QTime
&
fromTime
,
const
QTime
&
toTime
,
const
QRect
&
box
)
void
CalPrintPluginBase
::
drawTimeLine
(
QPainter
&
p
,
QTime
fromTime
,
QTime
toTime
,
QRect
box
)
{
drawBox
(
p
,
BOX_BORDER_WIDTH
,
box
);
...
...
@@ -786,9 +775,9 @@ void CalPrintPluginBase::drawTimeLine(QPainter &p, const QTime &fromTime, const
*/
int
CalPrintPluginBase
::
drawAllDayBox
(
QPainter
&
p
,
const
KCalendarCore
::
Event
::
List
&
eventList_
,
const
QDate
&
qd
,
QDate
qd
,
bool
expandable
,
const
QRect
&
box
,
QRect
box
,
bool
excludeConfidential
,
bool
excludePrivate
)
{
...
...
@@ -2211,7 +2200,7 @@ void CalPrintPluginBase::drawJournal(const KCalendarCore::Journal::Ptr &journal,
y
+=
10
;
}
void
CalPrintPluginBase
::
drawSplitHeaderRight
(
QPainter
&
p
,
const
QDate
&
fd
,
const
QDate
&
td
,
const
QDate
&
,
int
width
,
int
height
)
void
CalPrintPluginBase
::
drawSplitHeaderRight
(
QPainter
&
p
,
QDate
fd
,
QDate
td
,
QDate
,
int
width
,
int
height
)
{
QFont
oldFont
(
p
.
font
());
...
...
@@ -2262,7 +2251,7 @@ void CalPrintPluginBase::drawSplitHeaderRight(QPainter &p, const QDate &fd, cons
p
.
setFont
(
oldFont
);
}
void
CalPrintPluginBase
::
drawNoteLines
(
QPainter
&
p
,
const
QRect
&
box
,
int
startY
)
void
CalPrintPluginBase
::
drawNoteLines
(
QPainter
&
p
,
QRect
box
,
int
startY
)
{
int
lineHeight
=
int
(
p
.
fontMetrics
().
lineSpacing
()
*
1.5
);
int
linePos
=
box
.
y
();
...
...
src/printing/calprintpluginbase.h
View file @
816bc638
...
...
@@ -144,7 +144,7 @@ public:
@param linewidth The border width of the box
@param rect The rectangle of the box
*/
static
void
drawBox
(
QPainter
&
p
,
int
linewidth
,
const
QRect
&
rect
);
static
void
drawBox
(
QPainter
&
p
,
int
linewidth
,
QRect
rect
);
/**
Draw a shaded box with given width at the given coordinates.
@param p The printer to be used
...
...
@@ -152,7 +152,7 @@ public:
@param brush The brush to fill the box
@param rect The rectangle of the box
*/
static
void
drawShadedBox
(
QPainter
&
p
,
int
linewidth
,
const
QBrush
&
brush
,
const
QRect
&
rect
);
static
void
drawShadedBox
(
QPainter
&
p
,
int
linewidth
,
const
QBrush
&
brush
,
QRect
rect
);
/**
Print the given string (event summary) in the given rectangle. Margins
...
...
@@ -161,7 +161,7 @@ public:
@param box Coordinates of the surrounding event box
@param str The text to be printed in the box
*/
void
printEventString
(
QPainter
&
p
,
const
QRect
&
box
,
const
QString
&
str
,
int
flags
=
-
1
);
void
printEventString
(
QPainter
&
p
,
QRect
box
,
const
QString
&
str
,
int
flags
=
-
1
);
/**
Print the box for the given event with the given string.
...
...
@@ -173,7 +173,7 @@ public:
@param str The string to print inside the box
@param flags is a bitwise OR of Qt::AlignmentFlags and Qt::TextFlags values.
*/
void
showEventBox
(
QPainter
&
p
,
int
linewidth
,
const
QRect
&
box
,
const
KCalendarCore
::
Incidence
::
Ptr
&
incidence
,
const
QString
&
str
,
int
flags
=
-
1
);
void
showEventBox
(
QPainter
&
p
,
int
linewidth
,
QRect
box
,
const
KCalendarCore
::
Incidence
::
Ptr
&
incidence
,
const
QString
&
str
,
int
flags
=
-
1
);
/**
Draw a subheader box with a shaded background and the given string
...
...
@@ -181,7 +181,7 @@ public:
@param str Text to be printed inside the box
@param box Coordinates of the box
*/
void
drawSubHeaderBox
(
QPainter
&
p
,
const
QString
&
str
,
const
QRect
&
box
);
void
drawSubHeaderBox
(
QPainter
&
p
,
const
QString
&
str
,
QRect
box
);
/**
Draw an event box with vertical text.
...
...
@@ -191,7 +191,7 @@ public:
@param str ext to be printed inside the box
@param flags is a bitwise OR of Qt::AlignmentFlags and Qt::TextFlags values.
*/
void
drawVerticalBox
(
QPainter
&
p
,
int
linewidth
,
const
QRect
&
box
,
const
QString
&
str
,
int
flags
=
-
1
);
void
drawVerticalBox
(
QPainter
&
p
,
int
linewidth
,
QRect
box
,
const
QString
&
str
,
int
flags
=
-
1
);
/**
Draw a component box with a heading (printed in bold).
...
...
@@ -215,7 +215,7 @@ public:
custom contents in that case.
*/
int
drawBoxWithCaption
(
QPainter
&
p
,
const
QRect
&
box
,
QRect
box
,
const
QString
&
caption
,
const
QString
&
contents
,
bool
sameLine
,
...
...
@@ -252,8 +252,7 @@ public:
is box.bottom, otherwise it is larger than box.bottom
and matches the y-coordinate of the surrounding rectangle.
*/
int
drawHeader
(
QPainter
&
p
,
const
QString
&
title
,
const
QDate
&
month1
,
const
QDate
&
month2
,
const
QRect
&
box
,
bool
expand
=
false
,
QColor
backColor
=
QColor
());
int
drawHeader
(
QPainter
&
p
,
const
QString
&
title
,
QDate
month1
,
QDate
month2
,
QRect
box
,
bool
expand
=
false
,
QColor
backColor
=
QColor
());
/**
Draw a page footer containing the printing date and possibly
...
...
@@ -262,7 +261,7 @@ public:
@param box coordinates of the footer
@return The bottom of the printed box.
*/
int
drawFooter
(
QPainter
&
p
,
const
QRect
&
box
);
int
drawFooter
(
QPainter
&
p
,
QRect
box
);
/**
Draw a small calendar with the days of a month into the given area.
...
...
@@ -271,7 +270,7 @@ public:
@param qd Arbitrary Date within the month to be printed.
@param box coordinates of the small calendar
*/
void
drawSmallMonth
(
QPainter
&
p
,
const
QDate
&
qd
,
const
QRect
&
box
);
void
drawSmallMonth
(
QPainter
&
p
,
QDate
qd
,
QRect
box
);
/**
Draw a horizontal bar with the weekday names of the given date range
...
...
@@ -282,7 +281,7 @@ public:
@param toDate Last date of the printed dates
@param box coordinates of the box for the days of the week
*/
void
drawDaysOfWeek
(
QPainter
&
p
,
const
QDate
&
fromDate
,
const
QDate
&
toDate
,
const
QRect
&
box
);
void
drawDaysOfWeek
(
QPainter
&
p
,
const
QDate
&
fromDate
,
QDate
toDate
,
QRect
box
);
/**
Draw a single weekday name in a box inside the given area of the painter.
...
...
@@ -291,7 +290,7 @@ public:
@param qd Date of the printed day
@param box coordinates of the weekbox
*/
void
drawDaysOfWeekBox
(
QPainter
&
p
,
const
QDate
&
qd
,
const
QRect
&
box
);
void
drawDaysOfWeekBox
(
QPainter
&
p
,
QDate
qd
,
QRect
box
);
/**
Draw a (vertical) time scale from time fromTime to toTime inside the
...
...
@@ -303,7 +302,7 @@ public:
@param toTime End time of the time range to display
@param box coordinates of the timeline
*/
void
drawTimeLine
(
QPainter
&
p
,
const
QTime
&
fromTime
,
const
QTime
&
toTime
,
const
QRect
&
box
);
void
drawTimeLine
(
QPainter
&
p
,
QTime
fromTime
,
QTime
toTime
,
QRect
box
);
/**
Draw the all-day box for the agenda print view (the box on top which
...
...
@@ -327,9 +326,9 @@ public:
*/
int
drawAllDayBox
(
QPainter
&
p
,
const
KCalendarCore
::
Event
::
List
&
eventList
,
const
QDate
&
qd
,
QDate
qd
,
bool
expandable
,
const
QRect
&
box
,
QRect
box
,
bool
excludeConfidential
,
bool
excludePrivate
);
...
...
@@ -676,7 +675,7 @@ public:
*/
void
drawTextLines
(
QPainter
&
p
,
const
QString
&
entry
,
int
x
,
int
&
y
,
int
width
,
int
pageHeight
,
bool
richTextEntry
);
void
drawSplitHeaderRight
(
QPainter
&
p
,
const
QDate
&
fd
,
const
QDate
&
td
,
const
QDate
&
cd
,
int
width
,
int
height
);
void
drawSplitHeaderRight
(
QPainter
&
p
,
QDate
fd
,
QDate
td
,
QDate
cd
,
int
width
,
int
height
);
/**
Draws dotted lines for notes in a box.
...
...
@@ -684,7 +683,7 @@ public:
@param box coordinates of the box where the lines will be placed
@param startY starting y-coordinate for the first line
*/
void
drawNoteLines
(
QPainter
&
p
,
const
QRect
&
box
,
int
startY
);
void
drawNoteLines
(
QPainter
&
p
,
QRect
box
,
int
startY
);
protected:
QTime
dayStart
()
const
;
...
...
@@ -729,9 +728,9 @@ private:
*/
void
setColorsByIncidenceCategory
(
QPainter
&
p
,
const
KCalendarCore
::
Incidence
::
Ptr
&
incidence
)
const
;
QString
holidayString
(
const
QDate
&
date
)
const
;
QString
holidayString
(
QDate
date
)
const
;
KCalendarCore
::
Event
::
Ptr
holidayEvent
(
const
QDate
&
date
)
const
;
KCalendarCore
::
Event
::
Ptr
holidayEvent
(
QDate
date
)
const
;
/**
* Returns a nice QColor for text, give the input color &c.
...
...
src/utils.cpp
View file @
816bc638
...
...
@@ -697,7 +697,7 @@ QString CalendarSupport::subMimeTypeForIncidence(const KCalendarCore::Incidence:
return
incidence
->
mimeType
();
}
QList
<
QDate
>
CalendarSupport
::
workDays
(
const
QDate
&
startDate
,
const
QDate
&
endDate
)
QList
<
QDate
>
CalendarSupport
::
workDays
(
QDate
startDate
,
QDate
endDate
)
{
QList
<
QDate
>
result
;
...
...
@@ -731,7 +731,7 @@ QList<QDate> CalendarSupport::workDays(const QDate &startDate, const QDate &endD
return
result
;
}
QStringList
CalendarSupport
::
holiday
(
const
QDate
&
date
)
QStringList
CalendarSupport
::
holiday
(
QDate
date
)
{
QStringList
hdays
;
...
...
src/utils.h
View file @
816bc638
...
...
@@ -203,7 +203,7 @@ CALENDARSUPPORT_EXPORT QString subMimeTypeForIncidence(const KCalendarCore::Inci
/**
* Returns a list containing work days between @p start and @end.
*/
CALENDARSUPPORT_EXPORT
QList
<
QDate
>
workDays
(
const
QDate
&
start
,
const
QDate
&
end
);
CALENDARSUPPORT_EXPORT
QList
<
QDate
>
workDays
(
QDate
start
,
QDate
end
);
/**
* Creates a nicely formatted toolTip string for a calendar, containing some quick,
...
...
@@ -220,7 +220,7 @@ CALENDARSUPPORT_EXPORT QString toolTipString(const Akonadi::Collection &coll, bo
/**
* Returns a list of holidays that occur at @param date.
*/
CALENDARSUPPORT_EXPORT
QStringList
holiday
(
const
QDate
&
date
);
CALENDARSUPPORT_EXPORT
QStringList
holiday
(
QDate
date
);
CALENDARSUPPORT_EXPORT
QStringList
categories
(
const
KCalendarCore
::
Incidence
::
List
&
incidences
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment