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
utils/rdalsaconfig/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2009-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2009-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 -I$(top_srcdir)/rdhpi @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++17 -fPIC -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi @QT6_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi
MOC = @QT_MOC@
MOC = @QT6_MOC@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@@ -36,7 +36,7 @@ dist_rdalsaconfig_SOURCES = alsaitem.cpp alsaitem.h\
nodist_rdalsaconfig_SOURCES = moc_rdalsamodel.cpp\
moc_rdalsaconfig.cpp
rdalsaconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdalsaconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST = rdalsaconfig.pro

4
utils/rdalsaconfig/rdalsamodel.cpp
View File

@@ -74,8 +74,8 @@ QVariant RDAlsaModel::data(const QModelIndex &index,int role) const
case Qt::SizeHintRole:
case Qt::FontRole:
case Qt::TextAlignmentRole:
case Qt::BackgroundColorRole:
case Qt::TextColorRole:
case Qt::BackgroundRole:
case Qt::ForegroundRole:
case Qt::CheckStateRole:
case Qt::AccessibleTextRole:
case Qt::AccessibleDescriptionRole:

8
utils/rdcheckcuts/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2012-2022 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
@@ -17,9 +17,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
@@ -29,7 +29,7 @@ bin_PROGRAMS = rdcheckcuts
dist_rdcheckcuts_SOURCES = rdcheckcuts.cpp rdcheckcuts.h
rdcheckcuts_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdcheckcuts_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.idb\

8
utils/rdcleandirs/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2015-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2015-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
@@ -17,9 +17,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
@@ -29,7 +29,7 @@ sbin_PROGRAMS = rdcleandirs
dist_rdcleandirs_SOURCES = rdcleandirs.cpp rdcleandirs.h
rdcleandirs_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdcleandirs_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.exe\

8
utils/rdclilogedit/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2016-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2016-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
@@ -17,9 +17,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
@@ -34,7 +34,7 @@ dist_rdclilogedit_SOURCES = help.cpp\
nodist_rdclilogedit_SOURCES = moc_rdclilogedit.cpp
rdclilogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdclilogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.idb\

8
utils/rdcollect/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-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
@@ -17,9 +17,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
@@ -29,7 +29,7 @@ bin_PROGRAMS = rdcollect
dist_rdcollect_SOURCES = rdcollect.cpp rdcollect.h
rdcollect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdcollect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.exe\

8
utils/rdconvert/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2017-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2017-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
@@ -17,9 +17,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
@@ -29,7 +29,7 @@ bin_PROGRAMS = rdconvert
dist_rdconvert_SOURCES = rdconvert.cpp rdconvert.h
rdconvert_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdconvert_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.exe\

8
utils/rddbconfig/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2009-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2009-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 -I$(top_srcdir)/rdhpi @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++17 -fPIC -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi @QT6_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi
MOC = @QT_MOC@
MOC = @QT6_MOC@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@@ -33,7 +33,7 @@ dist_rddbconfig_SOURCES = rddbconfig.cpp rddbconfig.h mysql_login.cpp mysql_logi
nodist_rddbconfig_SOURCES = moc_rddbconfig.cpp moc_mysql_login.cpp
rddbconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rddbconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.qm\

6
utils/rddbmgr/Makefile.am
View File

@@ -17,9 +17,9 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -fno-var-tracking-assignments -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
AM_CPPFLAGS = -Wall -fno-var-tracking-assignments -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
@@ -37,7 +37,7 @@ dist_rddbmgr_SOURCES = analyze.cpp\
schemamap.cpp\
updateschema.cpp
rddbmgr_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rddbmgr_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.exe\

2
utils/rddbmgr/analyze.cpp
View File

@@ -22,7 +22,7 @@
#include <unistd.h>
#include <sys/stat.h>
#include <QRegExp>
//#include <QRegExp>
#include <rd.h>
#include <rdconf.h>

2
utils/rddbmgr/check.cpp
View File

@@ -936,11 +936,13 @@ bool MainObject::CheckTableNames(const QStringList &canonical,
for(int i=0;i<existing.size();i++) {
found=false;
for(int j=0;j<canonical.size();j++) {
/*
QRegExp exp(canonical.at(j));
exp.setPatternSyntax(QRegExp::Wildcard);
if(exp.indexIn(existing.at(i),0)>=0) {
found=true;
}
*/
}
if(!found) {
extra.push_back(existing.at(i));

8
utils/rddelete/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-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
@@ -17,9 +17,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
@@ -31,7 +31,7 @@ dist_rddelete_SOURCES = rddelete.cpp rddelete.h
nodist_rddelete_SOURCES = moc_rddelete.cpp
rddelete_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rddelete_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.idb\

8
utils/rdexport/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2016-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2016-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
@@ -17,9 +17,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
@@ -31,7 +31,7 @@ dist_rdexport_SOURCES = rdexport.cpp rdexport.h
nodist_rdexport_SOURCES = moc_rdexport.cpp
rdexport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdexport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.idb\

8
utils/rdgpimon/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-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
@@ -17,9 +17,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
@@ -43,7 +43,7 @@ dist_rdgpimon_SOURCES = gpi_label.cpp gpi_label.h\
nodist_rdgpimon_SOURCES = moc_gpi_label.cpp\
moc_rdgpimon.cpp
rdgpimon_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdgpimon_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST = rdgpimon.pro\
rdgpimon_cs.ts\

10
utils/rdgpimon/gpi_label.cpp
View File

@@ -2,7 +2,7 @@
//
// A Qt-based application for testing general purpose input (GPI) devices.
//
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@@ -39,8 +39,8 @@ GpiLabel::GpiLabel(QWidget *parent)
// On Cart Label
//
QPalette p=palette();
p.setColor(QPalette::Active,QPalette::Foreground,Qt::darkGreen);
p.setColor(QPalette::Inactive,QPalette::Foreground,Qt::darkGreen);
p.setColor(QPalette::Active,QPalette::WindowText,Qt::darkGreen);
p.setColor(QPalette::Inactive,QPalette::WindowText,Qt::darkGreen);
gpi_oncart_label=new QLabel(this);
gpi_oncart_label->setGeometry(0,33,59,16);
gpi_oncart_label->setFont(labelFont());
@@ -50,8 +50,8 @@ GpiLabel::GpiLabel(QWidget *parent)
//
// Off Cart Label
//
p.setColor(QPalette::Active,QPalette::Foreground,Qt::darkRed);
p.setColor(QPalette::Inactive,QPalette::Foreground,Qt::darkRed);
p.setColor(QPalette::Active,QPalette::WindowText,Qt::darkRed);
p.setColor(QPalette::Inactive,QPalette::WindowText,Qt::darkRed);
gpi_offcart_label=new QLabel(this);
gpi_offcart_label->setGeometry(0,49,59,16);
gpi_offcart_label->setFont(labelFont());

18
utils/rdgpimon/rdgpimon.cpp
View File

@@ -2,7 +2,7 @@
//
// A Qt-based application for testing General Purpose Input (GPI) devices.
//
// (C) Copyright 2002-2023 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@@ -155,18 +155,18 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
QPalette p=palette();
p.setColor(QPalette::Active,QPalette::Foreground,Qt::darkGreen);
p.setColor(QPalette::Inactive,QPalette::Foreground,Qt::darkGreen);
p.setColor(QPalette::Disabled,QPalette::Foreground,Qt::darkGreen);
p.setColor(QPalette::Active,QPalette::WindowText,Qt::darkGreen);
p.setColor(QPalette::Inactive,QPalette::WindowText,Qt::darkGreen);
p.setColor(QPalette::Disabled,QPalette::WindowText,Qt::darkGreen);
label->setPalette(p);
label=new QLabel(tr("Red = OFF Cart"),this);
label->setGeometry(200,392,300,12);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
p.setColor(QPalette::Active,QPalette::Foreground,Qt::darkRed);
p.setColor(QPalette::Inactive,QPalette::Foreground,Qt::darkRed);
p.setColor(QPalette::Disabled,QPalette::Foreground,Qt::darkRed);
p.setColor(QPalette::Active,QPalette::WindowText,Qt::darkRed);
p.setColor(QPalette::Inactive,QPalette::WindowText,Qt::darkRed);
p.setColor(QPalette::Disabled,QPalette::WindowText,Qt::darkRed);
label->setPalette(p);
//
@@ -221,13 +221,13 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
Qt::white);
gpi_scroll_color.setColor(QPalette::Active,QPalette::Button,
Qt::blue);
gpi_scroll_color.setColor(QPalette::Active,QPalette::Background,
gpi_scroll_color.setColor(QPalette::Active,QPalette::Window,
Qt::lightGray);
gpi_scroll_color.setColor(QPalette::Inactive,QPalette::ButtonText,
Qt::white);
gpi_scroll_color.setColor(QPalette::Inactive,QPalette::Button,
Qt::blue);
gpi_scroll_color.setColor(QPalette::Inactive,QPalette::Background,
gpi_scroll_color.setColor(QPalette::Inactive,QPalette::Window,
Qt::lightGray);
gpi_events_report_button=new QPushButton(tr("Report"),this);

8
utils/rdimport/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-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
@@ -17,9 +17,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
@@ -33,7 +33,7 @@ dist_rdimport_SOURCES = journal.cpp journal.h\
nodist_rdimport_SOURCES = moc_rdimport.cpp
rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.idb\

4
utils/rdimport/journal.cpp
View File

@@ -139,7 +139,7 @@ void Journal::sendAll()
used_addrs.clear();
if(c_good_groups.size()>0) {
QMultiMap<QString,QString> grp_map=GroupsByAddress(c_good_groups);
for(QMap<QString,QString>::const_iterator it=grp_map.begin();
for(QMultiMap<QString,QString>::const_iterator it=grp_map.begin();
it!=grp_map.end();it++) {
if(!used_addrs.contains(it.key())) {
QString errors;
@@ -187,7 +187,7 @@ void Journal::sendAll()
used_addrs.clear();
if(c_bad_groups.size()>0) {
QMultiMap<QString,QString> grp_map=GroupsByAddress(c_bad_groups);
for(QMap<QString,QString>::const_iterator it=grp_map.begin();
for(QMultiMap<QString,QString>::const_iterator it=grp_map.begin();
it!=grp_map.end();it++) {
if(!used_addrs.contains(it.key())) {
QString errors;

8
utils/rdmaint/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2008-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2008-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
@@ -17,9 +17,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
@@ -31,7 +31,7 @@ dist_rdmaint_SOURCES = rdmaint.cpp rdmaint.h
nodist_rdmaint_SOURCES = moc_rdmaint.cpp
rdmaint_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdmaint_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.idb\

8
utils/rdmarkerset/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-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
@@ -17,9 +17,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
@@ -31,7 +31,7 @@ dist_rdmarkerset_SOURCES = rdmarkerset.cpp rdmarkerset.h
nodist_rdmarkerset_SOURCES = moc_rdmarkerset.cpp
rdmarkerset_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdmarkerset_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST =

8
utils/rdmetadata/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-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
@@ -17,9 +17,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
@@ -31,7 +31,7 @@ dist_rdmetadata_SOURCES = rdmetadata.cpp rdmetadata.h
nodist_rdmetadata_SOURCES = moc_rdmetadata.cpp
rdmetadata_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdmetadata_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST =

8
utils/rdpopup/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2009-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2009-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
@@ -17,9 +17,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
@@ -29,7 +29,7 @@ bin_PROGRAMS = rdpopup
dist_rdpopup_SOURCES = rdpopup.cpp rdpopup.h
rdpopup_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdpopup_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.idb\

8
utils/rdrender/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2017-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2017-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
@@ -17,9 +17,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
@@ -31,7 +31,7 @@ dist_rdrender_SOURCES = rdrender.cpp rdrender.h
nodist_rdrender_SOURCES = moc_rdrender.cpp
rdrender_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdrender_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.idb\

8
utils/rdselect_helper/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2018-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2018-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
@@ -17,8 +17,8 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CLI_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
MOC = @QT_MOC@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++17 -fPIC @QT6_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
MOC = @QT6_MOC@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@@ -36,7 +36,7 @@ nodist_rdselect_helper_SOURCES = moc_rdselect_helper.cpp\
rdconfig.cpp rdconfig.h\
rdprofile.cpp rdprofile.h
rdselect_helper_LDADD = @QT5_CLI_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdselect_helper_LDADD = @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.idb\

6
utils/rdselect_helper/rdselect_helper.cpp
View File

@@ -23,9 +23,9 @@
#include <sys/mount.h>
#include <sys/types.h>
#include <qcoreapplication.h>
#include <qdir.h>
#include <qprocess.h>
#include <QCoreApplication>
#include <QDir>
#include <QProcess>
#include "rd.h"
#include "rdselect_helper.h"

8
utils/rdsinglestart/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 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
@@ -17,9 +17,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
@@ -29,7 +29,7 @@ bin_PROGRAMS = rdsinglestart
dist_rdsinglestart_SOURCES = rdsinglestart.cpp rdsinglestart.h
rdsinglestart_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdsinglestart_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.exe\

8
utils/rdsoftkeys/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-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
@@ -17,9 +17,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
@@ -31,7 +31,7 @@ dist_rdsoftkeys_SOURCES = rdsoftkeys.cpp rdsoftkeys.h
nodist_rdsoftkeys_SOURCES = moc_rdsoftkeys.cpp
rdsoftkeys_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdsoftkeys_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.exe\

2
utils/rdsoftkeys/rdsoftkeys.cpp
View File

@@ -104,7 +104,7 @@ MainWidget::MainWidget(RDConfig *config,Qt::WindowFlags f)
QString::asprintf("Color%d",n+1),"")).
isEmpty()) {
color=QColor(color_name);
QPalette pal=QPalette(color,palette().color(QPalette::Background));
QPalette pal=QPalette(color,palette().color(QPalette::Window));
color.getHsv(&h,&s,&v);
if((h>180)&&(h<300)) {
v=255;

8
utils/rmlsend/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-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
@@ -17,9 +17,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
@@ -41,7 +41,7 @@ dist_rmlsend_SOURCES = rmlsend.cpp rmlsend.h
nodist_rmlsend_SOURCES = moc_rmlsend.cpp
rmlsend_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rmlsend_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST = rmlsend.pro\
rmlsend_cs.ts\

4
utils/rmlsend/rmlsend.cpp
View File

@@ -2,7 +2,7 @@
//
// A utility for sending RML Commands
//
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@@ -376,7 +376,7 @@ void MainObject::InitStream()
}
}
input_stream=new QTextStream(f,QIODevice::ReadOnly);
input_stream->setCodec("UTF-8");
input_stream->setEncoding(QStringConverter::Utf8);
}