Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-libclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-libclient
Commits
d4104b7b
Commit
d4104b7b
authored
6 years ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
renderers: replace QScopedPointer by std::unique_ptr
Change-Id: Ib0cd0c1444a185c578e83b85673a6a1d04060e98
parent
f9ca31c6
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/directrenderer.cpp
+1
-1
1 addition, 1 deletion
src/directrenderer.cpp
src/directrenderer.h
+1
-2
1 addition, 2 deletions
src/directrenderer.h
src/shmrenderer.cpp
+2
-1
2 additions, 1 deletion
src/shmrenderer.cpp
src/shmrenderer.h
+1
-2
1 addition, 2 deletions
src/shmrenderer.h
with
5 additions
and
6 deletions
src/directrenderer.cpp
+
1
−
1
View file @
d4104b7b
...
@@ -69,7 +69,7 @@ q_ptr(parent)
...
@@ -69,7 +69,7 @@ q_ptr(parent)
///Constructor
///Constructor
Video
::
DirectRenderer
::
DirectRenderer
(
const
QByteArray
&
id
,
const
QSize
&
res
)
:
Video
::
DirectRenderer
::
DirectRenderer
(
const
QByteArray
&
id
,
const
QSize
&
res
)
:
Renderer
(
id
,
res
),
Renderer
(
id
,
res
),
d_ptr
(
new
DirectRendererPrivate
(
this
))
d_ptr
(
std
::
make_unique
<
DirectRendererPrivate
>
(
this
))
{
{
setObjectName
(
"Video::DirectRenderer:"
+
id
);
setObjectName
(
"Video::DirectRenderer:"
+
id
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/directrenderer.h
+
1
−
2
View file @
d4104b7b
...
@@ -60,8 +60,7 @@ public Q_SLOTS:
...
@@ -60,8 +60,7 @@ public Q_SLOTS:
virtual
void
stopRendering
()
override
;
virtual
void
stopRendering
()
override
;
private:
private:
QScopedPointer
<
DirectRendererPrivate
>
d_ptr
;
std
::
unique_ptr
<
DirectRendererPrivate
>
d_ptr
;
Q_DECLARE_PRIVATE
(
DirectRenderer
)
};
};
}
}
...
...
This diff is collapsed.
Click to expand it.
src/shmrenderer.cpp
+
2
−
1
View file @
d4104b7b
...
@@ -79,6 +79,7 @@ class ShmRendererPrivate final : public QObject
...
@@ -79,6 +79,7 @@ class ShmRendererPrivate final : public QObject
public:
public:
ShmRendererPrivate
(
ShmRenderer
*
parent
);
ShmRendererPrivate
(
ShmRenderer
*
parent
);
//Types
//Types
using
TimePoint
=
std
::
chrono
::
time_point
<
std
::
chrono
::
system_clock
>
;
using
TimePoint
=
std
::
chrono
::
time_point
<
std
::
chrono
::
system_clock
>
;
...
@@ -128,7 +129,7 @@ ShmRendererPrivate::ShmRendererPrivate(ShmRenderer* parent)
...
@@ -128,7 +129,7 @@ ShmRendererPrivate::ShmRendererPrivate(ShmRenderer* parent)
/// Constructor
/// Constructor
ShmRenderer
::
ShmRenderer
(
const
QByteArray
&
id
,
const
QString
&
shmPath
,
const
QSize
&
res
)
ShmRenderer
::
ShmRenderer
(
const
QByteArray
&
id
,
const
QString
&
shmPath
,
const
QSize
&
res
)
:
Renderer
(
id
,
res
)
:
Renderer
(
id
,
res
)
,
d_ptr
(
new
ShmRendererPrivate
(
this
))
,
d_ptr
(
std
::
make_unique
<
ShmRendererPrivate
>
(
this
))
{
{
d_ptr
->
m_ShmPath
=
shmPath
;
d_ptr
->
m_ShmPath
=
shmPath
;
setObjectName
(
"Video::Renderer:"
+
id
);
setObjectName
(
"Video::Renderer:"
+
id
);
...
...
This diff is collapsed.
Click to expand it.
src/shmrenderer.h
+
1
−
2
View file @
d4104b7b
...
@@ -63,8 +63,7 @@ public:
...
@@ -63,8 +63,7 @@ public:
void
setShmPath
(
const
QString
&
path
);
void
setShmPath
(
const
QString
&
path
);
private:
private:
QScopedPointer
<
ShmRendererPrivate
>
d_ptr
;
std
::
unique_ptr
<
ShmRendererPrivate
>
d_ptr
;
Q_DECLARE_PRIVATE
(
ShmRenderer
)
public
Q_SLOTS
:
public
Q_SLOTS
:
void
startRendering
()
override
;
void
startRendering
()
override
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment