fenix/PDF4QT
1
0
Fork 0
mirror of https://github.com/JakubMelka/PDF4QT.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue #22: Fix compilation warnings

Browse Source
This commit is contained in:
Jakub Melka
2022-07-31 18:32:57 +02:00
parent b30150a503
commit e310efb763
70 changed files with 424 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Pdf4QtViewer/pdfadvancedfindwidget.cpp
View File

@@ -258,7 +258,7 @@ void PDFAdvancedFindWidget::performSearch()
else
{
// Use regular expression search
QRegularExpression::PatternOptions patternOptions = QRegularExpression::UseUnicodePropertiesOption | QRegularExpression::OptimizeOnFirstUsageOption;
QRegularExpression::PatternOptions patternOptions = QRegularExpression::UseUnicodePropertiesOption;
if (!m_parameters.isCaseSensitive)
{
patternOptions |= QRegularExpression::CaseInsensitiveOption;

2
Pdf4QtViewer/pdfdocumentpropertiesdialog.cpp
View File

@@ -538,7 +538,7 @@ void PDFDocumentPropertiesDialog::onFontsFinished()
{
if (!m_fontTreeWidgetItems.empty())
{
std::sort(m_fontTreeWidgetItems.begin(), m_fontTreeWidgetItems.end(), [](QTreeWidgetItem* left, QTreeWidgetItem* right) { return left->data(0, Qt::DisplayRole) < right->data(0, Qt::DisplayRole); });
std::sort(m_fontTreeWidgetItems.begin(), m_fontTreeWidgetItems.end(), [](QTreeWidgetItem* left, QTreeWidgetItem* right) { return left->data(0, Qt::DisplayRole).toString() < right->data(0, Qt::DisplayRole).toString(); });
for (QTreeWidgetItem* item : m_fontTreeWidgetItems)
{
ui->fontsTreeWidget->addTopLevelItem(item);

2
Pdf4QtViewer/pdfencryptionstrengthhintwidget.cpp
View File

@@ -138,7 +138,7 @@ QSize PDFEncryptionStrengthHintWidget::getTextSizeHint() const
for (const auto& levelItem : m_levels)
{
width = qMax(width, fontMetrics.width(levelItem.text));
width = qMax(width, fontMetrics.horizontalAdvance(levelItem.text));
}
return QSize(width, height);

18
Pdf4QtViewer/pdfprogramcontroller.cpp
View File

@@ -672,7 +672,7 @@ void PDFProgramController::performPrint()
Q_ASSERT(page);
QRectF mediaBox = page->getRotatedMediaBox();
QRectF paperRect = printer.paperRect();
QRectF paperRect = printer.pageLayout().fullRectPixels(printer.resolution());
QSizeF scaledSize = mediaBox.size().scaled(paperRect.size(), Qt::KeepAspectRatio);
mediaBox.setSize(scaledSize);
mediaBox.moveCenter(paperRect.center());
@@ -1518,7 +1518,7 @@ void PDFProgramController::updateFileInfo(const QString& fileName)
m_fileInfo.path = fileInfo.path();
m_fileInfo.fileSize = fileInfo.size();
m_fileInfo.writable = fileInfo.isWritable();
m_fileInfo.creationTime = fileInfo.created();
m_fileInfo.creationTime = fileInfo.birthTime();
m_fileInfo.lastModifiedTime = fileInfo.lastModified();
m_fileInfo.lastReadTime = fileInfo.lastRead();
}
@@ -2050,13 +2050,13 @@ void PDFProgramController::onActionDeveloperCreateInstaller()
if (configFile.open(QFile::WriteOnly | QFile::Truncate))
{
QTextStream stream(&configFile);
stream << "TEMPLATE = aux" << endl << endl;
stream << "INSTALLER_NAME = $$PWD/instpdf4qt" << endl;
stream << "INPUT = $$PWD/config/config.xml $$PWD/packages" << endl;
stream << "pdfforqtinstaller.input = INPUT" << endl;
stream << "pdfforqtinstaller.output = $$INSTALLER_NAME" << endl;
stream << QString("pdfforqtinstaller.commands = %1/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT}").arg(binaryCreatorDirectory) << endl;
stream << "pdfforqtinstaller.CONFIG += target_predeps no_link combine" << endl << endl;
stream << "TEMPLATE = aux" << Qt::endl << Qt::endl;
stream << "INSTALLER_NAME = $$PWD/instpdf4qt" << Qt::endl;
stream << "INPUT = $$PWD/config/config.xml $$PWD/packages" << Qt::endl;
stream << "pdfforqtinstaller.input = INPUT" << Qt::endl;
stream << "pdfforqtinstaller.output = $$INSTALLER_NAME" << Qt::endl;
stream << QString("pdfforqtinstaller.commands = %1/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT}").arg(binaryCreatorDirectory) << Qt::endl;
stream << "pdfforqtinstaller.CONFIG += target_predeps no_link combine" << Qt::endl << Qt::endl;
stream << "QMAKE_EXTRA_COMPILERS += pdfforqtinstaller";
configFile.close();
}

14
Pdf4QtViewer/pdfsidebarwidget.cpp
View File

@@ -441,14 +441,14 @@ void PDFSidebarWidget::updateSignatures(const std::vector<pdf::PDFSignatureVerif
QDateTime signingDate = signature.getSignatureDate();
if (signingDate.isValid())
{
QTreeWidgetItem* item = new QTreeWidgetItem(rootItem, QStringList(QString("Signing date/time: %2").arg(signingDate.toString(Qt::DefaultLocaleShortDate))));
QTreeWidgetItem* item = new QTreeWidgetItem(rootItem, QStringList(QString("Signing date/time: %2").arg(QLocale::system().toString(signingDate, QLocale::ShortFormat))));
item->setIcon(0, infoIcon);
}
QDateTime timestampDate = signature.getTimestampDate();
if (timestampDate.isValid())
{
QTreeWidgetItem* item = new QTreeWidgetItem(rootItem, QStringList(QString("Timestamp: %2").arg(timestampDate.toString(Qt::DefaultLocaleShortDate))));
QTreeWidgetItem* item = new QTreeWidgetItem(rootItem, QStringList(QString("Timestamp: %2").arg(QLocale::system().toString(timestampDate, QLocale::ShortFormat))));
item->setIcon(0, infoIcon);
}
@@ -529,13 +529,13 @@ void PDFSidebarWidget::updateSignatures(const std::vector<pdf::PDFSignatureVerif
if (notValidBefore.isValid())
{
QTreeWidgetItem* item = new QTreeWidgetItem(certRoot, QStringList(QString("Valid from: %2").arg(notValidBefore.toString(Qt::DefaultLocaleShortDate))));
QTreeWidgetItem* item = new QTreeWidgetItem(certRoot, QStringList(QString("Valid from: %2").arg(QLocale::system().toString(notValidBefore, QLocale::ShortFormat))));
item->setIcon(0, infoIcon);
}
if (notValidAfter.isValid())
{
QTreeWidgetItem* item = new QTreeWidgetItem(certRoot, QStringList(QString("Valid to: %2").arg(notValidAfter.toString(Qt::DefaultLocaleShortDate))));
QTreeWidgetItem* item = new QTreeWidgetItem(certRoot, QStringList(QString("Valid to: %2").arg(QLocale::system().toString(notValidAfter, QLocale::ShortFormat))));
item->setIcon(0, infoIcon);
}
@@ -693,10 +693,10 @@ void PDFSidebarWidget::onSignatureCustomContextMenuRequested(const QPoint& pos)
{
if (QTreeWidgetItem* item = ui->signatureTreeWidget->itemAt(pos))
{
QVariant data = item->data(0, Qt::UserRole);
if (data.isValid())
QVariant itemData = item->data(0, Qt::UserRole);
if (itemData.isValid())
{
const pdf::PDFCertificateInfo& info = m_certificateInfos.at(data.toInt());
const pdf::PDFCertificateInfo& info = m_certificateInfos.at(itemData.toInt());
if (!m_certificateStore->contains(info))
{
QMenu menu;

4
Pdf4QtViewer/pdfviewersettingsdialog.cpp
View File

@@ -676,12 +676,12 @@ void PDFViewerSettingsDialog::updateTrustedCertificatesTable()
if (notValidBefore.isValid())
{
ui->trustedCertificateStoreTableWidget->setItem(i, 3, new QTableWidgetItem(notValidBefore.toString(Qt::DefaultLocaleShortDate)));
ui->trustedCertificateStoreTableWidget->setItem(i, 3, new QTableWidgetItem(QLocale::system().toString(notValidBefore, QLocale::ShortFormat)));
}
if (notValidAfter.isValid())
{
ui->trustedCertificateStoreTableWidget->setItem(i, 4, new QTableWidgetItem(notValidAfter.toString(Qt::DefaultLocaleShortDate)));
ui->trustedCertificateStoreTableWidget->setItem(i, 4, new QTableWidgetItem(QLocale::system().toString(notValidAfter, QLocale::ShortFormat)));
}
}