Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-19 17:11:15 +02:00
Code Issues Projects Releases Wiki Activity

2025-04-28 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Upgrade Qt dependency from Qt5 to Qt6.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2025-04-28 09:20:03 -04:00
parent 5950a9f7ab
commit 162aa3e483
169 changed files with 747 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rdmonitor/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2012-2021 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2012-2025 Fred Gleason <fredg@paravelsystems.com>
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License version 2 as
@@ -18,9 +18,9 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++17 -fPIC -I$(top_srcdir)/lib @QT6_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
MOC = @QT6_MOC@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@@ -44,7 +44,7 @@ dist_rdmonitor_SOURCES = positiondialog.cpp positiondialog.h\
nodist_rdmonitor_SOURCES = moc_positiondialog.cpp\
moc_rdmonitor.cpp
rdmonitor_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdmonitor_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST = rdmonitor.pro\
rdmonitor_cs.ts\

3
rdmonitor/positiondialog.cpp
View File

@@ -22,11 +22,10 @@
#include "positiondialog.h"
PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *mconfig,
PositionDialog::PositionDialog(RDMonitorConfig *mconfig,
RDConfig *config,QWidget *parent)
: RDDialog(config,parent)
{
pos_desktop_widget=dw;
pos_config=mconfig;
setWindowTitle("RDMonitor");

14
rdmonitor/positiondialog.h
View File

@@ -2,7 +2,7 @@
//
// Dialog to set RDMonitor screen position.
//
// (C) Copyright 2013-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2013-2025 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -21,11 +21,10 @@
#ifndef POSITIONDIALOG_H
#define POSITIONDIALOG_H
#include <qcombobox.h>
#include <qdesktopwidget.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <qspinbox.h>
#include <QComboBox>
#include <QLabel>
#include <QPushButton>
#include <QSpinBox>
#include <rddialog.h>
#include <rdmonitor_config.h>
@@ -34,7 +33,7 @@ class PositionDialog : public RDDialog
{
Q_OBJECT
public:
PositionDialog(QDesktopWidget *dw,RDMonitorConfig *mconfig,RDConfig *config,
PositionDialog(RDMonitorConfig *mconfig,RDConfig *config,
QWidget *parent=0);
QSize sizeHint() const;
QSizePolicy sizePolicy() const;
@@ -59,7 +58,6 @@ class PositionDialog : public RDDialog
QSpinBox *pos_y_offset_spin;
QPushButton *pos_ok_button;
QPushButton *pos_cancel_button;
QDesktopWidget *pos_desktop_widget;
RDMonitorConfig *pos_config;
};

10
rdmonitor/rdmonitor.cpp
View File

@@ -91,11 +91,9 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
mon_rdconfig->load();
mon_rdconfig->setModuleName("RDMonitor");
mon_desktop_widget=new QDesktopWidget();
mon_config=new RDMonitorConfig();
mon_config->load();
mon_position_dialog=new PositionDialog(mon_desktop_widget,mon_config,
mon_rdconfig,this);
mon_position_dialog=new PositionDialog(mon_config,mon_rdconfig,this);
mon_position_dialog->setGeometry(0,0,mon_position_dialog->sizeHint().width(),
mon_position_dialog->sizeHint().height());
@@ -190,14 +188,14 @@ void MainWidget::quitMainWidget()
void MainWidget::enterEvent(QEvent *e)
{
mon_status_label->show();
QWidget::enterEvent(e);
// QWidget::enterEvent(e);
}
void MainWidget::leaveEvent(QEvent *e)
{
mon_status_label->hide();
QWidget::leaveEvent(e);
// QWidget::leaveEvent(e);
}
@@ -301,7 +299,7 @@ void MainWidget::SetPosition()
else {
geo=screens.at(0)->geometry();
}
QRect main_geo=mon_desktop_widget->geometry();
QRect main_geo;//=mon_desktop_widget->geometry();
int x=0;
int dx=mon_config->xOffset();
int y=0;

3
rdmonitor/rdmonitor.h
View File

@@ -2,7 +2,7 @@
//
// System Monitor Applet for Rivendell
//
// (C) Copyright 2012-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2012-2025 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -70,7 +70,6 @@ class MainWidget : public RDWidget
int mon_rdselect_y;
QLabel *mon_status_label;
// StatusTip *mon_tooltip;
QDesktopWidget *mon_desktop_widget;
RDMonitorConfig *mon_config;
RDConfig *mon_rdconfig;
};