diff --git a/src/akonadi-contacts/contactviewer.cpp b/src/akonadi-contacts/contactviewer.cpp --- a/src/akonadi-contacts/contactviewer.cpp +++ b/src/akonadi-contacts/contactviewer.cpp @@ -60,14 +60,12 @@ KConfigGroup group(&config, QStringLiteral("View")); mShowQRCode = group.readEntry("QRCodes", true); mQRCode = Prison::createBarcode(Prison::QRCode); - mDataMatrix = Prison::createBarcode(Prison::DataMatrix); } ~Private() { delete mStandardContactFormatter; delete mQRCode; - delete mDataMatrix; } void updateView(const QVariantList &localCustomFieldDescriptions = QVariantList(), const QString &addressBookName = QString()) @@ -152,12 +150,6 @@ QUrl(QStringLiteral("qrcode")), mQRCode->toImage(QSizeF(50, 50))); } - if (mDataMatrix) { - mDataMatrix->setData(data); - mBrowser->document()->addResource(QTextDocument::ImageResource, - QUrl(QStringLiteral("datamatrix")), - mDataMatrix->toImage(QSizeF(50, 50))); - } } // merge local and global custom field descriptions @@ -265,7 +257,6 @@ AbstractContactFormatter *mStandardContactFormatter = nullptr; CollectionFetchJob *mParentCollectionFetchJob = nullptr; Prison::AbstractBarcode *mQRCode = nullptr; - Prison::AbstractBarcode *mDataMatrix = nullptr; bool mShowQRCode = true; }; diff --git a/src/akonadi-contacts/standardcontactformatter.cpp b/src/akonadi-contacts/standardcontactformatter.cpp --- a/src/akonadi-contacts/standardcontactformatter.cpp +++ b/src/akonadi-contacts/standardcontactformatter.cpp @@ -340,10 +340,8 @@ strAddr.append(QString::fromLatin1( "

" "" - "" "

" ) - .arg(QStringLiteral("datamatrix")) .arg(QStringLiteral("qrcode"))); } } diff --git a/src/akonadi-contacts/textbrowser.cpp b/src/akonadi-contacts/textbrowser.cpp --- a/src/akonadi-contacts/textbrowser.cpp +++ b/src/akonadi-contacts/textbrowser.cpp @@ -114,8 +114,7 @@ if (imageName == QLatin1String("contact_photo")) { mDataToCopy = pix; act->setText(i18nc("@action:inmenu Copy a contact photo", "Copy Photo")); - } else if (imageName == QLatin1String("datamatrix") - || imageName == QLatin1String("qrcode")) { + } else if (imageName == QLatin1String("qrcode")) { mDataToCopy = pix; act->setText(i18nc("@action:inmenu Copy a QR or Datamatrix image", "Copy Code")); }