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
Akonadi
Commits
405a168d
Commit
405a168d
authored
Oct 12, 2021
by
Laurent Montel
😁
Browse files
Rename some private class
parent
246c2ee7
Pipeline
#88074
canceled with stage
Changes
14
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/core/agentconfigurationbase.cpp
View file @
405a168d
...
...
@@ -13,10 +13,10 @@
namespace
Akonadi
{
class
Q_DECL_HIDDEN
AgentConfigurationBase
::
Private
class
Q_DECL_HIDDEN
AgentConfigurationBase
::
AgentConfigurationBase
Private
{
public:
Private
(
const
KSharedConfigPtr
&
config
,
QWidget
*
parentWidget
,
const
QVariantList
&
args
)
AgentConfigurationBase
Private
(
const
KSharedConfigPtr
&
config
,
QWidget
*
parentWidget
,
const
QVariantList
&
args
)
:
config
(
config
)
,
parentWidget
(
parentWidget
)
{
...
...
@@ -39,7 +39,7 @@ using namespace Akonadi;
AgentConfigurationBase
::
AgentConfigurationBase
(
const
KSharedConfigPtr
&
config
,
QWidget
*
parentWidget
,
const
QVariantList
&
args
)
:
QObject
(
reinterpret_cast
<
QObject
*>
(
parentWidget
))
,
d
(
new
Private
(
config
,
parentWidget
,
args
))
,
d
(
new
AgentConfigurationBase
Private
(
config
,
parentWidget
,
args
))
{
}
...
...
src/core/agentconfigurationbase.h
View file @
405a168d
...
...
@@ -149,9 +149,9 @@ Q_SIGNALS:
void
enableOkButton
(
bool
enabled
);
private:
class
Private
;
friend
class
Private
;
std
::
unique_ptr
<
Private
>
const
d
;
class
AgentConfigurationBase
Private
;
friend
class
AgentConfigurationBase
Private
;
std
::
unique_ptr
<
AgentConfigurationBase
Private
>
const
d
;
};
}
// namespace
...
...
src/core/agenttype.cpp
View file @
405a168d
...
...
@@ -12,7 +12,7 @@
using
namespace
Akonadi
;
AgentType
::
AgentType
()
:
d
(
new
Private
)
:
d
(
new
AgentType
Private
)
{
}
...
...
src/core/agenttype.h
View file @
405a168d
...
...
@@ -125,8 +125,8 @@ public:
private:
/// @cond PRIVATE
class
Private
;
QSharedDataPointer
<
Private
>
d
;
class
AgentType
Private
;
QSharedDataPointer
<
AgentType
Private
>
d
;
/// @endcond
};
...
...
src/core/agenttype_p.h
View file @
405a168d
...
...
@@ -15,14 +15,14 @@ namespace Akonadi
/**
* @internal
*/
class
AgentType
::
Private
:
public
QSharedData
class
AgentType
::
AgentType
Private
:
public
QSharedData
{
public:
Private
()
AgentType
Private
()
{
}
Private
(
const
Private
&
other
)
AgentType
Private
(
const
AgentType
Private
&
other
)
:
QSharedData
(
other
)
{
mIdentifier
=
other
.
mIdentifier
;
...
...
src/core/models/agentinstancemodel.cpp
View file @
405a168d
...
...
@@ -18,10 +18,10 @@ using namespace Akonadi;
/**
* @internal
*/
class
Q_DECL_HIDDEN
AgentInstanceModel
::
Private
class
AgentInstanceModel
::
AgentInstanceModel
Private
{
public:
explicit
Private
(
AgentInstanceModel
*
parent
)
explicit
AgentInstanceModel
Private
(
AgentInstanceModel
*
parent
)
:
mParent
(
parent
)
{
}
...
...
@@ -34,14 +34,14 @@ public:
void
instanceChanged
(
const
AgentInstance
&
/*instance*/
);
};
void
AgentInstanceModel
::
Private
::
instanceAdded
(
const
AgentInstance
&
instance
)
void
AgentInstanceModel
::
AgentInstanceModel
Private
::
instanceAdded
(
const
AgentInstance
&
instance
)
{
mParent
->
beginInsertRows
(
QModelIndex
(),
mInstances
.
count
(),
mInstances
.
count
());
mInstances
.
append
(
instance
);
mParent
->
endInsertRows
();
}
void
AgentInstanceModel
::
Private
::
instanceRemoved
(
const
AgentInstance
&
instance
)
void
AgentInstanceModel
::
AgentInstanceModel
Private
::
instanceRemoved
(
const
AgentInstance
&
instance
)
{
const
int
index
=
mInstances
.
indexOf
(
instance
);
if
(
index
==
-
1
)
{
...
...
@@ -53,7 +53,7 @@ void AgentInstanceModel::Private::instanceRemoved(const AgentInstance &instance)
mParent
->
endRemoveRows
();
}
void
AgentInstanceModel
::
Private
::
instanceChanged
(
const
AgentInstance
&
instance
)
void
AgentInstanceModel
::
AgentInstanceModel
Private
::
instanceChanged
(
const
AgentInstance
&
instance
)
{
const
int
numberOfInstance
(
mInstances
.
count
());
for
(
int
i
=
0
;
i
<
numberOfInstance
;
++
i
)
{
...
...
@@ -71,7 +71,7 @@ void AgentInstanceModel::Private::instanceChanged(const AgentInstance &instance)
AgentInstanceModel
::
AgentInstanceModel
(
QObject
*
parent
)
:
QAbstractItemModel
(
parent
)
,
d
(
new
Private
(
this
))
,
d
(
new
AgentInstanceModel
Private
(
this
))
{
d
->
mInstances
=
AgentManager
::
self
()
->
instances
();
...
...
src/core/models/agentinstancemodel.h
View file @
405a168d
...
...
@@ -82,8 +82,8 @@ public:
private:
/// @cond PRIVATE
class
Private
;
std
::
unique_ptr
<
Private
>
const
d
;
class
AgentInstanceModel
Private
;
std
::
unique_ptr
<
AgentInstanceModel
Private
>
const
d
;
/// @endcond
};
...
...
src/core/models/agenttypemodel.cpp
View file @
405a168d
...
...
@@ -15,10 +15,10 @@ using namespace Akonadi;
/**
* @internal
*/
class
Q_DECL_HIDDEN
AgentTypeModel
::
Private
class
AgentTypeModel
::
AgentTypeModel
Private
{
public:
explicit
Private
(
AgentTypeModel
*
parent
)
explicit
AgentTypeModel
Private
(
AgentTypeModel
*
parent
)
:
mParent
(
parent
)
{
mTypes
=
AgentManager
::
self
()
->
types
();
...
...
@@ -31,14 +31,14 @@ public:
void
typeRemoved
(
const
AgentType
&
agentType
);
};
void
AgentTypeModel
::
Private
::
typeAdded
(
const
AgentType
&
agentType
)
void
AgentTypeModel
::
AgentTypeModel
Private
::
typeAdded
(
const
AgentType
&
agentType
)
{
mTypes
.
append
(
agentType
);
Q_EMIT
mParent
->
layoutChanged
();
}
void
AgentTypeModel
::
Private
::
typeRemoved
(
const
AgentType
&
agentType
)
void
AgentTypeModel
::
AgentTypeModel
Private
::
typeRemoved
(
const
AgentType
&
agentType
)
{
mTypes
.
removeAll
(
agentType
);
...
...
@@ -47,7 +47,7 @@ void AgentTypeModel::Private::typeRemoved(const AgentType &agentType)
AgentTypeModel
::
AgentTypeModel
(
QObject
*
parent
)
:
QAbstractItemModel
(
parent
)
,
d
(
new
Private
(
this
))
,
d
(
new
AgentTypeModel
Private
(
this
))
{
connect
(
AgentManager
::
self
(),
&
AgentManager
::
typeAdded
,
this
,
[
this
](
const
Akonadi
::
AgentType
&
type
)
{
d
->
typeAdded
(
type
);
...
...
src/core/models/agenttypemodel.h
View file @
405a168d
...
...
@@ -72,8 +72,8 @@ public:
private:
/// @cond PRIVATE
class
Private
;
std
::
unique_ptr
<
Private
>
const
d
;
class
AgentTypeModel
Private
;
std
::
unique_ptr
<
AgentTypeModel
Private
>
const
d
;
/// @endcond
};
...
...
src/widgets/agentactionmanager.cpp
View file @
405a168d
...
...
@@ -41,10 +41,10 @@ static_assert(numAgentActionData == AgentActionManager::LastType, "agentActionDa
/**
* @internal
*/
class
Q_DECL_HIDDEN
AgentActionManager
::
Private
class
Q_DECL_HIDDEN
AgentActionManager
::
AgentActionManager
Private
{
public:
explicit
Private
(
AgentActionManager
*
parent
)
explicit
AgentActionManager
Private
(
AgentActionManager
*
parent
)
:
q
(
parent
)
{
mActions
.
fill
(
nullptr
,
AgentActionManager
::
LastType
);
...
...
@@ -213,7 +213,7 @@ public:
AgentActionManager
::
AgentActionManager
(
KActionCollection
*
actionCollection
,
QWidget
*
parent
)
:
QObject
(
parent
)
,
d
(
new
Private
(
this
))
,
d
(
new
AgentActionManager
Private
(
this
))
{
d
->
mParentWidget
=
parent
;
d
->
mActionCollection
=
actionCollection
;
...
...
src/widgets/agentactionmanager.h
View file @
405a168d
...
...
@@ -154,8 +154,8 @@ Q_SIGNALS:
private:
/// @cond PRIVATE
class
Private
;
std
::
unique_ptr
<
Private
>
const
d
;
class
AgentActionManager
Private
;
std
::
unique_ptr
<
AgentActionManager
Private
>
const
d
;
Q_PRIVATE_SLOT
(
d
,
void
updateActions
())
...
...
src/widgets/agentconfigurationwidget.cpp
View file @
405a168d
...
...
@@ -26,16 +26,16 @@
using
namespace
Akonadi
;
using
namespace
std
::
chrono_literals
;
AgentConfigurationWidget
::
Private
::
Private
(
const
AgentInstance
&
instance
)
AgentConfigurationWidget
::
AgentConfigurationWidgetPrivate
::
AgentConfigurationWidget
Private
(
const
AgentInstance
&
instance
)
:
agentInstance
(
instance
)
{
}
AgentConfigurationWidget
::
Private
::~
Private
()
AgentConfigurationWidget
::
AgentConfigurationWidgetPrivate
::~
AgentConfigurationWidget
Private
()
{
}
void
AgentConfigurationWidget
::
Private
::
setupErrorWidget
(
QWidget
*
parent
,
const
QString
&
text
)
void
AgentConfigurationWidget
::
AgentConfigurationWidget
Private
::
setupErrorWidget
(
QWidget
*
parent
,
const
QString
&
text
)
{
auto
layout
=
new
QVBoxLayout
(
parent
);
layout
->
addStretch
(
2
);
...
...
@@ -45,7 +45,7 @@ void AgentConfigurationWidget::Private::setupErrorWidget(QWidget *parent, const
layout
->
addStretch
(
2
);
}
bool
AgentConfigurationWidget
::
Private
::
loadPlugin
(
const
QString
&
pluginPath
)
bool
AgentConfigurationWidget
::
AgentConfigurationWidget
Private
::
loadPlugin
(
const
QString
&
pluginPath
)
{
if
(
pluginPath
.
isEmpty
())
{
qCDebug
(
AKONADIWIDGETS_LOG
)
<<
"Haven't found config plugin for"
<<
agentInstance
.
type
().
identifier
();
...
...
@@ -71,7 +71,7 @@ bool AgentConfigurationWidget::Private::loadPlugin(const QString &pluginPath)
AgentConfigurationWidget
::
AgentConfigurationWidget
(
const
AgentInstance
&
instance
,
QWidget
*
parent
)
:
QWidget
(
parent
)
,
d
(
new
Private
(
instance
))
,
d
(
new
AgentConfigurationWidget
Private
(
instance
))
{
if
(
AgentConfigurationManager
::
self
()
->
registerInstanceConfiguration
(
instance
.
identifier
()))
{
const
auto
pluginPath
=
AgentConfigurationManager
::
self
()
->
findConfigPlugin
(
instance
.
type
().
identifier
());
...
...
src/widgets/agentconfigurationwidget.h
View file @
405a168d
...
...
@@ -41,10 +41,10 @@ protected:
void
childEvent
(
QChildEvent
*
event
)
override
;
private:
class
Private
;
friend
class
Private
;
class
AgentConfigurationWidget
Private
;
friend
class
AgentConfigurationWidget
Private
;
friend
class
AgentConfigurationDialog
;
std
::
unique_ptr
<
Private
>
const
d
;
std
::
unique_ptr
<
AgentConfigurationWidget
Private
>
const
d
;
};
}
...
...
src/widgets/agentconfigurationwidget_p.h
View file @
405a168d
...
...
@@ -17,7 +17,7 @@
namespace
Akonadi
{
class
Q_DECL_HIDDEN
AgentConfigurationWidget
::
Private
class
Q_DECL_HIDDEN
AgentConfigurationWidget
::
AgentConfigurationWidget
Private
{
private:
struct
PluginLoaderDeleter
{
...
...
@@ -29,8 +29,8 @@ private:
};
public:
Private
(
const
AgentInstance
&
instance
);
~
Private
();
AgentConfigurationWidget
Private
(
const
AgentInstance
&
instance
);
~
AgentConfigurationWidget
Private
();
void
setupErrorWidget
(
QWidget
*
parent
,
const
QString
&
text
);
bool
loadPlugin
(
const
QString
&
pluginPath
);
...
...
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