mo/mediasystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major port Qt4 to Qt6

Browse Source 
- Updated header inclusions from QtGui to QtWidgets for consistency and compatibility with Qt 5 and later.
- Replaced deprecated QApplication::desktop() with QApplication::primaryScreen() for obtaining screen DPI.
- Modified MyOutputHandler to use QMessageLogContext and QString for improved logging.
- Changed QMatrix to QTransform for image rotation in ImageCutout class.
- Updated various debug statements to use toLocal8Bit() instead of toAscii() for better string handling.
- Refactored several classes to use QElapsedTimer instead of QTime for performance measurement.
- Ensured all operator overloads in Section and Tag classes are marked as const for better const-correctness.
This commit is contained in:
Mo Elzubeir
2025-10-22 23:04:56 -05:00
parent 04bb35b772
commit 99581bc990
34 changed files with 170 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ClippingStation/publication.cpp
+16 -15
View File
@@ -22,6 +22,7 @@
#include "issue.h"
#include "constants.h"
#include "systemconfiguration.h"
#include <QElapsedTimer>
Publication::Publication()
{
@@ -165,7 +166,7 @@ void Publication::loadIssues(QTreeView *view, QString localcachDir)
query.bindValue(":id", m_id);
QTime t;
QElapsedTimer t;
t.start();
if(!query.exec())
{
@@ -310,13 +311,13 @@ void Publication::loadFilteredIssues(QTreeView *view, QSqlDatabase &ocrDatabase,
else
{
qDebug() << "ocr query : " << ocr;
qDebug() << "ocr query error: " << query.lastError().text().toAscii();
qDebug() << "ocr query error: " << query.lastError().text().toLocal8Bit();
}
}
else
{
qDebug() << "id_company query : " << kywrd;
qDebug() << "id_company query error: " << query.lastError().text().toAscii();
qDebug() << "id_company query error: " << query.lastError().text().toLocal8Bit();
}
ptcWhere = QString(" AND sp.section_pages IN (%1)").arg(section_pages.join(", "));
}
@@ -357,10 +358,10 @@ void Publication::loadFilteredIssues(QTreeView *view, QSqlDatabase &ocrDatabase,
" group by name_publication_en, issue_date, name_article_section_en, page_name"
" order by name_publication_en, issue_date, id_section, page_name;").arg(ocrTable).arg(ptcTable).arg(m_id).arg(ptcWhere).arg(parts);
qDebug() << "loadFilteredIssues() query is " << str.toAscii() ;
qDebug() << "loadFilteredIssues() query is " << str.toLocal8Bit() ;
QSqlQuery query(str, m_database);
QTime t;
QElapsedTimer t;
t.start();
if(!query.exec())
{
@@ -518,7 +519,7 @@ void Publication::loadIssuesOnly(QTreeView *view)
query.bindValue(":id", m_id);
QTime t;
QElapsedTimer t;
t.start();
if(!query.exec())
{
@@ -671,7 +672,7 @@ void Publication::loadUndoneIssuesOnly(QTreeView *view)
query.bindValue(":id", m_id);
QTime t;
QElapsedTimer t;
t.start();
if(!query.exec())
{
@@ -719,7 +720,7 @@ void Publication::loadIssueSections(QStandardItem *issueItem, QString issueDate,
query.bindValue(":issue_date", issueDate);
QTime t;
QElapsedTimer t;
t.start();
if(!query.exec())
{
@@ -766,7 +767,7 @@ QList<QStandardItem*> Publication::getFilenamesFromDatabase(int id_publication,
QStringList &localFiles, QStringList &remoteFiles,
QString &localIssuePath, QString &remoteIssuePath)
{
QTime t;
QElapsedTimer t;
t.start();
static QString issuesPath = SystemConfiguration::issuesPath();
@@ -925,7 +926,7 @@ QStringList Publication::publicationsWithPreclips(QSqlDatabase &database)
if ( !query.exec() )
{
qDebug() << query.lastError().text().toAscii();
qDebug() << query.lastError().text().toLocal8Bit();
qDebug() << "\t...." << query.lastError().databaseText();
return QStringList();
}
@@ -1026,13 +1027,13 @@ QStringList Publication::publicationsFiltered(QSqlDatabase &database, QSqlDataba
else
{
qDebug() << "ocr query : " << ocr;
qDebug() << "ocr query error: " << query.lastError().text().toAscii();
qDebug() << "ocr query error: " << query.lastError().text().toLocal8Bit();
}
}
else
{
qDebug() << "id_company query : " << kywrd;
qDebug() << "id_company query error: " << query.lastError().text().toAscii();
qDebug() << "id_company query error: " << query.lastError().text().toLocal8Bit();
}
ptcWhere = QString(" AND sp.section_pages IN (%1)").arg(section_pages.join(", "));
}
@@ -1081,12 +1082,12 @@ QStringList Publication::publicationsFiltered(QSqlDatabase &database, QSqlDataba
" group by name_publication_en"
" order by name_publication_en").arg(ocrTable).arg(ptcWhere).arg(parts);
qDebug() << "publicationsFiltered query is \n" << str.toAscii() ;
qDebug() << "publicationsFiltered query is \n" << str.toLocal8Bit() ;
QSqlQuery query(str, database);
if ( !query.exec() )
{
qDebug() << query.lastError().text().toAscii();
qDebug() << query.lastError().text().toLocal8Bit();
return QStringList();
}
@@ -1111,7 +1112,7 @@ QStringList Publication::publicationsWithUndoneIssues(QSqlDatabase &database)
if(!query.exec())
{
qDebug() << "publicationsWithUndoneIssues() SQL Error: " << query.lastError().databaseText().toAscii();
qDebug() << "publicationsWithUndoneIssues() SQL Error: " << query.lastError().databaseText().toLocal8Bit();
return QStringList();
}