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
System
KCron
Commits
1a3eab7e
Commit
1a3eab7e
authored
Jan 14, 2021
by
Laurent Montel
😁
Browse files
Rename some variables
parent
3e3adc45
Changes
15
Hide whitespace changes
Inline
Side-by-side
src/crontabPrinter.cpp
View file @
1a3eab7e
...
...
@@ -28,62 +28,42 @@
class
CrontabPrinterPrivate
{
public:
/**
* Pointer a printer options object
*/
CrontabPrinterWidget
*
crontabPrinterWidget
=
nullptr
;
/**
* Pointer to parent widget
*/
CrontabWidget
*
crontabWidget
=
nullptr
;
QPainter
*
painter
=
nullptr
;
QPrinter
*
printer
=
nullptr
;
QRect
*
printView
=
nullptr
;
int
page
=
0
;
int
currentRowPosition
=
0
;
};
CrontabPrinter
::
CrontabPrinter
(
CrontabWidget
*
crontabWidget
)
:
d
(
new
CrontabPrinterPrivate
())
{
d
->
c
rontabWidget
=
crontabWidget
;
mC
rontabWidget
=
crontabWidget
;
}
CrontabPrinter
::~
CrontabPrinter
()
{
delete
d
->
crontabPrinterWidget
;
delete
d
->
painter
;
delete
d
->
printer
;
delete
d
->
printView
;
delete
mCrontabPrinterWidget
;
delete
d
;
delete
mPainter
;
delete
mPrinter
;
delete
mPrintView
;
}
bool
CrontabPrinter
::
start
()
{
logDebug
()
<<
"Printing selection..."
;
if
(
!
d
->
p
rinter
)
{
d
->
p
rinter
=
new
QPrinter
();
if
(
!
mP
rinter
)
{
mP
rinter
=
new
QPrinter
();
}
// do some printer initialization
d
->
p
rinter
->
setFullPage
(
true
);
mP
rinter
->
setFullPage
(
true
);
/*
CrontabPrinterWidget* dialogPage = new CrontabPrinterWidget(
d->
crontabWidge);
d->
printer->addDialogPage(dialogPage);
CrontabPrinterWidget* dialogPage = new CrontabPrinterWidget(crontabWidge);
printer->addDialogPage(dialogPage);
*/
// initialize the printer using the print dialog
QPrintDialog
*
printDialog
=
new
QPrintDialog
(
d
->
p
rinter
,
nullptr
);
printDialog
->
setOptionTabs
(
QList
<
QWidget
*>
()
<<
d
->
c
rontabWidget
);
QPrintDialog
*
printDialog
=
new
QPrintDialog
(
mP
rinter
,
nullptr
);
printDialog
->
setOptionTabs
(
QList
<
QWidget
*>
()
<<
mC
rontabWidget
);
printDialog
->
setEnabledOptions
(
QAbstractPrintDialog
::
PrintToFile
);
if
(
printDialog
->
exec
()
==
QDialog
::
Rejected
)
{
logDebug
()
<<
"Printing canceled"
;
...
...
@@ -94,16 +74,16 @@ bool CrontabPrinter::start()
delete
printDialog
;
// create a painter to paint on the printer object
d
->
p
ainter
=
new
QPainter
();
mP
ainter
=
new
QPainter
();
// start painting
d
->
p
ainter
->
begin
(
d
->
p
rinter
);
mP
ainter
->
begin
(
mP
rinter
);
const
int
margin
=
computeMargin
();
d
->
p
rintView
=
new
QRect
(
margin
,
margin
,
d
->
p
ainter
->
device
()
->
width
()
-
2
*
margin
,
d
->
p
ainter
->
device
()
->
height
()
-
2
*
margin
);
mP
rintView
=
new
QRect
(
margin
,
margin
,
mP
ainter
->
device
()
->
width
()
-
2
*
margin
,
mP
ainter
->
device
()
->
height
()
-
2
*
margin
);
d
->
p
age
=
1
;
d
->
c
urrentRowPosition
=
0
;
mP
age
=
1
;
mC
urrentRowPosition
=
0
;
drawMainTitle
();
...
...
@@ -112,7 +92,7 @@ bool CrontabPrinter::start()
void
CrontabPrinter
::
printTasks
()
{
CTCron
*
cron
=
d
->
c
rontabWidget
->
currentCron
();
CTCron
*
cron
=
mC
rontabWidget
->
currentCron
();
drawTitle
(
i18n
(
"Scheduled Tasks"
));
...
...
@@ -145,10 +125,10 @@ void CrontabPrinter::printTasks()
void
CrontabPrinter
::
printVariables
()
{
CTCron
*
cron
=
d
->
c
rontabWidget
->
currentCron
();
CTCron
*
cron
=
mC
rontabWidget
->
currentCron
();
d
->
p
ainter
->
translate
(
0
,
20
);
d
->
c
urrentRowPosition
=
0
;
mP
ainter
->
translate
(
0
,
20
);
mC
urrentRowPosition
=
0
;
//Environment Variables
...
...
@@ -157,23 +137,23 @@ void CrontabPrinter::printVariables()
//QList<QStringList> variablesContent;
const
auto
variables
=
cron
->
variables
();
for
(
CTVariable
*
variable
:
variables
)
{
d
->
p
ainter
->
drawText
(
*
(
d
->
p
rintView
),
Qt
::
AlignLeft
|
Qt
::
TextWordWrap
,
variable
->
variable
+
QLatin1String
(
" = "
)
+
variable
->
value
);
mP
ainter
->
drawText
(
*
(
mP
rintView
),
Qt
::
AlignLeft
|
Qt
::
TextWordWrap
,
variable
->
variable
+
QLatin1String
(
" = "
)
+
variable
->
value
);
const
int
moveBy
=
computeStringHeight
(
variable
->
variable
);
d
->
p
ainter
->
translate
(
0
,
moveBy
);
mP
ainter
->
translate
(
0
,
moveBy
);
}
}
void
CrontabPrinter
::
drawMainTitle
()
{
CTCron
*
cron
=
d
->
c
rontabWidget
->
currentCron
();
CTCron
*
cron
=
mC
rontabWidget
->
currentCron
();
QFont
originalFont
=
d
->
p
ainter
->
font
();
QFont
originalFont
=
mP
ainter
->
font
();
QFont
titleFont
(
originalFont
);
titleFont
.
setPixelSize
(
20
);
titleFont
.
setBold
(
true
);
d
->
p
ainter
->
setFont
(
titleFont
);
mP
ainter
->
setFont
(
titleFont
);
QString
mainTitle
;
if
(
cron
->
isSystemCron
())
{
...
...
@@ -184,40 +164,40 @@ void CrontabPrinter::drawMainTitle()
mainTitle
=
i18nc
(
"Crontab of user login"
,
"Crontab of user %1"
,
cron
->
userLogin
());
}
d
->
p
ainter
->
drawText
(
*
(
d
->
p
rintView
),
Qt
::
AlignHCenter
|
Qt
::
TextWordWrap
,
mainTitle
);
mP
ainter
->
drawText
(
*
(
mP
rintView
),
Qt
::
AlignHCenter
|
Qt
::
TextWordWrap
,
mainTitle
);
d
->
p
ainter
->
translate
(
0
,
computeStringHeight
(
mainTitle
));
mP
ainter
->
translate
(
0
,
computeStringHeight
(
mainTitle
));
d
->
p
ainter
->
setFont
(
originalFont
);
mP
ainter
->
setFont
(
originalFont
);
}
void
CrontabPrinter
::
drawTitle
(
const
QString
&
title
)
{
QFont
originalFont
=
d
->
p
ainter
->
font
();
QFont
originalFont
=
mP
ainter
->
font
();
QFont
titleFont
(
originalFont
);
titleFont
.
setPixelSize
(
16
);
titleFont
.
setBold
(
true
);
d
->
p
ainter
->
setFont
(
titleFont
);
mP
ainter
->
setFont
(
titleFont
);
d
->
p
ainter
->
drawText
(
*
(
d
->
p
rintView
),
Qt
::
AlignLeft
|
Qt
::
TextWordWrap
,
title
);
mP
ainter
->
drawText
(
*
(
mP
rintView
),
Qt
::
AlignLeft
|
Qt
::
TextWordWrap
,
title
);
d
->
p
ainter
->
translate
(
0
,
computeStringHeight
(
title
));
mP
ainter
->
translate
(
0
,
computeStringHeight
(
title
));
d
->
p
ainter
->
setFont
(
originalFont
);
mP
ainter
->
setFont
(
originalFont
);
}
void
CrontabPrinter
::
drawHeader
(
const
QList
<
int
>
&
columnWidths
,
const
QStringList
&
headers
)
{
QFont
originalFont
=
d
->
p
ainter
->
font
();
QFont
originalFont
=
mP
ainter
->
font
();
QFont
titleFont
(
originalFont
);
titleFont
.
setBold
(
true
);
d
->
p
ainter
->
setFont
(
titleFont
);
mP
ainter
->
setFont
(
titleFont
);
drawContentRow
(
columnWidths
,
headers
);
d
->
p
ainter
->
setFont
(
originalFont
);
mP
ainter
->
setFont
(
originalFont
);
}
void
CrontabPrinter
::
drawContentRow
(
const
QList
<
int
>
&
columnWidths
,
const
QStringList
&
contents
)
...
...
@@ -231,9 +211,9 @@ void CrontabPrinter::drawContentRow(const QList<int> &columnWidths, const QStrin
firstColumn
=
content
;
}
d
->
p
ainter
->
drawText
(
*
(
d
->
p
rintView
),
Qt
::
AlignLeft
|
Qt
::
TextWordWrap
,
QLatin1String
(
" "
)
+
content
);
mP
ainter
->
drawText
(
*
(
mP
rintView
),
Qt
::
AlignLeft
|
Qt
::
TextWordWrap
,
QLatin1String
(
" "
)
+
content
);
d
->
p
ainter
->
translate
(
columnWidths
[
index
],
0
);
mP
ainter
->
translate
(
columnWidths
[
index
],
0
);
totalWidths
+=
columnWidths
[
index
];
...
...
@@ -248,28 +228,28 @@ void CrontabPrinter::drawContentRow(const QList<int> &columnWidths, const QStrin
void
CrontabPrinter
::
finish
()
{
// stop painting, this will automatically send the print data to the printer
d
->
p
ainter
->
end
();
mP
ainter
->
end
();
}
void
CrontabPrinter
::
printPageNumber
()
{
logDebug
()
<<
"Printing page number..."
;
d
->
p
ainter
->
translate
(
0
,
-
d
->
c
urrentRowPosition
);
d
->
p
rintView
->
moveTo
(
QPoint
(
0
,
d
->
p
rintView
->
height
()));
d
->
p
ainter
->
translate
(
0
,
-
d
->
p
rintView
->
height
());
d
->
p
ainter
->
drawText
(
d
->
p
rintView
->
right
()
-
d
->
p
ainter
->
fontMetrics
().
boundingRect
(
QString
::
number
(
d
->
p
age
)).
width
(),
d
->
p
rintView
->
bottom
()
+
d
->
p
ainter
->
fontMetrics
().
ascent
()
+
5
,
QString
::
number
(
d
->
p
age
));
mP
ainter
->
translate
(
0
,
-
mC
urrentRowPosition
);
mP
rintView
->
moveTo
(
QPoint
(
0
,
mP
rintView
->
height
()));
mP
ainter
->
translate
(
0
,
-
mP
rintView
->
height
());
mP
ainter
->
drawText
(
mP
rintView
->
right
()
-
mP
ainter
->
fontMetrics
().
boundingRect
(
QString
::
number
(
mP
age
)).
width
(),
mP
rintView
->
bottom
()
+
mP
ainter
->
fontMetrics
().
ascent
()
+
5
,
QString
::
number
(
mP
age
));
}
void
CrontabPrinter
::
changeRow
(
int
x
,
int
y
)
{
d
->
p
ainter
->
translate
(
x
,
y
);
d
->
c
urrentRowPosition
=
d
->
c
urrentRowPosition
+
y
;
mP
ainter
->
translate
(
x
,
y
);
mC
urrentRowPosition
=
mC
urrentRowPosition
+
y
;
}
int
CrontabPrinter
::
computeMargin
()
const
{
const
int
dpiy
=
d
->
p
ainter
->
device
()
->
logicalDpiY
();
const
int
dpiy
=
mP
ainter
->
device
()
->
logicalDpiY
();
const
int
margin
=
(
int
)((
2
/
2.54
)
*
dpiy
);
// 2 cm margins
return
margin
;
...
...
@@ -277,8 +257,8 @@ int CrontabPrinter::computeMargin() const
int
CrontabPrinter
::
computeStringHeight
(
const
QString
&
text
)
const
{
const
int
fontHeight
=
d
->
p
ainter
->
fontMetrics
().
height
();
const
int
lines
=
d
->
p
ainter
->
fontMetrics
().
boundingRect
(
text
).
width
()
/
d
->
p
rintView
->
width
()
+
1
;
const
int
fontHeight
=
mP
ainter
->
fontMetrics
().
height
();
const
int
lines
=
mP
ainter
->
fontMetrics
().
boundingRect
(
text
).
width
()
/
mP
rintView
->
width
()
+
1
;
const
int
moveBy
=
(
fontHeight
+
2
)
*
lines
;
return
moveBy
;
...
...
@@ -289,7 +269,7 @@ int CrontabPrinter::computeStringHeight(const QString &text) const
*/
bool
CrontabPrinter
::
isPrintCrontab
()
const
{
return
d
->
c
rontabPrinterWidget
->
printCrontab
();
return
mC
rontabPrinterWidget
->
printCrontab
();
}
/**
...
...
@@ -297,12 +277,12 @@ bool CrontabPrinter::isPrintCrontab() const
*/
bool
CrontabPrinter
::
isAllUsers
()
const
{
return
d
->
c
rontabPrinterWidget
->
printAllUsers
();
return
mC
rontabPrinterWidget
->
printAllUsers
();
}
void
CrontabPrinter
::
drawTable
(
const
QList
<
int
>
&
columnWidths
)
{
d
->
p
ainter
->
translate
(
0
,
-
d
->
c
urrentRowPosition
+
computeMargin
());
mP
ainter
->
translate
(
0
,
-
mC
urrentRowPosition
+
computeMargin
());
int
columnWidthsTotal
=
0
;
for
(
int
columnWidth
:
columnWidths
)
{
...
...
@@ -312,33 +292,33 @@ void CrontabPrinter::drawTable(const QList<int> &columnWidths)
const
int
margin
=
computeMargin
();
int
linePositionX
=
margin
;
QPen
originalPen
=
d
->
p
ainter
->
pen
();
QPen
originalPen
=
mP
ainter
->
pen
();
QPen
pen
(
originalPen
);
pen
.
setWidth
(
1
);
d
->
p
ainter
->
setPen
(
pen
);
mP
ainter
->
setPen
(
pen
);
//First horizontal line
d
->
p
ainter
->
drawLine
(
QPoint
(
margin
,
0
),
QPoint
(
margin
+
columnWidthsTotal
,
0
));
mP
ainter
->
drawLine
(
QPoint
(
margin
,
0
),
QPoint
(
margin
+
columnWidthsTotal
,
0
));
//Second horizontal line
d
->
p
ainter
->
drawLine
(
QPoint
(
margin
,
0
+
computeStringHeight
(
QStringLiteral
(
" "
))),
QPoint
(
margin
+
columnWidthsTotal
,
0
+
computeStringHeight
(
QStringLiteral
(
" "
))));
mP
ainter
->
drawLine
(
QPoint
(
margin
,
0
+
computeStringHeight
(
QStringLiteral
(
" "
))),
QPoint
(
margin
+
columnWidthsTotal
,
0
+
computeStringHeight
(
QStringLiteral
(
" "
))));
//First vertical line
d
->
p
ainter
->
drawLine
(
QPoint
(
linePositionX
,
0
),
QPoint
(
linePositionX
,
d
->
c
urrentRowPosition
));
mP
ainter
->
drawLine
(
QPoint
(
linePositionX
,
0
),
QPoint
(
linePositionX
,
mC
urrentRowPosition
));
for
(
int
columnWidth
:
columnWidths
)
{
linePositionX
+=
columnWidth
;
d
->
p
ainter
->
drawLine
(
QPoint
(
linePositionX
,
0
),
QPoint
(
linePositionX
,
d
->
c
urrentRowPosition
));
mP
ainter
->
drawLine
(
QPoint
(
linePositionX
,
0
),
QPoint
(
linePositionX
,
mC
urrentRowPosition
));
}
//Last horizontal line
d
->
p
ainter
->
drawLine
(
QPoint
(
margin
,
d
->
c
urrentRowPosition
),
QPoint
(
margin
+
columnWidthsTotal
,
d
->
c
urrentRowPosition
));
mP
ainter
->
drawLine
(
QPoint
(
margin
,
mC
urrentRowPosition
),
QPoint
(
margin
+
columnWidthsTotal
,
mC
urrentRowPosition
));
d
->
p
ainter
->
setPen
(
originalPen
);
mP
ainter
->
setPen
(
originalPen
);
d
->
p
ainter
->
translate
(
0
,
d
->
c
urrentRowPosition
-
computeMargin
());
mP
ainter
->
translate
(
0
,
mC
urrentRowPosition
-
computeMargin
());
}
QList
<
int
>
CrontabPrinter
::
findMaxWidths
(
const
QList
<
QStringList
>
&
contents
,
int
columnCount
)
...
...
@@ -351,7 +331,7 @@ QList<int> CrontabPrinter::findMaxWidths(const QList<QStringList> &contents, int
for
(
const
QStringList
&
content
:
contents
)
{
int
columnIndex
=
0
;
while
(
columnIndex
<
columnWidths
.
count
())
{
const
int
valueWidth
=
d
->
p
ainter
->
fontMetrics
().
boundingRect
(
content
.
at
(
columnIndex
)).
width
();
const
int
valueWidth
=
mP
ainter
->
fontMetrics
().
boundingRect
(
content
.
at
(
columnIndex
)).
width
();
if
(
columnWidths
[
columnIndex
]
<
valueWidth
)
{
columnWidths
[
columnIndex
]
=
valueWidth
;
}
...
...
@@ -368,7 +348,7 @@ QList<int> CrontabPrinter::findColumnWidths(const QList<QStringList> &contents,
QList
<
int
>
columnWidths
=
findMaxWidths
(
contents
,
columnCount
);
int
margin
=
computeMargin
();
int
pageWidth
=
d
->
p
ainter
->
device
()
->
width
()
-
2
*
margin
;
int
pageWidth
=
mP
ainter
->
device
()
->
width
()
-
2
*
margin
;
int
columnWidthSum
=
0
;
for
(
int
width
:
qAsConst
(
columnWidths
))
{
...
...
@@ -396,10 +376,10 @@ QList<int> CrontabPrinter::findColumnWidths(const QList<QStringList> &contents,
void
CrontabPrinter
::
needNewPage
()
{
const
int
margin
=
computeMargin
();
if
(
d
->
c
urrentRowPosition
+
margin
>=
d
->
p
rintView
->
height
())
{
if
(
mC
urrentRowPosition
+
margin
>=
mP
rintView
->
height
())
{
printPageNumber
();
d
->
p
rinter
->
newPage
();
d
->
p
age
++
;
d
->
c
urrentRowPosition
=
0
;
mP
rinter
->
newPage
();
mP
age
++
;
mC
urrentRowPosition
=
0
;
}
}
src/crontabPrinter.h
View file @
1a3eab7e
...
...
@@ -19,7 +19,7 @@ class QString;
class
CrontabWidget
;
class
CrontabPrinterPrivate
;
class
QPrinter
;
/**
*Provides a wrapper for simple printing of text.
*/
...
...
@@ -81,7 +81,24 @@ private:
QList
<
int
>
findMaxWidths
(
const
QList
<
QStringList
>
&
tasksContent
,
int
columnCount
);
QList
<
int
>
findColumnWidths
(
const
QList
<
QStringList
>
&
tasksContent
,
int
columnCount
);
CrontabPrinterPrivate
*
const
d
;
/**
* Pointer a printer options object
*/
CrontabPrinterWidget
*
mCrontabPrinterWidget
=
nullptr
;
/**
* Pointer to parent widget
*/
CrontabWidget
*
mCrontabWidget
=
nullptr
;
QPainter
*
mPainter
=
nullptr
;
QPrinter
*
mPrinter
=
nullptr
;
QRect
*
mPrintView
=
nullptr
;
int
mPage
=
0
;
int
mCurrentRowPosition
=
0
;
};
#endif
src/crontablib/ctGlobalCron.cpp
View file @
1a3eab7e
...
...
@@ -28,7 +28,7 @@ CTGlobalCron::CTGlobalCron(CTHost *_ctHost)
d
->
userLogin
=
i18n
(
"All users"
);
c
tHost
=
_ctHost
;
mC
tHost
=
_ctHost
;
}
CTGlobalCron
::~
CTGlobalCron
()
...
...
@@ -40,7 +40,7 @@ QList<CTTask *> CTGlobalCron::tasks() const
logDebug
()
<<
"Global Cron Tasks"
;
QList
<
CTTask
*>
tasks
;
foreach
(
CTCron
*
cron
,
c
tHost
->
crons
)
{
foreach
(
CTCron
*
cron
,
mC
tHost
->
crons
)
{
if
(
cron
->
isSystemCron
())
{
continue
;
}
...
...
@@ -57,7 +57,7 @@ QList<CTVariable *> CTGlobalCron::variables() const
logDebug
()
<<
"Global Cron Variables"
;
QList
<
CTVariable
*>
variables
;
foreach
(
CTCron
*
cron
,
c
tHost
->
crons
)
{
foreach
(
CTCron
*
cron
,
mC
tHost
->
crons
)
{
if
(
cron
->
isSystemCron
())
{
continue
;
}
...
...
@@ -74,7 +74,7 @@ void CTGlobalCron::addTask(CTTask *task)
{
logDebug
()
<<
"Global Cron addTask"
;
CTCron
*
actualCron
=
c
tHost
->
findUserCron
(
task
->
userLogin
);
CTCron
*
actualCron
=
mC
tHost
->
findUserCron
(
task
->
userLogin
);
actualCron
->
addTask
(
task
);
}
...
...
@@ -82,7 +82,7 @@ void CTGlobalCron::addVariable(CTVariable *variable)
{
logDebug
()
<<
"Global Cron addVariable"
;
CTCron
*
actualCron
=
c
tHost
->
findUserCron
(
variable
->
userLogin
);
CTCron
*
actualCron
=
mC
tHost
->
findUserCron
(
variable
->
userLogin
);
actualCron
->
addVariable
(
variable
);
}
...
...
@@ -90,7 +90,7 @@ void CTGlobalCron::modifyTask(CTTask *task)
{
logDebug
()
<<
"Global Cron modifyTask"
;
CTCron
*
actualCron
=
c
tHost
->
findCronContaining
(
task
);
CTCron
*
actualCron
=
mC
tHost
->
findCronContaining
(
task
);
/*
* actualCron could be NULL is the task came from clipboard because those tasks are never
...
...
@@ -101,7 +101,7 @@ void CTGlobalCron::modifyTask(CTTask *task)
actualCron
->
removeTask
(
task
);
}
CTCron
*
newCron
=
c
tHost
->
findUserCron
(
task
->
userLogin
);
CTCron
*
newCron
=
mC
tHost
->
findUserCron
(
task
->
userLogin
);
newCron
->
addTask
(
task
);
}
}
...
...
@@ -110,7 +110,7 @@ void CTGlobalCron::modifyVariable(CTVariable *variable)
{
logDebug
()
<<
"Global Cron modifyVariable"
;
CTCron
*
actualCron
=
c
tHost
->
findCronContaining
(
variable
);
CTCron
*
actualCron
=
mC
tHost
->
findCronContaining
(
variable
);
/*
* actualCron could be NULL is the task came from clipboard because those tasks are never
...
...
@@ -121,7 +121,7 @@ void CTGlobalCron::modifyVariable(CTVariable *variable)
actualCron
->
removeVariable
(
variable
);
}
CTCron
*
newCron
=
c
tHost
->
findUserCron
(
variable
->
userLogin
);
CTCron
*
newCron
=
mC
tHost
->
findUserCron
(
variable
->
userLogin
);
newCron
->
addVariable
(
variable
);
}
}
...
...
@@ -130,7 +130,7 @@ void CTGlobalCron::removeTask(CTTask *task)
{
logDebug
()
<<
"Global Cron removeTask"
;
CTCron
*
actualCron
=
c
tHost
->
findCronContaining
(
task
);
CTCron
*
actualCron
=
mC
tHost
->
findCronContaining
(
task
);
actualCron
->
removeTask
(
task
);
}
...
...
@@ -138,6 +138,6 @@ void CTGlobalCron::removeVariable(CTVariable *variable)
{
logDebug
()
<<
"Global Cron removeVariable"
;
CTCron
*
actualCron
=
c
tHost
->
findCronContaining
(
variable
);
CTCron
*
actualCron
=
mC
tHost
->
findCronContaining
(
variable
);
actualCron
->
removeVariable
(
variable
);
}
src/crontablib/ctGlobalCron.h
View file @
1a3eab7e
...
...
@@ -46,7 +46,7 @@ public:
void
removeTask
(
CTTask
*
task
)
override
;
private:
CTHost
*
c
tHost
;
CTHost
*
mC
tHost
=
nullptr
;
};
#endif // CT_GLOBAL_CRON_H
src/crontablib/ctInitializationError.h
View file @
1a3eab7e
...
...
@@ -17,17 +17,17 @@ public:
QString
errorMessage
()
const
{
return
e
rror
;
return
mE
rror
;
}
void
setErrorMessage
(
const
QString
&
errorMessage
)
{
this
->
e
rror
=
errorMessage
;
this
->
mE
rror
=
errorMessage
;
}
bool
hasErrorMessage
()
{
if
(
e
rror
.
isEmpty
()
==
true
)
{
if
(
mE
rror
.
isEmpty
()
==
true
)
{
return
false
;
}
...
...
@@ -35,7 +35,7 @@ public:
}
private:
QString
e
rror
;
QString
mE
rror
;
};
#endif // CT_INITIALIZATION_ERROR
src/crontablib/ctSaveStatus.h
View file @
1a3eab7e
...
...
@@ -17,37 +17,37 @@ public:
CTSaveStatus
()
{
this
->
e
rrorStatus
=
false
;
this
->
mE
rrorStatus
=
false
;
}
CTSaveStatus
(
const
QString
&
errorMessage
,
const
QString
&
detailErrorMessage
)
{
this
->
e
rrorStatus
=
true
;
this
->
e
rror
=
errorMessage
;
this
->
d
etailError
=
detailErrorMessage
;
this
->
mE
rrorStatus
=
true
;
this
->
mE
rror
=
errorMessage
;
this
->
mD
etailError
=
detailErrorMessage
;
}
QString
errorMessage
()
const
{
return
e
rror
;
return
mE
rror
;
}
QString
detailErrorMessage
()
const
{
return
d
etailError
;
return
mD
etailError
;
}
bool
isError
()
const
{
return
e
rrorStatus
;
return
mE
rrorStatus
;
}
private:
bool
e
rrorStatus
;
bool
mE
rrorStatus
;
QString
e
rror
;
QString
mE
rror
;
QString
d
etailError
;
QString
mD
etailError
;
};
#endif // CT_SAVE_STATUS
src/crontablib/cthost.cpp
View file @
1a3eab7e
...
...
@@ -28,7 +28,7 @@ CTHost::CTHost(const QString &cronBinary, CTInitializationError &ctInitializatio
{
struct
passwd
*
userInfos
=
nullptr
;
this
->
c
rontabBinary
=
cronBinary
;
this
->
mC
rontabBinary
=
cronBinary
;
// If it is the root user
if
(
getuid
()
==
0
)
{
...
...
@@ -166,7 +166,7 @@ bool CTHost::isDirty()
CTCron
*
CTHost
::
createSystemCron
()
{
CTCron
*
p
=
new
CTSystemCron
(
c
rontabBinary
);
CTCron
*
p
=
new
CTSystemCron
(
mC
rontabBinary
);
crons
.
append
(
p
);
...
...
@@ -181,7 +181,7 @@ QString CTHost::createCTCron(const struct passwd *userInfos)
}
CTInitializationError
ctInitializationError
;
CTCron
*
p
=
new
CTCron
(
c
rontabBinary
,
userInfos
,
currentUserCron
,
ctInitializationError
);
CTCron
*
p
=
new
CTCron
(
mC
rontabBinary
,
userInfos
,
currentUserCron
,
ctInitializationError
);
if
(
ctInitializationError
.
hasErrorMessage
())
{
delete
p
;
return
ctInitializationError
.
errorMessage
();
...
...
src/crontablib/cthost.h
View file @
1a3eab7e
...
...
@@ -110,7 +110,7 @@ private:
*/
bool
allowDeny
(
char
*
name
);
QString
c
rontabBinary
;
QString
mC
rontabBinary
;
};
#endif // CTHOST_H
src/crontablib/cttask.cpp
View file @
1a3eab7e
...
...
@@ -19,7 +19,7 @@
#include "logging.h"