From 690339c1a55d5a8e28e11c5445cf8df864677ab7 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sun, 14 Feb 2021 17:58:42 -0500 Subject: [PATCH] 2021-02-14 Fred Gleason * Removed 'Q3TextStream' dependencies from 'librd'. Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ lib/export_bmiemr.cpp | 10 +++++----- lib/export_cutlog.cpp | 13 ++++++------- lib/export_deltaflex.cpp | 12 ++++++------ lib/export_musicclassical.cpp | 13 ++++++------- lib/export_musicplayout.cpp | 12 ++++++------ lib/export_musicsummary.cpp | 12 ++++++------ lib/export_nprsoundex.cpp | 12 ++++++------ lib/export_radiotraffic.cpp | 12 ++++++------ lib/export_soundex.cpp | 12 ++++++------ lib/export_spincount.cpp | 12 ++++++------ lib/export_technical.cpp | 8 ++++---- lib/export_textlog.cpp | 12 ++++++------ 13 files changed, 71 insertions(+), 71 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5fbc84a..096c8f0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21129,3 +21129,5 @@ 2021-02-14 Fred Gleason * Removed the 'RDListView' class. * Removed the 'RDListViewItem' class. +2021-02-14 Fred Gleason + * Removed 'Q3TextStream' dependencies from 'librd'. diff --git a/lib/export_bmiemr.cpp b/lib/export_bmiemr.cpp index d2aaa640..1cd98bee 100644 --- a/lib/export_bmiemr.cpp +++ b/lib/export_bmiemr.cpp @@ -2,7 +2,7 @@ // // Export a Rivendell Report to BMI EMR Format // -// (C) Copyright 2002-2006,2016-2017 Fred Gleason +// (C) Copyright 2002-2021 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 @@ -20,8 +20,8 @@ #include -#include -#include +#include +#include #include #include @@ -47,8 +47,8 @@ bool RDReport::ExportBmiEmr(const QString &filename,const QDate &startdate, delete file; return false; } - Q3TextStream *strm=new Q3TextStream(file); - strm->setEncoding(Q3TextStream::UnicodeUTF8); + QTextStream *strm=new QTextStream(file); + strm->setEncoding(QTextStream::UnicodeUTF8); // // Station Type diff --git a/lib/export_cutlog.cpp b/lib/export_cutlog.cpp index 3f9e4691..273d3e9f 100644 --- a/lib/export_cutlog.cpp +++ b/lib/export_cutlog.cpp @@ -2,7 +2,7 @@ // // Export a Rivendell Cut Report. // -// (C) Copyright 2002-2018 Fred Gleason +// (C) Copyright 2002-2021 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 @@ -20,10 +20,9 @@ #include -#include -#include -//Added by qt3to4: -#include +#include +#include +#include #include #include @@ -49,8 +48,8 @@ bool RDReport::ExportCutLog(const QString &filename,const QDate &startdate, delete file; return false; } - Q3TextStream *strm=new Q3TextStream(file); - strm->setEncoding(Q3TextStream::UnicodeUTF8); + QTextStream *strm=new QTextStream(file); + strm->setEncoding(QTextStream::UnicodeUTF8); if(useLeadingZeros()) { cart_fmt=QString().sprintf("%%0%uu",cartDigits()); } diff --git a/lib/export_deltaflex.cpp b/lib/export_deltaflex.cpp index 6fcca111..8113c30b 100644 --- a/lib/export_deltaflex.cpp +++ b/lib/export_deltaflex.cpp @@ -2,7 +2,7 @@ // // Export a Rivendell Report to CBSI DeltaFlex // -// (C) Copyright 2002-2005,2016-2018 Fred Gleason +// (C) Copyright 2002-2021 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 @@ -25,9 +25,9 @@ #define CBSI_STATION_ID 1 #define CBSI_SCHED_FLAG "C" -#include -#include -#include +#include +#include +#include #include "rddatedecode.h" #include "rddb.h" @@ -47,8 +47,8 @@ bool RDReport::ExportDeltaflex(const QString &filename,const QDate &startdate, delete file; return false; } - Q3TextStream *strm=new Q3TextStream(file); - strm->setEncoding(Q3TextStream::UnicodeUTF8); + QTextStream *strm=new QTextStream(file); + strm->setEncoding(QTextStream::UnicodeUTF8); if(useLeadingZeros()) { air_fmt=QString().sprintf("%%0%uu",cartDigits()); } diff --git a/lib/export_musicclassical.cpp b/lib/export_musicclassical.cpp index a76e61a7..35cf8649 100644 --- a/lib/export_musicclassical.cpp +++ b/lib/export_musicclassical.cpp @@ -2,7 +2,7 @@ // // Export a Rivendell Classical Music Playout report // -// (C) Copyright 2014,2016-2018 Fred Gleason +// (C) Copyright 2014-2021 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 @@ -18,9 +18,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include +#include +#include +#include #include "rdairplay_conf.h" #include "rdconf.h" @@ -36,7 +36,6 @@ bool RDReport::ExportMusicClassical(const QString &filename, { QString sql; RDSqlQuery *q; - // FILE *f; QString cut; QString str; QString cart_fmt; @@ -47,8 +46,8 @@ bool RDReport::ExportMusicClassical(const QString &filename, delete file; return false; } - Q3TextStream *strm=new Q3TextStream(file); - strm->setEncoding(Q3TextStream::UnicodeUTF8); + QTextStream *strm=new QTextStream(file); + strm->setEncoding(QTextStream::UnicodeUTF8); if(useLeadingZeros()) { cart_fmt=QString().sprintf("%%0%uu",cartDigits()); } diff --git a/lib/export_musicplayout.cpp b/lib/export_musicplayout.cpp index f3d3f1dd..8b8d220a 100644 --- a/lib/export_musicplayout.cpp +++ b/lib/export_musicplayout.cpp @@ -2,7 +2,7 @@ // // Export a Rivendell Report to an ASCII Text File. // -// (C) Copyright 2012,2016-2018 Fred Gleason +// (C) Copyright 2012-2021 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 @@ -18,9 +18,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include +#include +#include +#include #include "rdairplay_conf.h" #include "rdconf.h" @@ -47,8 +47,8 @@ bool RDReport::ExportMusicPlayout(const QString &filename, delete file; return false; } - Q3TextStream *strm=new Q3TextStream(file); - strm->setEncoding(Q3TextStream::UnicodeUTF8); + QTextStream *strm=new QTextStream(file); + strm->setEncoding(QTextStream::UnicodeUTF8); if(useLeadingZeros()) { cart_fmt=QString().sprintf("%%0%uu",cartDigits()); } diff --git a/lib/export_musicsummary.cpp b/lib/export_musicsummary.cpp index d6cc6387..c11031bd 100644 --- a/lib/export_musicsummary.cpp +++ b/lib/export_musicsummary.cpp @@ -2,7 +2,7 @@ // // Export a Rivendell Report to an ASCII Text File. // -// (C) Copyright 2012,2016-2018 Fred Gleason +// (C) Copyright 2012-2021 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 @@ -18,9 +18,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include +#include +#include +#include #include "rdairplay_conf.h" #include "rdconf.h" @@ -45,8 +45,8 @@ bool RDReport::ExportMusicSummary(const QString &filename, delete file; return false; } - Q3TextStream *strm=new Q3TextStream(file); - strm->setEncoding(Q3TextStream::UnicodeUTF8); + QTextStream *strm=new QTextStream(file); + strm->setEncoding(QTextStream::UnicodeUTF8); sql=QString("select ")+ "ELR_LINES.ARTIST,"+ // 00 "ELR_LINES.TITLE,"+ // 01 diff --git a/lib/export_nprsoundex.cpp b/lib/export_nprsoundex.cpp index c55902a5..d0d90cf6 100644 --- a/lib/export_nprsoundex.cpp +++ b/lib/export_nprsoundex.cpp @@ -2,7 +2,7 @@ // // Export a Rivendell NPR SoundExchange Report to an ASCII Text File. // -// (C) Copyright 2002-2006,2013,2016-2018 Fred Gleason +// (C) Copyright 2002-2021 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 @@ -18,9 +18,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include +#include +#include +#include #include "rdairplay_conf.h" #include "rddatedecode.h" @@ -55,8 +55,8 @@ bool RDReport::ExportNprSoundEx(const QString &filename,const QDate &startdate, delete file; return false; } - Q3TextStream *strm=new Q3TextStream(file); - strm->setEncoding(Q3TextStream::UnicodeUTF8); + QTextStream *strm=new QTextStream(file); + strm->setEncoding(QTextStream::UnicodeUTF8); // // Generate Header diff --git a/lib/export_radiotraffic.cpp b/lib/export_radiotraffic.cpp index 78e12de6..8b5b8d5b 100644 --- a/lib/export_radiotraffic.cpp +++ b/lib/export_radiotraffic.cpp @@ -2,7 +2,7 @@ // // Export a Rivendell Report to RadioTraffic.com // -// (C) Copyright 2002-2020 Fred Gleason +// (C) Copyright 2002-2021 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 @@ -18,9 +18,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include +#include +#include +#include #include "rddb.h" #include "rdconf.h" @@ -54,8 +54,8 @@ bool RDReport::ExportRadioTraffic(const QString &filename, delete file; return false; } - Q3TextStream *strm=new Q3TextStream(file); - strm->setEncoding(Q3TextStream::UnicodeUTF8); + QTextStream *strm=new QTextStream(file); + strm->setEncoding(QTextStream::UnicodeUTF8); if(useLeadingZeros()) { air_fmt=QString().sprintf("%%0%uu ",cartDigits()); } diff --git a/lib/export_soundex.cpp b/lib/export_soundex.cpp index ba6f8449..915bae3b 100644 --- a/lib/export_soundex.cpp +++ b/lib/export_soundex.cpp @@ -2,7 +2,7 @@ // // Export a Rivendell SoundExchange Report to an ASCII Text File. // -// (C) Copyright 2002-2006,2016-2018 Fred Gleason +// (C) Copyright 2002-2021 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 @@ -18,9 +18,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include +#include +#include +#include #include "rdairplay_conf.h" #include "rddatedecode.h" @@ -62,8 +62,8 @@ bool RDReport::ExportSoundEx(const QString &filename,const QDate &startdate, delete file; return false; } - Q3TextStream *strm=new Q3TextStream(file); - strm->setEncoding(Q3TextStream::UnicodeUTF8); + QTextStream *strm=new QTextStream(file); + strm->setEncoding(QTextStream::UnicodeUTF8); // // Generate Header diff --git a/lib/export_spincount.cpp b/lib/export_spincount.cpp index d2a3669e..34cad70a 100644 --- a/lib/export_spincount.cpp +++ b/lib/export_spincount.cpp @@ -2,7 +2,7 @@ // // Export a Rivendell Spin Count Report to an ASCII Text File. // -// (C) Copyright 2015,2018 Fred Gleason +// (C) Copyright 2015-2021 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 @@ -20,9 +20,9 @@ #include -#include -#include -#include +#include +#include +#include #include "rdairplay_conf.h" #include "rdconf.h" @@ -53,8 +53,8 @@ bool RDReport::ExportSpinCount(const QString &filename,const QDate &startdate, delete file; return false; } - Q3TextStream *strm=new Q3TextStream(file); - strm->setEncoding(Q3TextStream::UnicodeUTF8); + QTextStream *strm=new QTextStream(file); + strm->setEncoding(QTextStream::UnicodeUTF8); if(useLeadingZeros()) { cart_fmt=QString().sprintf("%%0%uu",cartDigits()); } diff --git a/lib/export_technical.cpp b/lib/export_technical.cpp index 31075e05..a15aa17e 100644 --- a/lib/export_technical.cpp +++ b/lib/export_technical.cpp @@ -18,8 +18,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include +#include +#include #include "rdairplay_conf.h" #include "rdconf.h" @@ -50,8 +50,8 @@ bool RDReport::ExportTechnical(const QString &filename,const QDate &startdate, delete file; return false; } - Q3TextStream *strm=new Q3TextStream(file); - strm->setEncoding(Q3TextStream::UnicodeUTF8); + QTextStream *strm=new QTextStream(file); + strm->setEncoding(QTextStream::UnicodeUTF8); if(useLeadingZeros()) { cart_fmt=QString().sprintf("%%0%uu",cartDigits()); } diff --git a/lib/export_textlog.cpp b/lib/export_textlog.cpp index 24e4a827..3ac4f8ba 100644 --- a/lib/export_textlog.cpp +++ b/lib/export_textlog.cpp @@ -2,7 +2,7 @@ // // Export a Rivendell Report to an Text File. // -// (C) Copyright 2002-2005,2016-2018 Fred Gleason +// (C) Copyright 2002-2021 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 @@ -18,9 +18,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include +#include +#include +#include #include "rdairplay_conf.h" #include "rdconf.h" @@ -46,8 +46,8 @@ bool RDReport::ExportTextLog(const QString &filename,const QDate &startdate, delete file; return false; } - Q3TextStream *strm=new Q3TextStream(file); - strm->setEncoding(Q3TextStream::UnicodeUTF8); + QTextStream *strm=new QTextStream(file); + strm->setEncoding(QTextStream::UnicodeUTF8); if(useLeadingZeros()) { cart_fmt=QString().sprintf("%%0%uu",cartDigits()); }