From 8baed5b1041d53efcc91e235076f8e6d466a3667 Mon Sep 17 00:00:00 2001 From: Wayne Merricks Date: Thu, 9 Jun 2016 22:46:07 +0100 Subject: [PATCH] Random Idiocy fixes Compilation fixes due to idiocy as usual (apologies) --- lib/rdcartslot.cpp | 2 +- lib/rdcut.cpp | 2 +- lib/rdfeed.cpp | 2 +- lib/rdfeed.h | 2 ++ lib/rdpodcast.h | 1 + lib/rdsound_panel.cpp | 4 ++-- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/rdcartslot.cpp b/lib/rdcartslot.cpp index 50073771..d62ad774 100644 --- a/lib/rdcartslot.cpp +++ b/lib/rdcartslot.cpp @@ -670,7 +670,7 @@ void RDCartSlot::LogPlayout(RDPlayDeck::State state) datetime.setDate(datetime.date().addDays(-1)); } if(!slot_svcname.isEmpty()) { - QDateTime eventDateTime=QDateTime::QDateTime(datetime::date(), + QDateTime eventDateTime(datetime.date(), slot_logline->startTime(RDLogLine::Actual)); QString svctablename=slot_svcname; svctablename.replace(" ","_"); diff --git a/lib/rdcut.cpp b/lib/rdcut.cpp index f0572cfb..6e9c36c6 100644 --- a/lib/rdcut.cpp +++ b/lib/rdcut.cpp @@ -1095,7 +1095,7 @@ void RDCut::setMetadata(RDWaveData *data) const startDateTime.setTime(QTime(0,0,0)); sql+=QString().sprintf("START_DATETIME=%s,", - (const char *)RDCheckDateTime(startDateTime)); + (const char *)RDCheckDateTime(startDateTime,"yyyy-MM-dd hh:mm:ss")); if(data->endDate().isValid()&&(data->endDate().year()<8000)) { diff --git a/lib/rdfeed.cpp b/lib/rdfeed.cpp index d24a19d2..54d43c80 100644 --- a/lib/rdfeed.cpp +++ b/lib/rdfeed.cpp @@ -898,7 +898,7 @@ void RDFeed::SetRow(const QString ¶m,const QString &value) const } void RDFeed::SetRow(const QString ¶m,const QDateTime &value, - const QString format) const + const QString &format) const { RDSqlQuery *q; QString sql; diff --git a/lib/rdfeed.h b/lib/rdfeed.h index 67bd2c19..e64af84d 100644 --- a/lib/rdfeed.h +++ b/lib/rdfeed.h @@ -123,6 +123,8 @@ class RDFeed : public QObject QString GetTempFilename() const; void SetRow(const QString ¶m,int value) const; void SetRow(const QString ¶m,const QString &value) const; + void SetRow(const QString ¶m,const QDateTime &value, + const QString &format) const; QString feed_keyname; unsigned feed_id; }; diff --git a/lib/rdpodcast.h b/lib/rdpodcast.h index c4080e94..f89ec2f6 100644 --- a/lib/rdpodcast.h +++ b/lib/rdpodcast.h @@ -76,6 +76,7 @@ class RDPodcast private: void SetRow(const QString ¶m,int value) const; void SetRow(const QString ¶m,const QString &value) const; + void SetRow(const QString ¶m,const QDateTime &datetime,const QString &value) const; QString podcast_keyname; unsigned podcast_id; }; diff --git a/lib/rdsound_panel.cpp b/lib/rdsound_panel.cpp index 22798402..982c82d0 100644 --- a/lib/rdsound_panel.cpp +++ b/lib/rdsound_panel.cpp @@ -1488,8 +1488,8 @@ void RDSoundPanel::LogTraffic(RDPanelButton *button) QString eventDateTimeSQL = "NULL"; - if(dateTime.isValid() && button->startTime().isValid()) - eventDateTimeSQL = RDCheckDateTime(QDateTime(dateTime.date(), + if(datetime.isValid() && button->startTime().isValid()) + eventDateTimeSQL = RDCheckDateTime(QDateTime(datetime.date(), button->startTime()), "yyyy-MM-dd hh:mm:ss"); sql=QString("insert into `")+panel_svcname+"_SRT` set "+