diff options
Diffstat (limited to 'pbap')
| -rw-r--r-- | pbap/meson.build | 10 | ||||
| -rw-r--r-- | pbap/pbap.cpp | 2 | ||||
| -rw-r--r-- | pbap/pbap.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pbap/meson.build b/pbap/meson.build index 7e2d1fb..fc980a8 100644 --- a/pbap/meson.build +++ b/pbap/meson.build @@ -1,14 +1,14 @@ -qt5_dep = dependency('qt5', modules: ['Qml']) +qt_dep = dependency('qt6', modules: ['Qml']) -moc_files = qt5.compile_moc(headers : 'pbap.h', - dependencies: qt5_dep) +moc_files = qt.compile_moc(headers : 'pbap.h', + dependencies: qt_dep) src = ['pbap.cpp', moc_files] lib = shared_library('qtappfw-bt-pbap', sources: src, version: '1.0.0', soversion: '0', - dependencies: qt5_dep, + dependencies: qt_dep, install: true) install_headers('pbap.h') @@ -18,5 +18,5 @@ pkg_mod.generate(libraries : lib, version : '1.0', name : 'libqtappfw-bt-pbap', filebase : 'qtappfw-bt-pbap', - requires: 'Qt5Qml', + requires: '', description : 'Library wrapping AGL Bluetooth PBAP profile API in Qt objects') diff --git a/pbap/pbap.cpp b/pbap/pbap.cpp index 7473c54..d98fbea 100644 --- a/pbap/pbap.cpp +++ b/pbap/pbap.cpp @@ -241,7 +241,7 @@ void Pbap::updateCalls(QJsonArray vcards) name = number; } - QStringList typelist = entry.value("type").toString().split(QRegExp("=")); + QStringList typelist = entry.value("type").toString().split(QRegularExpression("=")); type = typelist.takeLast(); datetime = entry.value("timestamp").toString(); diff --git a/pbap/pbap.h b/pbap/pbap.h index 25fa450..447eeac 100644 --- a/pbap/pbap.h +++ b/pbap/pbap.h @@ -62,7 +62,7 @@ class Contact : public QObject Q_PROPERTY(QString name READ name NOTIFY nameChanged) Q_PROPERTY(QString photo READ photo NOTIFY photoChanged) - Q_PROPERTY(QQmlListProperty<PhoneNumber>numbers READ numbersList NOTIFY numbersListChanged) + Q_PROPERTY(QQmlListProperty<PhoneNumber> numbers READ numbersList NOTIFY numbersListChanged) public: explicit Contact(QString name, QString photo, QList<PhoneNumber *>numbers); @@ -75,11 +75,11 @@ class Contact : public QObject QQmlListProperty<PhoneNumber>numbersList() { return QQmlListProperty<PhoneNumber>(this, 0, &Contact::countNumbers, &Contact::atNumbers); } - static int countNumbers(QQmlListProperty<PhoneNumber> *property) { + static qsizetype countNumbers(QQmlListProperty<PhoneNumber> *property) { Contact *contact = qobject_cast<Contact *>(property->object); return contact->m_numbers.size(); } - static PhoneNumber *atNumbers(QQmlListProperty<PhoneNumber> *property, int index) { + static PhoneNumber *atNumbers(QQmlListProperty<PhoneNumber> *property, qsizetype index) { Contact *contact = qobject_cast<Contact *>(property->object); return contact->m_numbers[index]; } |