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
libkleo
Commits
cf2f6470
Commit
cf2f6470
authored
Oct 10, 2021
by
Laurent Montel
😁
Browse files
USe std::unique_ptr
parent
cef7cd1d
Pipeline
#87573
passed with stage
in 7 minutes and 17 seconds
Changes
12
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/kleo/defaultkeygenerationjob.cpp
View file @
cf2f6470
...
...
@@ -16,13 +16,13 @@ using namespace Kleo;
namespace
Kleo
{
class
DefaultKeyGenerationJob
::
Private
class
DefaultKeyGenerationJob
::
DefaultKeyGenerationJob
Private
{
public:
Private
()
DefaultKeyGenerationJob
Private
()
{}
~
Private
()
~
DefaultKeyGenerationJob
Private
()
{
if
(
job
)
{
job
->
deleteLater
();
...
...
@@ -37,14 +37,11 @@ public:
DefaultKeyGenerationJob
::
DefaultKeyGenerationJob
(
QObject
*
parent
)
:
Job
(
parent
)
,
d
(
new
DefaultKeyGenerationJob
::
Private
())
,
d
(
new
DefaultKeyGenerationJob
::
DefaultKeyGenerationJob
Private
())
{
}
DefaultKeyGenerationJob
::~
DefaultKeyGenerationJob
()
{
delete
d
;
}
DefaultKeyGenerationJob
::~
DefaultKeyGenerationJob
()
=
default
;
QString
DefaultKeyGenerationJob
::
auditLogAsHtml
()
const
{
...
...
src/kleo/defaultkeygenerationjob.h
View file @
cf2f6470
...
...
@@ -9,6 +9,7 @@
#include
<qgpgme/job.h>
#include
<kleo_export.h>
#include
<memory>
namespace
GpgME
{
class
KeyGenerationResult
;
...
...
@@ -54,8 +55,8 @@ protected:
bool
eventFilter
(
QObject
*
watched
,
QEvent
*
event
)
override
;
private:
class
Private
;
Private
*
const
d
;
class
DefaultKeyGenerationJob
Private
;
std
::
unique_ptr
<
DefaultKeyGenerationJob
Private
>
const
d
;
};
}
...
...
src/ui/dnattributeorderconfigwidget.cpp
View file @
cf2f6470
...
...
@@ -22,7 +22,7 @@
#include
<QHeaderView>
class
Kleo
::
DNAttributeOrderConfigWidget
::
Private
class
Kleo
::
DNAttributeOrderConfigWidget
::
DNAttributeOrderConfigWidget
Private
{
public:
enum
{
UUp
=
0
,
Up
=
1
,
Left
=
2
,
Right
=
3
,
Down
=
4
,
DDown
=
5
};
...
...
@@ -50,7 +50,7 @@ static void prepare(QTreeWidget *lv)
#endif
Kleo
::
DNAttributeOrderConfigWidget
::
DNAttributeOrderConfigWidget
(
DNAttributeMapper
*
mapper
,
QWidget
*
parent
,
Qt
::
WindowFlags
f
)
:
QWidget
(
parent
,
f
),
d
(
new
Private
)
:
QWidget
(
parent
,
f
),
d
(
new
DNAttributeOrderConfigWidget
Private
)
{
Q_ASSERT
(
mapper
);
d
->
mapper
=
mapper
;
...
...
@@ -122,10 +122,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget(DNAttributeMapp
glay
->
addLayout
(
xlay
,
row
,
1
);
}
Kleo
::
DNAttributeOrderConfigWidget
::~
DNAttributeOrderConfigWidget
()
{
delete
d
;
}
Kleo
::
DNAttributeOrderConfigWidget
::~
DNAttributeOrderConfigWidget
()
=
default
;
void
Kleo
::
DNAttributeOrderConfigWidget
::
load
()
{
...
...
@@ -199,7 +196,7 @@ void Kleo::DNAttributeOrderConfigWidget::defaults()
void
Kleo
::
DNAttributeOrderConfigWidget
::
slotAvailableSelectionChanged
(
QTreeWidgetItem
*
item
)
{
d
->
navTB
[
Private
::
Right
]
->
setEnabled
(
item
);
d
->
navTB
[
DNAttributeOrderConfigWidget
Private
::
Right
]
->
setEnabled
(
item
);
}
void
Kleo
::
DNAttributeOrderConfigWidget
::
slotCurrentOrderSelectionChanged
(
QTreeWidgetItem
*
item
)
...
...
@@ -210,11 +207,11 @@ void Kleo::DNAttributeOrderConfigWidget::slotCurrentOrderSelectionChanged(QTreeW
void
Kleo
::
DNAttributeOrderConfigWidget
::
enableDisableButtons
(
QTreeWidgetItem
*
item
)
{
#ifndef QT_NO_TREEWIDGET
d
->
navTB
[
Private
::
UUp
]
->
setEnabled
(
item
&&
d
->
currentLV
->
itemAbove
(
item
));
d
->
navTB
[
Private
::
Up
]
->
setEnabled
(
item
&&
d
->
currentLV
->
itemAbove
(
item
));
d
->
navTB
[
Private
::
Left
]
->
setEnabled
(
item
);
d
->
navTB
[
Private
::
Down
]
->
setEnabled
(
item
&&
d
->
currentLV
->
itemBelow
(
item
));
d
->
navTB
[
Private
::
DDown
]
->
setEnabled
(
item
&&
d
->
currentLV
->
itemBelow
(
item
));
d
->
navTB
[
DNAttributeOrderConfigWidget
Private
::
UUp
]
->
setEnabled
(
item
&&
d
->
currentLV
->
itemAbove
(
item
));
d
->
navTB
[
DNAttributeOrderConfigWidget
Private
::
Up
]
->
setEnabled
(
item
&&
d
->
currentLV
->
itemAbove
(
item
));
d
->
navTB
[
DNAttributeOrderConfigWidget
Private
::
Left
]
->
setEnabled
(
item
);
d
->
navTB
[
DNAttributeOrderConfigWidget
Private
::
Down
]
->
setEnabled
(
item
&&
d
->
currentLV
->
itemBelow
(
item
));
d
->
navTB
[
DNAttributeOrderConfigWidget
Private
::
DDown
]
->
setEnabled
(
item
&&
d
->
currentLV
->
itemBelow
(
item
));
#endif
}
...
...
@@ -341,7 +338,7 @@ void Kleo::DNAttributeOrderConfigWidget::slotRightButtonClicked()
d
->
currentLV
->
insertTopLevelItem
(
newRightIndex
,
left
);
left
->
setSelected
(
true
);
enableDisableButtons
(
left
);
d
->
navTB
[
Private
::
Right
]
->
setEnabled
(
next
);
d
->
navTB
[
DNAttributeOrderConfigWidget
Private
::
Right
]
->
setEnabled
(
next
);
if
(
next
)
{
next
->
setSelected
(
true
);
}
...
...
src/ui/dnattributeorderconfigwidget.h
View file @
cf2f6470
...
...
@@ -57,8 +57,8 @@ private:
void
enableDisableButtons
(
QTreeWidgetItem
*
);
private:
class
Private
;
Private
*
const
d
;
class
DNAttributeOrderConfigWidget
Private
;
std
::
unique_ptr
<
DNAttributeOrderConfigWidget
Private
>
const
d
;
protected:
virtual
void
virtual_hook
(
int
,
void
*
);
};
...
...
src/ui/filenamerequester.cpp
View file @
cf2f6470
...
...
@@ -22,13 +22,13 @@
using
namespace
Kleo
;
class
Q_DECL_HIDDEN
FileNameRequester
::
Private
class
Q_DECL_HIDDEN
FileNameRequester
::
FileNameRequester
Private
{
friend
class
::
Kleo
::
FileNameRequester
;
FileNameRequester
*
const
q
;
public:
explicit
Private
(
FileNameRequester
*
qq
);
~
Private
();
explicit
FileNameRequester
Private
(
FileNameRequester
*
qq
);
~
FileNameRequester
Private
();
private:
void
slotButtonClicked
();
...
...
@@ -49,7 +49,7 @@ private:
bool
existingOnly
;
};
FileNameRequester
::
Private
::
Private
(
FileNameRequester
*
qq
)
FileNameRequester
::
FileNameRequesterPrivate
::
FileNameRequester
Private
(
FileNameRequester
*
qq
)
:
q
(
qq
),
#ifndef QT_NO_DIRMODEL
dirmodel
(),
...
...
@@ -87,16 +87,16 @@ FileNameRequester::Private::Private(FileNameRequester *qq)
connect
(
&
lineedit
,
&
KLineEdit
::
textChanged
,
q
,
&
FileNameRequester
::
fileNameChanged
);
}
FileNameRequester
::
Private
::~
Private
()
{}
FileNameRequester
::
FileNameRequesterPrivate
::~
FileNameRequester
Private
()
{}
FileNameRequester
::
FileNameRequester
(
QWidget
*
p
)
:
QWidget
(
p
),
d
(
new
Private
(
this
))
:
QWidget
(
p
),
d
(
new
FileNameRequester
Private
(
this
))
{
}
FileNameRequester
::
FileNameRequester
(
QDir
::
Filters
f
,
QWidget
*
p
)
:
QWidget
(
p
),
d
(
new
Private
(
this
))
:
QWidget
(
p
),
d
(
new
FileNameRequester
Private
(
this
))
{
#ifndef QT_NO_DIRMODEL
d
->
dirmodel
.
setFilter
(
f
);
...
...
@@ -105,10 +105,7 @@ FileNameRequester::FileNameRequester(QDir::Filters f, QWidget *p)
#endif
}
FileNameRequester
::~
FileNameRequester
()
{
delete
d
;
}
FileNameRequester
::~
FileNameRequester
()
=
default
;
void
FileNameRequester
::
setFileName
(
const
QString
&
file
)
{
...
...
@@ -158,7 +155,7 @@ QString FileNameRequester::nameFilter() const
return
d
->
nameFilter
;
}
void
FileNameRequester
::
Private
::
slotButtonClicked
()
void
FileNameRequester
::
FileNameRequester
Private
::
slotButtonClicked
()
{
const
QString
fileName
=
q
->
requestFileName
();
if
(
!
fileName
.
isEmpty
())
{
...
...
src/ui/filenamerequester.h
View file @
cf2f6470
...
...
@@ -50,8 +50,8 @@ private:
virtual
QString
requestFileName
();
private:
class
Private
;
Private
*
d
;
class
FileNameRequester
Private
;
std
::
unique_ptr
<
FileNameRequesterPrivate
>
const
d
;
};
}
...
...
src/ui/keyapprovaldialog.cpp
View file @
cf2f6470
...
...
@@ -67,10 +67,10 @@ static QStringList preferencesStrings()
<<
i18n
(
"Ask Whenever Encryption is Possible"
);
}
class
Q_DECL_HIDDEN
Kleo
::
KeyApprovalDialog
::
Private
class
Q_DECL_HIDDEN
Kleo
::
KeyApprovalDialog
::
KeyApprovalDialog
Private
{
public:
Private
()
{}
KeyApprovalDialog
Private
()
{}
Kleo
::
KeyRequester
*
selfRequester
=
nullptr
;
QStringList
addresses
;
...
...
@@ -83,7 +83,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog(const std::vector<Item> &recipients,
const
std
::
vector
<
GpgME
::
Key
>
&
sender
,
QWidget
*
parent
)
:
QDialog
(
parent
),
d
(
new
Private
())
d
(
new
KeyApprovalDialog
Private
())
{
setWindowTitle
(
i18nc
(
"@title:window"
,
"Encryption Key Approval"
));
auto
mainLayout
=
new
QVBoxLayout
(
this
);
...
...
@@ -159,10 +159,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog(const std::vector<Item> &recipients,
qMin
(
size
.
height
(),
7
*
desk
.
height
()
/
8
)));
}
Kleo
::
KeyApprovalDialog
::~
KeyApprovalDialog
()
{
delete
d
;
}
Kleo
::
KeyApprovalDialog
::~
KeyApprovalDialog
()
=
default
;
std
::
vector
<
GpgME
::
Key
>
Kleo
::
KeyApprovalDialog
::
senderKeys
()
const
{
...
...
src/ui/keyapprovaldialog.h
View file @
cf2f6470
...
...
@@ -58,8 +58,8 @@ private Q_SLOTS:
void
slotPrefsChanged
();
private:
class
Private
;
Private
*
const
d
;
class
KeyApprovalDialog
Private
;
std
::
unique_ptr
<
KeyApprovalDialog
Private
>
const
d
;
};
}
// namespace Kleo
...
...
src/ui/keylistview.cpp
View file @
cf2f6470
...
...
@@ -26,10 +26,10 @@
static
const
int
updateDelayMilliSecs
=
500
;
class
Q_DECL_HIDDEN
Kleo
::
KeyListView
::
Private
class
Q_DECL_HIDDEN
Kleo
::
KeyListView
::
KeyListView
Private
{
public:
Private
()
:
updateTimer
(
nullptr
)
{}
KeyListView
Private
()
:
updateTimer
(
nullptr
)
{}
std
::
vector
<
GpgME
::
Key
>
keyBuffer
;
QTimer
*
updateTimer
=
nullptr
;
...
...
@@ -61,7 +61,7 @@ Kleo::KeyListView::KeyListView(const ColumnStrategy *columnStrategy, const Displ
:
QTreeWidget
(
parent
),
mColumnStrategy
(
columnStrategy
),
mDisplayStrategy
(
displayStrategy
),
mHierarchical
(
false
),
d
(
new
Private
())
mHierarchical
(
false
),
d
(
new
KeyListView
Private
())
{
setWindowFlags
(
f
);
setContextMenuPolicy
(
Qt
::
CustomContextMenu
);
...
...
@@ -101,7 +101,6 @@ Kleo::KeyListView::~KeyListView()
clear
();
Q_ASSERT
(
d
->
itemMap
.
size
()
==
0
);
// need to delete the tooltip ourselves, as ~QToolTip isn't virtual :o
delete
d
;
delete
mColumnStrategy
;
mColumnStrategy
=
nullptr
;
delete
mDisplayStrategy
;
mDisplayStrategy
=
nullptr
;
}
...
...
src/ui/keylistview.h
View file @
cf2f6470
...
...
@@ -195,8 +195,8 @@ private:
const
DisplayStrategy
*
mDisplayStrategy
=
nullptr
;
bool
mHierarchical
=
false
;
class
Private
;
Private
*
const
d
;
class
KeyListView
Private
;
std
::
unique_ptr
<
KeyListView
Private
>
const
d
;
};
}
src/ui/keyselectioncombo.cpp
View file @
cf2f6470
...
...
@@ -465,10 +465,7 @@ KeySelectionCombo::KeySelectionCombo(bool secretOnly, QWidget* parent)
QTimer
::
singleShot
(
0
,
this
,
&
KeySelectionCombo
::
init
);
}
KeySelectionCombo
::~
KeySelectionCombo
()
{
delete
d
;
}
KeySelectionCombo
::~
KeySelectionCombo
()
=
default
;
void
KeySelectionCombo
::
init
()
{
...
...
src/ui/keyselectioncombo.h
View file @
cf2f6470
...
...
@@ -66,7 +66,7 @@ protected:
virtual
void
init
();
private:
KeySelectionComboPrivate
*
const
d
;
std
::
unique_ptr
<
KeySelectionComboPrivate
>
const
d
;
};
}
Write
Preview
Supports
Markdown
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