Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +01:00
Code Issues Projects Releases Wiki Activity

2021-02-23 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the Qt3Support library from the build system.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-23 18:07:21 -05:00
parent b2f8532e25
commit 89a0d72439
508 changed files with 5763 additions and 6078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
tests/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License version 2 as
@@ -18,7 +18,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
@@ -55,90 +55,90 @@ noinst_PROGRAMS = audio_convert_test\
wav_chunk_test
dist_audio_convert_test_SOURCES = audio_convert_test.cpp audio_convert_test.h
audio_convert_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
audio_convert_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_audio_export_test_SOURCES = audio_export_test.cpp audio_export_test.h
audio_export_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
audio_export_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_audio_import_test_SOURCES = audio_import_test.cpp audio_import_test.h
audio_import_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
audio_import_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_audio_metadata_test_SOURCES = audio_metadata_test.cpp audio_metadata_test.h
audio_metadata_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
audio_metadata_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_audio_peaks_test_SOURCES = audio_peaks_test.cpp audio_peaks_test.h
audio_peaks_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
audio_peaks_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_cmdline_parser_test_SOURCES = cmdline_parser_test.cpp cmdline_parser_test.h
cmdline_parser_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
cmdline_parser_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_datedecode_test_SOURCES = datedecode_test.cpp datedecode_test.h
datedecode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
datedecode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_dateparse_test_SOURCES = dateparse_test.cpp dateparse_test.h
dateparse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
dateparse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_db_charset_test_SOURCES = db_charset_test.cpp db_charset_test.h
db_charset_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
db_charset_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_delete_test_SOURCES = delete_test.cpp delete_test.h
delete_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
delete_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_download_test_SOURCES = download_test.cpp download_test.h
download_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
download_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_feed_image_test_SOURCES = feed_image_test.cpp feed_image_test.h
feed_image_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
feed_image_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_getpids_test_SOURCES = getpids_test.cpp getpids_test.h
getpids_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
getpids_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_log_unlink_test_SOURCES = log_unlink_test.cpp log_unlink_test.h
nodist_log_unlink_test_SOURCES = moc_log_unlink_test.cpp
log_unlink_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
log_unlink_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_metadata_wildcard_test_SOURCES = metadata_wildcard_test.cpp metadata_wildcard_test.h
nodist_metadata_wildcard_test_SOURCES = moc_metadata_wildcard_test.cpp
metadata_wildcard_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
metadata_wildcard_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_mcast_recv_test_SOURCES = mcast_recv_test.cpp mcast_recv_test.h
nodist_mcast_recv_test_SOURCES = moc_mcast_recv_test.cpp
mcast_recv_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
mcast_recv_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_notification_test_SOURCES = notification_test.cpp notification_test.h
nodist_notification_test_SOURCES = moc_notification_test.cpp
notification_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
notification_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_rdxml_parse_test_SOURCES = rdxml_parse_test.cpp rdxml_parse_test.h
rdxml_parse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
rdxml_parse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_readcd_test_SOURCES = readcd_test.cpp readcd_test.h
readcd_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
readcd_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_reserve_carts_test_SOURCES = reserve_carts_test.cpp reserve_carts_test.h
reserve_carts_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
reserve_carts_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_sendmail_test_SOURCES = sendmail_test.cpp sendmail_test.h
sendmail_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
sendmail_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_stringcode_test_SOURCES = stringcode_test.cpp stringcode_test.h
stringcode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
stringcode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_test_hash_SOURCES = test_hash.cpp test_hash.h
test_hash_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
test_hash_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_test_pam_SOURCES = test_pam.cpp test_pam.h
test_pam_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
test_pam_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_timer_test_SOURCES = timer_test.cpp timer_test.h
nodist_timer_test_SOURCES = moc_timer_test.cpp
timer_test_LDADD = @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
timer_test_LDADD = @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_upload_test_SOURCES = upload_test.cpp upload_test.h
upload_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
upload_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
dist_wav_chunk_test_SOURCES = wav_chunk_test.cpp wav_chunk_test.h
wav_chunk_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
wav_chunk_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
EXTRA_DIST = rivendell_standard.txt\
visualtraffic.txt

3
tests/audio_convert_test.cpp
View File

@@ -192,7 +192,8 @@ MainObject::MainObject(QObject *parent)
conv->setSpeedRatio(speed_ratio);
printf("Converting...\n");
conv_err=conv->convert();
printf("Result: %s\n",(const char *)RDAudioConvert::errorText(conv_err));
printf("Result: %s\n",RDAudioConvert::errorText(conv_err).toUtf8().
constData());
delete conv;
exit(0);

9
tests/audio_export_test.cpp
View File

@@ -18,8 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <qapplication.h>
#include <rdapplication.h>
@@ -48,7 +46,7 @@ MainObject::MainObject(QObject *parent)
//
rda=static_cast<RDApplication *>(new RDCoreApplication("audio_export_test","audio_export_test",AUDIO_EXPORT_TEST_USAGE,this));
if(!rda->open(&err_msg)) {
fprintf(stderr,"audio_export_test: %s\n",(const char *)err_msg);
fprintf(stderr,"audio_export_test: %s\n",err_msg.toUtf8().constData());
exit(1);
}
@@ -170,7 +168,7 @@ MainObject::MainObject(QObject *parent)
}
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"audio_export_test: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i));
rda->cmdSwitch()->key(i).toUtf8().constData());
exit(2);
}
}
@@ -205,7 +203,8 @@ MainObject::MainObject(QObject *parent)
printf("Exporting...\n");
conv_err=conv->runExport(username,password,&audio_conv_err);
printf("Result: %s\n",
(const char *)RDAudioExport::errorText(conv_err,audio_conv_err));
RDAudioExport::errorText(conv_err,audio_conv_err).toUtf8().
constData());
delete conv;
exit(0);

7
tests/audio_import_test.cpp
View File

@@ -47,7 +47,7 @@ MainObject::MainObject(QObject *parent)
//
rda=static_cast<RDApplication *>(new RDCoreApplication("audio_import_test","audio_import_test",AUDIO_IMPORT_TEST_USAGE,this));
if(!rda->open(&err_msg)) {
fprintf(stderr,"audio_import_test: %s\n",(const char *)err_msg);
fprintf(stderr,"audio_import_test: %s\n",err_msg.toUtf8().constData());
exit(1);
}
@@ -116,7 +116,7 @@ MainObject::MainObject(QObject *parent)
}
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"audio_import_test: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i));
rda->cmdSwitch()->key(i).toUtf8().constData());
exit(2);
}
}
@@ -149,7 +149,8 @@ MainObject::MainObject(QObject *parent)
printf("Importing...\n");
conv_err=conv->runImport(username,password,&audio_conv_err);
printf("Result: %s\n",
(const char *)RDAudioImport::errorText(conv_err,audio_conv_err));
RDAudioImport::errorText(conv_err,audio_conv_err).toUtf8().
constData());
delete conv;
exit(0);

16
tests/audio_peaks_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test the Rivendell audio peak routines.
//
// (C) Copyright 2015-2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2015-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,11 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <stdio.h>
#include <qapplication.h>
#include <qvariant.h>
#include <QApplication>
#include <rdcmd_switch.h>
#include <rdwavefile.h>
@@ -59,7 +55,7 @@ MainObject::MainObject(QObject *parent)
}
if(!cmd->processed(i)) {
fprintf(stderr,"audio_peaks_test: unknown option \"%s\"\n",
(const char *)cmd->value(i));
cmd->value(i).toUtf8().constData());
exit(256);
}
}
@@ -72,11 +68,11 @@ MainObject::MainObject(QObject *parent)
wave->nameWave(filename);
if(!wave->openWave()) {
fprintf(stderr,"audio_peaks_test: unable to open \"%s\"\n",
(const char *)filename);
filename.toUtf8().constData());
exit(256);
}
if(wave->hasEnergy()) {
printf("\"%s\" has energy, size: %u\n",(const char *)filename,
printf("\"%s\" has energy, size: %u\n",filename.toUtf8().constData(),
wave->energySize());
if(frame_used) {
if(wave->getChannels()==1) {
@@ -90,7 +86,7 @@ MainObject::MainObject(QObject *parent)
}
}
else {
printf("\"%s\" does NOT have energy\n",(const char *)filename);
printf("\"%s\" does NOT have energy\n",filename.toUtf8().constData());
}
wave->closeWave();
delete wave;

2
tests/cmdline_parser_test.cpp
View File

@@ -37,7 +37,7 @@ MainObject::MainObject(QObject *parent)
new RDCmdSwitch(qApp->argc(),qApp->argv(),"cmdline_parser_test",
CMDLINE_PARSER_TEST_USAGE);
for(unsigned i=0;i<cmd->keys();i++) {
printf(" key[%d]: %s\n",i,cmd->key(i).utf8().constData());
printf(" key[%d]: %s\n",i,cmd->key(i).toUtf8().constData());
printf("value[%d]: %s\n",i,cmd->value(i).toUtf8().constData());
}
exit(0);

22
tests/datedecode_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test the Rivendell db connection routines.
//
// (C) Copyright 2012,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2012-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,11 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <stdio.h>
#include <qapplication.h>
#include <qvariant.h>
#include <QApplication>
#include <rdcmd_switch.h>
#include <rddatedecode.h>
@@ -59,7 +55,7 @@ MainObject::MainObject(QObject *parent)
}
if(!cmd->processed(i)) {
fprintf(stderr,"datedecode_test: unknown option \"%s\"\n",
(const char *)cmd->value(i));
cmd->value(i).toUtf8().constData());
exit(256);
}
}
@@ -85,7 +81,7 @@ MainObject::MainObject(QObject *parent)
//
QString err (tr("datedecode_test: "));
if(!RDOpenDb(&schema,&err,config)) {
fprintf(stderr,err.ascii());
fprintf(stderr,err.toAscii());
delete cmd;
exit(256);
}
@@ -96,13 +92,13 @@ MainObject::MainObject(QObject *parent)
//
if(!date.isNull()) {
printf("%s\n",
(const char *)RDDateDecode(date,QDate::currentDate(),station,config,
service));
RDDateDecode(date,QDate::currentDate(),station,config,service).
toUtf8().constData());;
}
if(!datetime.isNull()) {
printf("%s\n",(const char *)RDDateTimeDecode(datetime,
QDateTime(QDate::currentDate(),QTime::currentTime()),station,
config,service));
printf("%s\n",RDDateTimeDecode(datetime,QDateTime(QDate::currentDate(),
QTime::currentTime()),
station,config,service).toUtf8().constData());
}
exit(0);
}

20
tests/dateparse_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test the Rivendell date/time parser routines.
//
// (C) Copyright 2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2019-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,11 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <stdio.h>
#include <qapplication.h>
#include <qvariant.h>
#include <QApplication>
#include <rdcmd_switch.h>
#include <rddatetime.h>
@@ -91,7 +87,7 @@ MainObject::MainObject(QObject *parent)
}
if(!cmd->processed(i)) {
fprintf(stderr,"dateparse_test: unknown option \"%s\"\n",
(const char *)cmd->value(i));
cmd->value(i).toUtf8().constData());
exit(256);
}
}
@@ -111,7 +107,7 @@ MainObject::MainObject(QObject *parent)
exit(1);
}
printf("XML xs:date: %s\n",
(const char *)RDWriteXmlDate(QDate::currentDate()));
RDWriteXmlDate(QDate::currentDate()).toUtf8().constData());
break;
case MainObject::Time:
@@ -120,19 +116,21 @@ MainObject::MainObject(QObject *parent)
exit(1);
}
printf("XML xs:time: %s\n",
(const char *)RDWriteXmlTime(QTime::currentTime()));
RDWriteXmlTime(QTime::currentTime()).toUtf8().constData());
break;
case MainObject::DateTime:
switch(format) {
case MainObject::Xml:
printf("XML xs:dateTime: %s\n",
(const char *)RDWriteXmlDateTime(QDateTime::currentDateTime()));
RDWriteXmlDateTime(QDateTime::currentDateTime()).toUtf8().
constData());
break;
case MainObject::Rfc822:
printf("RFC822: %s\n",
(const char *)RDWriteRfc822DateTime(QDateTime::currentDateTime()));
RDWriteRfc822DateTime(QDateTime::currentDateTime()).
toUtf8().constData());
break;
case MainObject::Auto:

16
tests/db_charset_test.cpp
View File

@@ -18,9 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <qapplication.h>
#include <QApplication>
#include <rdapplication.h>
@@ -38,7 +36,7 @@ MainObject::MainObject(QObject *parent)
for(unsigned i=0;i<cmd->keys();i++) {
if(!cmd->processed(i)) {
fprintf(stderr,"db_charset_test: unknown option \"%s\"\n",
(const char *)cmd->value(i));
cmd->value(i).toUtf8().constData());
exit(256);
}
}
@@ -48,23 +46,23 @@ MainObject::MainObject(QObject *parent)
//
rda=static_cast<RDApplication *>(new RDApplication("db_charset_test","rdvairplayd",DB_CHARSET_TEST_USAGE,this));
if(!rda->open(&err_msg)) {
fprintf(stderr,"db_charset_test: %s\n",(const char *)err_msg);
fprintf(stderr,"db_charset_test: %s\n",err_msg.toUtf8().constData());
exit(1);
}
sql=QString("show variables like '%character_set%'");
q=new RDSqlQuery(sql);
while(q->next()) {
printf("%s: %s\n",(const char *)q->value(0).toString(),
(const char *)q->value(1).toString());
printf("%s: %s\n",q->value(0).toString().toUtf8().constData(),
q->value(1).toString().toUtf8().constData());
}
delete q;
sql=QString("show variables like '%collation%'");
q=new RDSqlQuery(sql);
while(q->next()) {
printf("%s: %s\n",(const char *)q->value(0).toString(),
(const char *)q->value(1).toString());
printf("%s: %s\n",q->value(0).toString().toUtf8().constData(),
q->value(1).toString().toUtf8().constData());
}
delete q;

14
tests/delete_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test Rivendell file deletion routines.
//
// (C) Copyright 2010-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,9 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <qapplication.h>
#include <QApplication>
#include <rdapplication.h>
#include <rddb.h>
@@ -43,7 +41,7 @@ MainObject::MainObject(QObject *parent)
//
rda=new RDApplication("delete_test","delete_test",DELETE_TEST_USAGE,this);
if(!rda->open(&err_msg)) {
fprintf(stderr,"delete_test: %s\n",(const char *)err_msg);
fprintf(stderr,"delete_test: %s\n",err_msg.toUtf8().constData());
exit(1);
}
@@ -81,7 +79,7 @@ MainObject::MainObject(QObject *parent)
}
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"delete_test: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i));
rda->cmdSwitch()->key(i).toUtf8().constData());
exit(2);
}
}
@@ -102,12 +100,12 @@ MainObject::MainObject(QObject *parent)
fprintf(stderr,"delete_test: unsupported URL scheme\n");
exit(1);
}
conv->setTargetUrl(target_url);
conv->setTargetUrl(target_url.toString());
printf("Deleting...\n");
conv_err=conv->
runDelete(username,password,ssh_identity_filename,use_identity_file,
rda->config()->logXloadDebugData());
printf("Result: %s\n",(const char *)RDDelete::errorText(conv_err));
printf("Result: %s\n",RDDelete::errorText(conv_err).toUtf8().constData());
delete conv;
exit(0);

12
tests/download_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test Rivendell file downloading.
//
// (C) Copyright 2010-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,9 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <qapplication.h>
#include <QApplication>
#include <rdapplication.h>
#include <rddb.h>
@@ -44,7 +42,7 @@ MainObject::MainObject(QObject *parent)
//
rda=new RDApplication("download_test","download_test",DOWNLOAD_TEST_USAGE,this);
if(!rda->open(&err_msg)) {
fprintf(stderr,"download_test: %s\n",(const char *)err_msg);
fprintf(stderr,"download_test: %s\n",err_msg.toUtf8().constData());
exit(1);
}
@@ -78,7 +76,7 @@ MainObject::MainObject(QObject *parent)
}
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"download_test: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i));
rda->cmdSwitch()->key(i).toUtf8().constData());
exit(2);
}
}
@@ -105,7 +103,7 @@ MainObject::MainObject(QObject *parent)
conv_err=conv->
runDownload(username,password,ssh_identity_filename,use_identity_file,
rda->config()->logXloadDebugData());
printf("Result: %s\n",(const char *)RDDownload::errorText(conv_err));
printf("Result: %s\n",RDDownload::errorText(conv_err).toUtf8().constData());
delete conv;
exit(0);

4
tests/feed_image_test.cpp
View File

@@ -47,7 +47,7 @@ MainObject::MainObject(QObject *parent)
//
rda=new RDApplication("feed_image_test","feed_image_test",FEED_IMAGE_TEST_USAGE,this);
if(!rda->open(&err_msg)) {
fprintf(stderr,"feed_image_test: %s\n",(const char *)err_msg);
fprintf(stderr,"feed_image_test: %s\n",err_msg.toUtf8().constData());
exit(1);
}
@@ -104,7 +104,7 @@ MainObject::MainObject(QObject *parent)
}
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"feed_image_test: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i));
rda->cmdSwitch()->key(i).toUtf8().constData());
exit(2);
}
}

10
tests/getpids_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test the Rivendell RDGetPids() function.
//
// (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2018-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,11 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <stdio.h>
#include <qapplication.h>
#include <qvariant.h>
#include <QApplication>
#include <rdcmd_switch.h>
#include <rdconf.h>
@@ -50,7 +46,7 @@ MainObject::MainObject(QObject *parent)
}
if(!cmd->processed(i)) {
fprintf(stderr,"getpids_test: unknown option \"%s\"\n",
(const char *)cmd->value(i));
cmd->value(i).toUtf8().constData());
exit(256);
}
}

18
tests/log_unlink_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test the Rivendell log unlinker methods.
//
// (C) Copyright 2017 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2017-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,11 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <stdio.h>
#include <qapplication.h>
#include <qvariant.h>
#include <QApplication>
#include <rdcmd_switch.h>
#include <rdconfig.h>
@@ -52,11 +48,11 @@ MainObject::MainObject(QObject *parent)
cmd->setProcessed(i,true);
}
if(cmd->key(i)=="--source") {
if(cmd->value(i).lower()=="traffic") {
if(cmd->value(i).toLower()=="traffic") {
test_import_source=RDSvc::Traffic;
}
else {
if(cmd->value(i).lower()=="music") {
if(cmd->value(i).toLower()=="music") {
test_import_source=RDSvc::Music;
}
else {
@@ -69,7 +65,7 @@ MainObject::MainObject(QObject *parent)
}
if(!cmd->processed(i)) {
fprintf(stderr,"log_unlink_test: unknown option \"%s\"\n",
(const char *)cmd->value(i));
cmd->value(i).toUtf8().constData());
exit(256);
}
}
@@ -90,7 +86,7 @@ MainObject::MainObject(QObject *parent)
//
QString err (tr("upload_test: "));
if(!RDOpenDb(&schema,&err,test_config)) {
fprintf(stderr,err.ascii());
fprintf(stderr,err.toAscii());
delete cmd;
exit(256);
}
@@ -116,7 +112,7 @@ void MainObject::userData()
RDSvc *svc=new RDSvc(log->service(),test_station,test_config,this);
if(!svc->clearLogLinks(test_import_source,test_log_name,
new RDUser(test_ripc->user()),&err_msg)) {
fprintf(stderr,"log_unlink_test: %s\n",(const char *)err_msg);
fprintf(stderr,"log_unlink_test: %s\n",err_msg.toUtf8().constData());
exit(1);
}

18
tests/mcast_recv_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test the Rivendell multicast receiver routines
//
// (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2018-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,12 +18,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdint.h>
#include <stdlib.h>
#include <qapplication.h>
#include <qhostaddress.h>
#include <qstringlist.h>
#include <QApplication>
#include <QStringList>
#include <rdcmd_switch.h>
@@ -63,7 +59,7 @@ MainObject::MainObject(QObject *parent)
}
if(!cmd->processed(i)) {
fprintf(stderr,"mcast_recv_test: unknown option \"%s\"\n",
(const char *)cmd->value(i));
cmd->value(i).toUtf8().constData());
exit(256);
}
}
@@ -84,15 +80,15 @@ MainObject::MainObject(QObject *parent)
exit(1);
}
mcast_multicaster->subscribe(from_addr);
printf("listening for %s at %u\n",(const char *)from_addr.toString(),
printf("listening for %s at %u\n",from_addr.toString().toUtf8().constData(),
0xFFFF&from_port);
}
void MainObject::receivedData(const QString &msg,const QHostAddress &src_addr)
{
printf("%15s: %s\n",(const char *)src_addr.toString(),
(const char *)msg);
printf("%15s: %s\n",src_addr.toString().toUtf8().constData(),
msg.toUtf8().constData());
}

9
tests/metadata_wildcard_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test the Rivendell multicast receiver routines
//
// (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2018-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,10 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdint.h>
#include <stdlib.h>
#include <qapplication.h>
#include <QApplication>
#include <rd.h>
#include <rdapplication.h>
@@ -71,7 +68,7 @@ MainObject::MainObject(QObject *parent)
}
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"metadata_wildcard_test: unknown option \"%s\"\n",
(const char *)rda->cmdSwitch()->value(i));
rda->cmdSwitch()->value(i).toUtf8().constData());
exit(256);
}
}

11
tests/notification_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test Rivendell file uploading.
//
// (C) Copyright 2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2019-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,10 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <QApplication>
#include <QDebug>
#include <rdapplication.h>
@@ -34,14 +31,14 @@ MainObject::MainObject(QObject *parent)
rda=new RDApplication("notification_test","notification_test",NOTIFICATION_TEST_USAGE,this);
if(!rda->open(&err_msg)) {
fprintf(stderr,"notification_test: %s\n",(const char *)err_msg);
fprintf(stderr,"notification_test: %s\n",err_msg.toUtf8().constData());
exit(1);
}
for(unsigned i=0;i<rda->cmdSwitch()->keys();i++) {
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"rdrepld: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i));
rda->cmdSwitch()->key(i).toUtf8().constData());
exit(2);
}
}
@@ -58,7 +55,7 @@ MainObject::MainObject(QObject *parent)
void MainObject::notificationReceivedData(RDNotification *notify)
{
printf("%s\n",(const char *)notify->write());
printf("%s\n",notify->write().toUtf8().constData());
}

19
tests/rdxml_parse_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test the Rivendell RDXML parser routines.
//
// (C) Copyright 2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2016-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,13 +18,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <stdio.h>
#include <vector>
#include <qapplication.h>
#include <qfile.h>
#include <QApplication>
#include <QFile>
#include <rdcart.h>
#include <rdcmd_switch.h>
@@ -53,7 +48,7 @@ MainObject::MainObject(QObject *parent)
}
if(!cmd->processed(i)) {
fprintf(stderr,"rdxml_parse_test: unknown option \"%s\"\n",
(const char *)cmd->value(i));
cmd->value(i).toUtf8().constData());
exit(256);
}
}
@@ -68,7 +63,7 @@ MainObject::MainObject(QObject *parent)
file=new QFile(filename);
if(!file->open(QIODevice::ReadOnly)) {
fprintf(stderr,"rdxml_parse_test: unable to open \"%s\"\n",
(const char *)filename);
filename.toUtf8().constData());
exit(256);
}
while(file->readLine(line,1024)>=0) {
@@ -87,12 +82,12 @@ MainObject::MainObject(QObject *parent)
exit(256);
}
printf("*** CART DATA ***\n");
printf("%s\n",(const char *)data[0].dump());
printf("%s\n",data[0].dump().toUtf8().constData());
printf("\n");
for(unsigned i=1;i<data.size();i++) {
printf("*** CUT %u DATA ***\n",i);
printf("%s\n",(const char *)data[i].dump());
printf("%s\n",data[i].dump().toUtf8().constData());
printf("\n");
}

9
tests/readcd_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test the Rivendell CD reader routines
//
// (C) Copyright 2013-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2013-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,10 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <stdio.h>
#include <qapplication.h>
#include <QApplication>
#include <discid/discid.h>
@@ -53,7 +50,7 @@ MainObject::MainObject(QObject *parent)
}
if(!cmd->processed(i)) {
fprintf(stderr,"readcd_test: unknown option \"%s\"\n",
(const char *)cmd->key(i));
cmd->key(i).toUtf8().constData());
exit(1);
}
}

10
tests/reserve_carts_test.cpp
View File

@@ -18,11 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <stdio.h>
#include <QApplication>
#include <QVariant>
#include <rdconfig.h>
#include <rdgroup.h>
@@ -63,7 +59,7 @@ MainObject::MainObject(QObject *parent)
}
if(!cmd->processed(i)) {
fprintf(stderr,"reserve_carts_test: unknown option \"%s\"\n",
(const char *)cmd->value(i));
cmd->value(i).toUtf8().constData());
exit(256);
}
}
@@ -92,7 +88,7 @@ MainObject::MainObject(QObject *parent)
//
QString err (tr("upload_test: "));
if(!RDOpenDb(&schema,&err,config)) {
fprintf(stderr,err.ascii());
fprintf(stderr,err.toAscii());
delete cmd;
exit(256);
}
@@ -103,7 +99,7 @@ MainObject::MainObject(QObject *parent)
group=new RDGroup(group_name);
if(!group->exists()) {
fprintf(stderr,"group \"%s\" does not exist\n",
(const char *)group_name.utf8());
(const char *)group_name.toUtf8());
exit(256);
}
if(group->reserveCarts(&cart_nums,config->stationName(),RDCart::Audio,

10
tests/sendmail_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test the Rivendell string encoder routines.
//
// (C) Copyright 2013,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2013-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,11 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <stdio.h>
#include <qapplication.h>
#include <qvariant.h>
#include <QApplication>
#include <rdapplication.h>
#include <rdcmd_switch.h>
@@ -89,7 +85,7 @@ MainObject::MainObject(QObject *parent)
}
if(!cmd->processed(i)) {
fprintf(stderr,"sendmail_test: unknown option \"%s\"\n",
(const char *)cmd->key(i));
cmd->key(i).toUtf8().constData());
exit(RDApplication::ExitInvalidOption);
}
}

20
tests/stringcode_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test the Rivendell string encoder routines.
//
// (C) Copyright 2013,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2013-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,11 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <stdio.h>
#include <qapplication.h>
#include <qvariant.h>
#include <QApplication>
#include <rdcmd_switch.h>
#include <rdweb.h>
@@ -64,7 +60,7 @@ MainObject::MainObject(QObject *parent)
}
if(!cmd->processed(i)) {
fprintf(stderr,"stringcode_test: unknown option \"%s\"\n",
(const char *)cmd->key(i));
cmd->key(i).toUtf8().constData());
exit(256);
}
}
@@ -84,18 +80,18 @@ MainObject::MainObject(QObject *parent)
}
str=QString(teststr).replace("\n","");
printf("Testing String: |%s|\n",(const char *)str);
printf("Testing String: |%s|\n",str.toUtf8().constData());
if(xml_encode) {
printf(" RDXmlEscape: |%s|\n",(const char *)RDXmlEscape(str));
printf(" RDXmlEscape: |%s|\n",RDXmlEscape(str).toUtf8().constData());
}
if(xml_decode) {
printf(" RDXmlUnescape: |%s|\n",(const char *)RDXmlUnescape(str));
printf(" RDXmlUnescape: |%s|\n",RDXmlUnescape(str).toUtf8().constData());
}
if(url_encode) {
printf(" RDUrlEscape: |%s|\n",(const char *)RDUrlEscape(str));
printf(" RDUrlEscape: |%s|\n",RDUrlEscape(str).toUtf8().constData());
}
if(url_decode) {
printf(" RDUrlUnescape: |%s|\n",(const char *)RDUrlUnescape(str));
printf(" RDUrlUnescape: |%s|\n",RDUrlUnescape(str).toUtf8().constData());
}
printf("\n");

8
tests/test_hash.cpp
View File

@@ -2,7 +2,7 @@
//
// Test SHA1 hash generation
//
// (C) Copyright 2017 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2017-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,7 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qapplication.h>
#include <QApplication>
#include <rdcmd_switch.h>
#include <rdconfig.h>
@@ -52,10 +52,10 @@ MainObject::MainObject(QObject *parent)
QString hash=RDSha1Hash(filename);
if(hash.isEmpty()) {
fprintf(stderr,"test_hash: unable to open \"%s\"\n",
(const char *)filename);
filename.toUtf8().constData());
exit(256);
}
printf("%s\n",(const char *)hash);
printf("%s\n",hash.toUtf8().constData());
exit(0);
}

8
tests/test_pam.cpp
View File

@@ -2,7 +2,7 @@
//
// Test PAM Authentication Service
//
// (C) Copyright 2010,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,11 +18,9 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <unistd.h>
#include <security/pam_appl.h>
#include <qapplication.h>
#include <QApplication>
#include <rdcmd_switch.h>
@@ -94,7 +92,7 @@ MainObject::MainObject(QObject *parent)
memset(&conv,0,sizeof(conv));
conv.conv=ConversationResponseCallback;
if((err=pam_start(service_name,NULL,&conv,&pamh))!=PAM_SUCCESS) {
if((err=pam_start(service_name.toUtf8(),NULL,&conv,&pamh))!=PAM_SUCCESS) {
perror(pam_strerror(pamh,err));
exit(256);
}

10
tests/timer_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test QTimer Accuracy
//
// (C) Copyright 2013,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2013-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,10 +18,9 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <errno.h>
#include <stdio.h>
#include <qapplication.h>
#include <QApplication>
#include <timer_test.h>
@@ -32,6 +31,7 @@ MainObject::MainObject(QObject *parent)
// Timer
//
test_timer=new QTimer(this);
test_timer->setSingleShot(true);
connect(test_timer,SIGNAL(timeout()),this,SLOT(timeoutData()));
//
@@ -41,7 +41,7 @@ MainObject::MainObject(QObject *parent)
if(gettimeofday(&test_start_tv,NULL) !=0) {
perror("gettimeofday");
}
test_timer->start(test_interval,true);
test_timer->start(test_interval);
}
@@ -66,7 +66,7 @@ void MainObject::timeoutData()
if(gettimeofday(&test_start_tv,NULL) !=0) {
perror("gettimeofday");
}
test_timer->start(test_interval,true);
test_timer->start(test_interval);
}

12
tests/upload_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test Rivendell file uploading.
//
// (C) Copyright 2010-2020 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -18,9 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <qapplication.h>
#include <QApplication>
#include <rdapplication.h>
#include <rddb.h>
@@ -44,7 +42,7 @@ MainObject::MainObject(QObject *parent)
//
rda=new RDApplication("upload_test","upload_test",UPLOAD_TEST_USAGE,this);
if(!rda->open(&err_msg)) {
fprintf(stderr,"upload_test: %s\n",(const char *)err_msg);
fprintf(stderr,"upload_test: %s\n",err_msg.toUtf8().constData());
exit(1);
}
@@ -78,7 +76,7 @@ MainObject::MainObject(QObject *parent)
}
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"rdrepld: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i));
rda->cmdSwitch()->key(i).toUtf8().constData());
exit(2);
}
}
@@ -105,7 +103,7 @@ MainObject::MainObject(QObject *parent)
conv_err=conv->
runUpload(username,password,ssh_identity_filename,use_identity_file,
rda->config()->logXloadDebugData());
printf("Result: %s\n",(const char *)RDUpload::errorText(conv_err));
printf("Result: %s\n",RDUpload::errorText(conv_err).toUtf8().constData());
delete conv;
exit(0);

10
tests/wav_chunk_test.cpp
View File

@@ -2,7 +2,7 @@
//
// Test Rivendell file uploading.
//
// (C) Copyright 2010,2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2021 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,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <qapplication.h>
#include <QApplication>
#include <rdcmd_switch.h>
@@ -68,7 +68,7 @@ MainObject::MainObject(QObject *parent)
//
// Open File
//
if((file_fd=open(filename,O_RDONLY))<0) {
if((file_fd=open(filename.toUtf8(),O_RDONLY))<0) {
fprintf(stderr,"wav_chunk_test: unable to open file [%s]\n",
strerror(errno));
exit(256);
@@ -126,7 +126,9 @@ MainObject::MainObject(QObject *parent)
QString name;
uint32_t start_pos;
while((start_pos=NextChunk(name,&chunk_length))>0) {
printf("Chunk: %s Start: %u [0x%X] Length: %u [0x%X]\n",(const char *)name,start_pos,start_pos,chunk_length+8,chunk_length+8);
printf("Chunk: %s Start: %u [0x%X] Length: %u [0x%X]\n",
name.toUtf8().constData(),start_pos,start_pos,chunk_length+8,
chunk_length+8);
lseek(file_fd,chunk_length,SEEK_CUR);
}