Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
KScreen
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Plasma
KScreen
Commits
5296c911
Commit
5296c911
authored
Oct 25, 2017
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use nullptr here. Use QLatin1Char(...)
parent
67956563
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
kcm/src/declarative/qmloutput.cpp
kcm/src/declarative/qmloutput.cpp
+7
-7
kcm/src/declarative/qmlscreen.cpp
kcm/src/declarative/qmlscreen.cpp
+1
-1
kcm/src/scalingconfig.cpp
kcm/src/scalingconfig.cpp
+1
-1
kded/device.h
kded/device.h
+1
-1
No files found.
kcm/src/declarative/qmloutput.cpp
View file @
5296c911
...
...
@@ -40,12 +40,12 @@ bool operator>(const QSize &sizeA, const QSize &sizeB)
QMLOutput
::
QMLOutput
(
QQuickItem
*
parent
)
:
QQuickItem
(
parent
),
m_screen
(
0
),
m_cloneOf
(
0
),
m_leftDock
(
0
),
m_topDock
(
0
),
m_rightDock
(
0
),
m_bottomDock
(
0
),
m_screen
(
nullptr
),
m_cloneOf
(
nullptr
),
m_leftDock
(
nullptr
),
m_topDock
(
nullptr
),
m_rightDock
(
nullptr
),
m_bottomDock
(
nullptr
),
m_isCloneMode
(
false
)
{
connect
(
this
,
&
QMLOutput
::
xChanged
,
...
...
@@ -91,7 +91,7 @@ QMLScreen *QMLOutput::screen() const
void
QMLOutput
::
setScreen
(
QMLScreen
*
screen
)
{
Q_ASSERT
(
m_screen
==
0
);
Q_ASSERT
(
m_screen
==
nullptr
);
m_screen
=
screen
;
Q_EMIT
screenChanged
();
...
...
kcm/src/declarative/qmlscreen.cpp
View file @
5296c911
...
...
@@ -157,7 +157,7 @@ QMLOutput *QMLScreen::primaryOutput() const
}
}
return
0
;
return
nullptr
;
}
QList
<
QMLOutput
*>
QMLScreen
::
outputs
()
const
...
...
kcm/src/scalingconfig.cpp
View file @
5296c911
...
...
@@ -86,7 +86,7 @@ void ScalingConfig::accept()
QString
screenFactors
;
foreach
(
const
KScreen
::
OutputPtr
&
output
,
m_outputList
)
{
screenFactors
.
append
(
output
->
name
()
+
'='
+
QString
::
number
(
scalingFactor
)
+
';'
);
screenFactors
.
append
(
output
->
name
()
+
QLatin1Char
(
'='
)
+
QString
::
number
(
scalingFactor
)
+
QLatin1Char
(
';'
)
);
}
config
->
group
(
"KScreen"
).
writeEntry
(
"ScreenScaleFactors"
,
screenFactors
);
...
...
kded/device.h
View file @
5296c911
...
...
@@ -49,7 +49,7 @@ Q_SIGNALS:
void
aboutToSuspend
();
private:
explicit
Device
(
QObject
*
parent
=
0
);
explicit
Device
(
QObject
*
parent
=
nullptr
);
virtual
~
Device
();
void
setReady
();
...
...
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