diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/) -add_definitions(-DTRANSLATION_DOMAIN=\"kcm_pulseaudio\") +add_definitions(-DTRANSLATION_DOMAIN=\"kcm_pulseaudio\" -DQT_NO_KEYWORDS) include(FeatureSummary) include(KDEInstallDirs) diff --git a/src/card.h b/src/card.h --- a/src/card.h +++ b/src/card.h @@ -63,12 +63,12 @@ Q_ASSERT(value); m_properties.insert(QString::fromUtf8(key), QString::fromUtf8(value)); } - emit propertiesChanged(); + Q_EMIT propertiesChanged(); } QVariantMap properties() const { return m_properties; } -signals: +Q_SIGNALS: void propertiesChanged(); private: @@ -93,7 +93,7 @@ void setActiveProfileIndex(quint32 profileIndex); QList ports() const; -signals: +Q_SIGNALS: void nameChanged(); void profilesChanged(); void activeProfileIndexChanged(); diff --git a/src/card.cpp b/src/card.cpp --- a/src/card.cpp +++ b/src/card.cpp @@ -39,7 +39,7 @@ QString infoName = QString::fromUtf8(info->name); if (m_name != infoName) { m_name = infoName; - emit nameChanged(); + Q_EMIT nameChanged(); } qDeleteAll(m_profiles); @@ -52,17 +52,17 @@ m_activeProfileIndex = m_profiles.length() - 1; } } - emit profilesChanged(); - emit activeProfileIndexChanged(); + Q_EMIT profilesChanged(); + Q_EMIT activeProfileIndexChanged(); qDeleteAll(m_ports); m_ports.clear(); for (auto **it = info->ports; it && *it != nullptr; ++it) { CardPort *port = new CardPort(this); port->update(*it); m_ports.append(port); } - emit portsChanged(); + Q_EMIT portsChanged(); } QString Card::name() const diff --git a/src/client.h b/src/client.h --- a/src/client.h +++ b/src/client.h @@ -42,7 +42,7 @@ QString name() const; -signals: +Q_SIGNALS: void nameChanged(); private: diff --git a/src/client.cpp b/src/client.cpp --- a/src/client.cpp +++ b/src/client.cpp @@ -41,7 +41,7 @@ QString infoName = QString::fromUtf8(info->name); if (m_name != infoName) { m_name = infoName; - emit nameChanged(); + Q_EMIT nameChanged(); } } diff --git a/src/device.h b/src/device.h --- a/src/device.h +++ b/src/device.h @@ -63,23 +63,23 @@ if (m_name != info->name) { m_name = info->name; - emit nameChanged(); + Q_EMIT nameChanged(); } if (m_description != info->description) { m_description = info->description; - emit descriptionChanged(); + Q_EMIT descriptionChanged(); } const char *form_factor = pa_proplist_gets(info->proplist, PA_PROP_DEVICE_FORM_FACTOR); if (form_factor) { QString formFactor = QString::fromUtf8(form_factor); if (m_formFactor != formFactor) { m_formFactor = formFactor; - emit formFactorChanged(); + Q_EMIT formFactorChanged(); } } m_cardIndex = info->card; - emit cardIndexChanged(); + Q_EMIT cardIndexChanged(); // TODO: this rebuilds the entire port list on every update. would be // nicer if it actually removed what needs removing updates what needs @@ -95,19 +95,19 @@ m_activePortIndex = m_ports.length() - 1; } } - emit portsChanged(); - emit activePortIndexChanged(); + Q_EMIT portsChanged(); + Q_EMIT activePortIndexChanged(); State infoState = stateFromPaState(info->state); if (infoState != m_state) { m_state = infoState; - emit stateChanged(); + Q_EMIT stateChanged(); } const bool isVirtual = !(info->flags & 4); // PA_X_HARDWARE if (m_virtualDevice != isVirtual) { m_virtualDevice = isVirtual; - emit virtualDeviceChanged(); + Q_EMIT virtualDeviceChanged(); } } @@ -123,7 +123,7 @@ virtual void setDefault(bool enable) = 0; bool isVirtualDevice() const; -signals: +Q_SIGNALS: void stateChanged(); void nameChanged(); void descriptionChanged(); diff --git a/src/kcm/module.h b/src/kcm/module.h --- a/src/kcm/module.h +++ b/src/kcm/module.h @@ -37,7 +37,7 @@ KCMPulseAudio(QObject *parent, const QVariantList &args); ~KCMPulseAudio() override; -public slots: +public Q_SLOTS: void defaults() final; void load() final; void save() final; diff --git a/src/maps.h b/src/maps.h --- a/src/maps.h +++ b/src/maps.h @@ -55,7 +55,7 @@ virtual QObject *objectAt(int index) const = 0; virtual int indexOfObject(QObject *object) const = 0; -signals: +Q_SIGNALS: void aboutToBeAdded(int index); void added(int index); void aboutToBeRemoved(int index); @@ -120,10 +120,10 @@ modelIndex++; } - emit aboutToBeAdded(modelIndex); + Q_EMIT aboutToBeAdded(modelIndex); m_data.insert(object->index(), object); Q_ASSERT(modelIndex == m_data.keys().indexOf(object->index())); - emit added(modelIndex); + Q_EMIT added(modelIndex); } // Context is passed in as parent because context needs to include the maps @@ -155,9 +155,9 @@ m_pendingRemovals.insert(index); } else { const int modelIndex = m_data.keys().indexOf(index); - emit aboutToBeRemoved(modelIndex); + Q_EMIT aboutToBeRemoved(modelIndex); delete m_data.take(index); - emit removed(modelIndex); + Q_EMIT removed(modelIndex); } } diff --git a/src/module.h b/src/module.h --- a/src/module.h +++ b/src/module.h @@ -45,7 +45,7 @@ QString name() const; QString argument() const; -signals: +Q_SIGNALS: void nameChanged(); void argumentChanged(); diff --git a/src/module.cpp b/src/module.cpp --- a/src/module.cpp +++ b/src/module.cpp @@ -39,12 +39,12 @@ const QString infoName = QString::fromUtf8(info->name); if (m_name != infoName) { m_name = infoName; - emit nameChanged(); + Q_EMIT nameChanged(); } const QString infoArgument = QString::fromUtf8(info->argument); if (m_argument != infoArgument) { m_argument = infoArgument; - emit argumentChanged(); + Q_EMIT argumentChanged(); } } diff --git a/src/profile.h b/src/profile.h --- a/src/profile.h +++ b/src/profile.h @@ -57,7 +57,7 @@ quint32 priority() const; Availability availability() const; -signals: +Q_SIGNALS: void nameChanged(); void descriptionChanged(); void priorityChanged(); @@ -72,23 +72,23 @@ QString infoName = QString::fromUtf8(info->name); if (m_name != infoName) { m_name = infoName; - emit nameChanged(); + Q_EMIT nameChanged(); } if (info->description) { QString infoDescription = QString::fromUtf8(info->description); if (m_description != infoDescription) { m_description = infoDescription; - emit descriptionChanged(); + Q_EMIT descriptionChanged(); } } if (m_priority != info->priority) { m_priority = info->priority; - emit priorityChanged(); + Q_EMIT priorityChanged(); } if (m_availability != newAvailability) { m_availability = newAvailability; - emit availabilityChanged(); + Q_EMIT availabilityChanged(); } } diff --git a/src/pulseaudio.h b/src/pulseaudio.h --- a/src/pulseaudio.h +++ b/src/pulseaudio.h @@ -51,7 +51,7 @@ void initRoleNames(const QMetaObject &qobjectMetaObject); Context *context() const; -private slots: +private Q_SLOTS: void propertyChanged(); private: @@ -93,7 +93,7 @@ Sink *preferredSink() const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; -signals: +Q_SIGNALS: void defaultSinkChanged(); void preferredSinkChanged(); @@ -127,7 +127,7 @@ Source *defaultSource() const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; -signals: +Q_SIGNALS: void defaultSourceChanged(); }; diff --git a/src/pulseaudio.cpp b/src/pulseaudio.cpp --- a/src/pulseaudio.cpp +++ b/src/pulseaudio.cpp @@ -191,16 +191,16 @@ } int index = m_map->indexOfObject(sender()); qCDebug(PLASMAPA) << "PROPERTY CHANGED (" << index << ") :: " << role << roleNames().value(role); - emit dataChanged(createIndex(index, 0), createIndex(index, 0), {role}); + Q_EMIT dataChanged(createIndex(index, 0), createIndex(index, 0), {role}); } void AbstractModel::onDataAdded(int index) { QObject *data = m_map->objectAt(index); const QMetaObject *mo = data->metaObject(); // We have all the data changed notify signals already stored auto keys = m_signalIndexToProperties.keys(); - foreach (int index, keys) { + Q_FOREACH (int index, keys) { QMetaMethod meth = mo->method(index); connect(data, meth, this, propertyChangedMetaMethod()); } @@ -231,7 +231,7 @@ connect(context()->server(), &Server::defaultSinkChanged, this, [this]() { updatePreferredSink(); - emit defaultSinkChanged(); + Q_EMIT defaultSinkChanged(); }); } @@ -279,7 +279,7 @@ if (sink != m_preferredSink) { qCDebug(PLASMAPA) << "Changing preferred sink to" << sink << (sink ? sink->name() : ""); m_preferredSink = sink; - emit preferredSinkChanged(); + Q_EMIT preferredSinkChanged(); } } diff --git a/src/pulseobject.h b/src/pulseobject.h --- a/src/pulseobject.h +++ b/src/pulseobject.h @@ -55,14 +55,14 @@ Q_ASSERT(value); m_properties.insert(QString::fromUtf8(key), QString::fromUtf8(value)); } - emit propertiesChanged(); + Q_EMIT propertiesChanged(); } quint32 index() const; QString iconName() const; QVariantMap properties() const; -signals: +Q_SIGNALS: void propertiesChanged(); protected: diff --git a/src/qml/globalactioncollection.h b/src/qml/globalactioncollection.h --- a/src/qml/globalactioncollection.h +++ b/src/qml/globalactioncollection.h @@ -45,7 +45,7 @@ QString displayName() const; void setDisplayName(const QString &displayName); -signals: +Q_SIGNALS: void nameChanged(); void displayNameChanged(); diff --git a/src/qml/globalactioncollection.cpp b/src/qml/globalactioncollection.cpp --- a/src/qml/globalactioncollection.cpp +++ b/src/qml/globalactioncollection.cpp @@ -39,7 +39,7 @@ void GlobalActionCollection::setName(const QString &name) { m_name = name; - emit nameChanged(); + Q_EMIT nameChanged(); } QString GlobalActionCollection::displayName() const @@ -50,12 +50,12 @@ void GlobalActionCollection::setDisplayName(const QString &displayName) { m_displayName = displayName; - emit displayNameChanged(); + Q_EMIT displayNameChanged(); } void GlobalActionCollection::componentComplete() { - foreach (QObject *item, children()) { + Q_FOREACH (QObject *item, children()) { GlobalAction *action = qobject_cast(item); if (!action) { continue; diff --git a/src/qml/volumefeedback.h b/src/qml/volumefeedback.h --- a/src/qml/volumefeedback.h +++ b/src/qml/volumefeedback.h @@ -36,7 +36,7 @@ bool isValid() const; -public slots: +public Q_SLOTS: void play(quint32 sinkIndex); }; diff --git a/src/qml/volumeosd.h b/src/qml/volumeosd.h --- a/src/qml/volumeosd.h +++ b/src/qml/volumeosd.h @@ -29,7 +29,7 @@ public: explicit VolumeOSD(QObject *parent = nullptr); -public slots: +public Q_SLOTS: void show(int percent); void showMicrophone(int percent); void showText(const QString &iconName, const QString &text); diff --git a/src/server.h b/src/server.h --- a/src/server.h +++ b/src/server.h @@ -47,7 +47,7 @@ void reset(); void update(const pa_server_info *info); -signals: +Q_SIGNALS: void defaultSinkChanged(Sink *sink); void defaultSourceChanged(Source *source); diff --git a/src/server.cpp b/src/server.cpp --- a/src/server.cpp +++ b/src/server.cpp @@ -66,12 +66,12 @@ { if (m_defaultSink) { m_defaultSink = nullptr; - emit defaultSinkChanged(m_defaultSink); + Q_EMIT defaultSinkChanged(m_defaultSink); } if (m_defaultSource) { m_defaultSource = nullptr; - emit defaultSourceChanged(m_defaultSource); + Q_EMIT defaultSourceChanged(m_defaultSource); } } @@ -110,13 +110,13 @@ if (m_defaultSink != sink) { qCDebug(PLASMAPA) << "Default sink changed" << sink; m_defaultSink = sink; - emit defaultSinkChanged(m_defaultSink); + Q_EMIT defaultSinkChanged(m_defaultSink); } if (m_defaultSource != source) { qCDebug(PLASMAPA) << "Default source changed" << source; m_defaultSource = source; - emit defaultSourceChanged(m_defaultSource); + Q_EMIT defaultSourceChanged(m_defaultSource); } } diff --git a/src/sink.h b/src/sink.h --- a/src/sink.h +++ b/src/sink.h @@ -44,7 +44,7 @@ bool isDefault() const override; void setDefault(bool enable) override; -public slots: +public Q_SLOTS: void testChannel(const QString &name); private: diff --git a/src/sinkinput.cpp b/src/sinkinput.cpp --- a/src/sinkinput.cpp +++ b/src/sinkinput.cpp @@ -35,7 +35,7 @@ updateStream(info); if (m_deviceIndex != info->sink) { m_deviceIndex = info->sink; - emit deviceIndexChanged(); + Q_EMIT deviceIndexChanged(); } } diff --git a/src/sourceoutput.cpp b/src/sourceoutput.cpp --- a/src/sourceoutput.cpp +++ b/src/sourceoutput.cpp @@ -35,7 +35,7 @@ updateStream(info); if (m_deviceIndex != info->source) { m_deviceIndex = info->source; - emit deviceIndexChanged(); + Q_EMIT deviceIndexChanged(); } } diff --git a/src/stream.h b/src/stream.h --- a/src/stream.h +++ b/src/stream.h @@ -51,27 +51,27 @@ if (m_name != QString::fromUtf8(info->name)) { m_name = QString::fromUtf8(info->name); - emit nameChanged(); + Q_EMIT nameChanged(); } if (m_hasVolume != info->has_volume) { m_hasVolume = info->has_volume; - emit hasVolumeChanged(); + Q_EMIT hasVolumeChanged(); } if (m_volumeWritable != info->volume_writable) { m_volumeWritable = info->volume_writable; - emit isVolumeWritableChanged(); + Q_EMIT isVolumeWritableChanged(); } if (m_clientIndex != info->client) { m_clientIndex = info->client; - emit clientChanged(); + Q_EMIT clientChanged(); } if (m_virtualStream != (info->client == PA_INVALID_INDEX)) { m_virtualStream = info->client == PA_INVALID_INDEX; - emit virtualStreamChanged(); + Q_EMIT virtualStreamChanged(); } if (m_corked != info->corked) { m_corked = info->corked; - emit corkedChanged(); + Q_EMIT corkedChanged(); } } @@ -83,7 +83,7 @@ virtual void setDeviceIndex(quint32 deviceIndex) = 0; -signals: +Q_SIGNALS: void nameChanged(); void clientChanged(); void virtualStreamChanged(); diff --git a/src/streamrestore.h b/src/streamrestore.h --- a/src/streamrestore.h +++ b/src/streamrestore.h @@ -68,7 +68,7 @@ Q_INVOKABLE void setChannelVolume(int channel, qint64 volume); -signals: +Q_SIGNALS: void nameChanged(); void deviceChanged(); void volumeChanged(); diff --git a/src/streamrestore.cpp b/src/streamrestore.cpp --- a/src/streamrestore.cpp +++ b/src/streamrestore.cpp @@ -42,30 +42,30 @@ const QString infoName = QString::fromUtf8(info->name); if (m_name != infoName) { m_name = infoName; - emit nameChanged(); + Q_EMIT nameChanged(); } const QString infoDevice = QString::fromUtf8(info->device); if (m_device != infoDevice) { m_device = infoDevice; - emit deviceChanged(); + Q_EMIT deviceChanged(); } if (m_muted != info->mute) { m_muted = info->mute; - emit mutedChanged(); + Q_EMIT mutedChanged(); } if (memcmp(&m_volume, &info->volume, sizeof(pa_cvolume)) != 0) { m_volume = info->volume; - emit volumeChanged(); - emit channelVolumesChanged(); + Q_EMIT volumeChanged(); + Q_EMIT channelVolumesChanged(); } if (memcmp(&m_channelMap, &info->channel_map, sizeof(pa_channel_map)) != 0) { m_channels.clear(); m_channels.reserve(info->channel_map.channels); for (int i = 0; i < info->channel_map.channels; ++i) { m_channels << QString::fromUtf8(pa_channel_position_to_pretty_string(info->channel_map.map[i])); } m_channelMap = info->channel_map; - emit channelsChanged(); + Q_EMIT channelsChanged(); } } diff --git a/src/volumeobject.h b/src/volumeobject.h --- a/src/volumeobject.h +++ b/src/volumeobject.h @@ -47,21 +47,21 @@ updatePulseObject(info); if (m_muted != info->mute) { m_muted = info->mute; - emit mutedChanged(); + Q_EMIT mutedChanged(); } if (!pa_cvolume_equal(&m_volume, &info->volume)) { m_volume = info->volume; - emit volumeChanged(); - emit channelVolumesChanged(); + Q_EMIT volumeChanged(); + Q_EMIT channelVolumesChanged(); } QStringList infoChannels; infoChannels.reserve(info->channel_map.channels); for (int i = 0; i < info->channel_map.channels; ++i) { infoChannels << QString::fromUtf8(pa_channel_position_to_pretty_string(info->channel_map.map[i])); } if (m_channels != infoChannels) { m_channels = infoChannels; - emit channelsChanged(); + Q_EMIT channelsChanged(); } } @@ -78,7 +78,7 @@ QList channelVolumes() const; Q_INVOKABLE virtual void setChannelVolume(int channel, qint64 volume) = 0; -signals: +Q_SIGNALS: void volumeChanged(); void mutedChanged(); void hasVolumeChanged();