diff --git a/ChangeLog b/ChangeLog index 0c0e9f92..544c3d8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21609,3 +21609,6 @@ no groups were included in the search terms. 2021-04-26 Fred Gleason * Fixed an invalid slot error in 'lib/rdlistsvcs.cpp'. +2021-04-26 Fred Gleason + * Fixed regressions caused by changes in behavior in the null + constructor of 'QTime' between Qt4 and Qt5. diff --git a/lib/export_bmiemr.cpp b/lib/export_bmiemr.cpp index c8aa1566..b2a79521 100644 --- a/lib/export_bmiemr.cpp +++ b/lib/export_bmiemr.cpp @@ -131,7 +131,7 @@ bool RDReport::ExportBmiEmr(const QString &filename,const QDate &startdate, RDReport::leftJustify(q->value(1).toString(),40)+ RDReport::leftJustify(q->value(2).toString(),40)+ RDReport::leftJustify(q->value(3).toString(),40)+ - QTime().addMSecs(q->value(4).toInt()).toString("hh:mm:ss")+" "+ + QTime(0,0,0).addMSecs(q->value(4).toInt()).toString("hh:mm:ss")+" "+ RDReport::rightJustify(q->value(5).toString(),12)+ usage_code+" \x0d\x0a"; records++; diff --git a/lib/rdcart.cpp b/lib/rdcart.cpp index a7c4b4b0..261c0b46 100644 --- a/lib/rdcart.cpp +++ b/lib/rdcart.cpp @@ -740,7 +740,7 @@ QDateTime RDCart::startDateTime() const if(value.isValid()) { return value; } - return QDateTime(QDate(),QTime()); + return QDateTime(); } @@ -766,7 +766,7 @@ QDateTime RDCart::endDateTime() const if(value.isValid()) { return value; } - return QDateTime(QDate(),QTime()); + return QDateTime(); } diff --git a/lib/rdclock.cpp b/lib/rdclock.cpp index e7560861..02716986 100644 --- a/lib/rdclock.cpp +++ b/lib/rdclock.cpp @@ -166,7 +166,7 @@ bool RDClock::load() while(q->next()) { clock_events.push_back(new RDEventLine(clock_station)); clock_events.back()->setName(q->value(0).toString()); - clock_events.back()->setStartTime(QTime().addMSecs(q->value(1).toInt())); + clock_events.back()->setStartTime(QTime(0,0,0).addMSecs(q->value(1).toInt())); clock_events.back()->setLength(q->value(2).toInt()); clock_events.back()->load(); } @@ -215,7 +215,7 @@ bool RDClock::save() "`CLOCK_NAME`='"+RDEscapeString(clock_name)+"',"+ "`EVENT_NAME`='"+RDEscapeString(clock_events.at(i)->name())+"',"+ QString().sprintf("`START_TIME`=%d,", - QTime().msecsTo(clock_events.at(i)->startTime()))+ + QTime(0,0,0).msecsTo(clock_events.at(i)->startTime()))+ QString().sprintf("`LENGTH`=%d",clock_events.at(i)->length()); RDSqlQuery::apply(sql); } @@ -283,7 +283,7 @@ bool RDClock::generateLog(int hour,const QString &logname, while(q->next()) { eventline.setName(q->value(0).toString()); eventline.load(); - eventline.setStartTime(QTime().addMSecs(q->value(1).toInt()). + eventline.setStartTime(QTime(0,0,0).addMSecs(q->value(1).toInt()). addSecs(3600*hour)); eventline.setLength(q->value(2).toInt()); eventline.generateLog(logname,svc_name,errors,clock_name); diff --git a/lib/rdevent_line.cpp b/lib/rdevent_line.cpp index fe6fb04d..2b1f0499 100644 --- a/lib/rdevent_line.cpp +++ b/lib/rdevent_line.cpp @@ -460,7 +460,7 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname, if(event_preposition>=0) { time_type=RDLogLine::Hard; grace_time=-1; - if(QTime().msecsTo(time)>event_preposition) { + if(QTime(0,0,0).msecsTo(time)>event_preposition) { time=time.addMSecs(-event_preposition); } else { @@ -480,7 +480,7 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname, QString().sprintf("`COUNT`=%d,",count)+ QString().sprintf("`TYPE`=%d,",i_item->eventType())+ QString().sprintf("`SOURCE`=%d,",RDLogLine::Template)+ - QString().sprintf("`START_TIME`=%d,",QTime().msecsTo(time))+ + QString().sprintf("`START_TIME`=%d,",QTime(0,0,0).msecsTo(time))+ QString().sprintf("`GRACE_TIME`=%d,",grace_time)+ QString().sprintf("`CART_NUMBER`=%u,",i_item->cartNumber())+ QString().sprintf("`TIME_TYPE`=%d,",time_type)+ @@ -520,13 +520,13 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname, QString().sprintf("`COUNT`=%d,",count)+ QString().sprintf("`TYPE`=%d,",link_type)+ QString().sprintf("`SOURCE`=%d,",RDLogLine::Template)+ - QString().sprintf("`START_TIME`=%d,",QTime().msecsTo(time))+ + QString().sprintf("`START_TIME`=%d,",QTime(0,0,0).msecsTo(time))+ QString().sprintf("`GRACE_TIME`=%d,",grace_time)+ QString().sprintf("`TIME_TYPE`=%d,",time_type)+ QString().sprintf("`TRANS_TYPE`=%d,",trans_type)+ "`LINK_EVENT_NAME`='"+RDEscapeString(event_name)+"',"+ QString().sprintf("`LINK_START_TIME`=%d,", - QTime().msecsTo(event_start_time))+ + QTime(0,0,0).msecsTo(event_start_time))+ QString().sprintf("`LINK_LENGTH`=%d,", event_start_time.msecsTo(end_start_time))+ QString().sprintf("`LINK_ID`=%d,",link_id)+ @@ -841,7 +841,7 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname, QString().sprintf("`COUNT`=%d,",count)+ QString().sprintf("`TYPE`=%d,",RDLogLine::Cart)+ QString().sprintf("`SOURCE`=%d,",source)+ - QString().sprintf("`START_TIME`=%d,",QTime().msecsTo(time))+ + QString().sprintf("`START_TIME`=%d,",QTime(0,0,0).msecsTo(time))+ QString().sprintf("`GRACE_TIME`=%d,",grace_time)+ QString().sprintf("`CART_NUMBER`=%u,",schedCL->getItemCartNumber(schedpos))+ QString().sprintf("`TIME_TYPE`=%d,",time_type)+ @@ -894,7 +894,7 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname, QString().sprintf("`COUNT`=%d,",count)+ QString().sprintf("`TYPE`=%d,",i_item->eventType())+ QString().sprintf("`SOURCE`=%d,",RDLogLine::Template)+ - QString().sprintf("`START_TIME`=%d,",QTime().msecsTo(time))+ + QString().sprintf("`START_TIME`=%d,",QTime(0,0,0).msecsTo(time))+ QString().sprintf("`GRACE_TIME`=%d,",grace_time)+ QString().sprintf("`CART_NUMBER`=%u,",i_item->cartNumber())+ QString().sprintf("`TIME_TYPE`=%d,",time_type)+ @@ -1101,7 +1101,7 @@ bool RDEventLine::linkLog(RDLogModel *e,RDLog *log,const QString &svcname, logline->setGraceTime(grace_time); logline->setTimeType(time_type); logline->setTransType(trans_type); - logline->setExtStartTime(QTime().addSecs(3600*start_start_hour+ + logline->setExtStartTime(QTime(0,0,0).addSecs(3600*start_start_hour+ q->value(1).toInt())); logline->setExtLength(q->value(2).toInt()); logline->setExtData(q->value(3).toString().trimmed()); @@ -1199,17 +1199,17 @@ bool RDEventLine::linkLog(RDLogModel *e,RDLog *log,const QString &svcname, // Fill Check // if(event_autofill_slop>=0) { - int slop=QTime().msecsTo(end_time)-QTime().msecsTo(time); + int slop=QTime(0,0,0).msecsTo(end_time)-QTime(0,0,0).msecsTo(time); if(abs(slop)>=event_autofill_slop) { if(slop>0) { *errors+=QString(" ")+time.toString("hh:mm:ss")+ " -- \""+event_name+"\" "+QObject::tr("is underscheduled by")+" "+ - QTime().addMSecs(slop).toString("hh:mm:ss")+".\n"; + QTime(0,0,0).addMSecs(slop).toString("hh:mm:ss")+".\n"; } else { *errors+=QString(" ")+time.toString("hh:mm:ss")+ " -- \""+event_name+"\" "+QObject::tr("is overscheduled by")+" "+ - QTime().addMSecs(-slop).toString("hh:mm:ss")+".\n"; + QTime(0,0,0).addMSecs(-slop).toString("hh:mm:ss")+".\n"; } } } diff --git a/lib/rdlogmodel.cpp b/lib/rdlogmodel.cpp index 3ca46e1d..69e43876 100644 --- a/lib/rdlogmodel.cpp +++ b/lib/rdlogmodel.cpp @@ -1114,9 +1114,9 @@ int RDLogModel::LoadLines(const QString &logname,int id_offset,bool track_ptrs) d_max_id=q->value(0).toInt()+id_offset; } line.setStartTime(RDLogLine::Imported, - QTime().addMSecs(q->value(2).toInt())); // Start Time + QTime(0,0,0).addMSecs(q->value(2).toInt())); // Start Time line.setStartTime(RDLogLine::Logged, - QTime().addMSecs(q->value(2).toInt())); + QTime(0,0,0).addMSecs(q->value(2).toInt())); line. setTimeType((RDLogLine::TimeType)q->value(3).toInt()); // Time Type line. @@ -1128,7 +1128,7 @@ int RDLogModel::LoadLines(const QString &logname,int id_offset,bool track_ptrs) line.setEventLength(q->value(62).toInt()); // Event Length line.setSource((RDLogLine::Source)q->value(31).toUInt()); line.setLinkEventName(q->value(48).toString()); // Link Event Name - line.setLinkStartTime(QTime().addMSecs(q->value(49).toInt())); // Link Start Time + line.setLinkStartTime(QTime(0,0,0).addMSecs(q->value(49).toInt())); // Link Start Time line.setLinkLength(q->value(50).toInt()); // Link Length line.setLinkStartSlop(q->value(56).toInt()); // Link Start Slop line.setLinkEndSlop(q->value(57).toInt()); // Link End Slop @@ -1410,7 +1410,7 @@ void RDLogModel::InsertLineValues(QString *query, int line) QString().sprintf("%d,",ll->id())+ QString().sprintf("%d,",line)+ QString().sprintf("%u,",ll->cartNumber())+ - QString().sprintf("%d,",QTime().msecsTo(ll->startTime(RDLogLine::Logged)))+ + QString().sprintf("%d,",QTime(0,0,0).msecsTo(ll->startTime(RDLogLine::Logged)))+ QString().sprintf("%d,",ll->timeType())+ QString().sprintf("%d,",ll->transType())+ QString().sprintf("%d,",ll->startPoint(RDLogLine::LogPointer))+ @@ -1434,7 +1434,7 @@ void RDLogModel::InsertLineValues(QString *query, int line) QString().sprintf("%d,",ll->fadedownGain())+ QString().sprintf("%d,",ll->segueGain())+ "'"+RDEscapeString(ll->linkEventName())+"',"+ - QString().sprintf("%d,",QTime().msecsTo(ll->linkStartTime()))+ + QString().sprintf("%d,",QTime(0,0,0).msecsTo(ll->linkStartTime()))+ QString().sprintf("%d,",ll->linkLength())+ QString().sprintf("%d,",ll->linkId())+ "'"+RDYesNo(ll->linkEmbedded())+"',"+ diff --git a/lib/rdtimeengine.cpp b/lib/rdtimeengine.cpp index 1790cf1c..eb291525 100644 --- a/lib/rdtimeengine.cpp +++ b/lib/rdtimeengine.cpp @@ -2,7 +2,7 @@ // // An event timer engine. // -// (C) Copyright 2002-2004,2016 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 Library General Public License @@ -151,7 +151,7 @@ void RDTimeEngine::SetTimer() engine_timer->start(diff); return; } - diff=GetNextDiff(QTime(),&engine_pending_id); + diff=GetNextDiff(QTime(0,0,0),&engine_pending_id); if(diff!=86400001) { diff+=(current_time.msecsTo(QTime(23,59,59))+1000); engine_timer->start(diff); diff --git a/rdadmin/edit_rdlibrary.cpp b/rdadmin/edit_rdlibrary.cpp index 99535dd3..700ed213 100644 --- a/rdadmin/edit_rdlibrary.cpp +++ b/rdadmin/edit_rdlibrary.cpp @@ -379,7 +379,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, lib_input_card->setPort(lib_lib->inputPort()); lib_output_card->setCard(lib_lib->outputCard()); lib_output_card->setPort(lib_lib->outputPort()); - lib_maxlength_time->setTime(QTime().addMSecs(lib_lib->maxLength())); + lib_maxlength_time->setTime(QTime(0,0,0).addMSecs(lib_lib->maxLength())); lib_vox_spin->setValue(lib_lib->voxThreshold()/100); lib_trim_spin->setValue(lib_lib->trimThreshold()/100); lib_preroll_spin->setValue(lib_lib->tailPreroll()); @@ -511,7 +511,7 @@ void EditRDLibrary::okData() lib_lib->setInputPort(lib_input_card->port()); lib_lib->setOutputCard(lib_output_card->card()); lib_lib->setOutputPort(lib_output_card->port()); - lib_lib->setMaxLength(QTime().msecsTo(lib_maxlength_time->time())); + lib_lib->setMaxLength(QTime(0,0,0).msecsTo(lib_maxlength_time->time())); lib_lib->setVoxThreshold(100*lib_vox_spin->value()); lib_lib->setTrimThreshold(100*lib_trim_spin->value()); lib_lib->setTailPreroll(lib_preroll_spin->value()); diff --git a/rdadmin/edit_rdlogedit.cpp b/rdadmin/edit_rdlogedit.cpp index af8e355b..4bd78469 100644 --- a/rdadmin/edit_rdlogedit.cpp +++ b/rdadmin/edit_rdlogedit.cpp @@ -318,7 +318,7 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, lib_input_card->setPort(lib_lib->inputPort()); lib_output_card->setCard(lib_lib->outputCard()); lib_output_card->setPort(lib_lib->outputPort()); - lib_maxlength_time->setTime(QTime().addMSecs(lib_lib->maxLength())); + lib_maxlength_time->setTime(QTime(0,0,0).addMSecs(lib_lib->maxLength())); lib_threshold_spin->setValue(lib_lib->trimThreshold()/100); lib_normalization_spin->setValue(lib_lib->ripperLevel()/100); lib_waveform_caption_edit->setText(lib_lib->waveformCaption()); @@ -437,7 +437,7 @@ void EditRDLogedit::okData() lib_lib->setInputPort(lib_input_card->port()); lib_lib->setOutputCard(lib_output_card->card()); lib_lib->setOutputPort(lib_output_card->port()); - lib_lib->setMaxLength(QTime().msecsTo(lib_maxlength_time->time())); + lib_lib->setMaxLength(QTime(0,0,0).msecsTo(lib_maxlength_time->time())); lib_lib->setTrimThreshold(lib_threshold_spin->value()*100); lib_lib->setRipperLevel(lib_normalization_spin->value()*100); lib_lib->setTailPreroll(lib_preroll_spin->value()); diff --git a/rdairplay/edit_event.cpp b/rdairplay/edit_event.cpp index b568e9da..9009ecb3 100644 --- a/rdairplay/edit_event.cpp +++ b/rdairplay/edit_event.cpp @@ -188,7 +188,7 @@ int EditEvent::exec(int line) default: edit_grace_bgroup->button(2)->setChecked(true); graceClickedData(2); - edit_grace_edit->setTime(QTime().addMSecs(edit_logline->graceTime())); + edit_grace_edit->setTime(QTime(0,0,0).addMSecs(edit_logline->graceTime())); break; } edit_transtype_box->setCurrentIndex((int)edit_logline->transType()); @@ -381,7 +381,7 @@ void EditEvent::okData() case 2: edit_logline-> - setGraceTime(QTime().msecsTo(edit_grace_edit->time())); + setGraceTime(QTime(0,0,0).msecsTo(edit_grace_edit->time())); break; } } diff --git a/rdairplay/post_counter.cpp b/rdairplay/post_counter.cpp index a06c3fb0..edbbd61f 100644 --- a/rdairplay/post_counter.cpp +++ b/rdairplay/post_counter.cpp @@ -147,13 +147,13 @@ void PostCounter::UpdateDisplay() if(post_offset_valid) { if(offset<-POST_COUNTER_MARGIN) { - state="-"+QTime().addMSecs(-offset).toString(); + state="-"+QTime(0,0,0).addMSecs(-offset).toString(); setPalette(post_early_palette); color=POSTPOINT_EARLY_COLOR; } else { if(offset>POST_COUNTER_MARGIN) { - state="+"+QTime().addMSecs(offset).toString(); + state="+"+QTime(0,0,0).addMSecs(offset).toString(); setPalette(post_late_palette); color=POSTPOINT_LATE_COLOR; } diff --git a/rdcatch/edit_recording.cpp b/rdcatch/edit_recording.cpp index 10a2596b..f2899d2c 100644 --- a/rdcatch/edit_recording.cpp +++ b/rdcatch/edit_recording.cpp @@ -472,7 +472,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, edit_startmatrix_spin->setValue(edit_recording->startMatrix()); edit_startline_spin->setValue(edit_recording->startLine()); edit_startoffset_edit-> - setTime(QTime().addMSecs(edit_recording->startOffset())); + setTime(QTime(0,0,0).addMSecs(edit_recording->startOffset())); edit_multirec_box-> setChecked(edit_recording->allowMultipleRecordings()); break; @@ -482,7 +482,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, switch((RDRecording::EndType)edit_endtype_group->checkedId()) { case RDRecording::LengthEnd: edit_endlength_edit-> - setTime(QTime().addMSecs(edit_recording->length())); + setTime(QTime(0,0,0).addMSecs(edit_recording->length())); break; case RDRecording::HardEnd: @@ -499,7 +499,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, break; } edit_maxlength_edit-> - setTime(QTime().addMSecs(edit_recording->maxGpiRecordingLength())); + setTime(QTime(0,0,0).addMSecs(edit_recording->maxGpiRecordingLength())); endTypeClickedData(edit_endtype_group->checkedId()); edit_cutname=edit_recording->cutName(); @@ -865,7 +865,7 @@ void EditRecording::Save() edit_recording->setStartMatrix(edit_startmatrix_spin->value()); edit_recording->setStartLine(edit_startline_spin->value()); edit_recording-> - setStartOffset(QTime().msecsTo(edit_startoffset_edit->time())); + setStartOffset(QTime(0,0,0).msecsTo(edit_startoffset_edit->time())); edit_recording-> setAllowMultipleRecordings(edit_multirec_box->isChecked()); break; @@ -873,11 +873,11 @@ void EditRecording::Save() edit_recording-> setEndType((RDRecording::EndType)edit_endtype_group->checkedId()); edit_recording-> - setMaxGpiRecordingLength(QTime().msecsTo(edit_maxlength_edit->time())); + setMaxGpiRecordingLength(QTime(0,0,0).msecsTo(edit_maxlength_edit->time())); switch((RDRecording::EndType)edit_endtype_group->checkedId()) { case RDRecording::LengthEnd: edit_recording-> - setLength(QTime().msecsTo(edit_endlength_edit->time())); + setLength(QTime(0,0,0).msecsTo(edit_endlength_edit->time())); break; case RDRecording::HardEnd: diff --git a/rdcatch/rdcatch.cpp b/rdcatch/rdcatch.cpp index f555ab74..2ed38b5a 100644 --- a/rdcatch/rdcatch.cpp +++ b/rdcatch/rdcatch.cpp @@ -498,7 +498,7 @@ void MainWidget::nextEventData() if(ShowNextEvents(i,QTime(),&next_time)>0) { int interval=current_time.msecsTo(QTime(23,59,59))+1000+ 86400000*extra_day+ - QTime().msecsTo(next_time); + QTime(0,0,0).msecsTo(next_time); catch_next_timer->start(interval); if(catch_scroll) { UpdateScroll(); @@ -511,7 +511,7 @@ void MainWidget::nextEventData() if(ShowNextEvents(i,QTime(),&next_time)>0) { int interval=current_time.msecsTo(QTime(23,59,59))+1000+ 86400000*extra_day+ - QTime().msecsTo(next_time); + QTime(0,0,0).msecsTo(next_time); catch_next_timer->start(interval); if(catch_scroll) { UpdateScroll(); @@ -1116,7 +1116,7 @@ void MainWidget::midnightData() filterChangedData(false); catch_midnight_timer-> start(86400000+QTime::currentTime().addMSecs(catch_time_offset). - msecsTo(QTime())); + msecsTo(QTime(0,0,0))); } diff --git a/rdcatch/recordlistmodel.cpp b/rdcatch/recordlistmodel.cpp index 1a78da3c..628c728a 100644 --- a/rdcatch/recordlistmodel.cpp +++ b/rdcatch/recordlistmodel.cpp @@ -608,7 +608,7 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q) ","+q->value(4).toTime().addMSecs(q->value(31).toInt()). toString("hh:mm:ss")+","+ QString().sprintf("%d:%d,",q->value(32).toInt(),q->value(33).toInt())+ - QTime().addMSecs(q->value(34).toUInt()).toString("mm:ss"); + QTime(0,0,0).addMSecs(q->value(34).toUInt()).toString("mm:ss"); break; } switch((RDRecording::EndType)q->value(35).toUInt()) { diff --git a/rdcatchd/rdcatchd.cpp b/rdcatchd/rdcatchd.cpp index bbdb39ab..df6ec56c 100644 --- a/rdcatchd/rdcatchd.cpp +++ b/rdcatchd/rdcatchd.cpp @@ -691,8 +691,8 @@ void MainObject::engineData(int id) case RDRecording::GpiStart: catch_events[event].gpiStartTimer()-> start(catch_events[event].startLength()- - (QTime().msecsTo(current_time)- - QTime().msecsTo(catch_events[event].startTime()))); + (QTime(0,0,0).msecsTo(current_time)- + QTime(0,0,0).msecsTo(catch_events[event].startTime()))); catch_record_deck_status[catch_events[event].channel()-1]= RDDeck::Waiting; catch_record_id[catch_events[event].channel()-1]= diff --git a/rdlibrary/audio_cart.cpp b/rdlibrary/audio_cart.cpp index 542a5d12..60fb4760 100644 --- a/rdlibrary/audio_cart.cpp +++ b/rdlibrary/audio_cart.cpp @@ -358,7 +358,7 @@ void AudioCart::deleteCutData() rdcart_cut_model->removeCut(cutnames.at(i)); } rdcart_cart->updateLength(rdcart_controls->enforce_length_box->isChecked(), - QTime().msecsTo(rdcart_controls-> + QTime(0,0,0).msecsTo(rdcart_controls-> forced_length_edit->time())); rdcart_cart->resetRotation(); disk_gauge->update(); @@ -407,7 +407,7 @@ void AudioCart::pasteCutData() cut_clipboard->copyTo(rda->station(),rda->user(), rdcart_cut_model->cutName(row),rda->config()); rdcart_cart->updateLength(rdcart_controls->enforce_length_box->isChecked(), - QTime().msecsTo(rdcart_controls-> + QTime(0,0,0).msecsTo(rdcart_controls-> forced_length_edit->time())); rdcart_cart->resetRotation(); rdcart_cut_model->refresh(row); @@ -455,7 +455,7 @@ void AudioCart::editCutData() if(rdcart_marker_dialog->exec(RDCut::cartNumber(cutname),RDCut::cutNumber(cutname))) { emit cartDataChanged(); rdcart_cart->updateLength(rdcart_controls->enforce_length_box->isChecked(), - QTime().msecsTo(rdcart_controls-> + QTime(0,0,0).msecsTo(rdcart_controls-> forced_length_edit->time())); QModelIndex index=rdcart_cut_model->refresh(row); if(index.isValid()) { @@ -484,7 +484,7 @@ void AudioCart::recordCutData() disk_gauge->update(); emit cartDataChanged(); rdcart_cart->updateLength(rdcart_controls->enforce_length_box->isChecked(), - QTime().msecsTo(rdcart_controls-> + QTime(0,0,0).msecsTo(rdcart_controls-> forced_length_edit->time())); } @@ -536,7 +536,7 @@ void AudioCart::ripCutData() delete rec; disk_gauge->update(); rdcart_cart->updateLength(rdcart_controls->enforce_length_box->isChecked(), - QTime().msecsTo(rdcart_controls-> + QTime(0,0,0).msecsTo(rdcart_controls-> forced_length_edit->time())); row=rdcart_cut_model->refresh(row); if(row.isValid()) { @@ -617,7 +617,7 @@ void AudioCart::importCutData() delete import; disk_gauge->update(); rdcart_cart->updateLength(rdcart_controls->enforce_length_box->isChecked(), - QTime().msecsTo(rdcart_controls-> + QTime(0,0,0).msecsTo(rdcart_controls-> forced_length_edit->time())); row=rdcart_cut_model->refresh(row); if(row.isValid()) { diff --git a/rdlibrary/edit_cart.cpp b/rdlibrary/edit_cart.cpp index f53b852f..4aeb958f 100644 --- a/rdlibrary/edit_cart.cpp +++ b/rdlibrary/edit_cart.cpp @@ -584,7 +584,7 @@ EditCart::EditCart(const QList &cartnums,QString *path,bool new_cart, setText(RDGetTimeLength(rdcart_cart->averageLength())); } rdcart_controls.forced_length_edit-> - setTime(QTime().addMSecs(rdcart_cart->forcedLength())); + setTime(QTime(0,0,0).addMSecs(rdcart_cart->forcedLength())); rdcart_forced_length_ledit-> setText(rdcart_controls.forced_length_edit->time().toString("hh:mm:ss")); rdcart_controls.title_edit->setText(rdcart_cart->title()); @@ -792,13 +792,13 @@ void EditCart::okData() rdcart_cart->calculateAverageLength(&rdcart_length_deviation); rdcart_cart->setLengthDeviation(rdcart_length_deviation); rdcart_cart->updateLength(rdcart_controls.enforce_length_box->isChecked(), - QTime().msecsTo(rdcart_controls. + QTime(0,0,0).msecsTo(rdcart_controls. forced_length_edit->time())); rdcart_cart-> setAverageLength(RDSetTimeLength(rdcart_average_length_edit->text())); if(rdcart_controls.enforce_length_box->isChecked()) { rdcart_cart-> - setForcedLength(QTime().msecsTo(rdcart_controls.forced_length_edit->time())); + setForcedLength(QTime(0,0,0).msecsTo(rdcart_controls.forced_length_edit->time())); rdcart_cart->setEnforceLength(true); } else { @@ -907,7 +907,7 @@ void EditCart::cancelData() rdcart_cart->setForcedLength(len); } rdcart_cart->updateLength(rdcart_controls.enforce_length_box->isChecked(), - QTime().msecsTo(rdcart_controls. + QTime(0,0,0).msecsTo(rdcart_controls. forced_length_edit->time())); } done(false); @@ -920,7 +920,7 @@ void EditCart::forcedLengthData(bool state) rdcart_controls.forced_length_edit->setEnabled(state); if(state) { rdcart_controls.forced_length_edit-> - setTime(QTime(). + setTime(QTime(0,0,0). addMSecs(RDSetTimeLength(rdcart_average_length_edit->text()))); } } @@ -955,7 +955,7 @@ void EditCart::closeEvent(QCloseEvent *e) bool EditCart::ValidateLengths() { - return rdcart_cart->validateLengths(QTime(). + return rdcart_cart->validateLengths(QTime(0,0,0). msecsTo(rdcart_controls.forced_length_edit->time())); } diff --git a/rdlogedit/edit_event.cpp b/rdlogedit/edit_event.cpp index bc9078ff..57ca3bc5 100644 --- a/rdlogedit/edit_event.cpp +++ b/rdlogedit/edit_event.cpp @@ -130,7 +130,7 @@ EditEvent::EditEvent(RDLogLine *line,QWidget *parent) default: edit_grace_bgroup->button(2)->setChecked(true); - edit_grace_timeedit->setTime(QTime().addMSecs(edit_logline->graceTime())); + edit_grace_timeedit->setTime(QTime(0,0,0).addMSecs(edit_logline->graceTime())); graceClickedData(2); break; } @@ -216,7 +216,7 @@ void EditEvent::okData() break; case 2: - edit_logline->setGraceTime(QTime().msecsTo(edit_grace_timeedit->time())); + edit_logline->setGraceTime(QTime(0,0,0).msecsTo(edit_grace_timeedit->time())); break; } } diff --git a/rdlogmanager/edit_clock.cpp b/rdlogmanager/edit_clock.cpp index f9b6293d..29e26c35 100644 --- a/rdlogmanager/edit_clock.cpp +++ b/rdlogmanager/edit_clock.cpp @@ -624,7 +624,7 @@ void EditClock::UpdateClock(int line) p->setBrush(edit_clocks_view->palette(). color(QPalette::Active,QPalette::Highlight)); p->drawPie(-size_x/2,-size_y/2,size_x,size_y, - -QTime().secsTo(edit_clocks_model->eventLine(line)->startTime())*5760/3600, + -QTime(0,0,0).secsTo(edit_clocks_model->eventLine(line)->startTime())*5760/3600, -(edit_clocks_model->eventLine(line)->length()/1000)*5760/3600); } else { @@ -635,7 +635,7 @@ void EditClock::UpdateClock(int line) p->setBrush(palette().color(QPalette::Active,QPalette::Base)); } p->drawPie(-size_x/2,-size_y/2,size_x,size_y, - -QTime().secsTo(edit_clocks_model->eventLine(i)->startTime())*5760/3600, + -QTime(0,0,0).secsTo(edit_clocks_model->eventLine(i)->startTime())*5760/3600, -(edit_clocks_model->eventLine(i)->length()/1000)*5760/3600); } } diff --git a/rdlogmanager/edit_event.cpp b/rdlogmanager/edit_event.cpp index 7016703a..bb8fe2e9 100644 --- a/rdlogmanager/edit_event.cpp +++ b/rdlogmanager/edit_event.cpp @@ -745,7 +745,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, } else { event_position_box->setChecked(true); - event_position_edit->setTime(QTime().addMSecs(pos)); + event_position_edit->setTime(QTime(0,0,0).addMSecs(pos)); prepositionToggledData(true); } @@ -772,7 +772,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, default: event_grace_group->button(2)->setChecked(true); - event_grace_edit->setTime(QTime().addMSecs(grace)); + event_grace_edit->setTime(QTime(0,0,0).addMSecs(grace)); break; } @@ -784,13 +784,13 @@ EditEvent::EditEvent(QString eventname,bool new_event, int autofill_slop=event_event->autofillSlop(); if(autofill_slop>=0) { event_autofill_slop_box->setChecked(true); - event_autofill_slop_edit->setTime(QTime().addMSecs(autofill_slop)); + event_autofill_slop_edit->setTime(QTime(0,0,0).addMSecs(autofill_slop)); } autofillToggledData(event_autofill_box->isChecked()); event_timescale_box->setChecked(event_event->useTimescale()); event_source_group->button(event_event->importSource())->setChecked(true); - event_startslop_edit->setTime(QTime().addMSecs(event_event->startSlop())); - event_endslop_edit->setTime(QTime().addMSecs(event_event->endSlop())); + event_startslop_edit->setTime(QTime(0,0,0).addMSecs(event_event->startSlop())); + event_endslop_edit->setTime(QTime(0,0,0).addMSecs(event_event->endSlop())); if(event_position_box->isChecked()||event_timetype_check->isChecked()) { event_firsttrans_box->setCurrentIndex(event_event->firstTransType()); } @@ -1269,7 +1269,7 @@ void EditEvent::Save() event_event->setRemarks(event_remarks_edit->toPlainText()); if(event_position_box->isChecked()) { - event_event->setPreposition(QTime().msecsTo(event_position_edit->time())); + event_event->setPreposition(QTime(0,0,0).msecsTo(event_position_edit->time())); } else { event_event->setPreposition(-1); @@ -1288,7 +1288,7 @@ void EditEvent::Save() break; default: - event_event->setGraceTime(QTime().msecsTo(event_grace_edit->time())); + event_event->setGraceTime(QTime(0,0,0).msecsTo(event_grace_edit->time())); break; } } @@ -1301,7 +1301,7 @@ void EditEvent::Save() event_event->setUseAutofill(event_autofill_box->isChecked()); if(event_autofill_slop_box->isChecked()) { event_event-> - setAutofillSlop(QTime().msecsTo(event_autofill_slop_edit->time())); + setAutofillSlop(QTime(0,0,0).msecsTo(event_autofill_slop_edit->time())); } else { event_event->setAutofillSlop(-1); @@ -1309,8 +1309,8 @@ void EditEvent::Save() event_event->setUseTimescale(event_timescale_box->isChecked()); event_event-> setImportSource((RDEventLine::ImportSource)event_source_group->checkedId()); - event_event->setStartSlop(QTime().msecsTo(event_startslop_edit->time())); - event_event->setEndSlop(QTime().msecsTo(event_endslop_edit->time())); + event_event->setStartSlop(QTime(0,0,0).msecsTo(event_startslop_edit->time())); + event_event->setEndSlop(QTime(0,0,0).msecsTo(event_endslop_edit->time())); if(!event_timetype_check->isChecked()) { event_event-> setFirstTransType((RDLogLine::TransType)event_firsttrans_box-> @@ -1368,7 +1368,7 @@ QString EditEvent::GetProperties() int grace_msec=-1; if(event_position_box->isChecked()) { - prepos_msec=QTime().msecsTo(event_position_edit->time()); + prepos_msec=QTime(0,0,0).msecsTo(event_position_edit->time()); } if(event_timetype_check->isChecked()) { time_type=RDLogLine::Hard; @@ -1384,7 +1384,7 @@ QString EditEvent::GetProperties() break; default: - grace_msec=QTime().msecsTo(event_grace_edit->time()); + grace_msec=QTime(0,0,0).msecsTo(event_grace_edit->time()); break; } } diff --git a/utils/rddbmgr/updateschema.cpp b/utils/rddbmgr/updateschema.cpp index bbea606d..8ff4332d 100644 --- a/utils/rddbmgr/updateschema.cpp +++ b/utils/rddbmgr/updateschema.cpp @@ -2188,8 +2188,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) while(q->next()) { sql=QString(). sprintf("update `RECORDINGS` set `MAX_GPI_REC_LENGTH`=%u where `ID`=%u", - QTime().msecsTo(q->value(2).toTime())+q->value(3).toUInt()- - QTime().msecsTo(q->value(1).toTime()),q->value(0).toUInt()); + QTime(0,0,0).msecsTo(q->value(2).toTime())+q->value(3).toUInt()- + QTime(0,0,0).msecsTo(q->value(1).toTime()),q->value(0).toUInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10976,7 +10976,7 @@ bool MainObject::ConvertTimeField186(const QString &table,const QString &field, sql=QString("update `")+table+ "` set `"+ field+QString().sprintf("_TEMP`=%d where `ID`=%d", - QTime().msecsTo(q->value(1).toTime()), + QTime(0,0,0).msecsTo(q->value(1).toTime()), q->value(0).toInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; diff --git a/web/rdxport/logs.cpp b/web/rdxport/logs.cpp index 02b294ef..226a25ee 100644 --- a/web/rdxport/logs.cpp +++ b/web/rdxport/logs.cpp @@ -331,10 +331,10 @@ void Xport::SaveLog() XmlExit("Missing "+line+"_START_TIME",400,"logs.cpp",LINE_NUMBER); } if(ll->timeType()==RDLogLine::Hard) { - ll->setStartTime(RDLogLine::Logged,QTime().addMSecs(integer1)); + ll->setStartTime(RDLogLine::Logged,QTime(0,0,0).addMSecs(integer1)); } else { - ll->setStartTime(RDLogLine::Predicted,QTime().addMSecs(integer1)); + ll->setStartTime(RDLogLine::Predicted,QTime(0,0,0).addMSecs(integer1)); } if(!xport_post->getValue(line+"_GRACE_TIME",&integer1)) { @@ -444,7 +444,7 @@ void Xport::SaveLog() if(!xport_post->getValue(line+"_LINK_START_TIME",&integer1)) { XmlExit("Missing "+line+"_LINK_START_TIME",400,"logs.cpp",LINE_NUMBER); } - ll->setLinkStartTime(QTime().addMSecs(integer1)); + ll->setLinkStartTime(QTime(0,0,0).addMSecs(integer1)); if(!xport_post->getValue(line+"_LINK_LENGTH",&integer1)) { XmlExit("Missing "+line+"_LINK_LENGTH",400,"logs.cpp",LINE_NUMBER);