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
Multimedia
Elisa
Commits
45ea00c7
Commit
45ea00c7
authored
May 21, 2021
by
Nate Graham
Browse files
Bump frameworks version to 5.80 and use Q_EMIT consistently
parent
dc67ee9e
Pipeline
#62754
passed with stage
in 8 minutes and 56 seconds
Changes
10
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
45ea00c7
...
...
@@ -22,7 +22,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Network Qml Quick T
find_package
(
Qt5Core
${
REQUIRED_QT_VERSION
}
CONFIG REQUIRED Private
)
set
(
REQUIRED_KF5_VERSION
"5.
77
.0"
)
set
(
REQUIRED_KF5_VERSION
"5.
80
.0"
)
find_package
(
ECM
${
REQUIRED_KF5_VERSION
}
REQUIRED NO_MODULE
)
set
(
CMAKE_MODULE_PATH
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake"
${
ECM_MODULE_PATH
}
)
...
...
src/embeddedcoverageimageprovider.cpp
View file @
45ea00c7
...
...
@@ -47,7 +47,7 @@ public:
}
}
emit
finished
();
Q_EMIT
finished
();
}
QString
mId
;
...
...
src/localFileConfiguration/elisaconfigurationdialog.cpp
View file @
45ea00c7
...
...
@@ -218,7 +218,7 @@ void ElisaConfigurationDialog::setColorScheme(const QString &scheme)
void
ElisaConfigurationDialog
::
removeMusicLocation
(
QString
location
)
{
mRootPath
.
removeAll
(
location
);
emit
rootPathChanged
(
mRootPath
);
Q_EMIT
rootPathChanged
(
mRootPath
);
}
void
ElisaConfigurationDialog
::
configChanged
()
...
...
src/manageheaderbar.cpp
View file @
45ea00c7
...
...
@@ -339,7 +339,7 @@ void ManageHeaderBar::notifyIsValidProperty()
void
ManageHeaderBar
::
setIsValidRole
(
int
isValidRole
)
{
mIsValidRole
=
isValidRole
;
emit
isValidRoleChanged
();
Q_EMIT
isValidRoleChanged
();
}
void
ManageHeaderBar
::
setCurrentTrack
(
const
QPersistentModelIndex
&
currentTrack
)
...
...
src/mediaplaylistproxymodel.cpp
View file @
45ea00c7
...
...
@@ -549,7 +549,7 @@ void MediaPlayListProxyModel::skipPreviousTrack(qint64 position)
}
if
(
position
>
mSeekToBeginningDelay
)
{
emit
seek
(
0
);
Q_EMIT
seek
(
0
);
return
;
}
...
...
src/mpris2/mediaplayer2.cpp
View file @
45ea00c7
...
...
@@ -43,7 +43,7 @@ void MediaPlayer2::Quit()
void
MediaPlayer2
::
Raise
()
{
emit
raisePlayer
();
Q_EMIT
raisePlayer
();
}
QString
MediaPlayer2
::
Identity
()
const
...
...
src/mpris2/mediaplayer2player.cpp
View file @
45ea00c7
...
...
@@ -118,7 +118,7 @@ bool MediaPlayer2Player::CanGoNext() const
void
MediaPlayer2Player
::
Next
()
{
emit
next
();
Q_EMIT
next
();
if
(
m_playListControler
)
{
m_playListControler
->
skipNextTrack
();
...
...
@@ -132,7 +132,7 @@ bool MediaPlayer2Player::CanGoPrevious() const
void
MediaPlayer2Player
::
Previous
()
{
emit
previous
();
Q_EMIT
previous
();
if
(
m_playListControler
)
{
m_playListControler
->
skipPreviousTrack
(
m_audioPlayer
->
position
());
...
...
@@ -153,7 +153,7 @@ void MediaPlayer2Player::Pause()
void
MediaPlayer2Player
::
PlayPause
()
{
emit
playPause
();
Q_EMIT
playPause
();
if
(
m_playListControler
)
{
m_manageAudioPlayer
->
playPause
();
...
...
@@ -162,7 +162,7 @@ void MediaPlayer2Player::PlayPause()
void
MediaPlayer2Player
::
Stop
()
{
emit
stop
();
Q_EMIT
stop
();
if
(
m_playListControler
)
{
m_manageAudioPlayer
->
stop
();
...
...
@@ -189,7 +189,7 @@ double MediaPlayer2Player::Volume() const
void
MediaPlayer2Player
::
setVolume
(
double
volume
)
{
m_volume
=
qBound
(
0.0
,
volume
,
1.0
);
emit
volumeChanged
(
m_volume
);
Q_EMIT
volumeChanged
(
m_volume
);
m_audioPlayer
->
setVolume
(
100
*
m_volume
);
...
...
@@ -238,7 +238,7 @@ void MediaPlayer2Player::setRate(double newRate)
Pause
();
}
else
{
m_rate
=
qBound
(
MinimumRate
(),
newRate
,
MaximumRate
());
emit
rateChanged
(
m_rate
);
Q_EMIT
rateChanged
(
m_rate
);
signalPropertiesChange
(
QStringLiteral
(
"Rate"
),
Rate
());
}
...
...
@@ -304,8 +304,8 @@ void MediaPlayer2Player::playControlEnabledChanged()
signalPropertiesChange
(
QStringLiteral
(
"CanPause"
),
CanPause
());
signalPropertiesChange
(
QStringLiteral
(
"CanPlay"
),
CanPlay
());
emit
canPauseChanged
();
emit
canPlayChanged
();
Q_EMIT
canPauseChanged
();
Q_EMIT
canPlayChanged
();
}
void
MediaPlayer2Player
::
skipBackwardControlEnabledChanged
()
...
...
@@ -317,7 +317,7 @@ void MediaPlayer2Player::skipBackwardControlEnabledChanged()
m_canGoPrevious
=
m_manageMediaPlayerControl
->
skipBackwardControlEnabled
();
signalPropertiesChange
(
QStringLiteral
(
"CanGoPrevious"
),
CanGoPrevious
());
emit
canGoPreviousChanged
();
Q_EMIT
canGoPreviousChanged
();
}
void
MediaPlayer2Player
::
skipForwardControlEnabledChanged
()
...
...
@@ -329,13 +329,13 @@ void MediaPlayer2Player::skipForwardControlEnabledChanged()
m_canGoNext
=
m_manageMediaPlayerControl
->
skipForwardControlEnabled
();
signalPropertiesChange
(
QStringLiteral
(
"CanGoNext"
),
CanGoNext
());
emit
canGoNextChanged
();
Q_EMIT
canGoNextChanged
();
}
void
MediaPlayer2Player
::
playerPlaybackStateChanged
()
{
signalPropertiesChange
(
QStringLiteral
(
"PlaybackStatus"
),
PlaybackStatus
());
emit
playbackStatusChanged
();
Q_EMIT
playbackStatusChanged
();
playerIsSeekableChanged
();
}
...
...
@@ -345,7 +345,7 @@ void MediaPlayer2Player::playerIsSeekableChanged()
m_playerIsSeekableChanged
=
m_manageAudioPlayer
->
playerIsSeekable
();
signalPropertiesChange
(
QStringLiteral
(
"CanSeek"
),
CanSeek
());
emit
canSeekChanged
();
Q_EMIT
canSeekChanged
();
}
void
MediaPlayer2Player
::
audioPositionChanged
()
...
...
@@ -385,7 +385,7 @@ void MediaPlayer2Player::setCurrentTrack(int newTrackPosition)
m_currentTrack
=
m_manageAudioPlayer
->
playerSource
().
toString
();
m_currentTrackId
=
QDBusObjectPath
(
QLatin1String
(
"/org/kde/elisa/playlist/"
)
+
QString
::
number
(
newTrackPosition
)).
path
();
emit
currentTrackChanged
();
Q_EMIT
currentTrackChanged
();
m_metadata
=
getMetadataOfCurrentTrack
();
signalPropertiesChange
(
QStringLiteral
(
"Metadata"
),
Metadata
());
...
...
@@ -466,16 +466,16 @@ void MediaPlayer2Player::setMediaPlayerPresent(int status)
{
if
(
m_mediaPlayerPresent
!=
status
)
{
m_mediaPlayerPresent
=
status
;
emit
mediaPlayerPresentChanged
();
Q_EMIT
mediaPlayerPresentChanged
();
signalPropertiesChange
(
QStringLiteral
(
"CanGoNext"
),
CanGoNext
());
signalPropertiesChange
(
QStringLiteral
(
"CanGoPrevious"
),
CanGoPrevious
());
signalPropertiesChange
(
QStringLiteral
(
"CanPause"
),
CanPause
());
signalPropertiesChange
(
QStringLiteral
(
"CanPlay"
),
CanPlay
());
emit
canGoNextChanged
();
emit
canGoPreviousChanged
();
emit
canPauseChanged
();
emit
canPlayChanged
();
Q_EMIT
canGoNextChanged
();
Q_EMIT
canGoPreviousChanged
();
Q_EMIT
canPauseChanged
();
Q_EMIT
canPlayChanged
();
}
}
...
...
src/mpris2/mpris2.cpp
View file @
45ea00c7
...
...
@@ -104,7 +104,7 @@ void Mpris2::setPlayerName(const QString &playerName)
}
}
emit
playerNameChanged
();
Q_EMIT
playerNameChanged
();
}
void
Mpris2
::
setPlayListModel
(
MediaPlayListProxyModel
*
playListModel
)
...
...
@@ -121,7 +121,7 @@ void Mpris2::setPlayListModel(MediaPlayListProxyModel *playListModel)
}
}
emit
playListModelChanged
();
Q_EMIT
playListModelChanged
();
}
void
Mpris2
::
setAudioPlayerManager
(
ManageAudioPlayer
*
manageAudioPlayer
)
...
...
@@ -138,7 +138,7 @@ void Mpris2::setAudioPlayerManager(ManageAudioPlayer *manageAudioPlayer)
}
}
emit
audioPlayerManagerChanged
();
Q_EMIT
audioPlayerManagerChanged
();
}
void
Mpris2
::
setManageMediaPlayerControl
(
ManageMediaPlayerControl
*
manageMediaPlayerControl
)
...
...
@@ -155,7 +155,7 @@ void Mpris2::setManageMediaPlayerControl(ManageMediaPlayerControl *manageMediaPl
}
}
emit
manageMediaPlayerControlChanged
();
Q_EMIT
manageMediaPlayerControlChanged
();
}
void
Mpris2
::
setHeaderBarManager
(
ManageHeaderBar
*
manageHeaderBar
)
...
...
@@ -171,7 +171,7 @@ void Mpris2::setHeaderBarManager(ManageHeaderBar *manageHeaderBar)
}
}
emit
headerBarManagerChanged
();
Q_EMIT
headerBarManagerChanged
();
}
void
Mpris2
::
setAudioPlayer
(
AudioWrapper
*
audioPlayer
)
...
...
@@ -187,7 +187,7 @@ void Mpris2::setAudioPlayer(AudioWrapper *audioPlayer)
}
}
emit
audioPlayerChanged
();
Q_EMIT
audioPlayerChanged
();
}
void
Mpris2
::
setShowProgressOnTaskBar
(
bool
value
)
...
...
src/musiclistenersmanager.cpp
View file @
45ea00c7
...
...
@@ -261,7 +261,7 @@ void MusicListenersManager::setElisaApplication(ElisaApplication *elisaApplicati
}
d
->
mElisaApplication
=
elisaApplication
;
emit
elisaApplicationChanged
();
Q_EMIT
elisaApplicationChanged
();
}
void
MusicListenersManager
::
playBackError
(
const
QUrl
&
sourceInError
,
QMediaPlayer
::
Error
playerError
)
...
...
src/upnp/didlparser.cpp
View file @
45ea00c7
...
...
@@ -146,7 +146,7 @@ void DidlParser::setParentId(QString parentId)
}
d
->
mParentId
=
std
::
move
(
parentId
);
emit
parentIdChanged
();
Q_EMIT
parentIdChanged
();
}
void
DidlParser
::
setDeviceUUID
(
QString
deviceUUID
)
...
...
@@ -156,7 +156,7 @@ void DidlParser::setDeviceUUID(QString deviceUUID)
}
d
->
mDeviceUUID
=
std
::
move
(
deviceUUID
);
emit
deviceUUIDChanged
();
Q_EMIT
deviceUUIDChanged
();
}
void
DidlParser
::
systemUpdateIDChanged
()
...
...
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