Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-29 07:02:34 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -25035,3 +25035,5 @@
'apis/rivwebcapi/rivwebcapi/' to avoid false warnings.
2025-04-26 Fred Gleason <fredg@paravelsystems.com>
* Restored SHA1 hash code in 'lib/rdhash.cpp'.
2025-04-28 Fred Gleason <fredg@paravelsystems.com>
* Upgrade Qt dependency from Qt5 to Qt6.

2
INSTALL
View File

@ -82,7 +82,7 @@ Requests, v2.12.5 or later
HTTP transfer library for Python. Available at
http://docs.python-requests.org/.
Qt5 Toolkit, v5.9 or better
Qt5 Toolkit, v6.9 or better
Most modern Linux distros include this. It can also be downloaded directly
at http://www.qt.io/.

106
acinclude.m4
View File

@ -2,7 +2,7 @@
#
# Local Autoconf macro definitions
#
# (C) Copyright 2006-2021 Fred Gleason <fredg@paravelsystems.com>
# (C) Copyright 2006-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
@ -196,3 +196,107 @@ AC_DEFUN([AR_PYTHON_MODULE],[
])dnl
])dnl
])dnl
dnl Attempt to find a Qt6 installation.
dnl
dnl By default, this will look for a system-wide install, at
dnl '/usr/lib/<machine>/qt6/qt6.conf', with <machine> being gcc(1)'s
dnl idea of the machine's arch/os/distro --e.g. 'x86_64-linux-gnu'. This can
dnl overridden by defining a 'QT6_PATH' environmental variable containing
dnl the path to the configuration file of the desired Qt6 installation.
dnl
dnl If an installation is successfully detected, the following variables
dnl are set:
dnl
dnl prefix_CFLAGS - Flags to pass to the C++ compiler
dnl
dnl prefix_LIBS - Linker arguments
dnl
dnl prefix_MOC - Path to the appropriate moc(1)
dnl
AC_DEFUN([AQ_FIND_QT6],[AC_REQUIRE([AC_PROG_CXX])]
[
AC_MSG_CHECKING([for ]$1)
dnl
dnl Load the Qt6 configuration
dnl
AC_ARG_VAR(QT6_PATH,[path to the location of the Qt6 installation's configuration (default: "/usr/lib/<machine>/qt6/qt6.conf")])
if test -n "$QT6_PATH" ; then
config_path=$QT6_PATH
if ! test -f $config_path ; then
config_path=""
fi
else
config_path=/usr/lib/$(gcc -dumpmachine)/qt6/qt6.conf
if ! test -f $config_path ; then
config_path=/usr/lib/$(gcc -dumpmachine)/qtchooser/qt6.conf
if ! test -f $config_path ; then
config_path=""
fi
fi
fi
if test $config_path ; then
qt_var=$(grep ^Prefix\= $config_path)
qt_Prefix=${qt_var:7}
qt_var=$(grep ^ArchData\= $config_path)
qt_ArchData=${qt_var:9}
qt_var=$(grep ^Binaries\= $config_path)
qt_Binaries=${qt_var:9}
qt_var=$(grep ^Data\= $config_path)
qt_Data=${qt_var:5}
qt_var=$(grep ^Documentation\= $config_path)
qt_Documentation=${qt_var:14}
qt_var=$(grep ^Headers\= $config_path)
qt_Headers=${qt_var:8}
qt_var=$(grep ^HostBinaries\= $config_path)
qt_HostBinaries=${qt_var:13}
qt_var=$(grep ^HostData\= $config_path)
qt_HostData=${qt_var:9}
qt_var==$(grep ^HostLibraries\= $config_path)
qt_HostLibraries=${qt_var:15}
qt_var=$(grep ^Libraries\= $config_path)
qt_Libraries=${qt_var:10}
qt_var=$(grep ^LibraryExecutables\= $config_path)
qt_LibraryExecutables=${qt_var:19}
qt_var=$(grep ^Plugins\= $config_path)
qt_Plugins=${qt_var:8}
qt_var=$(grep ^Qml2Imports\= $config_path)
qt_Qml2Imports=${qt_var:12}
qt_var=$(grep ^Settings\= $config_path)
qt_Settings=${qt_var:9}
qt_var=$(grep ^Translations\= $config_path)
qt_Translations=${qt_var:13}
qt_libs="-L "$qt_Prefix$qt_Libraries
qt_cppflags="-I"$qt_Prefix"/"$qt_Headers
qt_libs="-L"$qt_Prefix"/"$qt_Libraries
qt_moc=$qt_Prefix"/"$qt_Binaries"/moc"
if test -n "$QT6_MOC" ; then
qt_moc=$QT6_MOC
fi
if test -x $qt_moc ; then
for module in $2
do
:
qt_cppflags=$qt_cppflags" -DQT_"${module^^}"_LIB -I"$qt_Prefix"/"$qt_Headers"/Qt"$module
qt_libs=$qt_libs" -lQt6"$module
done
AC_ARG_VAR([$1][_CFLAGS],[C++ compiler flags for $1, overriding autodetected values])
AC_ARG_VAR([$1][_LIBS],[linker flags for $1, overriding autodetected values])
AC_ARG_VAR([$1][_MOC],[path to the moc(1) binary, overriding autodetected values])
AC_SUBST([$1][_CFLAGS],$qt_cppflags)
AC_SUBST([$1][_LIBS],$qt_libs)
AC_SUBST([$1][_MOC],$qt_moc)
AC_MSG_RESULT([found])
$3
else
AC_MSG_RESULT([moc(1) not found])
$4
fi
else
AC_MSG_RESULT([not found])
$4
fi
]
)

8
cae/Makefile.am
View File

@ -2,7 +2,7 @@
##
## Core Audio Engine Makefile.am for Rivendell
##
## Copyright 2002-2023 Fred Gleason <fredg@paravelsystems.com>
## 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
@ -19,9 +19,9 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ @LIBJACK_CFLAGS@
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi -Wno-strict-aliasing -std=c++17 -fPIC @QT6_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ @LIBJACK_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
@ -50,7 +50,7 @@ caed_LDADD = @LIB_RDLIBS@\
@LIBJACK_LIBS@\
@LIBSRC@\
@LIBVORBIS@\
@QT5_LIBS@\
@QT6_LIBS@\
@MUSICBRAINZ_LIBS@\
@IMAGEMAGICK_LIBS@

33
configure.ac
View File

@ -93,15 +93,26 @@ AC_ARG_ENABLE(i18n-updates,[ --enable-i18n-updates enable I18N metadata updat
#
# Check for Qt5 (Mandatory)
#
PKG_CHECK_MODULES(QT5,Qt5Core Qt5Widgets Qt5Gui Qt5Network Qt5Sql Qt5Xml Qt5WebKitWidgets,,[AC_MSG_ERROR([*** Qt5 not found ***])])
PKG_CHECK_MODULES(QT5_CLI,Qt5Core Qt5Network Qt5Sql Qt5Xml,,[AC_MSG_ERROR([*** Qt5 not found ***])])
AC_CHECK_PROG(MOC_NAME,moc-qt5,[moc-qt5],[moc])
AC_SUBST(QT_MOC,$MOC_NAME)
#PKG_CHECK_MODULES(QT5,Qt5Core Qt5Widgets Qt5Gui Qt5Network Qt5Sql Qt5Xml Qt5WebKitWidgets,,[AC_MSG_ERROR([*** Qt5 not found ***])])
#PKG_CHECK_MODULES(QT5_CLI,Qt5Core Qt5Network Qt5Sql Qt5Xml,,[AC_MSG_ERROR([*** Qt5 not found ***])])
#AC_CHECK_PROG(MOC_NAME,moc-qt5,[moc-qt5],[moc])
#AC_SUBST(QT_MOC,$MOC_NAME)
AC_CHECK_PROG(LUPDATE_NAME,lupdate-qt5,[lupdate-qt5],[lupdate])
#AC_CHECK_PROG(LUPDATE_NAME,lupdate-qt5,[lupdate-qt5],[lupdate])
#AC_SUBST(QT_LUPDATE,$LUPDATE_NAME)
#AC_CHECK_PROG(LRELEASE_NAME,lrelease-qt5,[lrelease-qt5],[lrelease])
#AC_SUBST(QT_LRELEASE,$LRELEASE_NAME)
#
# Check for Qt6 (Mandatory)
#
AQ_FIND_QT6(QT6,Core Gui Widgets Network Sql Xml,[],[AC_MSG_ERROR([*** Qt6 not found ***])])
AC_CHECK_PROG(LUPDATE_NAME,lupdate-qt6,[lupdate-qt6],[lupdate])
AC_SUBST(QT_LUPDATE,$LUPDATE_NAME)
AC_CHECK_PROG(LRELEASE_NAME,lrelease-qt5,[lrelease-qt5],[lrelease])
AC_CHECK_PROG(LRELEASE_NAME,lrelease-qt6,[lrelease-qt6],[lrelease])
AC_SUBST(QT_LRELEASE,$LRELEASE_NAME)
@ -143,7 +154,7 @@ case "$ar_distro_id" in
AC_SUBST(APACHE_CONFIG_DIR,"/etc/apache2/conf.d")
AC_SUBST(USERMODE_PKG,"")
AC_SUBST(MYSQL_PKG,"mariadb-client")
AC_SUBST(QT_MYSQL_PKG,"libqt5sql5-mysql")
AC_SUBST(QT_MYSQL_PKG,"libqt6sql5-mysql")
AC_SUBST(DOC_PATH,"/usr/share/doc/rivendell")
AC_SUBST(HAVE_USERMODE,"no")
AC_SUBST(RDALSACONFIG_DESKTOP_FILE,"rivendell-rdalsaconfig-sudo.desktop")
@ -161,7 +172,7 @@ case "$ar_distro_id" in
AC_SUBST(APACHE_CONFIG_DIR,"/etc/apache2/conf.d")
AC_SUBST(USERMODE_PKG,"")
AC_SUBST(MYSQL_PKG,"mariadb-client")
AC_SUBST(QT_MYSQL_PKG,"libqt5sql5-mysql")
AC_SUBST(QT_MYSQL_PKG,"libqt6sql5-mysql")
AC_SUBST(DOC_PATH,"/usr/share/doc/rivendell")
AC_SUBST(HAVE_USERMODE,"no")
AC_SUBST(RDALSACONFIG_DESKTOP_FILE,"rivendell-rdalsaconfig-sudo.desktop")
@ -179,7 +190,7 @@ case "$ar_distro_id" in
AC_SUBST(APACHE_CONFIG_DIR,"/etc/apache2/conf.d")
AC_SUBST(USERMODE_PKG,"")
AC_SUBST(MYSQL_PKG,"mariadb-client")
AC_SUBST(QT_MYSQL_PKG,"libqt5sql5-mysql")
AC_SUBST(QT_MYSQL_PKG,"libqt6sql5-mysql")
AC_SUBST(DOC_PATH,"/usr/share/doc/rivendell")
AC_SUBST(HAVE_USERMODE,"no")
AC_SUBST(RDALSACONFIG_DESKTOP_FILE,"rivendell-rdalsaconfig-sudo.desktop")
@ -197,7 +208,7 @@ case "$ar_distro_id" in
AC_SUBST(APACHE_CONFIG_DIR,"/etc/apache2/conf.d")
AC_SUBST(USERMODE_PKG,"")
AC_SUBST(MYSQL_PKG,"mariadb-client")
AC_SUBST(QT_MYSQL_PKG,"libqt5sql5-mysql")
AC_SUBST(QT_MYSQL_PKG,"libqt6sql5-mysql")
AC_SUBST(DOC_PATH,"/usr/share/doc/rivendell")
AC_SUBST(HAVE_USERMODE,"no")
AC_SUBST(RDALSACONFIG_DESKTOP_FILE,"rivendell-rdalsaconfig-sudo.desktop")
@ -225,7 +236,7 @@ case "$ar_distro_id" in
AC_SUBST(APACHE_CONFIG_DIR,"/etc/httpd/conf.d")
AC_SUBST(USERMODE_PKG,"usermode usermode-gtk")
AC_SUBST(MYSQL_PKG,"mariadb")
AC_SUBST(QT_MYSQL_PKG,"qt5-qtbase-mysql")
AC_SUBST(QT_MYSQL_PKG,"qt6-qtbase-mysql")
AC_SUBST(DOC_PATH,"/usr/share/doc/rivendell-$PACKAGE_VERSION")
AC_SUBST(HAVE_USERMODE,"yes")
AC_SUBST(RDALSACONFIG_DESKTOP_FILE,"rivendell-rdalsaconfig-root.desktop")

18
importers/Makefile.am
View File

@ -1,8 +1,8 @@
## Makefile.am
##
## Automake.am for rivendell/importers
## Makefile.am for rivendell/importers
##
## (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
@ -20,9 +20,9 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++17 -fPIC @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
@ -36,23 +36,23 @@ bin_PROGRAMS = nexgen_filter\
dist_nexgen_filter_SOURCES = nexgen_filter.cpp nexgen_filter.h
nodist_nexgen_filter_SOURCES = moc_nexgen_filter.cpp
nexgen_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
nexgen_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
dist_panel_copy_SOURCES = panel_copy.cpp panel_copy.h
nodist_panel_copy_SOURCES = moc_panel_copy.cpp
panel_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
panel_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
dist_rdcatch_copy_SOURCES = rdcatch_copy.cpp rdcatch_copy.h
nodist_rdcatch_copy_SOURCES = moc_rdcatch_copy.cpp
rdcatch_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdcatch_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
dist_rivendell_filter_SOURCES = rivendell_filter.cpp rivendell_filter.h
nodist_rivendell_filter_SOURCES = moc_rivendell_filter.cpp
rivendell_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rivendell_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
dist_wings_filter_SOURCES = wings_filter.cpp wings_filter.h
nodist_wings_filter_SOURCES = moc_wings_filter.cpp
wings_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
wings_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST = export_slax

3
importers/nexgen_filter.cpp
View File

@ -640,6 +640,7 @@ QDateTime MainObject::GetDateTime(const QString &str) const
QString MainObject::SwapCase(const QString &str) const
{
/*
QStringList parts=str.split(".");
if(parts[parts.size()-1].
contains(QRegExp("*[a-z]*",Qt::CaseSensitive,QRegExp::Wildcard))>0) {
@ -649,6 +650,8 @@ QString MainObject::SwapCase(const QString &str) const
parts[parts.size()-1]=parts[parts.size()-1].toLower();
}
return parts.join(".");
*/
return QString();
}

4
lib/Makefile.am
View File

@ -20,8 +20,8 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -Wno-strict-aliasing -std=c++11 -fPIC -I/usr/include/taglib @IMAGEMAGICK_CFLAGS@
MOC = @QT_MOC@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" @QT6_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -Wno-strict-aliasing -std=c++17 -fPIC -I/usr/include/taglib @IMAGEMAGICK_CFLAGS@
MOC = @QT6_MOC@
CWRAP = ../helpers/cwrap
# The dependency for qt's Meta Object Compiler (moc)

2
lib/export_bmiemr.cpp
View File

@ -48,7 +48,7 @@ bool RDReport::ExportBmiEmr(const QString &filename,const QDate &startdate,
return false;
}
QTextStream *strm=new QTextStream(file);
strm->setCodec("UTF-8");
strm->setEncoding(QStringConverter::Utf8);
//
// Station Type

4
lib/export_cutlog.cpp
View File

@ -2,7 +2,7 @@
//
// Export a Rivendell Cut Report.
//
// (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
@ -50,7 +50,7 @@ bool RDReport::ExportCutLog(const QString &filename,const QDate &startdate,
return false;
}
QTextStream *strm=new QTextStream(file);
strm->setCodec("UTF-8");
strm->setEncoding(QStringConverter::Utf8);
if(useLeadingZeros()) {
cart_fmt=QString::asprintf("%%0%uu",cartDigits());
}

4
lib/export_deltaflex.cpp
View File

@ -2,7 +2,7 @@
//
// Export a Rivendell Report to CBSI DeltaFlex
//
// (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
@ -48,7 +48,7 @@ bool RDReport::ExportDeltaflex(const QString &filename,const QDate &startdate,
return false;
}
QTextStream *strm=new QTextStream(file);
strm->setCodec("UTF-8");
strm->setEncoding(QStringConverter::Utf8);
if(useLeadingZeros()) {
air_fmt=QString::asprintf("%%0%uu",cartDigits());
}

4
lib/export_musicclassical.cpp
View File

@ -2,7 +2,7 @@
//
// Export a Rivendell Classical Music Playout report
//
// (C) Copyright 2014-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2014-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
@ -48,7 +48,7 @@ bool RDReport::ExportMusicClassical(const QString &filename,
return false;
}
QTextStream *strm=new QTextStream(file);
strm->setCodec("UTF-8");
strm->setEncoding(QStringConverter::Utf8);
if(useLeadingZeros()) {
cart_fmt=QString::asprintf("%%0%uu",cartDigits());
}

4
lib/export_musicplayout.cpp
View File

@ -2,7 +2,7 @@
//
// Export a Rivendell Report to an ASCII Text File.
//
// (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
@ -49,7 +49,7 @@ bool RDReport::ExportMusicPlayout(const QString &filename,
return false;
}
QTextStream *strm=new QTextStream(file);
strm->setCodec("UTF-8");
strm->setEncoding(QStringConverter::Utf8);
if(useLeadingZeros()) {
cart_fmt=QString::asprintf("%%0%uu",cartDigits());
}

4
lib/export_musicsummary.cpp
View File

@ -2,7 +2,7 @@
//
// Export a Rivendell Report to an ASCII Text File.
//
// (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
@ -47,7 +47,7 @@ bool RDReport::ExportMusicSummary(const QString &filename,
return false;
}
QTextStream *strm=new QTextStream(file);
strm->setCodec("UTF-8");
strm->setEncoding(QStringConverter::Utf8);
sql=QString("select ")+
"`ELR_LINES`.`ARTIST`,"+ // 00
"`ELR_LINES`.`TITLE`,"+ // 01

4
lib/export_nprsoundex.cpp
View File

@ -2,7 +2,7 @@
//
// Export a Rivendell NPR SoundExchange Report to an ASCII Text File.
//
// (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
@ -56,7 +56,7 @@ bool RDReport::ExportNprSoundEx(const QString &filename,const QDate &startdate,
return false;
}
QTextStream *strm=new QTextStream(file);
strm->setCodec("UTF-8");
strm->setEncoding(QStringConverter::Utf8);
//
// Generate Header

4
lib/export_radiotraffic.cpp
View File

@ -2,7 +2,7 @@
//
// Export a Rivendell Report to RadioTraffic.com
//
// (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
@ -55,7 +55,7 @@ bool RDReport::ExportRadioTraffic(const QString &filename,
return false;
}
QTextStream *strm=new QTextStream(file);
strm->setCodec("UTF-8");
strm->setEncoding(QStringConverter::Utf8);
if(useLeadingZeros()) {
air_fmt=QString::asprintf("%%0%uu ",cartDigits());
}

4
lib/export_resultsrecon.cpp
View File

@ -2,7 +2,7 @@
//
// Export a Rivendell Report in 'results' format
//
// (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
@ -43,7 +43,7 @@ bool RDReport::ExportResultsReport(const QString &filename,
return false;
}
QTextStream *strm=new QTextStream(file);
strm->setCodec("UTF-8");
strm->setEncoding(QStringConverter::Utf8);
sql=QString("select ")+
"`ELR_LINES`.`EVENT_DATETIME`,"+ // 00
"`ELR_LINES`.`EVENT_TYPE`,"+ // 01

4
lib/export_soundex.cpp
View File

@ -2,7 +2,7 @@
//
// Export a Rivendell SoundExchange Report to an ASCII Text File.
//
// (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
@ -65,7 +65,7 @@ bool RDReport::ExportSoundEx(const QString &filename,const QDate &startdate,
return false;
}
QTextStream *strm=new QTextStream(file);
strm->setCodec("UTF-8");
strm->setEncoding(QStringConverter::Utf8);
//
// Generate Header

4
lib/export_spincount.cpp
View File

@ -2,7 +2,7 @@
//
// Export a Rivendell Spin Count Report to an ASCII Text File.
//
// (C) Copyright 2015-2021 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
@ -55,7 +55,7 @@ bool RDReport::ExportSpinCount(const QString &filename,const QDate &startdate,
return false;
}
QTextStream *strm=new QTextStream(file);
strm->setCodec("UTF-8");
strm->setEncoding(QStringConverter::Utf8);
if(useLeadingZeros()) {
cart_fmt=QString::asprintf("%%0%uu",cartDigits());
}

4
lib/export_technical.cpp
View File

@ -2,7 +2,7 @@
//
// Export a Rivendell Technical Report to an ASCII Text File.
//
// (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
@ -52,7 +52,7 @@ bool RDReport::ExportTechnical(const QString &filename,const QDate &startdate,
return false;
}
QTextStream *strm=new QTextStream(file);
strm->setCodec("UTF-8");
strm->setEncoding(QStringConverter::Utf8);
if(useLeadingZeros()) {
cart_fmt=QString::asprintf("%%0%uu",cartDigits());
}

4
lib/export_textlog.cpp
View File

@ -2,7 +2,7 @@
//
// Export a Rivendell Report to an Text File.
//
// (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
@ -48,7 +48,7 @@ bool RDReport::ExportTextLog(const QString &filename,const QDate &startdate,
return false;
}
QTextStream *strm=new QTextStream(file);
strm->setCodec("UTF-8");
strm->setEncoding(QStringConverter::Utf8);
if(useLeadingZeros()) {
cart_fmt=QString::asprintf("%%0%uu",cartDigits());
}

6
lib/rdbusybar.cpp
View File

@ -2,7 +2,7 @@
//
// A 'progress bar' widget that shows busy state.
//
// (C) Copyright 2010-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2025 Fred Gleason <fredg@paravelsystems.com>
//
// it under the terms of the GNU Library General Public License
// version 2 as published by the Free Software Foundation.
@ -25,12 +25,12 @@ RDBusyBar::RDBusyBar(QWidget *parent,Qt::WindowFlags f)
bar_pos=0;
setFrameStyle(QFrame::StyledPanel|QFrame::Sunken);
QPalette p=palette();
p.setColor(QPalette::Active,QPalette::Background,
p.setColor(QPalette::Active,QPalette::Window,
p.color(QPalette::Active,QPalette::Base));
setPalette(p);
bar_label=new QLabel(this);
p.setColor(QPalette::Active,QPalette::Background,
p.setColor(QPalette::Active,QPalette::Window,
p.color(QPalette::Active,QPalette::Highlight));
bar_label->setPalette(p);
bar_label->setStyleSheet("background-color:"+

8
lib/rdbutton_dialog.cpp
View File

@ -2,7 +2,7 @@
//
// Button Editor for SoundPanel
//
// (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
@ -142,7 +142,7 @@ int RDButtonDialog::exec(RDPanelButton *button,bool hookmode,
edit_user_password=passwd;
edit_cart=edit_button->cart();
edit_color=edit_button->defaultColor();
QPalette p=QPalette(edit_color,palette().color(QPalette::Background));
QPalette p=QPalette(edit_color,palette().color(QPalette::Window));
p.setColor(QPalette::ButtonText,RDGetTextColor(edit_color));
edit_color_button->setPalette(p);
edit_label_edit->setText(edit_button->text());
@ -163,7 +163,7 @@ void RDButtonDialog::clearCartData()
{
edit_cart=0;
edit_color=Qt::lightGray;
edit_color_button->setPalette(QPalette(edit_color,palette().color(QPalette::Background)));
edit_color_button->setPalette(QPalette(edit_color,palette().color(QPalette::Window)));
edit_label_edit->setText("");
edit_cart_edit->setText("");
}
@ -174,7 +174,7 @@ void RDButtonDialog::setColorData()
QColor new_color=QColorDialog::getColor(edit_color,this,"edit_color_dialog");
if(new_color.isValid()) {
edit_color=new_color;
QPalette p=QPalette(edit_color,palette().color(QPalette::Background));
QPalette p=QPalette(edit_color,palette().color(QPalette::Window));
p.setColor(QPalette::ButtonText,RDGetTextColor(edit_color));
edit_color_button->setPalette(p);
}

4
lib/rdcardselector.cpp
View File

@ -2,7 +2,7 @@
//
// Audio channel assignments widget for Rivendell
//
// (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
@ -217,7 +217,7 @@ void RDCardSelector::portData(int port)
void RDCardSelector::resizeEvent(QResizeEvent *e)
{
int label_width=defaultFontMetrics()->horizontalAdvance(tr("Card:"));
if(defaultFontMetrics()->horizontalAdvance(tr("Port:")>label_width)) {
if(defaultFontMetrics()->horizontalAdvance(tr("Port:"))>label_width) {
label_width=defaultFontMetrics()->horizontalAdvance(tr("Port:"));
}
card_title->setGeometry(0,0,width(),19);

4
lib/rdcartdrag.cpp
View File

@ -2,7 +2,7 @@
//
// Stored value drag object for Rivendell carts.
//
// (C) Copyright 2013-2021 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
@ -82,7 +82,7 @@ bool RDCartDrag::decode(const QMimeData *e,RDLogLine *ll,
}
QVariant RDCartDrag::retrieveData(const QString &mimetype,QVariant::Type type)
QVariant RDCartDrag::retrieveData(const QString &mimetype,QMetaType::Type type)
const
{
return d_data.value(mimetype,QVariant());

4
lib/rdcartdrag.h
View File

@ -2,7 +2,7 @@
//
// Stored value drag object for Rivendell carts.
//
// (C) Copyright 2013-2021 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
@ -46,7 +46,7 @@ class RDCartDrag : public QMimeData
RDLogLine::TransType trans=RDLogLine::NoTrans);
protected:
QVariant retrieveData(const QString &mimetype,QVariant::Type type) const;
QVariant retrieveData(const QString &mimetype,QMetaType::Type type) const;
private:
void SetData(unsigned cartnum,const QColor &color,const QString &title);

6
lib/rdcartslot.cpp
View File

@ -2,7 +2,7 @@
//
// The cart slot widget.
//
// (C) Copyright 2012-2023 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
@ -61,10 +61,10 @@ RDCartSlot::RDCartSlot(int slotnum,RDRipc *ripc,RDCae *cae,RDStation *station,
//
slot_ready_color=
QPalette(QColor(BUTTON_STOPPED_BACKGROUND_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
slot_playing_color=
QPalette(QColor(BUTTON_PLAY_BACKGROUND_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
//
// Slot Options

9
lib/rdcddblookup.cpp
View File

@ -2,7 +2,7 @@
//
// RDDiscLookup instance class for accessing the FreeDB CD Database.
//
// (C) Copyright 2003-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2003-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 Library General Public License
@ -21,10 +21,9 @@
#include <stdlib.h>
#include <string.h>
#include <qapplication.h>
#include <qdatetime.h>
#include <qregexp.h>
#include <qtimer.h>
#include <QApplication>
#include <QDateTime>
#include <QTimer>
#include "rdapplication.h"
#include "rdcddblookup.h"

4
lib/rdclockmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Abstract a Rivendell Log Manager Clock.
//
// (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
@ -124,7 +124,7 @@ QVariant RDClockModel::data(const QModelIndex &index,int role) const
case Qt::FontRole:
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

6
lib/rdconf.cpp
View File

@ -2,7 +2,7 @@
//
// Small library for handling common configuration file tasks
//
// (C) Copyright 1996-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 1996-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 Library General Public License
@ -857,7 +857,7 @@ QString RDTempFile()
QString RDTimeZoneName(const QDateTime &datetime)
{
char name[20];
time_t time=datetime.toTime_t();
time_t time=datetime.toSecsSinceEpoch();
strftime(name,20,"%Z",localtime(&time));
return QString(name);
}
@ -1043,7 +1043,7 @@ QList<pid_t> RDGetPids(const QString &program)
QFile file(QString("/proc/")+files.at(i)+"/cmdline");
if(file.open(QIODevice::ReadOnly)) {
QTextStream strm(&file);
strm.setCodec("UTF-8");
strm.setEncoding(QStringConverter::Utf8);
QStringList f0=strm.readLine().split(" ");
QStringList f1=f0.at(0).split("/");
if(f1.back().left(f1.back().length()-1)==program.trimmed()) {

13
lib/rdconfig.cpp
View File

@ -2,7 +2,7 @@
//
// A container class for a Rivendell Base Configuration
//
// (C) Copyright 2002-2024 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
@ -30,7 +30,7 @@
#include <QDateTime>
#include <QObject>
#include <QRegExp>
//#include <QRegExp>
#include <QSettings>
#include <QStringList>
@ -255,6 +255,9 @@ QHostAddress RDConfig::provisioningHostIpAddress() const
QString RDConfig::provisioningHostShortName(const QString &hostname) const
{
/*
* FIXME: Reimplement using QRegularExpression
*
QRegExp exp(conf_provisioning_host_short_name_regex);
exp.indexIn(hostname);
@ -263,6 +266,7 @@ QString RDConfig::provisioningHostShortName(const QString &hostname) const
return QString();
}
return texts[conf_provisioning_host_short_name_group];
*/return QString();
}
@ -280,6 +284,9 @@ QString RDConfig::provisioningServiceTemplate() const
QString RDConfig::provisioningServiceName(const QString &hostname) const
{
/*
* FIXME: Reimplement using QRegularExpression
*
QRegExp exp(conf_provisioning_service_name_regex);
exp.indexIn(hostname);
@ -288,6 +295,8 @@ QString RDConfig::provisioningServiceName(const QString &hostname) const
return QString();
}
return texts[conf_provisioning_service_name_group];
*/
return QString();
}

24
lib/rdcueedit.cpp
View File

@ -2,7 +2,7 @@
//
// Cueing Editor for RDLogLine-based Events
//
// (C) Copyright 2013-2023 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
@ -37,9 +37,9 @@ RDCueEdit::RDCueEdit(QWidget *parent)
//
edit_play_color=
QPalette(QColor(BUTTON_PLAY_BACKGROUND_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
edit_start_color=palette();
edit_start_color.setColor(QPalette::Foreground,RD_CUEEDITOR_START_MARKER);
edit_start_color.setColor(QPalette::WindowText,RD_CUEEDITOR_START_MARKER);
edit_position_label=new QLabel(this);
edit_position_label->setGeometry(0,0,sizeHint().width()-30,30);
@ -106,7 +106,7 @@ RDCueEdit::RDCueEdit(QWidget *parent)
edit_pause_button=new RDTransportButton(RDTransportButton::Pause,this);
edit_pause_button->setGeometry(sizeHint().width()/2-40,90,80,50);
edit_pause_button->
setPalette(QPalette(palette().color(QPalette::Background),
setPalette(QPalette(palette().color(QPalette::Window),
QColor(Qt::gray)));
edit_pause_button->setFont(buttonFont());
edit_pause_button->
@ -120,7 +120,7 @@ RDCueEdit::RDCueEdit(QWidget *parent)
edit_stop_button->setGeometry(sizeHint().width()/2+50,90,80,50);
edit_stop_button->setOnColor(QColor(Qt::red));
edit_stop_button->
setPalette(QPalette(palette().color(QPalette::Background),
setPalette(QPalette(palette().color(QPalette::Window),
QColor(Qt::gray)));
edit_stop_button->setFont(buttonFont());
edit_stop_button->
@ -133,11 +133,11 @@ RDCueEdit::RDCueEdit(QWidget *parent)
edit_start_button=new RDPushButton(this);
edit_start_button->setCheckable(true);
edit_start_button->setGeometry(0,155,66,45);
edit_start_button->setFlashColor(palette().color(QPalette::Background));
edit_start_button->setFlashColor(palette().color(QPalette::Window));
edit_start_button->setFlashPeriod(RD_CUEEDITOR_BUTTON_FLASH_PERIOD);
edit_start_button->
setPalette(QPalette(QColor(RD_CUEEDITOR_START_MARKER),
palette().color(QPalette::Background)));
palette().color(QPalette::Window)));
edit_start_button->setFont(buttonFont());
edit_start_button->setText(tr("Start"));
connect(edit_start_button,SIGNAL(clicked()),this,SLOT(startClickedData()));
@ -148,10 +148,10 @@ RDCueEdit::RDCueEdit(QWidget *parent)
edit_end_button=new RDPushButton(this);
edit_end_button->setCheckable(true);
edit_end_button->setGeometry(90,155,66,45);
edit_end_button->setFlashColor(palette().color(QPalette::Background));
edit_end_button->setFlashColor(palette().color(QPalette::Window));
edit_end_button->setFlashPeriod(RD_CUEEDITOR_BUTTON_FLASH_PERIOD);
edit_end_button->setPalette(QPalette(QColor(RD_CUEEDITOR_START_MARKER),
palette().color(QPalette::Background)));
palette().color(QPalette::Window)));
edit_end_button->setFont(buttonFont());
edit_end_button->setText(tr("End"));
connect(edit_end_button,SIGNAL(clicked()),this,SLOT(endClickedData()));
@ -162,11 +162,11 @@ RDCueEdit::RDCueEdit(QWidget *parent)
edit_recue_button=new RDPushButton(this);
edit_recue_button->setCheckable(true);
edit_recue_button->setGeometry(180,155,66,45);
edit_recue_button->setFlashColor(palette().color(QPalette::Background));
edit_recue_button->setFlashColor(palette().color(QPalette::Window));
edit_recue_button->setFlashPeriod(RD_CUEEDITOR_BUTTON_FLASH_PERIOD);
edit_recue_button->
setPalette(QPalette(QColor(RD_CUEEDITOR_START_MARKER),
palette().color(QPalette::Background)));
palette().color(QPalette::Window)));
edit_recue_button->setFont(buttonFont());
edit_recue_button->setText(tr("Recue"));
connect(edit_recue_button,SIGNAL(clicked()),this,SLOT(recue()));
@ -663,7 +663,7 @@ void RDCueEdit::mousePressEvent(QMouseEvent *e)
}
break;
case Qt::MidButton:
case Qt::MiddleButton:
if(edit_audition_button->isVisible()) {
if(edit_logline->forcedLength()>10000) {
if(edit_play_deck->state()==RDPlayDeck::Playing) {

12
lib/rdcutlistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell cut metadata
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -143,7 +143,7 @@ QVariant RDCutListModel::data(const QModelIndex &index,int role) const
case Qt::FontRole:
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;
@ -176,7 +176,7 @@ QModelIndex RDCutListModel::addCut(const QString &name)
}
list[12]=name;
d_texts.push_back(list);
d_colors.push_back(d_palette.color(QPalette::Background));
d_colors.push_back(d_palette.color(QPalette::Window));
d_row_index.push_back(d_row_index.size());
updateCutLine(d_texts.size()-1);
sortRows(d_use_weighting);
@ -297,7 +297,7 @@ void RDCutListModel::setCartNumber(unsigned cartnum)
int row=0;
while(q->next()) {
d_texts.push_back(text);
d_colors.push_back(d_palette.color(QPalette::Background));
d_colors.push_back(d_palette.color(QPalette::Window));
d_row_index.push_back(row++);
updateRow(d_texts.size()-1,q);
}
@ -411,7 +411,7 @@ void RDCutListModel::updateRow(int row,RDSqlQuery *q)
break;
case RDCart::AlwaysValid:
d_colors[d_row_index.at(row)]=d_palette.color(QPalette::Background);
d_colors[d_row_index.at(row)]=d_palette.color(QPalette::Window);
break;
}
}
@ -547,7 +547,7 @@ RDCart::Validity RDCutListModel::ValidateCut(RDSqlQuery *q,unsigned offset,
void RDCutListModel::DumpIndex(const QString &str) const
{
printf("* %s ****************\n",str.toUtf8().constData());
printf("SIZE: %d\n",d_row_index.size());
printf("SIZE: %lld\n",d_row_index.size());
for(int i=0;i<d_row_index.size();i++) {
printf("%s - %d => %d\n",
d_texts.at(i).at(12).toString().toUtf8().constData(),

28
lib/rddatepicker.cpp
View File

@ -68,10 +68,10 @@ RDDatePicker::RDDatePicker(int low_year,int high_year,QWidget *parent)
// Date Labels
//
QPalette weekend_palette=palette();
weekend_palette.setColor(QPalette::Active,QPalette::Background,
weekend_palette.setColor(QPalette::Active,QPalette::Window,
palette().color(QPalette::Active,
QPalette::Mid));
weekend_palette.setColor(QPalette::Inactive,QPalette::Background,
weekend_palette.setColor(QPalette::Inactive,QPalette::Window,
palette().color(QPalette::Active,
QPalette::Mid));
@ -254,10 +254,10 @@ void RDDatePicker::PrintDays()
// Clear Days
//
QPalette weekend_palette=palette();
weekend_palette.setColor(QPalette::Active,QPalette::Background,
weekend_palette.setColor(QPalette::Active,QPalette::Window,
palette().color(QPalette::Active,
QPalette::Mid));
weekend_palette.setColor(QPalette::Inactive,QPalette::Background,
weekend_palette.setColor(QPalette::Inactive,QPalette::Window,
palette().color(QPalette::Active,
QPalette::Mid));
for(int i=0;i<6;i++) {
@ -313,26 +313,26 @@ void RDDatePicker::SelectDay(int day,int dow_offset,bool state)
int dow=slot-7*week;
QPalette pal=palette();
if(state) {
pal.setColor(QPalette::Active,QPalette::Foreground,
pal.setColor(QPalette::Active,QPalette::WindowText,
palette().
color(QPalette::Active,QPalette::HighlightedText));
pal.setColor(QPalette::Active,QPalette::Background,
pal.setColor(QPalette::Active,QPalette::Window,
palette().color(QPalette::Active,QPalette::Highlight));
pal.setColor(QPalette::Inactive,QPalette::Foreground,
pal.setColor(QPalette::Inactive,QPalette::WindowText,
palette().
color(QPalette::Active,QPalette::HighlightedText));
pal.setColor(QPalette::Inactive,QPalette::Background,
pal.setColor(QPalette::Inactive,QPalette::Window,
palette().color(QPalette::Active,QPalette::Highlight));
}
else {
pal.setColor(QPalette::Active,QPalette::Foreground,
pal.setColor(QPalette::Active,QPalette::WindowText,
palette().color(QPalette::Active,QPalette::Text));
pal.setColor(QPalette::Active,QPalette::Background,
palette().color(QPalette::Active,QPalette::Background));
pal.setColor(QPalette::Inactive,QPalette::Foreground,
pal.setColor(QPalette::Active,QPalette::Window,
palette().color(QPalette::Active,QPalette::Window));
pal.setColor(QPalette::Inactive,QPalette::WindowText,
palette().color(QPalette::Active,QPalette::Text));
pal.setColor(QPalette::Inactive,QPalette::Background,
palette().color(QPalette::Active,QPalette::Background));
pal.setColor(QPalette::Inactive,QPalette::Window,
palette().color(QPalette::Active,QPalette::Window));
}
pick_date_label[week][dow]->setPalette(pal);
}

3
lib/rddb.cpp
View File

@ -3,7 +3,7 @@
// Database driver with automatic reconnect
//
// (C) Copyright 2007 Dan Mills <dmills@exponent.myzen.co.uk>
// (C) Copyright 2018-2019 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
@ -28,7 +28,6 @@
#include <QObject>
#include <QString>
#include <QTextCodec>
#include <QTranslator>
#include <QSqlError>
#include <QStringList>

1
lib/rddisclookup.cpp
View File

@ -26,7 +26,6 @@
#include <QDateTime>
#include <QMessageBox>
#include <QProcess>
#include <QRegExp>
#include <QTimer>
#include "rdtempdirectory.h"

4
lib/rddiscmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Audio CD track information
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -126,7 +126,7 @@ QVariant RDDiscModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

4
lib/rddropboxlistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell dropboxes
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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,7 +155,7 @@ QVariant RDDropboxListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
if(col==1) {
return d_group_colors.at(row);
}

4
lib/rdendpointlistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell switcher endpoints
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -162,7 +162,7 @@ QVariant RDEndpointListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

2
lib/rdfeedlistmodel.cpp
View File

@ -222,7 +222,7 @@ QVariant RDFeedListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do here!
break;

4
lib/rdgpiolistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell GPI/GPO configuration
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -136,7 +136,7 @@ QVariant RDGpioListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

4
lib/rdgpiologmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell GPIO log records
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -121,7 +121,7 @@ QVariant RDGpioLogModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
return d_text_colors.at(row);
case Qt::BackgroundRole:

4
lib/rdgpioslotsmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Livewire multicast GPIO slots
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -120,7 +120,7 @@ QVariant RDGpioSlotsModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

4
lib/rdgrouplistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell groups
//
// (C) Copyright 2021-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -151,7 +151,7 @@ QVariant RDGroupListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
if(col==0) {
return d_colors.at(row);
}

4
lib/rdhostvarlistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell host variables
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -119,7 +119,7 @@ QVariant RDHostvarListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

4
lib/rdjackclientlistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell services
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -112,7 +112,7 @@ QVariant RDJackClientListModel::data(const QModelIndex &index,int role) const
case Qt::FontRole:
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

2
lib/rdlibrarymodel.cpp
View File

@ -310,7 +310,7 @@ QVariant RDLibraryModel::data(const QModelIndex &index,int role) const
return d_notes.at(row);
}
case Qt::TextColorRole:
case Qt::ForegroundRole:
if(col==1) {
return d_group_colors.value(d_texts.at(row).at(1).toString());
}

4
lib/rdlogimportmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell log imports
//
// (C) Copyright 2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2022-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
@ -139,7 +139,7 @@ QVariant RDLogImportModel::data(const QModelIndex &index,int role) const
case Qt::FontRole:
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

4
lib/rdloglistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell log metadata
//
// (C) Copyright 2020-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2020-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,7 +155,7 @@ QVariant RDLogListModel::data(const QModelIndex &index,int role) const
// Nothing to do!
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

2
lib/rdlogmodel.cpp
View File

@ -186,7 +186,7 @@ QVariant RDLogModel::data(const QModelIndex &index,int role) const
case Qt::FontRole:
return cellTextFont(col,row,ll);
case Qt::TextColorRole:
case Qt::ForegroundRole:
return cellTextColor(col,row,ll);
case Qt::BackgroundRole:

2
lib/rdmacrocartmodel.cpp
View File

@ -115,7 +115,7 @@ QVariant RDMacroCartModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

4
lib/rdmarker_bar.cpp
View File

@ -2,7 +2,7 @@
//
// A marker widget for the RDCueEdit widget.
//
// (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
@ -84,7 +84,7 @@ void RDMarkerBar::DrawMap()
QPixmap *pix=new QPixmap(size());
QPainter *p=new QPainter(pix);
QPolygon *pt;
p->fillRect(0,0,size().width(),size().height(),palette().color(QPalette::Background));
p->fillRect(0,0,size().width(),size().height(),palette().color(QPalette::Window));
if(marker_length>0) {
p->setPen(RD_CUEEDITOR_START_MARKER);
p->setBrush(RD_CUEEDITOR_START_MARKER);

4
lib/rdmarkerplayer.cpp
View File

@ -2,7 +2,7 @@
//
// Audio player for RDMarkerDialog
//
// (C) Copyright 2021-2023 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -95,7 +95,7 @@ RDMarkerPlayer::RDMarkerPlayer(int card,int port,QWidget *parent)
d_position_label->setFont(labelFont());
d_position_label->setAlignment(Qt::AlignCenter);
d_position_label->
setPalette(QPalette(palette().color(QPalette::Background),
setPalette(QPalette(palette().color(QPalette::Window),
palette().mid().color()));
d_position_edit=new QLabel(this);
d_position_edit->setAcceptDrops(false);

4
lib/rdmarkerview.cpp
View File

@ -2,7 +2,7 @@
//
// Widget for displaying/editing cut markers
//
// (C) Copyright 2021-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -1171,7 +1171,7 @@ void RDMarkerView::mousePressEvent(QMouseEvent *e)
emit positionClicked(d_msec_pos);
break;
case Qt::MidButton:
case Qt::MiddleButton:
break;
case Qt::RightButton:

4
lib/rdmatrixlistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell matrix devices
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -135,7 +135,7 @@ QVariant RDMatrixListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

6
lib/rdnodelistmodel.cpp
View File

@ -1,8 +1,8 @@
// rdnodelistmodel.cpp
//
// Data model for Rivendell PyPAD instances
// Data model for Rivendell switcher nodes.
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -118,7 +118,7 @@ QVariant RDNodeListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

4
lib/rdnodeslotsmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell switcher nodes.
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -150,7 +150,7 @@ QVariant RDNodeSlotsModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

2
lib/rdpanel_button.cpp
View File

@ -164,7 +164,7 @@ void RDPanelButton::setColor(QColor color)
{
button_color=color;
if(button_flash) {
if(color==palette().color(QPalette::Background)) {
if(color==palette().color(QPalette::Window)) {
button_flashing=false;
}
else {

2
lib/rdpodcastlistmodel.cpp
View File

@ -194,7 +194,7 @@ QVariant RDPodcastListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

6
lib/rdpushbutton.cpp
View File

@ -93,7 +93,7 @@ void RDPushButton::setFlashColor(QColor color)
int v=0;
flash_color=color;
flash_palette=QPalette(QColor(flash_color),palette().color(QPalette::Background));
flash_palette=QPalette(QColor(flash_color),palette().color(QPalette::Window));
color.getHsv(&h,&s,&v);
if((h>180)&&(h<300)) {
@ -158,7 +158,7 @@ void RDPushButton::mousePressEvent(QMouseEvent *e)
QPushButton::mousePressEvent(e);
break;
case Qt::MidButton:
case Qt::MiddleButton:
emit centerPressed();
break;
@ -179,7 +179,7 @@ void RDPushButton::mouseReleaseEvent(QMouseEvent *e)
QPushButton::mouseReleaseEvent(e);
break;
case Qt::MidButton:
case Qt::MiddleButton:
e->accept();
emit centerReleased();
if((e->x()>=0)&&(e->x()<geometry().width())&&

4
lib/rdpypadlistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell PyPAD instances
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -129,7 +129,7 @@ QVariant RDPypadListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

4
lib/rdreplcartlistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for replicator carts
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -127,7 +127,7 @@ QVariant RDReplCartListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

4
lib/rdreplicatorlistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell services
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -120,7 +120,7 @@ QVariant RDReplicatorListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

4
lib/rdresourcelistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell console router resource settings
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -167,7 +167,7 @@ QVariant RDResourceListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

4
lib/rdschedcodelistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell schedule codes
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -115,7 +115,7 @@ QVariant RDSchedCodeListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

4
lib/rdservicelistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell services
//
// (C) Copyright 2021-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -153,7 +153,7 @@ QVariant RDServiceListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
if(col==3) { // Track Group
return d_group_color_map.value(d_texts.at(row).at(col).toString(),
QVariant());

8
lib/rdslider.cpp
View File

@ -2,7 +2,7 @@
//
// An audio- and touchscreen-friendly slider widget.
//
// (C) Copyright 2009-2021 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 Library General Public License
@ -133,7 +133,7 @@ void RDSlider::setKnobColor(const QPalette &pal)
void RDSlider::setKnobColor(const QColor &color)
{
knob_color.setColor(QPalette::Background,color);
knob_color.setColor(QPalette::Window,color);
calcKnob();
update();
}
@ -710,7 +710,7 @@ void RDSlider::calcKnob(int x,int y,int w,int h)
delete knob_map;
}
knob_map=new QPixmap(curr_knob.size());
knob_map->fill(knob_color.color(QPalette::Background));
knob_map->fill(knob_color.color(QPalette::Window));
p.begin(knob_map);
//
@ -789,7 +789,7 @@ void RDSlider::calcKnob(int x,int y,int w,int h)
delete knob_map;
}
knob_map=new QPixmap(curr_knob.size());
knob_map->fill(knob_color.color(QPalette::Background));
knob_map->fill(knob_color.color(QPalette::Window));
p.begin(knob_map);
//

22
lib/rdslotbox.cpp
View File

@ -71,21 +71,21 @@ RDSlotBox::RDSlotBox(RDPlayDeck *deck,RDAirPlayConf *conf,QWidget *parent)
QColor(BAR_CHANGED_TRANSITION_COLOR));
line_time_palette=palette();
line_hard_palette=palette();
line_hard_palette.setColor(QPalette::Active,QPalette::Foreground,
line_hard_palette.setColor(QPalette::Active,QPalette::WindowText,
QColor(LOG_HARDTIME_TEXT_COLOR));
line_hard_palette.setColor(QPalette::Inactive,QPalette::Foreground,
line_hard_palette.setColor(QPalette::Inactive,QPalette::WindowText,
QColor(LOG_HARDTIME_TEXT_COLOR));
line_timescale_palette=palette();
line_timescale_palette.setColor(QPalette::Active,QPalette::Foreground,
line_timescale_palette.setColor(QPalette::Active,QPalette::WindowText,
QColor(LABELBOX_TIMESCALE_COLOR));
line_timescale_palette.setColor(QPalette::Inactive,QPalette::Foreground,
line_timescale_palette.setColor(QPalette::Inactive,QPalette::WindowText,
QColor(LABELBOX_TIMESCALE_COLOR));
line_text_palette=palette();
line_text_palette.setColor(QPalette::Active,QPalette::Foreground,
line_text_palette.setColor(QPalette::Active,QPalette::WindowText,
QColor(Qt::black));
line_text_palette.setColor(QPalette::Inactive,QPalette::Foreground,
line_text_palette.setColor(QPalette::Inactive,QPalette::WindowText,
QColor(Qt::black));
//
@ -303,7 +303,7 @@ void RDSlotBox::setCart(RDLogLine *logline)
}
line_group_label->setText(cart->groupName());
p=line_group_label->palette();
p.setColor(QPalette::Foreground,line_logline->groupColor());
p.setColor(QPalette::WindowText,line_logline->groupColor());
line_group_label->setPalette(p);
if(line_logline->talkLength()<=0) {
line_talktime_label->setText(":00");
@ -394,7 +394,7 @@ void RDSlotBox::setCart(RDLogLine *logline)
line_cut_label->setText("");
line_group_label->setText(cart->groupName());
p=line_group_label->palette();
p.setColor(QPalette::Foreground,line_logline->groupColor());
p.setColor(QPalette::WindowText,line_logline->groupColor());
line_group_label->setPalette(p);
line_length_label->
setText(RDGetTimeLength(line_logline->effectiveLength(),
@ -505,7 +505,7 @@ void RDSlotBox::mousePressEvent(QMouseEvent *e)
RDCartDrag *cd=
new RDCartDrag(line_logline->cartNumber(),line_logline->title(),
line_group_label->
palette().color(QPalette::Foreground));
palette().color(QPalette::WindowText));
drag->setMimeData(cd);
// drag->setPixmap(*line_icon_label->pixmap());
drag->setPixmap(line_icon_label->pixmap((Qt::ReturnByValueConstant)0));
@ -526,7 +526,7 @@ void RDSlotBox::paintEvent(QPaintEvent *e)
QPainter *p=new QPainter(this);
p->drawRect(0,0,sizeHint().width()-1,sizeHint().height()-1);
p->fillRect(1,1,sizeHint().width()-3,sizeHint().height()-3,
palette().color(QPalette::Background));
palette().color(QPalette::Window));
p->end();
delete p;
}
@ -555,7 +555,7 @@ void RDSlotBox::dropEvent(QDropEvent *e)
void RDSlotBox::SetColor(QColor color)
{
QPalette pal=palette();
pal.setColor(QPalette::Background,color);
pal.setColor(QPalette::Window,color);
setPalette(pal);
// setBackgroundColor(color);
/*

6
lib/rdslotbutton.cpp
View File

@ -33,10 +33,10 @@ RDSlotButton::RDSlotButton(int slotnum,QWidget *parent,RDConfig *c)
//
d_ready_color=
QPalette(QColor(BUTTON_STOPPED_BACKGROUND_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
d_playing_color=
QPalette(QColor(BUTTON_PLAY_BACKGROUND_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
setFocusPolicy(Qt::NoFocus);
}
@ -101,7 +101,7 @@ void RDSlotButton::WriteKeycap()
p->setRenderHint(QPainter::SmoothPixmapTransform,true);
p->setPen(Qt::black);
p->setBrush(Qt::black);
p->fillRect(0,0,w,h,palette().color(QPalette::Background));
p->fillRect(0,0,w,h,palette().color(QPalette::Window));
p->setFont(hugeButtonFont());
p->drawText((w-p->fontMetrics().horizontalAdvance(QString::asprintf("%d",1+d_slot_number)))/2,

4
lib/rdsound_panel.cpp
View File

@ -1835,8 +1835,8 @@ void RDSoundPanel::ApplyButtonFields(RDPanelButton *button,RDSqlQuery *q)
}
}
if(q->value(8).toString().isEmpty()) {
button->setColor(palette().color(QPalette::Background));
button->setDefaultColor(palette().color(QPalette::Background));
button->setColor(palette().color(QPalette::Window));
button->setDefaultColor(palette().color(QPalette::Window));
}
else {
button->setColor(QColor(q->value(8).toString()));

2
lib/rdstationlistmodel.cpp
View File

@ -153,7 +153,7 @@ QVariant RDStationListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

20
lib/rdtextvalidator.cpp
View File

@ -2,7 +2,7 @@
//
// Validate a string as being valid for a SQL text datatype.
//
// (C) Copyright 2004,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2004-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
@ -27,11 +27,11 @@ RDTextValidator::RDTextValidator(QObject *parent,bool allow_quote)
d_lower_case_only=false;
if(!allow_quote) {
banned_chars.push_back(34); // Double Quote
}
banned_chars.push_back(39); // Single Quote
banned_chars.push_back(92); // Backslash Quote
banned_chars.push_back(96); // Apostrophe Quote
banned_chars.push_back(QChar('"')); // Double Quote
}
banned_chars.push_back(QChar('\'')); // Single Quote
banned_chars.push_back(QChar('\\')); // Backslash Quote
banned_chars.push_back(QChar('`')); // Apostrophe Quote
}
@ -78,10 +78,10 @@ void RDTextValidator::setLowerCaseOnly(bool state)
QString RDTextValidator::stripString(QString str)
{
str.replace(34,""); // Double Quote
str.replace(39,""); // Single Quote
str.replace(92,""); // Backslash Quote
str.replace(96,""); // Apostrophe Quote
str.replace('"',""); // Double Quote
str.replace('\'',""); // Single Quote
str.replace('\\',""); // Backslash Quote
str.replace('`',""); // Apostrophe Quote
return str;
}

34
lib/rdtrackerwidget.cpp
View File

@ -74,10 +74,10 @@ RDTrackerWidget::RDTrackerWidget(QString *import_path,QWidget *parent)
//
// Create Palettes
//
d_record_palette=QPalette(TRACKER_RECORD_BUTTON_COLOR,palette().color(QPalette::Background));
d_start_palette=QPalette(TRACKER_START_BUTTON_COLOR,palette().color(QPalette::Background));
d_done_palette=QPalette(TRACKER_DONE_BUTTON_COLOR,palette().color(QPalette::Background));
d_abort_palette=QPalette(TRACKER_ABORT_BUTTON_COLOR,palette().color(QPalette::Background));
d_record_palette=QPalette(TRACKER_RECORD_BUTTON_COLOR,palette().color(QPalette::Window));
d_start_palette=QPalette(TRACKER_START_BUTTON_COLOR,palette().color(QPalette::Window));
d_done_palette=QPalette(TRACKER_DONE_BUTTON_COLOR,palette().color(QPalette::Window));
d_abort_palette=QPalette(TRACKER_ABORT_BUTTON_COLOR,palette().color(QPalette::Window));
QColor system_mid_color = palette().mid().color();
QColor system_button_color = palette().button().color();
@ -290,7 +290,7 @@ RDTrackerWidget::RDTrackerWidget(QString *import_path,QWidget *parent)
d_length_label->setText("-:--:--.-");
d_length_label->
setStyleSheet("background-color: "+
palette().color(QPalette::Background).name());
palette().color(QPalette::Window).name());
d_length_label->setAlignment(Qt::AlignCenter);
d_length_label->setFont(timerFont());
@ -301,39 +301,39 @@ RDTrackerWidget::RDTrackerWidget(QString *import_path,QWidget *parent)
d_tracks_remaining_label_label->setFont(subLabelFont());
d_tracks_remaining_label_label->setAlignment(Qt::AlignHCenter);
d_tracks_remaining_label_label->
setPalette(QPalette(palette().color(QPalette::Background),palette().mid().
setPalette(QPalette(palette().color(QPalette::Window),palette().mid().
color()));
d_tracks_remaining_label=new QLabel(this);
d_tracks_remaining_label->setText("0");
d_tracks_remaining_label->
setStyleSheet("background-color: "+
palette().color(QPalette::Background).name());
palette().color(QPalette::Window).name());
d_tracks_remaining_label->setAlignment(Qt::AlignCenter);
d_tracks_remaining_label->setFont(labelFont());
d_time_remaining_label_label=new QLabel(tr("Tracks"),this);
d_time_remaining_label_label->setFont(subLabelFont());
d_time_remaining_label_label->setAlignment(Qt::AlignHCenter);
d_time_remaining_label_label->
setPalette(QPalette(palette().color(QPalette::Background),palette().mid().
setPalette(QPalette(palette().color(QPalette::Window),palette().mid().
color()));
d_time_remaining_label=new QLabel(this);
d_time_remaining_label->setText("0:00:00.0");
d_time_remaining_label->
setStyleSheet("background-color: "+
palette().color(QPalette::Background).name());
palette().color(QPalette::Window).name());
d_time_remaining_label->setAlignment(Qt::AlignCenter);
d_time_remaining_label->setFont(labelFont());
d_time_remaining_palette[0]=d_time_remaining_label->palette();
d_time_remaining_palette[1]=d_time_remaining_label->palette();
d_time_remaining_palette[1].
setColor(QPalette::Active,QPalette::Foreground,Qt::red);
setColor(QPalette::Active,QPalette::WindowText,Qt::red);
d_time_remaining_palette[1].
setColor(QPalette::Inactive,QPalette::Foreground,Qt::red);
setColor(QPalette::Inactive,QPalette::WindowText,Qt::red);
d_time_label=new QLabel(tr("Time"),this);
d_time_label->setFont(subLabelFont());
d_time_label->setAlignment(Qt::AlignHCenter);
d_time_label->setPalette(QPalette(palette().color(QPalette::Background),
d_time_label->setPalette(QPalette(palette().color(QPalette::Window),
palette().mid().color()));
//
@ -1975,7 +1975,7 @@ void RDTrackerWidget::mouseReleaseEvent(QMouseEvent *e)
d_rightclick_track=-1;
break;
case Qt::MidButton:
case Qt::MiddleButton:
if(e->y()<TRACKER_Y_ORIGIN+TRACKER_Y_HEIGHT) {
DragTrack(0,((d_wave_origin[0]-d_loglines[0]->
startPoint())/TRACKER_MSECS_PER_PIXEL)+250);
@ -2874,7 +2874,7 @@ void RDTrackerWidget::DrawTrackMap(int trackno)
d_wpg[0]->begin(d_wave_map[0]);
d_wpg[0]->setFont(labelFont());
d_wpg[0]->setPen(TRACKER_TEXT_COLOR);
d_wpg[0]->setBackground(palette().color(QPalette::Background));
d_wpg[0]->setBackground(palette().color(QPalette::Window));
d_wpg[0]->eraseRect(0,0,d_wave_map[0]->size().width(),
d_wave_map[0]->size().height());
if(!d_wave_name[0].isEmpty()) {
@ -2955,7 +2955,7 @@ void RDTrackerWidget::DrawTrackMap(int trackno)
if(!d_wave_map[1]->isNull()) {
p=new QPainter(d_wave_map[1]);
if(d_loaded) {
p->setBackground(palette().color(QPalette::Background));
p->setBackground(palette().color(QPalette::Window));
p->setFont(labelFont());
p->setPen(TRACKER_TEXT_COLOR);
p->eraseRect(0,0,d_wave_map[1]->size().width(),
@ -2978,7 +2978,7 @@ void RDTrackerWidget::DrawTrackMap(int trackno)
}
else {
if((d_loglines[1]->transType()==RDLogLine::Segue)) {
back_color=palette().color(QPalette::Background);
back_color=palette().color(QPalette::Window);
}
else {
back_color=Qt::lightGray;
@ -3120,7 +3120,7 @@ void RDTrackerWidget::DrawTrackMap(int trackno)
}
else {
if((d_loglines[2]->transType()==RDLogLine::Segue)) {
back_color=palette().color(QPalette::Background);
back_color=palette().color(QPalette::Window);
}
else {
back_color=Qt::lightGray;

6
lib/rdtransportbutton.cpp
View File

@ -2,7 +2,7 @@
//
// An audio transport button widget.
//
// (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 Library General Public License
@ -384,7 +384,7 @@ void RDTransportButton::drawOnCap()
}
delete on_cap;
on_cap=new QPixmap(capSize());
on_cap->fill(palette().color(QPalette::Background));
on_cap->fill(palette().color(QPalette::Window));
drawMask(on_cap);
p=new QPainter(on_cap);
p->setPen(on_color);
@ -743,7 +743,7 @@ void RDTransportButton::drawOffCap()
}
delete off_cap;
off_cap=new QPixmap(capSize());
off_cap->fill(palette().color(QPalette::Background));
off_cap->fill(palette().color(QPalette::Window));
drawMask(off_cap);
p=new QPainter(off_cap);
p->setPen(QColor(Qt::black));

4
lib/rduserlistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell users
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -122,7 +122,7 @@ QVariant RDUserListModel::data(const QModelIndex &index,int role) const
case Qt::FontRole:
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
// Nothing to do!
break;

6
lib/rdwavefile.cpp
View File

@ -2,7 +2,7 @@
//
// A class for handling audio files.
//
// (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 Library General Public License
@ -3081,7 +3081,7 @@ bool RDWaveFile::GetAv10(int fd)
istate=1;
}
else {
label+=av10_chunk_data[i];
label+=QChar(av10_chunk_data[i]);
}
break;
@ -3169,7 +3169,7 @@ bool RDWaveFile::GetAv10(int fd)
istate=0;
}
else {
arg+=av10_chunk_data[i];
arg+=QChar(av10_chunk_data[i]);
}
break;
}

10
rdadmin/Makefile.am
View File

@ -1,8 +1,8 @@
## Makefile.am
##
## Automake.am for rivendell/rdadmin
## Makefile.am for rivendell/rdadmin
##
## (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
@ -20,9 +20,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@
CWRAP = ../helpers/cwrap
# The dependency for qt's Meta Object Compiler (moc)
@ -212,7 +212,7 @@ nodist_rdadmin_SOURCES = global_credits.cpp\
moc_view_node_info.cpp\
moc_view_pypad_errors.cpp
rdadmin_LDADD = @LIB_RDLIBS@ -lsamplerate @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdadmin_LDADD = @LIB_RDLIBS@ -lsamplerate @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST = gpl2.html\
info_banner1.xpm\

4
rdadmin/add_schedcodes.cpp
View File

@ -21,7 +21,7 @@
#include <QMessageBox>
#include <QPushButton>
#include <QRegExpValidator>
//#include <QRegExpValidator>
#include <rddb.h>
#include <rdescape_string.h>
@ -45,9 +45,11 @@ AddSchedCode::AddSchedCode(QWidget *parent)
//
d_code_edit=new QLineEdit(this);
d_code_edit->setMaxLength(10);
/*
QRegExpValidator *code_validator=
new QRegExpValidator(QRegExp("[a-z0-9 ]{1,10}",Qt::CaseInsensitive),this);
d_code_edit->setValidator(code_validator);
*/
connect(d_code_edit,SIGNAL(textChanged(const QString &)),
this,SLOT(codeChangedData(const QString &)));
d_code_label=new QLabel(tr("New Code:"),this);

10
rdairplay/Makefile.am
View File

@ -1,8 +1,8 @@
## Makefile.am
##
## Automake.am for rivendell/rdairplay
## Makefile.am for rivendell/rdairplay
##
## (C) 2002-2024 Fred Gleason <fredg@paravelsystems.com>
## (C) 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
@ -20,9 +20,9 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++17 -fPIC @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
@ -82,7 +82,7 @@ nodist_rdairplay_SOURCES = moc_button_log.cpp\
moc_voicetracker.cpp\
moc_wall_clock.cpp
rdairplay_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdairplay_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdairplay_LDFLAGS = -rdynamic
EXTRA_DIST = rdairplay.pro\

4
rdairplay/edit_event.cpp
View File

@ -2,7 +2,7 @@
//
// Event Editor for RDAirPlay
//
// (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
@ -99,7 +99,7 @@ EditEvent::EditEvent(RDLogPlay *log,QWidget *parent)
QPainter *p=new QPainter(pix);
p->setPen(Qt::black);
p->setBrush(Qt::black);
p->fillRect(0,0,sizeHint().width(),3,palette().color(QPalette::Background));
p->fillRect(0,0,sizeHint().width(),3,palette().color(QPalette::Window));
p->drawLine(10,1,sizeHint().width()-10,1);
p->end();
edit_horizrule_label->setPixmap(*pix);

4
rdairplay/hourselector.cpp
View File

@ -2,7 +2,7 @@
//
// Hour Selector widget for RDAirPlay
//
// (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
@ -27,7 +27,7 @@ HourSelector::HourSelector(QWidget *parent)
// Palettes
//
hour_active_palette=
QPalette(QColor(BUTTON_STOPPED_BACKGROUND_COLOR),palette().color(QPalette::Background));
QPalette(QColor(BUTTON_STOPPED_BACKGROUND_COLOR),palette().color(QPalette::Window));
//
// Buttons

10
rdairplay/list_log.cpp
View File

@ -2,7 +2,7 @@
//
// The full log widget for RDAirPlay
//
// (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
@ -81,26 +81,26 @@ ListLog::ListLog(RDLogPlay *log,int id,bool allow_pause,
BUTTON_LOG_ACTIVE_TEXT_COLOR);
list_scroll_color[0].setColor(QPalette::Active,QPalette::Button,
BUTTON_LOG_ACTIVE_BACKGROUND_COLOR);
list_scroll_color[0].setColor(QPalette::Active,QPalette::Background,
list_scroll_color[0].setColor(QPalette::Active,QPalette::Window,
system_mid_color);
list_scroll_color[0].setColor(QPalette::Inactive,QPalette::ButtonText,
BUTTON_LOG_ACTIVE_TEXT_COLOR);
list_scroll_color[0].setColor(QPalette::Inactive,QPalette::Button,
BUTTON_LOG_ACTIVE_BACKGROUND_COLOR);
list_scroll_color[0].setColor(QPalette::Inactive,QPalette::Background,
list_scroll_color[0].setColor(QPalette::Inactive,QPalette::Window,
system_mid_color);
list_scroll_color[1]=palette();
list_scroll_color[1].setColor(QPalette::Active,QPalette::ButtonText,
system_button_text_color);
list_scroll_color[1].setColor(QPalette::Active,QPalette::Button,
system_button_color);
list_scroll_color[1].setColor(QPalette::Active,QPalette::Background,
list_scroll_color[1].setColor(QPalette::Active,QPalette::Window,
system_mid_color);
list_scroll_color[1].setColor(QPalette::Inactive,QPalette::ButtonText,
system_button_text_color);
list_scroll_color[1].setColor(QPalette::Inactive,QPalette::Button,
system_button_color);
list_scroll_color[1].setColor(QPalette::Inactive,QPalette::Background,
list_scroll_color[1].setColor(QPalette::Inactive,QPalette::Window,
system_mid_color);
//

22
rdairplay/loglinebox.cpp
View File

@ -132,28 +132,28 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent)
line_changed_play_palette.setColor(QPalette::Inactive,QPalette::Highlight,
QColor(BAR_CHANGED_TRANSITION_COLOR));
line_time_palette=QGuiApplication::palette();
line_time_palette.setColor(QPalette::Active,QPalette::Foreground,
line_time_palette.setColor(QPalette::Active,QPalette::WindowText,
QColor(Qt::black));
line_time_palette.setColor(QPalette::Inactive,QPalette::Foreground,
line_time_palette.setColor(QPalette::Inactive,QPalette::WindowText,
QColor(Qt::black));
line_time_style_sheet="";
line_hard_palette=QGuiApplication::palette();
line_hard_palette.setColor(QPalette::Active,QPalette::Foreground,
line_hard_palette.setColor(QPalette::Active,QPalette::WindowText,
QColor(LOG_HARDTIME_TEXT_COLOR));
line_hard_palette.setColor(QPalette::Inactive,QPalette::Foreground,
line_hard_palette.setColor(QPalette::Inactive,QPalette::WindowText,
QColor(LOG_HARDTIME_TEXT_COLOR));
line_hard_style_sheet="color: "+QColor(LOG_HARDTIME_TEXT_COLOR).name();
line_timescale_palette=QGuiApplication::palette();
line_timescale_palette.setColor(QPalette::Active,QPalette::Foreground,
line_timescale_palette.setColor(QPalette::Active,QPalette::WindowText,
QColor(LOGLINEBOX_TIMESCALE_COLOR));
line_timescale_palette.setColor(QPalette::Inactive,QPalette::Foreground,
line_timescale_palette.setColor(QPalette::Inactive,QPalette::WindowText,
QColor(LOGLINEBOX_TIMESCALE_COLOR));
line_transition_palette=QGuiApplication::palette();
line_transition_palette.setColor(QPalette::Active,QPalette::Foreground,
line_transition_palette.setColor(QPalette::Active,QPalette::WindowText,
QColor(RD_CUSTOM_TRANSITION_COLOR));
line_transition_palette.setColor(QPalette::Inactive,QPalette::Foreground,
line_transition_palette.setColor(QPalette::Inactive,QPalette::WindowText,
QColor(RD_CUSTOM_TRANSITION_COLOR));
line_text_palette=QGuiApplication::palette();
@ -544,7 +544,7 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
}
line_group_label->setText(cart->groupName());
p=line_group_label->palette();
p.setColor(QPalette::Foreground,line_logline->groupColor());
p.setColor(QPalette::WindowText,line_logline->groupColor());
line_group_label->setPalette(p);
if(line_logline->talkLength()<=0) {
line_talktime_label->setText(":00");
@ -702,7 +702,7 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
line_cut_label->setText("");
line_group_label->setText(cart->groupName());
p=line_group_label->palette();
p.setColor(QPalette::Foreground,line_logline->groupColor());
p.setColor(QPalette::WindowText,line_logline->groupColor());
line_group_label->setPalette(p);
line_length_label->
setText(RDGetTimeLength(line_logline->effectiveLength(),
@ -833,7 +833,7 @@ void LogLineBox::mouseMoveEvent(QMouseEvent *e)
RDCartDrag *cd=new RDCartDrag(line_logline->cartNumber(),
line_logline->title(),
line_group_label->palette().
color(QPalette::Foreground));
color(QPalette::WindowText));
drag->setMimeData(cd);
drag->setPixmap(line_icon_label->pixmap((Qt::ReturnByValueConstant)0));
drag->exec();

22
rdairplay/messagewidget.cpp
View File

@ -20,7 +20,7 @@
#include <QEvent>
#include <QKeyEvent>
#include <QWebFrame>
//#include <QWebFrame>
#include <rdapplication.h>
#include <rdeventfilter.h>
@ -49,6 +49,7 @@ MessageWidget::MessageWidget(QWidget *parent)
d_label=new QLabel(this);
d_label->setWordWrap(true);
d_label->setAlignment(Qt::AlignCenter);
/*
d_view=new QWebView(this);
connect(d_view,SIGNAL(loadFinished(bool)),
this,SLOT(webLoadFinishedData(bool)));
@ -64,7 +65,7 @@ MessageWidget::MessageWidget(QWidget *parent)
filter->addFilter(QEvent::MouseMove);
filter->addFilter(QEvent::Wheel);
d_view->installEventFilter(filter);
*/
//
// Refresh Timer
//
@ -86,13 +87,13 @@ void MessageWidget::setText(const QString &str,const QColor &col)
{
QPalette pal=d_label->palette();
pal.setColor(QPalette::Active,QPalette::Foreground,col);
pal.setColor(QPalette::Inactive,QPalette::Foreground,col);
pal.setColor(QPalette::Active,QPalette::WindowText,col);
pal.setColor(QPalette::Inactive,QPalette::WindowText,col);
d_label->setPalette(pal);
d_label->setFont(MessageFont(str));
d_label->setText(str);
d_label->show();
d_view->hide();
// d_view->hide();
d_refresh_timer->stop();
}
@ -100,6 +101,7 @@ void MessageWidget::setText(const QString &str,const QColor &col)
bool MessageWidget::setUrl(const QString &str)
{
/*
QUrl url(str);
if(!url.isValid()) {
setText(tr("invalid URL")+": "+str.toUtf8().constData(),Qt::black);
@ -126,7 +128,7 @@ bool MessageWidget::setUrl(const QString &str)
else {
d_refresh_timer->stop();
}
*/
return true;
}
@ -135,7 +137,7 @@ void MessageWidget::clear()
{
d_label->clear();
d_label->show();
d_view->hide();
// d_view->hide();
d_refresh_timer->stop();
rda->airplayConf()->setMessageWidgetUrl(QString());
@ -144,16 +146,18 @@ void MessageWidget::clear()
void MessageWidget::webLoadFinishedData(bool state)
{
/*
d_view->page()->mainFrame()->
setScrollBarPolicy(Qt::Horizontal,Qt::ScrollBarAlwaysOff);
d_view->page()->mainFrame()->
setScrollBarPolicy(Qt::Vertical,Qt::ScrollBarAlwaysOff);
*/
}
void MessageWidget::refreshData()
{
d_view->load(d_url);
// d_view->load(d_url);
d_refresh_timer->start(1000);
}
@ -161,7 +165,7 @@ void MessageWidget::refreshData()
void MessageWidget::resizeEvent(QResizeEvent *e)
{
d_label->setGeometry(0,0,size().width(),size().height());
d_view->setGeometry(0,0,size().width(),size().height());
// d_view->setGeometry(0,0,size().width(),size().height());
}

4
rdairplay/messagewidget.h
View File

@ -23,7 +23,7 @@
#include <QLabel>
#include <QTimer>
#include <QWebView>
//#include <QWebView>
#define MESSAGE_FONT_QUANTITY 8
#define MESSAGE_WIDGET_WIDTH 410
@ -47,7 +47,7 @@ class MessageWidget : public QWidget
private:
QFont MessageFont(QString str) const;
QLabel *d_label;
QWebView *d_view;
// QWebView *d_view;
QTimer *d_refresh_timer;
QFont d_message_fonts[MESSAGE_FONT_QUANTITY];
QFontMetrics *d_message_metrics[MESSAGE_FONT_QUANTITY];

6
rdairplay/mode_display.cpp
View File

@ -36,11 +36,11 @@ ModeDisplay::ModeDisplay(QWidget *parent)
// Create Palettes
//
auto_color=
QPalette(QColor(BUTTON_MODE_AUTO_COLOR),palette().color(QPalette::Background));
QPalette(QColor(BUTTON_MODE_AUTO_COLOR),palette().color(QPalette::Window));
live_assist_color=
QPalette(QColor(BUTTON_MODE_LIVE_ASSIST_COLOR),palette().color(QPalette::Background));
QPalette(QColor(BUTTON_MODE_LIVE_ASSIST_COLOR),palette().color(QPalette::Window));
manual_color=
QPalette(QColor(BUTTON_MODE_MANUAL_COLOR),palette().color(QPalette::Background));
QPalette(QColor(BUTTON_MODE_MANUAL_COLOR),palette().color(QPalette::Window));
setPalette(live_assist_color);
}

14
rdairplay/pie_counter.cpp
View File

@ -2,7 +2,7 @@
//
// The pie counter widget for Rivendell
//
// (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
@ -41,10 +41,10 @@ PieCounter::PieCounter(int count_length,QWidget *parent)
const int ring=(PIE_COUNTER_BBOX-PIE_COUNTER_SIZE)/2;
onair_on_palette=palette();
onair_on_palette.setColor(QPalette::Background,PIE_ONAIR_COLOR);
onair_on_palette.setColor(QPalette::Window,PIE_ONAIR_COLOR);
onair_off_palette=palette();
onair_on_palette.
setColor(QPalette::Background,QColor(AIR_WIDGET_BACKGROUND_COLOR));
setColor(QPalette::Window,QColor(AIR_WIDGET_BACKGROUND_COLOR));
setPalette(onair_on_palette);
setAutoFillBackground(true);
@ -53,8 +53,8 @@ PieCounter::PieCounter(int count_length,QWidget *parent)
pie_time_label->
setGeometry(PIE_X_PADDING+ring+25,PIE_Y_PADDING+ring+32,48,36);
time_label_palette=palette();
time_label_palette.setColor(QPalette::Background,Qt::lightGray);
time_label_palette.setColor(QPalette::Foreground,PIE_FINAL_COLOR);
time_label_palette.setColor(QPalette::Window,Qt::lightGray);
time_label_palette.setColor(QPalette::WindowText,PIE_FINAL_COLOR);
pie_time_label->setPalette(time_label_palette);
pie_time_label->setFont(bannerFont());
pie_time_label->setAlignment(Qt::AlignCenter);
@ -65,8 +65,8 @@ PieCounter::PieCounter(int count_length,QWidget *parent)
pie_talk_label->
setGeometry(PIE_X_PADDING+ring+25,PIE_Y_PADDING+ring+32,48,36);
talk_label_palette=palette();
talk_label_palette.setColor(QPalette::Background,Qt::lightGray);
talk_label_palette.setColor(QPalette::Foreground,PIE_TALK_COLOR);
talk_label_palette.setColor(QPalette::Window,Qt::lightGray);
talk_label_palette.setColor(QPalette::WindowText,PIE_TALK_COLOR);
pie_talk_label->setPalette(talk_label_palette);
pie_talk_label->setFont(bannerFont());
pie_talk_label->setAlignment(Qt::AlignCenter);

8
rdairplay/post_counter.cpp
View File

@ -44,15 +44,15 @@ PostCounter::PostCounter(QWidget *parent)
post_early_palette=
QPalette(QColor(POSTPOINT_EARLY_COLOR),
QGuiApplication::palette().color(QPalette::Inactive,
QPalette::Background));
QPalette::Window));
post_ontime_palette=
QPalette(QColor(POSTPOINT_ONTIME_COLOR),
QGuiApplication::palette().color(QPalette::Inactive,
QPalette::Background));
QPalette::Window));
post_late_palette=
QPalette(QColor(POSTPOINT_LATE_COLOR),
QGuiApplication::palette().color(QPalette::Inactive,
QPalette::Background));
QPalette::Window));
post_offset = 0;
UpdateDisplay();
@ -119,7 +119,7 @@ void PostCounter::resizeEvent(QResizeEvent *e)
void PostCounter::UpdateDisplay()
{
QColor color=QGuiApplication::palette().color(QPalette::Inactive,
QPalette::Background);
QPalette::Window);
QColor text_color=QGuiApplication::palette().buttonText().color();
QString str;
QString point;

12
rdairplay/rdairplay.cpp
View File

@ -337,22 +337,22 @@ MainWidget::MainWidget(RDConfig *config,QWidget *parent)
// Create Palettes
//
auto_color=QPalette(QColor(BUTTON_MODE_AUTO_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
manual_color=QPalette(QColor(BUTTON_MODE_MANUAL_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
active_color=palette();
active_color.setColor(QPalette::Active,QPalette::ButtonText,
BUTTON_LOG_ACTIVE_TEXT_COLOR);
active_color.setColor(QPalette::Active,QPalette::Button,
BUTTON_LOG_ACTIVE_BACKGROUND_COLOR);
active_color.setColor(QPalette::Active,QPalette::Background,
palette().color(QPalette::Background));
active_color.setColor(QPalette::Active,QPalette::Window,
palette().color(QPalette::Window));
active_color.setColor(QPalette::Inactive,QPalette::ButtonText,
BUTTON_LOG_ACTIVE_TEXT_COLOR);
active_color.setColor(QPalette::Inactive,QPalette::Button,
BUTTON_LOG_ACTIVE_BACKGROUND_COLOR);
active_color.setColor(QPalette::Inactive,QPalette::Background,
palette().color(QPalette::Background));
active_color.setColor(QPalette::Inactive,QPalette::Window,
palette().color(QPalette::Window));
//
// Add Button

14
rdairplay/start_button.cpp
View File

@ -36,35 +36,35 @@ StartButton::StartButton(bool allow_pause,QWidget *parent)
//
start_stop_color=
QPalette(QColor(BUTTON_STOPPED_BACKGROUND_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
start_play_color=
QPalette(QColor(BUTTON_PLAY_BACKGROUND_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
start_play_color.
setColor(QPalette::ButtonText,QColor(BUTTON_PLAY_TEXT_COLOR));
start_pause_color=
QPalette(QColor(BUTTON_PAUSE_BACKGROUND_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
start_pause_color.
setColor(QPalette::ButtonText,QColor(BUTTON_PAUSE_TEXT_COLOR));
start_from_color=QPalette(QColor(BUTTON_FROM_BACKGROUND_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
start_from_color.
setColor(QPalette::ButtonText,QColor(BUTTON_FROM_TEXT_COLOR));
start_to_color=QPalette(QColor(BUTTON_TO_BACKGROUND_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
start_to_color.
setColor(QPalette::ButtonText,QColor(BUTTON_TO_TEXT_COLOR));
start_disabled_color=QPalette(QColor(BUTTON_DISABLED_BACKGROUND_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
start_disabled_color.
setColor(QPalette::ButtonText,QColor(BUTTON_DISABLED_TEXT_COLOR));
start_error_color=QPalette(QColor(BUTTON_ERROR_BACKGROUND_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
start_error_color.
setColor(QPalette::ButtonText,QColor(BUTTON_ERROR_TEXT_COLOR));

2
rdairplay/stop_counter.cpp
View File

@ -120,7 +120,7 @@ void StopCounter::UpdateTime()
p->fillRect(0,0,sizeHint().width()-2,sizeHint().height()-2,
QGuiApplication::palette().color(QPalette::Inactive,
QPalette::Background));
QPalette::Window));
p->setPen(QColor(text_color));
p->setFont(subLabelFont());
p->drawText((sizeHint().width()-2-p->fontMetrics().horizontalAdvance(stop_text))/2,32,

2
rdairplay/topstrip.h
View File

@ -22,7 +22,7 @@
#define TOPSTRIP_H
#include <QLabel>
#include <QWebView>
//#include <QWebView>
#include <rdmeterstrip.h>
#include <rdwidget.h>

2
rdairplay/wall_clock.cpp
View File

@ -109,7 +109,7 @@ void WallClock::tickClock()
}
else {
p.fillRect(0,0,width()-2,height()-2,QGuiApplication::palette().color(QPalette::Inactive,
QPalette::Background));
QPalette::Window));
p.setPen(QColor(text_color));
}
p.setFont(subLabelFont());

10
rdcartslots/Makefile.am
View File

@ -1,8 +1,8 @@
## Makefile.am
##
## Automake.am for rivendell/rdcartslots
## Makefile.am for rivendell/rdcartslots
##
## (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
@ -20,9 +20,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
@ -45,7 +45,7 @@ dist_rdcartslots_SOURCES = local_macros.cpp\
nodist_rdcartslots_SOURCES = moc_rdcartslots.cpp
rdcartslots_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdcartslots_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST = rdcartslots.pro\
rdcartslots_de.ts\

10
rdcastmanager/Makefile.am
View File

@ -1,8 +1,8 @@
## Makefile.am
##
## Automake.am for rivendell/rdcastmanager
## Makefile.am for rivendell/rdcastmanager
##
## (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
@ -20,9 +20,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
@ -53,7 +53,7 @@ nodist_rdcastmanager_SOURCES = moc_edit_cast.cpp\
moc_rdcastmanager.cpp\
moc_render_dialog.cpp
rdcastmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdcastmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST = rdcastmanager.pro\
rdcastmanager_cs.ts\

10
rdcatch/Makefile.am
View File

@ -1,8 +1,8 @@
## Makefile.am
##
## Automake.am for rivendell/rdcatch
## Makefile.am for rivendell/rdcatch
##
## (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
@ -20,9 +20,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
@ -77,7 +77,7 @@ nodist_rdcatch_SOURCES = moc_add_recording.cpp\
moc_vbox.cpp
rdcatch_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdcatch_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST = rdcatch.pro\

8
rdcatch/deckmon.cpp
View File

@ -2,7 +2,7 @@
//
// Monitor a Rivendell RDCatch Deck
//
// (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
@ -39,8 +39,8 @@ DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent)
// Generate Palettes
//
mon_red_palette=palette();
mon_red_palette.setColor(QPalette::Background,Qt::darkRed);
mon_red_palette.setColor(QPalette::Foreground,Qt::white);
mon_red_palette.setColor(QPalette::Window,Qt::darkRed);
mon_red_palette.setColor(QPalette::WindowText,Qt::white);
mon_red_stylesheet="color: white;background-color: darkRed;";
mon_dark_palette=palette();
@ -65,7 +65,7 @@ DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent)
mon_monitor_button->setFont(subButtonFont());
mon_monitor_button->setText(tr("MON"));
mon_monitor_palette=new QPalette(QColor(BUTTON_MONITOR_FLASHING_COLOR),
palette().color(QPalette::Background));
palette().color(QPalette::Window));
if((mon_channel>128)&&(mon_channel<(MAX_DECKS+129))) {
mon_monitor_button->hide();
}

12
rdcatch/rdcatch.cpp
View File

@ -2,7 +2,7 @@
//
// The Event Schedule Manager for Rivendell.
//
// (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
@ -102,15 +102,15 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
BUTTON_ACTIVE_TEXT_COLOR);
catch_scroll_color[0].setColor(QPalette::Active,QPalette::Button,
BUTTON_ACTIVE_BACKGROUND_COLOR);
catch_scroll_color[0].setColor(QPalette::Active,QPalette::Background,
palette().color(QPalette::Background));
catch_scroll_color[0].setColor(QPalette::Active,QPalette::Window,
palette().color(QPalette::Window));
catch_scroll_color[0].setColor(QPalette::Inactive,QPalette::ButtonText,
BUTTON_ACTIVE_TEXT_COLOR);
catch_scroll_color[0].setColor(QPalette::Inactive,QPalette::Button,
BUTTON_ACTIVE_BACKGROUND_COLOR);
catch_scroll_color[0].setColor(QPalette::Inactive,QPalette::Background,
palette().color(QPalette::Background));
catch_scroll_color[1]=QPalette(palette().color(QPalette::Background),palette().color(QPalette::Background));
catch_scroll_color[0].setColor(QPalette::Inactive,QPalette::Window,
palette().color(QPalette::Window));
catch_scroll_color[1]=QPalette(palette().color(QPalette::Window),palette().color(QPalette::Window));
str=QString("RDCatch")+" v"+VERSION+" - "+tr("Host")+":";
setWindowTitle(str+" "+rda->config()->stationName());

6
rdcatch/recordlistmodel.cpp
View File

@ -2,7 +2,7 @@
//
// Data model for Rivendell RDCatch events.
//
// (C) Copyright 2021-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@ -203,7 +203,7 @@ QVariant RecordListModel::data(const QModelIndex &index,int role) const
}
return d_font;
case Qt::TextColorRole:
case Qt::ForegroundRole:
return d_text_colors.at(row);
case Qt::BackgroundRole:
@ -632,7 +632,7 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q)
d_exit_codes[row]=(RDRecording::ExitCode)q->value(25).toUInt();
//
// Qt::TextColorRole
// Qt::ForegroundRole
//
if(q->value(2).toString()=="Y") {
d_text_colors[row]=QColor(EVENT_ACTIVE_TEXT_COLOR);

8
rdcatchd/Makefile.am
View File

@ -2,7 +2,7 @@
##
## rdcatchd/ Makefile.am for Rivendell
##
## (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
@ -20,9 +20,9 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++17 -fPIC @QT6_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
MOC = @QT6_MOC@
# QT's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -39,7 +39,7 @@ dist_rdcatchd_SOURCES = batch.cpp\
nodist_rdcatchd_SOURCES = moc_event_player.cpp\
moc_rdcatchd.cpp
rdcatchd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdcatchd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
moc_*

Some files were not shown because too many files have changed in this diff Show More