From 210bb8bca7307e23ae03b10f4edc36b023af0d17 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Thu, 1 Jun 2023 15:48:34 -0400 Subject: [PATCH] 2023-06-01 Fred Gleason * Fixed a bug that would cause 'failed to load translation file' warnings to be sent to the Apache error log. Signed-off-by: Fred Gleason --- ChangeLog | 3 +++ cae/cae.cpp | 3 ++- importers/nexgen_filter.cpp | 5 +++-- importers/wings_filter.cpp | 5 +++-- lib/rdapplication.cpp | 5 +++-- lib/rdapplication.h | 2 +- lib/rdcoreapplication.cpp | 5 +++-- lib/rdcoreapplication.h | 2 +- lib/rdtranslator.cpp | 5 +++-- lib/rdtranslator.h | 2 +- rdadmin/rdadmin.cpp | 2 +- rdairplay/rdairplay.cpp | 2 +- rdcartslots/rdcartslots.cpp | 2 +- rdcastmanager/rdcastmanager.cpp | 2 +- rdcatch/rdcatch.cpp | 2 +- rdcatchd/rdcatchd.cpp | 2 +- rdlibrary/rdlibrary.cpp | 2 +- rdlogedit/rdlogedit.cpp | 2 +- rdlogin/rdlogin.cpp | 2 +- rdlogmanager/commandline_ops.cpp | 2 +- rdlogmanager/logobject.cpp | 3 ++- rdlogmanager/rdlogmanager.cpp | 3 ++- rdpadengined/rdpadengined.cpp | 3 ++- rdpanel/rdpanel.cpp | 2 +- rdrepld/rdrepld.cpp | 3 ++- rdrssd/rdrssd.cpp | 3 ++- rdservice/rdservice.cpp | 3 ++- rdvairplayd/rdvairplayd.cpp | 3 ++- ripcd/ripcd.cpp | 3 ++- tests/audio_convert_test.cpp | 3 ++- tests/audio_export_test.cpp | 3 ++- tests/audio_import_test.cpp | 3 ++- tests/audio_metadata_test.cpp | 3 ++- tests/db_charset_test.cpp | 3 ++- tests/delete_test.cpp | 3 ++- tests/download_test.cpp | 3 ++- tests/feed_image_test.cpp | 3 ++- tests/metadata_wildcard_test.cpp | 2 +- tests/meterstrip_test.cpp | 2 +- tests/notification_test.cpp | 3 ++- tests/timeengine_test.cpp | 2 +- tests/upload_test.cpp | 3 ++- tests/wavefactory_test.cpp | 4 ++-- tests/wavescene_test.cpp | 2 +- tests/wavewidget_test.cpp | 2 +- utils/rdalsaconfig/rdalsaconfig.cpp | 6 ++++-- utils/rdcheckcuts/rdcheckcuts.cpp | 3 ++- utils/rdclilogedit/rdclilogedit.cpp | 3 ++- utils/rdconvert/rdconvert.cpp | 3 ++- utils/rddelete/rddelete.cpp | 3 ++- utils/rdexport/rdexport.cpp | 3 ++- utils/rdgpimon/rdgpimon.cpp | 2 +- utils/rdimport/rdimport.cpp | 2 +- utils/rdmaint/rdmaint.cpp | 3 ++- utils/rdmarkerset/rdmarkerset.cpp | 3 ++- utils/rdmetadata/rdmetadata.cpp | 3 ++- utils/rdrender/rdrender.cpp | 3 ++- web/rdxport/rdxport.cpp | 3 ++- web/webget/webget.cpp | 3 ++- 59 files changed, 105 insertions(+), 65 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45cb4fe8..98c173d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24202,3 +24202,6 @@ * Refactored the WebAPI HTML test harnesses to allow testing via both 'multipart/form-data' and 'application/x-www-form-urlencoded' encodings. +2023-06-01 Fred Gleason + * Fixed a bug that would cause 'failed to load translation file' + warnings to be sent to the Apache error log. diff --git a/cae/cae.cpp b/cae/cae.cpp index c947ef92..7899b0a7 100644 --- a/cae/cae.cpp +++ b/cae/cae.cpp @@ -91,7 +91,8 @@ MainObject::MainObject(QObject *parent) // // Open Database // - rda=static_cast(new RDCoreApplication("caed","caed",CAED_USAGE,this)); + rda=static_cast(new RDCoreApplication("caed","caed", + CAED_USAGE,false,this)); if(!rda->open(&err_msg,&err_type,false)) { fprintf(stderr,"caed: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/importers/nexgen_filter.cpp b/importers/nexgen_filter.cpp index 0555dd93..ffa4c74a 100644 --- a/importers/nexgen_filter.cpp +++ b/importers/nexgen_filter.cpp @@ -2,7 +2,7 @@ // // A Library import filter for the Prophet NexGen system // -// (C) Copyright 2012-2021 Fred Gleason +// (C) Copyright 2012-2023 Fred Gleason // // 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 @@ -62,7 +62,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("nexgen_filter","nexgen_filter",NEXGEN_FILTER_USAGE,this)); + rda=static_cast(new RDCoreApplication("nexgen_filter", + "nexgen_filter",NEXGEN_FILTER_USAGE,false,this)); if(!rda->open(&err_msg,NULL,false)) { fprintf(stderr,"nexgen_filter: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/importers/wings_filter.cpp b/importers/wings_filter.cpp index f9193947..e24a1ff0 100644 --- a/importers/wings_filter.cpp +++ b/importers/wings_filter.cpp @@ -2,7 +2,7 @@ // // A Library import filter for the Airforce Wings system // -// (C) Copyright 2002-2021 Fred Gleason +// (C) Copyright 2002-2023 Fred Gleason // // 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,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("wings_filter","wings_filter",WINGS_FILTER_USAGE,this)); + rda=static_cast(new RDCoreApplication("wings_filter", + "wings_filter",WINGS_FILTER_USAGE,false,this)); if(!rda->open(&err_msg,NULL,false)) { fprintf(stderr,"wings_filter: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/lib/rdapplication.cpp b/lib/rdapplication.cpp index e6444a41..36ab4721 100644 --- a/lib/rdapplication.cpp +++ b/lib/rdapplication.cpp @@ -25,8 +25,9 @@ RDApplication *rda=NULL; RDApplication::RDApplication(const QString &module_name,const QString &cmdname, - const QString &usage,QObject *parent) - : RDCoreApplication(module_name,cmdname,usage,parent) + const QString &usage,bool use_translations, + QObject *parent) + : RDCoreApplication(module_name,cmdname,usage,use_translations,parent) { app_icon_engine=new RDIconEngine(); } diff --git a/lib/rdapplication.h b/lib/rdapplication.h index 6f4834b9..11181e27 100644 --- a/lib/rdapplication.h +++ b/lib/rdapplication.h @@ -29,7 +29,7 @@ class RDApplication : public RDCoreApplication Q_OBJECT; public: RDApplication(const QString &module_name,const QString &cmdname, - const QString &usage,QObject *parent); + const QString &usage,bool use_translations,QObject *parent); ~RDApplication(); RDIconEngine *iconEngine() const; static QString locale(); diff --git a/lib/rdcoreapplication.cpp b/lib/rdcoreapplication.cpp index cdbe7d99..56c992f8 100644 --- a/lib/rdcoreapplication.cpp +++ b/lib/rdcoreapplication.cpp @@ -45,7 +45,8 @@ void __RDCoreApplication_ExitCallback() RDCoreApplication::RDCoreApplication(const QString &module_name, const QString &cmdname, - const QString &usage,QObject *parent) + const QString &usage,bool use_translations, + QObject *parent) : QObject(parent) { app_module_name=module_name; @@ -81,7 +82,7 @@ RDCoreApplication::RDCoreApplication(const QString &module_name, // // Translations // - rdt=new RDTranslator(app_command_name,this); + rdt=new RDTranslator(app_command_name,use_translations,this); atexit(__RDCoreApplication_ExitCallback); } diff --git a/lib/rdcoreapplication.h b/lib/rdcoreapplication.h index edc41a79..26ddab91 100644 --- a/lib/rdcoreapplication.h +++ b/lib/rdcoreapplication.h @@ -56,7 +56,7 @@ class RDCoreApplication : public QObject ExitInvalidCart=16,ExitNoSchedCode=17, ExitBadTicket=18,ExitNoStation=19,ExitLast=20}; RDCoreApplication(const QString &module_name,const QString &cmdname, - const QString &usage,QObject *parent=0); + const QString &usage,bool use_translations,QObject *parent); ~RDCoreApplication(); bool open(QString *err_msg,ErrorType *err_type,bool check_svc); RDAirPlayConf *airplayConf(); diff --git a/lib/rdtranslator.cpp b/lib/rdtranslator.cpp index 550d302c..8b52a04d 100644 --- a/lib/rdtranslator.cpp +++ b/lib/rdtranslator.cpp @@ -26,13 +26,14 @@ RDTranslator *rdt=NULL; -RDTranslator::RDTranslator(const QString &cmdname,QObject *parent) +RDTranslator::RDTranslator(const QString &cmdname,bool use_translations, + QObject *parent) : QObject(parent) { d_command_name=cmdname; QString loc=RDApplication::locale().left(2)+".qm"; - if(loc.left(2)!="en") { // There are no English translations + if(use_translations&&(loc.left(2)!="en")) { // There are no English translations LoadTranslation("qt_"+loc,"/usr/share/qt5/translations"); LoadTranslation("librd_"+loc,"/usr/share/rivendell"); LoadTranslation("rdhpi_"+loc,"/usr/share/rivendell"); diff --git a/lib/rdtranslator.h b/lib/rdtranslator.h index edc6e35a..9262191a 100644 --- a/lib/rdtranslator.h +++ b/lib/rdtranslator.h @@ -27,7 +27,7 @@ class RDTranslator : public QObject { Q_OBJECT; public: - RDTranslator(const QString &cmdname,QObject *parent=0); + RDTranslator(const QString &cmdname,bool use_translations,QObject *parent=0); private: bool LoadTranslation(const QString &filename,const QString &dirname); diff --git a/rdadmin/rdadmin.cpp b/rdadmin/rdadmin.cpp index e4994720..83f519dc 100644 --- a/rdadmin/rdadmin.cpp +++ b/rdadmin/rdadmin.cpp @@ -83,7 +83,7 @@ MainWidget::MainWidget(RDConfig *config,RDWidget *parent) // // Open the Database // - rda=new RDApplication("RDAdmin","rdadmin",RDADMIN_USAGE,this); + rda=new RDApplication("RDAdmin","rdadmin",RDADMIN_USAGE,true,this); if(!rda->open(&err_msg,&err_type,false)) { if(err_type!=RDApplication::ErrorNoHostEntry) { QMessageBox::critical(this,"RDAdmin - "+tr("Error"),err_msg); diff --git a/rdairplay/rdairplay.cpp b/rdairplay/rdairplay.cpp index 0de86182..23984671 100644 --- a/rdairplay/rdairplay.cpp +++ b/rdairplay/rdairplay.cpp @@ -73,7 +73,7 @@ MainWidget::MainWidget(RDConfig *config,QWidget *parent) // // Open the Database // - rda=new RDApplication("RDAirPlay","rdairplay",RDAIRPLAY_USAGE,this); + rda=new RDApplication("RDAirPlay","rdairplay",RDAIRPLAY_USAGE,true,this); if(!rda->open(&err_msg,NULL,true)) { QMessageBox::critical(this,"RDAirPlay - "+tr("Error"),err_msg); exit(1); diff --git a/rdcartslots/rdcartslots.cpp b/rdcartslots/rdcartslots.cpp index 5bef1bdb..39e9ccfb 100644 --- a/rdcartslots/rdcartslots.cpp +++ b/rdcartslots/rdcartslots.cpp @@ -34,7 +34,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Open the Database // - rda=new RDApplication("RDCartSlots","rdcartslots",RDCARTSLOTS_USAGE,this); + rda=new RDApplication("RDCartSlots","rdcartslots",RDCARTSLOTS_USAGE,true,this); if(!rda->open(&err_msg,NULL,false)) { QMessageBox::critical(this,"RDCartSlots - "+tr("Error"),err_msg); exit(1); diff --git a/rdcastmanager/rdcastmanager.cpp b/rdcastmanager/rdcastmanager.cpp index 566054ff..8e0233da 100644 --- a/rdcastmanager/rdcastmanager.cpp +++ b/rdcastmanager/rdcastmanager.cpp @@ -57,7 +57,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Open the Database/ // - rda=new RDApplication("RDCastManager","rdcastmanager",RDCASTMANAGER_USAGE, + rda=new RDApplication("RDCastManager","rdcastmanager",RDCASTMANAGER_USAGE,true, this); if(!rda->open(&err_msg,NULL,true)) { QMessageBox::critical(this,"RDCastManager - "+tr("Error"),err_msg); diff --git a/rdcatch/rdcatch.cpp b/rdcatch/rdcatch.cpp index 53c5e061..edad388c 100644 --- a/rdcatch/rdcatch.cpp +++ b/rdcatch/rdcatch.cpp @@ -66,7 +66,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Open the Database // - rda=new RDApplication("RDCatch","rdcatch",RDCATCH_USAGE,this); + rda=new RDApplication("RDCatch","rdcatch",RDCATCH_USAGE,true,this); if(!rda->open(&err_msg,NULL,true)) { QMessageBox::critical(this,"RDCatch - "+tr("Error"),err_msg); exit(1); diff --git a/rdcatchd/rdcatchd.cpp b/rdcatchd/rdcatchd.cpp index 56ce534b..689b2ced 100644 --- a/rdcatchd/rdcatchd.cpp +++ b/rdcatchd/rdcatchd.cpp @@ -90,7 +90,7 @@ MainObject::MainObject(QObject *parent) // Open the Database // rda=static_cast(new RDCoreApplication("rdcatchd","rdcatchd", - RDCATCHD_USAGE,this)); + RDCATCHD_USAGE,false,this)); if(!rda->open(&err_msg,&err_type,false)) { fprintf(stderr,"rdcatchd: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/rdlibrary/rdlibrary.cpp b/rdlibrary/rdlibrary.cpp index 44ae3b22..6beeb53b 100644 --- a/rdlibrary/rdlibrary.cpp +++ b/rdlibrary/rdlibrary.cpp @@ -86,7 +86,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Open the Database // - rda=new RDApplication("RDLibrary","rdlibrary",RDLIBRARY_USAGE,this); + rda=new RDApplication("RDLibrary","rdlibrary",RDLIBRARY_USAGE,true,this); if(!rda->open(&err_msg,NULL,true)) { QMessageBox::critical(this,"RDLibrary - "+tr("Error"),err_msg); exit(1); diff --git a/rdlogedit/rdlogedit.cpp b/rdlogedit/rdlogedit.cpp index 027010ba..1f44869a 100644 --- a/rdlogedit/rdlogedit.cpp +++ b/rdlogedit/rdlogedit.cpp @@ -60,7 +60,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Open the Database // - rda=new RDApplication("RDLogEdit","rdlogedit",RDLOGEDIT_USAGE,this); + rda=new RDApplication("RDLogEdit","rdlogedit",RDLOGEDIT_USAGE,true,this); if(!rda->open(&err_msg,NULL,true)) { QMessageBox::critical(this,"RDLogEdit - "+tr("Error"),err_msg); exit(1); diff --git a/rdlogin/rdlogin.cpp b/rdlogin/rdlogin.cpp index e9f2e6e1..96254644 100644 --- a/rdlogin/rdlogin.cpp +++ b/rdlogin/rdlogin.cpp @@ -47,7 +47,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Open the database // - rda=new RDApplication("RDLogin","rdlogin",RDLOGIN_USAGE,this); + rda=new RDApplication("RDLogin","rdlogin",RDLOGIN_USAGE,true,this); if(!rda->open(&err_msg,NULL,true)) { QMessageBox::critical(this,"RDLogin - "+tr("Error"),err_msg); exit(1); diff --git a/rdlogmanager/commandline_ops.cpp b/rdlogmanager/commandline_ops.cpp index 3b2ed6cd..ca145140 100644 --- a/rdlogmanager/commandline_ops.cpp +++ b/rdlogmanager/commandline_ops.cpp @@ -46,7 +46,7 @@ int RunReportOperation(int argc,char *argv[],const QString &rptname, } rda=static_cast(new RDCoreApplication("RDLogManager", - "rdlogmanager",RDLOGMANAGER_USAGE)); + "rdlogmanager",RDLOGMANAGER_USAGE,true,NULL)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"rdlogmanager: %s\n",err_msg.toUtf8().constData()); exit(RDApplication::ExitNoDb); diff --git a/rdlogmanager/logobject.cpp b/rdlogmanager/logobject.cpp index 1c76b7d1..a89d2c44 100644 --- a/rdlogmanager/logobject.cpp +++ b/rdlogmanager/logobject.cpp @@ -44,7 +44,8 @@ LogObject::LogObject(const QString &svcname,int start_offset, // // Open the Database // - rda=static_cast(new RDCoreApplication("RDLogManager","rdlogmanager","")); + rda=static_cast(new RDCoreApplication("RDLogManager", + "rdlogmanager","",true,NULL)); if(!rda->open(&err_msg,NULL,false)) { fprintf(stderr,"rdlogmanager: %s\n",err_msg.toUtf8().constData()); exit(RDApplication::ExitNoDb); diff --git a/rdlogmanager/rdlogmanager.cpp b/rdlogmanager/rdlogmanager.cpp index 8d4ffee6..37fa91af 100644 --- a/rdlogmanager/rdlogmanager.cpp +++ b/rdlogmanager/rdlogmanager.cpp @@ -52,7 +52,8 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Open the Database // - rda=new RDApplication("RDLogManager","rdlogmanager",RDLOGMANAGER_USAGE,this); + rda=new RDApplication("RDLogManager","rdlogmanager",RDLOGMANAGER_USAGE,true, + this); if(!rda->open(&err_msg,NULL,true)) { QMessageBox::critical(this,"RDLogManager - "+tr("Error"),err_msg); exit(RDApplication::ExitNoDb); diff --git a/rdpadengined/rdpadengined.cpp b/rdpadengined/rdpadengined.cpp index 0aab356b..ca089d3e 100644 --- a/rdpadengined/rdpadengined.cpp +++ b/rdpadengined/rdpadengined.cpp @@ -54,7 +54,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdpadengined","rdpadengined",RDPADENGINED_USAGE,this)); + rda=static_cast(new RDCoreApplication("rdpadengined", + "rdpadengined",RDPADENGINED_USAGE,false,this)); if(!rda->open(&err_msg,&err_type,false)) { fprintf(stderr,"rdpadengined: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/rdpanel/rdpanel.cpp b/rdpanel/rdpanel.cpp index c4eefff1..1bf03a17 100644 --- a/rdpanel/rdpanel.cpp +++ b/rdpanel/rdpanel.cpp @@ -53,7 +53,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Open the Database // - rda=new RDApplication("RDPanel","rdpanel",RDPANEL_USAGE,this); + rda=new RDApplication("RDPanel","rdpanel",RDPANEL_USAGE,true,this); if(!rda->open(&err_msg,NULL,true)) { QMessageBox::critical(this,"RDPanel - "+tr("Error"),err_msg); exit(1); diff --git a/rdrepld/rdrepld.cpp b/rdrepld/rdrepld.cpp index c6bcdfd5..473e040f 100644 --- a/rdrepld/rdrepld.cpp +++ b/rdrepld/rdrepld.cpp @@ -71,7 +71,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdrepld","rdrepld",RDREPLD_USAGE,this)); + rda=static_cast(new RDCoreApplication("rdrepld","rdrepld", + RDREPLD_USAGE,false,this)); if(!rda->open(&err_msg,&err_type,false)) { fprintf(stderr,"rdrepld: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/rdrssd/rdrssd.cpp b/rdrssd/rdrssd.cpp index 1616d0e8..c1d8e554 100644 --- a/rdrssd/rdrssd.cpp +++ b/rdrssd/rdrssd.cpp @@ -39,7 +39,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdrssd","rdrssd",RDRSSD_USAGE,this)); + rda=static_cast(new RDCoreApplication("rdrssd","rdrssd", + RDRSSD_USAGE,false,this)); if(!rda->open(&err_msg,&err_type,false)) { fprintf(stderr,"rdrssd: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/rdservice/rdservice.cpp b/rdservice/rdservice.cpp index 8630dc97..ea4db051 100644 --- a/rdservice/rdservice.cpp +++ b/rdservice/rdservice.cpp @@ -66,7 +66,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdservice","rdservice","\n\n",this)); + rda=static_cast(new RDCoreApplication("rdservice","rdservice", + "\n\n",false,this)); if(!rda->open(&err_msg,&err_type,false)) { rda->syslog(LOG_ERR,"unable to open database [%s]", err_msg.toUtf8().constData()); diff --git a/rdvairplayd/rdvairplayd.cpp b/rdvairplayd/rdvairplayd.cpp index b51d8189..5b4fbff3 100644 --- a/rdvairplayd/rdvairplayd.cpp +++ b/rdvairplayd/rdvairplayd.cpp @@ -66,7 +66,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdvairplayd","rdvairplayd",RDVAIRPLAYD_USAGE,this)); + rda=static_cast(new RDCoreApplication("rdvairplayd", + "rdvairplayd",false,RDVAIRPLAYD_USAGE,this)); if(!rda->open(&err_msg,&err_type,false)) { fprintf(stderr,"rdvairplayd: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/ripcd/ripcd.cpp b/ripcd/ripcd.cpp index 1a720dfb..c52272fd 100644 --- a/ripcd/ripcd.cpp +++ b/ripcd/ripcd.cpp @@ -71,7 +71,8 @@ MainObject::MainObject(QObject *parent) QString err_msg; RDApplication::ErrorType err_type=RDApplication::ErrorOk; - rda=static_cast(new RDCoreApplication("ripcd","ripcd",RIPCD_USAGE,this)); + rda=static_cast(new RDCoreApplication("ripcd","ripcd", + RIPCD_USAGE,false,this)); if(!rda->open(&err_msg,&err_type,false)) { fprintf(stderr,"ripcd: %s\n",(const char *)err_msg.toUtf8()); exit(1); diff --git a/tests/audio_convert_test.cpp b/tests/audio_convert_test.cpp index a0595356..ddb0c5af 100644 --- a/tests/audio_convert_test.cpp +++ b/tests/audio_convert_test.cpp @@ -42,7 +42,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("audio_convert_test","audio_convert_test",AUDIO_CONVERT_TEST_USAGE,this)); + rda=static_cast(new RDCoreApplication("audio_convert_test", + "audio_convert_test",AUDIO_CONVERT_TEST_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"audio_convert_test: %s\n",(const char *)err_msg.toUtf8()); exit(1); diff --git a/tests/audio_export_test.cpp b/tests/audio_export_test.cpp index 06d793a8..d24dc456 100644 --- a/tests/audio_export_test.cpp +++ b/tests/audio_export_test.cpp @@ -44,7 +44,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("audio_export_test","audio_export_test",AUDIO_EXPORT_TEST_USAGE,this)); + rda=static_cast(new RDCoreApplication("audio_export_test", + "audio_export_test",AUDIO_EXPORT_TEST_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"audio_export_test: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/tests/audio_import_test.cpp b/tests/audio_import_test.cpp index 95ac2761..6e7bfdf6 100644 --- a/tests/audio_import_test.cpp +++ b/tests/audio_import_test.cpp @@ -45,7 +45,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("audio_import_test","audio_import_test",AUDIO_IMPORT_TEST_USAGE,this)); + rda=static_cast(new RDCoreApplication("audio_import_test", + "audio_import_test",AUDIO_IMPORT_TEST_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"audio_import_test: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/tests/audio_metadata_test.cpp b/tests/audio_metadata_test.cpp index ceb02ae0..7e49cd36 100644 --- a/tests/audio_metadata_test.cpp +++ b/tests/audio_metadata_test.cpp @@ -35,7 +35,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("audio_metadata_test","audio_metadata_test",AUDIO_METADATA_TEST_USAGE,this)); + rda=static_cast(new RDCoreApplication("audio_metadata_test", + "audio_metadata_test",AUDIO_METADATA_TEST_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"audio_metadata_test: %s\n",(const char *)err_msg.toUtf8()); exit(1); diff --git a/tests/db_charset_test.cpp b/tests/db_charset_test.cpp index ad7b848a..aabae649 100644 --- a/tests/db_charset_test.cpp +++ b/tests/db_charset_test.cpp @@ -42,7 +42,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDApplication("db_charset_test","rdvairplayd",DB_CHARSET_TEST_USAGE,this)); + rda=static_cast(new RDApplication("db_charset_test", + "rdvairplayd",DB_CHARSET_TEST_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"db_charset_test: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/tests/delete_test.cpp b/tests/delete_test.cpp index 93905bd1..bb50dc28 100644 --- a/tests/delete_test.cpp +++ b/tests/delete_test.cpp @@ -39,7 +39,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=new RDApplication("delete_test","delete_test",DELETE_TEST_USAGE,this); + rda=new RDApplication("delete_test","delete_test",DELETE_TEST_USAGE,false, + this); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"delete_test: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/tests/download_test.cpp b/tests/download_test.cpp index 95a24bf4..f739c52b 100644 --- a/tests/download_test.cpp +++ b/tests/download_test.cpp @@ -41,7 +41,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=new RDApplication("download_test","download_test",DOWNLOAD_TEST_USAGE,this); + rda=new RDApplication("download_test","download_test",DOWNLOAD_TEST_USAGE, + false,this); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"download_test: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/tests/feed_image_test.cpp b/tests/feed_image_test.cpp index 2547a6d4..9ba21c88 100644 --- a/tests/feed_image_test.cpp +++ b/tests/feed_image_test.cpp @@ -45,7 +45,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=new RDApplication("feed_image_test","feed_image_test",FEED_IMAGE_TEST_USAGE,this); + rda=new RDApplication("feed_image_test","feed_image_test", + FEED_IMAGE_TEST_USAGE,false,this); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"feed_image_test: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/tests/metadata_wildcard_test.cpp b/tests/metadata_wildcard_test.cpp index c6edc3ea..494215fb 100644 --- a/tests/metadata_wildcard_test.cpp +++ b/tests/metadata_wildcard_test.cpp @@ -40,7 +40,7 @@ MainObject::MainObject(QObject *parent) // Open the Database // rda=new RDApplication("metadata_wildcard_test","metadata_wildcard_test", - METADATA_WILDCARD_TEST_USAGE,this); + METADATA_WILDCARD_TEST_USAGE,false,this); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"metadata_wildcard_test: %s\n",(const char *)err_msg.toUtf8()); exit(1); diff --git a/tests/meterstrip_test.cpp b/tests/meterstrip_test.cpp index 418d0f62..642ebcfe 100644 --- a/tests/meterstrip_test.cpp +++ b/tests/meterstrip_test.cpp @@ -35,7 +35,7 @@ MainWidget::MainWidget(QWidget *parent) // Open the database // rda=new RDApplication("meterstrip_test","meterstrip_test",METERSTRIP_TEST_USAGE, - this); + false,this); if(!rda->open(&err_msg,NULL,true)) { QMessageBox::critical(this,"meterstrip_test - "+tr("Error"),err_msg); exit(RDApplication::ExitNoDb); diff --git a/tests/notification_test.cpp b/tests/notification_test.cpp index fa423877..302752a2 100644 --- a/tests/notification_test.cpp +++ b/tests/notification_test.cpp @@ -29,7 +29,8 @@ MainObject::MainObject(QObject *parent) { QString err_msg; - rda=new RDApplication("notification_test","notification_test",NOTIFICATION_TEST_USAGE,this); + rda=new RDApplication("notification_test","notification_test", + NOTIFICATION_TEST_USAGE,false,this); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"notification_test: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/tests/timeengine_test.cpp b/tests/timeengine_test.cpp index 496cded6..fdabce21 100644 --- a/tests/timeengine_test.cpp +++ b/tests/timeengine_test.cpp @@ -41,7 +41,7 @@ MainObject::MainObject(QObject *parent) rda=static_cast(new RDCoreApplication("timeengine_test", "timeengine_test", TIMEENGINE_TEST_USAGE, - this)); + false,this)); if(!rda->open(&err_msg,&err_type,false)) { fprintf(stderr,"timeengine_test: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/tests/upload_test.cpp b/tests/upload_test.cpp index dd113399..3b7c1c8d 100644 --- a/tests/upload_test.cpp +++ b/tests/upload_test.cpp @@ -41,7 +41,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=new RDApplication("upload_test","upload_test",UPLOAD_TEST_USAGE,this); + rda=new RDApplication("upload_test","upload_test",UPLOAD_TEST_USAGE,false, + this); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"upload_test: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/tests/wavefactory_test.cpp b/tests/wavefactory_test.cpp index 44b158d0..a85f2dcd 100644 --- a/tests/wavefactory_test.cpp +++ b/tests/wavefactory_test.cpp @@ -42,8 +42,8 @@ MainWidget::MainWidget(QWidget *parent) // // Open the database // - rda=new RDApplication("wavefactory_test","wavefactory_test",WAVEFACTORY_TEST_USAGE, - this); + rda=new RDApplication("wavefactory_test","wavefactory_test", + WAVEFACTORY_TEST_USAGE,false,this); if(!rda->open(&err_msg,NULL,true)) { QMessageBox::critical(this,"wavefactory_test - "+tr("Error"),err_msg); exit(RDApplication::ExitNoDb); diff --git a/tests/wavescene_test.cpp b/tests/wavescene_test.cpp index 4f17cd4b..d899af6c 100644 --- a/tests/wavescene_test.cpp +++ b/tests/wavescene_test.cpp @@ -42,7 +42,7 @@ MainWidget::MainWidget(QWidget *parent) // Open the database // rda=new RDApplication("wavescene_test","wavescene_test",WAVESCENE_TEST_USAGE, - this); + false,this); if(!rda->open(&err_msg,NULL,true)) { QMessageBox::critical(this,"wavescene_test - "+tr("Error"),err_msg); exit(RDApplication::ExitNoDb); diff --git a/tests/wavewidget_test.cpp b/tests/wavewidget_test.cpp index d971a849..0201fc0b 100644 --- a/tests/wavewidget_test.cpp +++ b/tests/wavewidget_test.cpp @@ -41,7 +41,7 @@ MainWidget::MainWidget(QWidget *parent) // Open the database // rda=new RDApplication("wavewidget_test","wavewidget_test",WAVEWIDGET_TEST_USAGE, - this); + false,this); if(!rda->open(&err_msg,NULL,true)) { QMessageBox::critical(this,"wavewidget_test - "+tr("Error"),err_msg); exit(RDApplication::ExitNoDb); diff --git a/utils/rdalsaconfig/rdalsaconfig.cpp b/utils/rdalsaconfig/rdalsaconfig.cpp index 97cbee8f..3420ab8b 100644 --- a/utils/rdalsaconfig/rdalsaconfig.cpp +++ b/utils/rdalsaconfig/rdalsaconfig.cpp @@ -82,7 +82,8 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Open the Database // - rda=new RDApplication("RDAlsaConfig","rdalsaconfig",RDALSACONFIG_USAGE,this); + rda=new RDApplication("RDAlsaConfig","rdalsaconfig",RDALSACONFIG_USAGE,false, + this); if(!rda->open(&err_msg,NULL,false)) { QMessageBox::critical(this,"RDAlsaConfig - "+tr("Error"),err_msg); exit(1); @@ -362,7 +363,8 @@ Autogen::Autogen() // // Open the Database // - rda=new RDApplication("RDAlsaConfig","rdalsaconfig",RDALSACONFIG_USAGE,this); + rda=new RDApplication("RDAlsaConfig","rdalsaconfig",RDALSACONFIG_USAGE, + false,this); if(!rda->open(&err_msg,NULL,false)) { fprintf(stderr,"rdalsaconfig: unable to open database [%s]\n", (const char *)err_msg.toUtf8()); diff --git a/utils/rdcheckcuts/rdcheckcuts.cpp b/utils/rdcheckcuts/rdcheckcuts.cpp index 58378821..efe4f6b1 100644 --- a/utils/rdcheckcuts/rdcheckcuts.cpp +++ b/utils/rdcheckcuts/rdcheckcuts.cpp @@ -42,7 +42,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdcheckcuts","rdcheckcuts",RDCHECKCUTS_USAGE,this)); + rda=static_cast(new RDCoreApplication("rdcheckcuts", + "rdcheckcuts",RDCHECKCUTS_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"rdcheckcuts: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/utils/rdclilogedit/rdclilogedit.cpp b/utils/rdclilogedit/rdclilogedit.cpp index 7bec5c0a..521e4de5 100644 --- a/utils/rdclilogedit/rdclilogedit.cpp +++ b/utils/rdclilogedit/rdclilogedit.cpp @@ -48,7 +48,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdclilogedit","rdclilogedit",RDCLILOGEDIT_USAGE,this)); + rda=static_cast(new RDCoreApplication("rdclilogedit", + "rdclilogedit",RDCLILOGEDIT_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"rdclilogedit: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/utils/rdconvert/rdconvert.cpp b/utils/rdconvert/rdconvert.cpp index acb12704..1a1907e8 100644 --- a/utils/rdconvert/rdconvert.cpp +++ b/utils/rdconvert/rdconvert.cpp @@ -42,7 +42,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdconvert","rdconvert",RDCONVERT_USAGE,this)); + rda=static_cast(new RDCoreApplication("rdconvert","rdconvert", + RDCONVERT_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"rdconvert: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/utils/rddelete/rddelete.cpp b/utils/rddelete/rddelete.cpp index 1725ed10..3f4671f4 100644 --- a/utils/rddelete/rddelete.cpp +++ b/utils/rddelete/rddelete.cpp @@ -43,7 +43,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rddelete","rddelete",RDDELETE_USAGE,this)); + rda=static_cast(new RDCoreApplication("rddelete","rddelete", + RDDELETE_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"rddelete: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/utils/rdexport/rdexport.cpp b/utils/rdexport/rdexport.cpp index 168dde29..7a4bc6b8 100644 --- a/utils/rdexport/rdexport.cpp +++ b/utils/rdexport/rdexport.cpp @@ -56,7 +56,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdexport","rdexport",RDEXPORT_USAGE,this)); + rda=static_cast(new RDCoreApplication("rdexport","rdexport", + RDEXPORT_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"rdexport: %s\n",(const char *)err_msg.toUtf8()); exit(1); diff --git a/utils/rdgpimon/rdgpimon.cpp b/utils/rdgpimon/rdgpimon.cpp index ee194af2..ab4d4482 100644 --- a/utils/rdgpimon/rdgpimon.cpp +++ b/utils/rdgpimon/rdgpimon.cpp @@ -38,7 +38,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Open the Database // - rda=new RDApplication("RDGpiMon","rdgpimon",RDGPIMON_USAGE,this); + rda=new RDApplication("RDGpiMon","rdgpimon",RDGPIMON_USAGE,true,this); if(!rda->open(&err_msg,NULL,true)) { QMessageBox::critical(this,"RDGpiMon - "+tr("Error"),err_msg); exit(1); diff --git a/utils/rdimport/rdimport.cpp b/utils/rdimport/rdimport.cpp index bbefd6e5..a05a2349 100644 --- a/utils/rdimport/rdimport.cpp +++ b/utils/rdimport/rdimport.cpp @@ -108,7 +108,7 @@ MainObject::MainObject(QObject *parent) // Open the Database // rda=static_cast(new RDCoreApplication("rdimport","rdimport", - RDIMPORT_USAGE,this)); + RDIMPORT_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"rdimport: %s\n",err_msg.toUtf8().constData()); ErrorExit(RDApplication::ExitNoDb); diff --git a/utils/rdmaint/rdmaint.cpp b/utils/rdmaint/rdmaint.cpp index a0fa7ee3..34c4eefc 100644 --- a/utils/rdmaint/rdmaint.cpp +++ b/utils/rdmaint/rdmaint.cpp @@ -57,7 +57,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdmaint","rdmaint",RDMAINT_USAGE,this)); + rda=static_cast(new RDCoreApplication("rdmaint","rdmaint", + RDMAINT_USAGE,false,this)); if(!rda->open(&err_msg,NULL,false)) { fprintf(stderr,"rdmaint: %s\n",err_msg.toUtf8().constData()); rda->syslog(LOG_ERR,"%s",err_msg.toUtf8().constData()); diff --git a/utils/rdmarkerset/rdmarkerset.cpp b/utils/rdmarkerset/rdmarkerset.cpp index bc582775..0fb5b075 100644 --- a/utils/rdmarkerset/rdmarkerset.cpp +++ b/utils/rdmarkerset/rdmarkerset.cpp @@ -57,7 +57,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdmarkerset","rdmarkerset",RDMARKERSET_USAGE,this)); + rda=static_cast(new RDCoreApplication("rdmarkerset", + "rdmarkerset",RDMARKERSET_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"rdmarkerset: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/utils/rdmetadata/rdmetadata.cpp b/utils/rdmetadata/rdmetadata.cpp index b11f00fb..ce6df6a7 100644 --- a/utils/rdmetadata/rdmetadata.cpp +++ b/utils/rdmetadata/rdmetadata.cpp @@ -49,7 +49,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdmetadata","rdmetadata",RDMETADATA_USAGE,this)); + rda=static_cast(new RDCoreApplication("rdmetadata", + "rdmetadata",RDMETADATA_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"rdmetadata: %s\n",err_msg.toUtf8().constData()); exit(1); diff --git a/utils/rdrender/rdrender.cpp b/utils/rdrender/rdrender.cpp index 8c54f2a2..c4dc4ed3 100644 --- a/utils/rdrender/rdrender.cpp +++ b/utils/rdrender/rdrender.cpp @@ -67,7 +67,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdrender","rdrender",RDRENDER_USAGE,this)); + rda=static_cast(new RDCoreApplication("rdrender","rdrender", + RDRENDER_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { fprintf(stderr,"rdrender: %s\n",(const char *)err_msg.toUtf8()); exit(1); diff --git a/web/rdxport/rdxport.cpp b/web/rdxport/rdxport.cpp index 855d0d5f..8c695911 100644 --- a/web/rdxport/rdxport.cpp +++ b/web/rdxport/rdxport.cpp @@ -49,7 +49,8 @@ Xport::Xport(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("rdxport.cgi","rdxport.cgi",RDXPORT_CGI_USAGE,this)); + rda=static_cast(new RDCoreApplication("rdxport.cgi", + "rdxport.cgi",RDXPORT_CGI_USAGE,false,this)); if(!rda->open(&err_msg,NULL,false)) { printf("Content-type: text/html\n"); printf("Status: 500\n"); diff --git a/web/webget/webget.cpp b/web/webget/webget.cpp index 1b868aa6..83a5c7b4 100644 --- a/web/webget/webget.cpp +++ b/web/webget/webget.cpp @@ -50,7 +50,8 @@ MainObject::MainObject(QObject *parent) // // Open the Database // - rda=static_cast(new RDCoreApplication("webget.cgi","webget.cgi",WEBGET_CGI_USAGE,this)); + rda=static_cast(new RDCoreApplication("webget.cgi", + "webget.cgi",WEBGET_CGI_USAGE,false,this)); if(!rda->open(&err_msg,NULL,true)) { TextExit(err_msg,500,LINE_NUMBER); }