Skip to content

Commit ea12c84

Browse files
aarntaarnt
committed
- Make code compatible with Qt5/Qt6 libs.
1 parent cdb9600 commit ea12c84

18 files changed

+100
-61
lines changed

‎CHANGELOG‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
0.3.2 (dev)
2+
Make code compatible with Qt5/Qt6 libs.
3+
14
0.3.1 (2023/09/08)
25
Added german translation (thanks to Leon Schumacher - 42LoCo42).
36
Added dutch translation (thanks to Heimen Stoffels - Vistaus).

‎src/QtSolutions/qtlocalpeer.cpp‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@
4242
#include <QtCore/QCoreApplication>
4343
#include <QtCore/QTime>
4444
#include <QRegularExpression>
45+
46+
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
47+
#include <QByteArrayView>
48+
#endif
49+
4550
#include <QDataStream>
4651

4752
#if defined(Q_OS_WIN)
@@ -81,9 +86,15 @@ QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
8186
prefix.truncate(6);
8287

8388
QByteArray idc = id.toUtf8();
89+
90+
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
91+
quint16 idNum = qChecksum(QByteArrayView(idc.constData(), idc.size()), Qt::ChecksumIso3309);
92+
#else
8493
quint16 idNum = qChecksum(idc.constData(), idc.size());
85-
socketName = QLatin1String("qtsingleapp-") + prefix
86-
+ QLatin1Char('-') + QString::number(idNum, 16);
94+
#endif
95+
96+
socketName = QLatin1String("qtsingleapp-") + prefix +
97+
QLatin1Char('-') + QString::number(idNum, 16);
8798

8899
#if defined(Q_OS_WIN)
89100
if (!pProcessIdToSessionId) {

‎src/main.cpp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "argumentlist.h"
2323
#include "strconstants.h"
2424
#include "unixcommand.h"
25-
#include "wmhelper.h"
25+
//#include "wmhelper.h"
2626
#include <iostream>
2727

2828
#include "QtSolutions/qtsingleapplication.h"
@@ -33,6 +33,10 @@
3333

3434
int main(int argc, char *argv[])
3535
{
36+
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
37+
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
38+
#endif
39+
3640
ArgumentList *argList = new ArgumentList(argc, argv);
3741
QString packagesToInstall;
3842
QtSingleApplication app( StrConstants::getApplicationName(), argc, argv );
@@ -54,27 +58,32 @@ int main(int argc, char *argv[])
5458
else
5559
app.sendMessage(QStringLiteral("RAISE"));
5660

61+
delete argList;
5762
return 0;
5863
}
5964

6065
if(!QFile::exists(ctn_OCTOXBPS_SUDO))
6166
{
6267
QMessageBox::critical( 0, StrConstants::getApplicationName(), StrConstants::getErrorBinaryXNotFound(ctn_OCTOXBPS_SUDO));
68+
delete argList;
6369
return 1;
6470
}
6571
if(!QFile::exists(QStringLiteral("/usr/bin/xbps-query")))
6672
{
6773
QMessageBox::critical( 0, StrConstants::getApplicationName(), StrConstants::getErrorBinaryXNotFound(QStringLiteral("xbps-query")));
74+
delete argList;
6875
return 1;
6976
}
7077
if(!QFile::exists(QStringLiteral("/usr/bin/curl")))
7178
{
7279
QMessageBox::critical( 0, StrConstants::getApplicationName(), StrConstants::getErrorBinaryXNotFound(QStringLiteral("curl")));
80+
delete argList;
7381
return 1;
7482
}
7583
if(!QFile::exists(QStringLiteral("/usr/bin/sh")))
7684
{
7785
QMessageBox::critical( 0, StrConstants::getApplicationName(), StrConstants::getErrorBinaryXNotFound(QStringLiteral("sh")));
86+
delete argList;
7887
return 1;
7988
}
8089

@@ -135,4 +144,5 @@ int main(int argc, char *argv[])
135144
QResource::registerResource(QStringLiteral("./resources.qrc"));
136145

137146
return app.exec();
147+
delete argList;
138148
}

‎src/mainwindow.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include <QElapsedTimer>
4949
#include <QToolTip>
5050
#include <QFutureWatcher>
51+
#include <QActionGroup>
5152
#include <QtConcurrent/QtConcurrentRun>
5253

5354
/*
@@ -240,7 +241,7 @@ void MainWindow::show()
240241
QMainWindow::show();
241242

242243
m_listOfVisitedPackages.clear();
243-
m_indOfVisitedPackage = 0;
244+
m_indOfVisitedPackage = -1;
244245

245246
if (Package::hasXBPSDatabase())
246247
{
@@ -351,6 +352,7 @@ void MainWindow::outputTextBrowserAnchorClicked(const QUrl &link)
351352
if (link.toString().contains("goto:"))
352353
{
353354
QString pkgName = link.toString().mid(5);
355+
if (pkgName.isEmpty()) return;
354356

355357
if (m_packageModel->getPackageCount() > 0)
356358
{
@@ -390,14 +392,14 @@ void MainWindow::outputTextBrowserAnchorClicked(const QUrl &link)
390392
}
391393
else if (m_indOfVisitedPackage == 1)
392394
{
393-
m_indOfVisitedPackage++;
394395
indIncremented = true;
395396
m_listOfVisitedPackages.insert(m_indOfVisitedPackage, selectedPackage->name);
396397
m_listOfVisitedPackages.insert(m_indOfVisitedPackage+1, pkgName);
397398
}
398399
}
399400
else //The list is EMPTY!
400401
{
402+
m_indOfVisitedPackage = -1;
401403
m_indOfVisitedPackage++;
402404
indIncremented = true;
403405
m_listOfVisitedPackages.insert(m_indOfVisitedPackage, selectedPackage->name);

‎src/mainwindow.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include <QToolButton>
3333
#include <QList>
3434
#include <QUrl>
35+
#include <QActionGroup>
3536

3637
class QTreeView;
3738
class QStandardItemModel;
@@ -46,7 +47,7 @@ class QTextBrowser;
4647
class QMenu;
4748
class SearchLineEdit;
4849
class QAction;
49-
class QActionGroup;
50+
//class QActionGroup;
5051
class QTreeWidgetItem;
5152
class QTime;
5253
class XBPSExec;

‎src/mainwindow_help.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void MainWindow::initTabHelpUsage()
4141
QWidget *tabHelpUsage = new QWidget();
4242
QGridLayout *gridLayoutX = new QGridLayout(tabHelpUsage);
4343
gridLayoutX->setSpacing(0);
44-
gridLayoutX->setMargin(0);
44+
gridLayoutX->setContentsMargins(0, 0, 0, 0);
4545

4646
QTextBrowser *text = new QTextBrowser(tabHelpUsage);
4747
text->setObjectName("textBrowser");

‎src/mainwindow_init.cpp‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include <cassert>
3535
#include "termwidget.h"
3636

37+
#include <QGridLayout>
3738
#include <QLabel>
3839
#include <QStandardItemModel>
3940
#include <QTextBrowser>
@@ -46,6 +47,7 @@
4647
#include <QSystemTrayIcon>
4748
#include <QToolButton>
4849
#include <QDebug>
50+
#include <QActionGroup>
4951

5052
/*
5153
* Loads various application settings configured in ~/.config/octopkg/octopkg.conf
@@ -83,9 +85,9 @@ void MainWindow::loadPanelSettings(){
8385
}
8486

8587
//Do we have to show or hide the Groups panel?
86-
if (!SettingsManager::getShowGroupsPanel()){
88+
/*if (!SettingsManager::getShowGroupsPanel()){
8789
hideGroupsWidget();
88-
}
90+
}*/
8991
}
9092

9193
/*
@@ -363,12 +365,12 @@ void MainWindow::changeTabWidgetPropertiesIndex(const int newIndex)
363365
refreshTabFiles();
364366
}
365367

366-
ui->twProperties->currentWidget()->childAt(1,1)->setFocus();
368+
//ui->twProperties->currentWidget()->childAt(1,1)->setFocus();
367369
}
368370
else
369371
{
370372
//For any other tab... just doing the following is enough
371-
ui->twProperties->currentWidget()->childAt(1,1)->setFocus();
373+
//ui->twProperties->currentWidget()->childAt(1,1)->setFocus();
372374
}
373375
}
374376

@@ -391,7 +393,7 @@ void MainWindow::initTabTransaction()
391393
QWidget *tabTransaction = new QWidget();
392394
QGridLayout *gridLayoutX = new QGridLayout(tabTransaction);
393395
gridLayoutX->setSpacing(0);
394-
gridLayoutX->setMargin(0);
396+
gridLayoutX->setContentsMargins(0, 0, 0, 0);
395397

396398
QTreeView *tvTransaction = new QTreeView(tabTransaction);
397399
tvTransaction->setObjectName("tvTransaction");
@@ -491,8 +493,8 @@ void MainWindow::removePackageTreeViewConnections()
491493
void MainWindow::initTabInfo(){
492494
QWidget *tabInfo = new QWidget();
493495
QGridLayout *gridLayoutX = new QGridLayout ( tabInfo );
494-
gridLayoutX->setSpacing ( 0 );
495-
gridLayoutX->setMargin ( 0 );
496+
gridLayoutX->setSpacing(0);
497+
gridLayoutX->setContentsMargins(0, 0, 0, 0);
496498

497499
QTextBrowser *text = new QTextBrowser(tabInfo);
498500
text->setObjectName("textBrowser");
@@ -530,7 +532,7 @@ void MainWindow::initTabTerminal()
530532
QWidget *tabTerminal = new QWidget(this);
531533
QGridLayout *gridLayoutX = new QGridLayout(tabTerminal);
532534
gridLayoutX->setSpacing ( 0 );
533-
gridLayoutX->setMargin ( 0 );
535+
gridLayoutX->setContentsMargins(0, 0, 0, 0);
534536

535537
m_console = new TermWidget(this);
536538
//connect(m_console, SIGNAL(finished()), this, SLOT(initTabTerminal()));
@@ -570,9 +572,9 @@ void MainWindow::onExecCommandInTabTerminal(QString command)
570572
void MainWindow::initTabFiles()
571573
{
572574
QWidget *tabPkgFileList = new QWidget(this);
573-
QGridLayout *gridLayoutX = new QGridLayout ( tabPkgFileList );
574-
gridLayoutX->setSpacing ( 0 );
575-
gridLayoutX->setMargin ( 0 );
575+
QGridLayout *gridLayoutX = new QGridLayout (tabPkgFileList);
576+
gridLayoutX->setSpacing(0);
577+
gridLayoutX->setContentsMargins(0, 0, 0, 0);
576578
QStandardItemModel *modelPkgFileList = new QStandardItemModel(this);
577579
QTreeView *tvPkgFileList = new QTreeView(tabPkgFileList);
578580
tvPkgFileList->setEditTriggers(QAbstractItemView::NoEditTriggers);
@@ -620,8 +622,8 @@ void MainWindow::initTabOutput()
620622
{
621623
QWidget *tabOutput = new QWidget();
622624
QGridLayout *gridLayoutX = new QGridLayout(tabOutput);
623-
gridLayoutX->setSpacing ( 0 );
624-
gridLayoutX->setMargin ( 0 );
625+
gridLayoutX->setSpacing(0);
626+
gridLayoutX->setContentsMargins(0, 0, 0, 0);
625627

626628
QTextBrowser *text = new QTextBrowser(tabOutput);
627629
text->setObjectName("textBrowser");

‎src/mainwindow_news.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void MainWindow::showDistroNews(QString distroRSSXML, bool searchForLatestNews)
9898
{
9999
QString html;
100100

101-
if (distroRSSXML.count() >= 200)
101+
if (distroRSSXML.length() >= 200)
102102
{
103103
if (distroRSSXML.at(0)=='*')
104104
{
@@ -182,7 +182,7 @@ void MainWindow::initTabNews()
182182
QWidget *tabNews = new QWidget();
183183
QGridLayout *gridLayoutX = new QGridLayout(tabNews);
184184
gridLayoutX->setSpacing(0);
185-
gridLayoutX->setMargin(0);
185+
gridLayoutX->setContentsMargins(0, 0, 0, 0);
186186

187187
QTextBrowser *text = new QTextBrowser(tabNews);
188188
text->setObjectName("textBrowser");

‎src/mainwindow_refresh.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#include <QElapsedTimer>
4343
#include <QMutableListIterator>
4444
#include <QtConcurrent/QtConcurrentRun>
45+
#include <QActionGroup>
4546

4647
/*
4748
* If we have some outdated packages, let's put an angry red face icon in this app!

‎src/mainwindow_transaction.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ void MainWindow::doRemoveAndInstall()
848848
QStringList *installTargets = ti.packages;
849849
QString ds = ti.sizeToDownload;
850850

851-
if (ti.sizeToDownload == 0) ds = "0.00 Bytes";
851+
if (ti.sizeToDownload == "0") ds = "0.00 Bytes";
852852

853853
QString installList;
854854

@@ -1037,7 +1037,7 @@ void MainWindow::doInstall()
10371037
QString list;
10381038
QString ds = ti.sizeToDownload;
10391039

1040-
if (ti.sizeToDownload == 0) ds = "0.00 Bytes";
1040+
if (ti.sizeToDownload == "0") ds = "0.00 Bytes";
10411041

10421042
TransactionDialog question(this);
10431043

0 commit comments

Comments
 (0)