Git commit 6279d0eae97b68d4043a5a02a54957e7bc45c196 by Konstantinos Smanis. Committed on 24/10/2013 at 14:08. Pushed by ksmanis into branch 'master'. emit -> Q_EMIT M +1 -1 src/convertDlg.cpp M +24 -24 src/kcm_grub2.cpp M +2 -2 src/qPkBackend.cpp M +2 -2 src/qapt2Backend.cpp M +1 -1 src/qaptBackend.cpp http://commits.kde.org/kcm-grub2/6279d0eae97b68d4043a5a02a54957e7bc45c196 diff --git a/src/convertDlg.cpp b/src/convertDlg.cpp index 1b0fa21..ef589c4 100644 --- a/src/convertDlg.cpp +++ b/src/convertDlg.cpp @@ -90,7 +90,7 @@ void ConvertDialog::slotButtonClicked(int button) image.classType(Magick::DirectClass); image.write(std::string(ui->kurlrequester_converted->url().toLocal= File().toUtf8().constData())); if (ui->checkBox_wallpaper->isChecked()) { - emit splashImageCreated(ui->kurlrequester_converted->url().toL= ocalFile()); + Q_EMIT splashImageCreated(ui->kurlrequester_converted->url().t= oLocalFile()); } } KDialog::slotButtonClicked(button); diff --git a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp index 5b8e656..4722f58 100644 --- a/src/kcm_grub2.cpp +++ b/src/kcm_grub2.cpp @@ -262,7 +262,7 @@ void KCMGRUB2::load() ui->checkBox_uuid->setChecked(unquoteWord(m_settings.value("GRUB_DISAB= LE_LINUX_UUID")).compare("true") !=3D 0); = m_dirtyBits.fill(0); - emit changed(false); + Q_EMIT changed(false); } void KCMGRUB2::save() { @@ -520,7 +520,7 @@ void KCMGRUB2::slotRemoveOldEntries() void KCMGRUB2::slotGrubSavedefaultChanged() { m_dirtyBits.setBit(grubSavedefaultDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubHiddenTimeoutToggled(bool checked) { @@ -530,12 +530,12 @@ void KCMGRUB2::slotGrubHiddenTimeoutToggled(bool chec= ked) void KCMGRUB2::slotGrubHiddenTimeoutChanged() { m_dirtyBits.setBit(grubHiddenTimeoutDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubHiddenTimeoutQuietChanged() { m_dirtyBits.setBit(grubHiddenTimeoutQuietDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubTimeoutToggled(bool checked) { @@ -546,27 +546,27 @@ void KCMGRUB2::slotGrubTimeoutToggled(bool checked) void KCMGRUB2::slotGrubTimeoutChanged() { m_dirtyBits.setBit(grubTimeoutDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubLanguageChanged() { m_dirtyBits.setBit(grubLocaleDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubDisableRecoveryChanged() { m_dirtyBits.setBit(grubDisableRecoveryDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotMemtestChanged() { m_dirtyBits.setBit(memtestDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubDisableOsProberChanged() { m_dirtyBits.setBit(grubDisableOsProberDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotInstallBootloader() { @@ -594,7 +594,7 @@ void KCMGRUB2::slotGrubGfxmodeChanged() } } m_dirtyBits.setBit(grubGfxmodeDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubGfxpayloadLinuxChanged() { @@ -616,23 +616,23 @@ void KCMGRUB2::slotGrubGfxpayloadLinuxChanged() } } m_dirtyBits.setBit(grubGfxpayloadLinuxDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubColorNormalChanged() { m_dirtyBits.setBit(grubColorNormalDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubColorHighlightChanged() { m_dirtyBits.setBit(grubColorHighlightDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slowGrubBackgroundChanged() { ui->kpushbutton_preview->setEnabled(!ui->kurlrequester_background->tex= t().isEmpty()); m_dirtyBits.setBit(grubBackgroundDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotPreviewGrubBackground() { @@ -663,17 +663,17 @@ void KCMGRUB2::slotCreateGrubBackground() void KCMGRUB2::slotGrubThemeChanged() { m_dirtyBits.setBit(grubThemeDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubCmdlineLinuxDefaultChanged() { m_dirtyBits.setBit(grubCmdlineLinuxDefaultDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubCmdlineLinuxChanged() { m_dirtyBits.setBit(grubCmdlineLinuxDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubTerminalChanged() { @@ -683,37 +683,37 @@ void KCMGRUB2::slotGrubTerminalChanged() ui->klineedit_terminalInput->setText(!grubTerminal.isEmpty() ? grubTer= minal : unquoteWord(m_settings.value("GRUB_TERMINAL_INPUT"))); ui->klineedit_terminalOutput->setText(!grubTerminal.isEmpty() ? grubTe= rminal : unquoteWord(m_settings.value("GRUB_TERMINAL_OUTPUT"))); m_dirtyBits.setBit(grubTerminalDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubTerminalInputChanged() { m_dirtyBits.setBit(grubTerminalInputDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubTerminalOutputChanged() { m_dirtyBits.setBit(grubTerminalOutputDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubDistributorChanged() { m_dirtyBits.setBit(grubDistributorDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubSerialCommandChanged() { m_dirtyBits.setBit(grubSerialCommandDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubInitTuneChanged() { m_dirtyBits.setBit(grubInitTuneDirty); - emit changed(true); + Q_EMIT changed(true); } void KCMGRUB2::slotGrubDisableLinuxUuidChanged() { m_dirtyBits.setBit(grubDisableLinuxUuidDirty); - emit changed(true); + Q_EMIT changed(true); } = void KCMGRUB2::slotUpdateSuggestions() diff --git a/src/qPkBackend.cpp b/src/qPkBackend.cpp index 56ad5a6..8d4bc8a 100644 --- a/src/qPkBackend.cpp +++ b/src/qPkBackend.cpp @@ -196,7 +196,7 @@ void QPkBackend::slotFinished(PackageKit::Enum::Exit st= atus, uint runtime) Q_UNUSED(runtime) m_status =3D status; if (m_t && m_t->role() =3D=3D PackageKit::Enum::RoleRemovePackages) { - emit finished(m_status =3D=3D PackageKit::Enum::ExitSuccess); + Q_EMIT finished(m_status =3D=3D PackageKit::Enum::ExitSuccess); } } void QPkBackend::slotPackage(const QSharedPointer &pa= ckage) @@ -205,7 +205,7 @@ void QPkBackend::slotPackage(const QSharedPointer &package) } void QPkBackend::slotUpdateProgress() { - emit progress(statusToString(m_t->status()), m_t->percentage()); + Q_EMIT progress(statusToString(m_t->status()), m_t->percentage()); } = bool QPkBackend::packageExists(const QString &packageName) diff --git a/src/qapt2Backend.cpp b/src/qapt2Backend.cpp index 6fecd78..47cea04 100644 --- a/src/qapt2Backend.cpp +++ b/src/qapt2Backend.cpp @@ -69,10 +69,10 @@ void QApt2Backend::undoChanges() = void QApt2Backend::slotUpdateProgress() { - emit progress(m_trans->statusDetails(), m_trans->progress()); + Q_EMIT progress(m_trans->statusDetails(), m_trans->progress()); } void QApt2Backend::slotTransactionFinished(QApt::ExitStatus status) { m_exitStatus =3D status; - emit finished(status =3D=3D QApt::ExitSuccess); + Q_EMIT finished(status =3D=3D QApt::ExitSuccess); } diff --git a/src/qaptBackend.cpp b/src/qaptBackend.cpp index 365aa91..6d9b6fe 100644 --- a/src/qaptBackend.cpp +++ b/src/qaptBackend.cpp @@ -72,7 +72,7 @@ void QAptBackend::undoChanges() void QAptBackend::slotWorkerEvent(QApt::WorkerEvent event) { if (event =3D=3D QApt::CommitChangesFinished) { - emit finished(m_error =3D=3D QApt::UnknownError); + Q_EMIT finished(m_error =3D=3D QApt::UnknownError); } } void QAptBackend::slotErrorOccurred(QApt::ErrorCode error, const QVariantM= ap &details)