Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb50171' into 'master'
[qt] Replace Qt keywords with macros. JB#50171

See merge request mer-core/qtmpris!5
  • Loading branch information
Andrew Branson committed Jun 12, 2020
2 parents d68eaef + 21a93a7 commit 21a4f35
Show file tree
Hide file tree
Showing 11 changed files with 88 additions and 88 deletions.
12 changes: 6 additions & 6 deletions src/mpriscontroller.cpp
Expand Up @@ -656,11 +656,11 @@ void MprisController::onCanControlChanged()
// I could disconnect and re-connect the signals so I avoid
// double arriving signals but this really shouldn't happen
// ever.
emit canGoNextChanged();
emit canGoPreviousChanged();
emit canPauseChanged();
emit canPlayChanged();
emit canSeekChanged();
Q_EMIT canGoNextChanged();
Q_EMIT canGoPreviousChanged();
Q_EMIT canPauseChanged();
Q_EMIT canPlayChanged();
Q_EMIT canSeekChanged();
qWarning() << Q_FUNC_INFO
<< "CanControl is not supposed to change its value!";
return;
Expand All @@ -672,7 +672,7 @@ void MprisController::onCanControlChanged()
void MprisController::onPositionChanged(qlonglong aPosition)
{
m_requestedPosition = false;
emit positionChanged(aPosition);
Q_EMIT positionChanged(aPosition);
}


Expand Down
4 changes: 2 additions & 2 deletions src/mpriscontroller.h
Expand Up @@ -101,7 +101,7 @@ class MPRIS_QT_EXPORT MprisController : public QObject
bool setPosition(const QString &aTrackId, qlonglong position);
bool stop();

public slots:
public Q_SLOTS:

QString service() const;

Expand Down Expand Up @@ -161,7 +161,7 @@ public slots:
double volume() const;
void setVolume(double volume);

signals:
Q_SIGNALS:

// Mpris2 Root Interface
void canQuitChanged();
Expand Down
12 changes: 6 additions & 6 deletions src/mprismanager.cpp
Expand Up @@ -151,7 +151,7 @@ void MprisManager::setSingleService(bool single)
}

m_singleService = single;
emit singleServiceChanged();
Q_EMIT singleServiceChanged();
}

QString MprisManager::currentService() const
Expand Down Expand Up @@ -416,7 +416,7 @@ void MprisManager::onServiceAppeared(const QString &service)

if (controller == m_currentController) {
m_availableControllers.prepend(controller);
emit availableServicesChanged();
Q_EMIT availableServicesChanged();
return;
}

Expand All @@ -431,7 +431,7 @@ void MprisManager::onServiceAppeared(const QString &service)
}
}

emit availableServicesChanged();
Q_EMIT availableServicesChanged();
}

void MprisManager::onServiceVanished(const QString &service)
Expand All @@ -445,7 +445,7 @@ void MprisManager::onServiceVanished(const QString &service)

if (!m_currentController.isNull() && service == m_currentController->service()) {
if (m_singleService) {
emit availableServicesChanged();
Q_EMIT availableServicesChanged();
return;
}

Expand All @@ -456,7 +456,7 @@ void MprisManager::onServiceVanished(const QString &service)
}
}

emit availableServicesChanged();
Q_EMIT availableServicesChanged();
}

void MprisManager::onAvailableControllerPlaybackStatusChanged(const QString &service)
Expand Down Expand Up @@ -583,7 +583,7 @@ void MprisManager::setCurrentController(QSharedPointer<MprisController> controll
}
}

emit currentServiceChanged();
Q_EMIT currentServiceChanged();
}

bool MprisManager::checkController(const char *callerName) const
Expand Down
4 changes: 2 additions & 2 deletions src/mprismanager.h
Expand Up @@ -100,7 +100,7 @@ class MPRIS_QT_EXPORT MprisManager : public QObject
Q_INVOKABLE bool setPosition(const QString &trackId, qlonglong position) const;
Q_INVOKABLE bool stop() const;

public slots:
public Q_SLOTS:

bool singleService() const;
void setSingleService(bool single);
Expand Down Expand Up @@ -166,7 +166,7 @@ public slots:
double volume() const;
void setVolume(double volume);

signals:
Q_SIGNALS:
void singleServiceChanged();
void currentServiceChanged();
void availableServicesChanged();
Expand Down
50 changes: 25 additions & 25 deletions src/mprisplayer.cpp
Expand Up @@ -95,7 +95,7 @@ void MprisPlayer::setServiceName(const QString &serviceName)
m_serviceName = serviceName;
registerService();

emit serviceNameChanged();
Q_EMIT serviceNameChanged();
}


Expand All @@ -112,7 +112,7 @@ void MprisPlayer::setCanQuit(bool canQuit)
}

m_canQuit = canQuit;
emit canQuitChanged();
Q_EMIT canQuitChanged();
}

bool MprisPlayer::canRaise() const
Expand All @@ -127,7 +127,7 @@ void MprisPlayer::setCanRaise(bool canRaise)
}

m_canRaise = canRaise;
emit canRaiseChanged();
Q_EMIT canRaiseChanged();
}

bool MprisPlayer::canSetFullscreen() const
Expand All @@ -142,7 +142,7 @@ void MprisPlayer::setCanSetFullscreen(bool canSetFullscreen)
}

m_canSetFullscreen = canSetFullscreen;
emit canSetFullscreenChanged();
Q_EMIT canSetFullscreenChanged();
}

QString MprisPlayer::desktopEntry() const
Expand All @@ -157,7 +157,7 @@ void MprisPlayer::setDesktopEntry(const QString &desktopEntry)
}

m_desktopEntry = desktopEntry;
emit desktopEntryChanged();
Q_EMIT desktopEntryChanged();
}

bool MprisPlayer::fullscreen() const
Expand All @@ -172,7 +172,7 @@ void MprisPlayer::setFullscreen(bool fullscreen)
}

m_fullscreen = fullscreen;
emit fullscreenChanged();
Q_EMIT fullscreenChanged();
}

bool MprisPlayer::hasTrackList() const
Expand All @@ -187,7 +187,7 @@ void MprisPlayer::setHasTrackList(bool hasTrackList)
}

m_hasTrackList = hasTrackList;
emit hasTrackListChanged();
Q_EMIT hasTrackListChanged();
}

QString MprisPlayer::identity() const
Expand All @@ -202,7 +202,7 @@ void MprisPlayer::setIdentity(const QString &identity)
}

m_identity = identity;
emit identityChanged();
Q_EMIT identityChanged();
}

QStringList MprisPlayer::supportedUriSchemes() const
Expand All @@ -217,7 +217,7 @@ void MprisPlayer::setSupportedUriSchemes(const QStringList &supportedUriSchemes)
}

m_supportedUriSchemes = supportedUriSchemes;
emit supportedUriSchemesChanged();
Q_EMIT supportedUriSchemesChanged();
}

QStringList MprisPlayer::supportedMimeTypes() const
Expand All @@ -232,7 +232,7 @@ void MprisPlayer::setSupportedMimeTypes(const QStringList &supportedMimeTypes)
}

m_supportedMimeTypes = supportedMimeTypes;
emit supportedMimeTypesChanged();
Q_EMIT supportedMimeTypesChanged();
}

// Mpris2 Player Interface
Expand All @@ -248,7 +248,7 @@ void MprisPlayer::setCanControl(bool canControl)
}

m_canControl = canControl;
emit canControlChanged();
Q_EMIT canControlChanged();
}

bool MprisPlayer::canGoNext() const
Expand All @@ -263,7 +263,7 @@ void MprisPlayer::setCanGoNext(bool canGoNext)
}

m_canGoNext = canGoNext;
emit canGoNextChanged();
Q_EMIT canGoNextChanged();
}

bool MprisPlayer::canGoPrevious() const
Expand All @@ -278,7 +278,7 @@ void MprisPlayer::setCanGoPrevious(bool canGoPrevious)
}

m_canGoPrevious = canGoPrevious;
emit canGoPreviousChanged();
Q_EMIT canGoPreviousChanged();
}

bool MprisPlayer::canPause() const
Expand All @@ -293,7 +293,7 @@ void MprisPlayer::setCanPause(bool canPause)
}

m_canPause = canPause;
emit canPauseChanged();
Q_EMIT canPauseChanged();
}

bool MprisPlayer::canPlay() const
Expand All @@ -308,7 +308,7 @@ void MprisPlayer::setCanPlay(bool canPlay)
}

m_canPlay = canPlay;
emit canPlayChanged();
Q_EMIT canPlayChanged();
}

bool MprisPlayer::canSeek() const
Expand All @@ -323,7 +323,7 @@ void MprisPlayer::setCanSeek(bool canSeek)
}

m_canSeek = canSeek;
emit canSeekChanged();
Q_EMIT canSeekChanged();
}

Mpris::LoopStatus MprisPlayer::loopStatus() const
Expand All @@ -338,7 +338,7 @@ void MprisPlayer::setLoopStatus(Mpris::LoopStatus loopStatus)
}

m_loopStatus = loopStatus;
emit loopStatusChanged();
Q_EMIT loopStatusChanged();
}

double MprisPlayer::maximumRate() const
Expand All @@ -353,7 +353,7 @@ void MprisPlayer::setMaximumRate(double maximumRate)
}

m_maximumRate = maximumRate;
emit maximumRateChanged();
Q_EMIT maximumRateChanged();
}

QVariantMap MprisPlayer::metadata() const
Expand All @@ -369,7 +369,7 @@ void MprisPlayer::setMetadata(const QVariantMap &metadata)

m_metadata = metadata;
m_typedMetadata = typeMetadata(metadata);
emit metadataChanged();
Q_EMIT metadataChanged();
}

double MprisPlayer::minimumRate() const
Expand All @@ -384,7 +384,7 @@ void MprisPlayer::setMinimumRate(double minimumRate)
}

m_minimumRate = minimumRate;
emit minimumRateChanged();
Q_EMIT minimumRateChanged();
}

Mpris::PlaybackStatus MprisPlayer::playbackStatus() const
Expand All @@ -399,7 +399,7 @@ void MprisPlayer::setPlaybackStatus(Mpris::PlaybackStatus playbackStatus)
}

m_playbackStatus = playbackStatus;
emit playbackStatusChanged();
Q_EMIT playbackStatusChanged();
}

qlonglong MprisPlayer::position() const
Expand All @@ -414,7 +414,7 @@ void MprisPlayer::setPosition(qlonglong position)
}

m_position = position;
emit positionChanged();
Q_EMIT positionChanged();
}

double MprisPlayer::rate() const
Expand All @@ -429,7 +429,7 @@ void MprisPlayer::setRate(double rate)
}

m_rate = rate;
emit rateChanged();
Q_EMIT rateChanged();
}

bool MprisPlayer::shuffle() const
Expand All @@ -444,7 +444,7 @@ void MprisPlayer::setShuffle(bool shuffle)
}

m_shuffle= shuffle;
emit shuffleChanged();
Q_EMIT shuffleChanged();
}

double MprisPlayer::volume() const
Expand All @@ -459,7 +459,7 @@ void MprisPlayer::setVolume(double volume)
}

m_volume = volume;
emit volumeChanged();
Q_EMIT volumeChanged();
}


Expand Down
4 changes: 2 additions & 2 deletions src/mprisplayer.h
Expand Up @@ -75,7 +75,7 @@ class MPRIS_QT_EXPORT MprisPlayer : public QObject,
MprisPlayer(QObject *parent = 0);
~MprisPlayer();

public slots:
public Q_SLOTS:

QString serviceName() const;
void setServiceName(const QString &serviceName);
Expand Down Expand Up @@ -154,7 +154,7 @@ public slots:
double volume() const;
void setVolume(double volume);

signals:
Q_SIGNALS:
void serviceNameChanged();

// Mpris2 Root Interface
Expand Down

0 comments on commit 21a4f35

Please sign in to comment.