haraldwolff
/
AusweisApp2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: workaround GCC < 5.x bugs in implicit casts 

The following error happens when building with GCC 4.8.5:

    no matching function for call to ‘QObject::connect(QPointer<T>&, ...)’
    no matching function for call to ‘QObject::disconnect(QPointer<T>&, ...)’

There is a simular problem in qtlocation, see Qt bug report:

    https://bugreports.qt.io/browse/QTBUG-69512

It's apparently a compiler bug fixed in GCC 5.x and later.

Signed-off-by: Stephan Linz <linz@li-pro.net>
pull/13/head
Stephan Linz 2018-08-13 18:54:19 +02:00 committed by André Klitzing
parent 3d08ce3e5f
commit 06836ad54b
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/card/base/CardConnectionWorker.cpp
View File

@ -18,9 +18,9 @@ CardConnectionWorker::CardConnectionWorker(Reader* pReader)
, mReader(pReader)
, mSecureMessaging()
{
connect(mReader, &Reader::fireCardInserted, this, &CardConnectionWorker::onReaderInfoChanged);
connect(mReader, &Reader::fireCardRemoved, this, &CardConnectionWorker::onReaderInfoChanged);
connect(mReader, &Reader::fireCardRetryCounterChanged, this, &CardConnectionWorker::onReaderInfoChanged);
connect(mReader.data(), &Reader::fireCardInserted, this, &CardConnectionWorker::onReaderInfoChanged);
connect(mReader.data(), &Reader::fireCardRemoved, this, &CardConnectionWorker::onReaderInfoChanged);
connect(mReader.data(), &Reader::fireCardRetryCounterChanged, this, &CardConnectionWorker::onReaderInfoChanged);
}

8
src/qml/HistoryModel.cpp
View File

@ -119,8 +119,8 @@ HistoryModel::HistoryModel(HistorySettings* pHistorySettings, QObject* pParent)
mFilterModel.setFilterCaseSensitivity(Qt::CaseInsensitive);
mNameFilterModel.setSourceModel(this);
mHistoryModelSearchFilter.setSourceModel(this);
connect(mHistorySettings, &HistorySettings::fireHistoryInfosChanged, this, &HistoryModel::onHistoryEntriesChanged);
connect(mHistorySettings, &HistorySettings::fireEnabledChanged, this, &HistoryModel::fireEnabledChanged);
connect(mHistorySettings.data(), &HistorySettings::fireHistoryInfosChanged, this, &HistoryModel::onHistoryEntriesChanged);
connect(mHistorySettings.data(), &HistorySettings::fireEnabledChanged, this, &HistoryModel::fireEnabledChanged);
connect(Env::getSingleton<ProviderConfiguration>(), &ProviderConfiguration::fireUpdated, this, &HistoryModel::onProvidersChanged);
}
@ -366,9 +366,9 @@ bool HistoryModel::removeRows(int pRow, int pCount, const QModelIndex& pParent)
entries.remove(pRow, pCount);
// disconnect the signal, otherwise this model gets reset
disconnect(mHistorySettings, &HistorySettings::fireHistoryInfosChanged, this, &HistoryModel::onHistoryEntriesChanged);
disconnect(mHistorySettings.data(), &HistorySettings::fireHistoryInfosChanged, this, &HistoryModel::onHistoryEntriesChanged);
mHistorySettings->setHistoryInfos(entries);
connect(mHistorySettings, &HistorySettings::fireHistoryInfosChanged, this, &HistoryModel::onHistoryEntriesChanged);
connect(mHistorySettings.data(), &HistorySettings::fireHistoryInfosChanged, this, &HistoryModel::onHistoryEntriesChanged);
mHistorySettings->save();

2
src/widget/DiagnosisGui.cpp
View File

@ -47,7 +47,7 @@ void DiagnosisGui::activate()
auto context = new DiagnosisContext();
mDialog = new DiagnosisDialog(context, dialogParent);
connect(mDialog, &QDialog::finished, this, &DiagnosisGui::fireFinished);
connect(mDialog.data(), &QDialog::finished, this, &DiagnosisGui::fireFinished);
mDialog->show();
auto controller = new DiagnosisController(context, mDialog);

2
src/widget/SetupAssistantGui.cpp
View File

@ -36,7 +36,7 @@ void SetupAssistantGui::activate()
}
mWizard = new SetupAssistantWizard(dialogParent);
connect(mWizard, &SetupAssistantWizard::fireChangePinButtonClicked, this, &SetupAssistantGui::fireChangePinButtonClicked);
connect(mWizard.data(), &SetupAssistantWizard::fireChangePinButtonClicked, this, &SetupAssistantGui::fireChangePinButtonClicked);
}
mWizard->exec();

2
src/widget/step/StepChooseCardGui.cpp
View File

@ -39,7 +39,7 @@ StepChooseCardGui::StepChooseCardGui(const QSharedPointer<AuthContext>& pContext
mDeviceButton = mInformationMessageBox->addButton(tr("Settings"), QMessageBox::YesRole);
mDeviceButton->setFocus();
connect(mReaderDeviceGui, &ReaderDeviceGui::fireFinished, this, &StepChooseCardGui::onSubDialogFinished);
connect(mReaderDeviceGui.data(), &ReaderDeviceGui::fireFinished, this, &StepChooseCardGui::onSubDialogFinished);
}