From 95a304c6fea2df204291b9fff74621da9cc89b8a Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 15 Feb 2021 09:52:01 -0500 Subject: [PATCH] 2021-02-15 Fred Gleason * Removed the 'Q3Frame' dependency from 'RDCueEdit'. * Removed the 'Q3Frame' dependency from 'RDMarkerBar'. * Removed the 'Q3Frame' dependency from 'RDTimeEdit'. Signed-off-by: Fred Gleason --- ChangeLog | 4 ++++ lib/rdcueedit.cpp | 9 +++------ lib/rdcueedit.h | 5 +---- lib/rdmarker_bar.cpp | 8 ++------ lib/rdtimeedit.cpp | 29 ++++++++++------------------- lib/rdtimeedit.h | 16 +++++----------- 6 files changed, 25 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed156266..8075abcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21137,3 +21137,7 @@ * Fixed a regression in 'RDCae' that broke the build. 2021-02-15 Fred Gleason * Removed 'Q3SocketDevice' dependencies from 'RDMulticaster'. +2021-02-15 Fred Gleason + * Removed the 'Q3Frame' dependency from 'RDCueEdit'. + * Removed the 'Q3Frame' dependency from 'RDMarkerBar'. + * Removed the 'Q3Frame' dependency from 'RDTimeEdit'. diff --git a/lib/rdcueedit.cpp b/lib/rdcueedit.cpp index 4b04b82f..83645764 100644 --- a/lib/rdcueedit.cpp +++ b/lib/rdcueedit.cpp @@ -18,10 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include - -#include +//#include #include "rdconf.h" #include "rdcueedit.h" @@ -50,7 +47,7 @@ RDCueEdit::RDCueEdit(QWidget *parent) edit_position_label->setBackgroundColor(QColor(Qt::white)); edit_position_label->setLineWidth(1); edit_position_label->setMidLineWidth(0); - edit_position_label->setFrameStyle(Q3Frame::Box|Q3Frame::Plain); + edit_position_label->setFrameStyle(QFrame::Box|QFrame::Plain); edit_position_bar=new RDMarkerBar(this); edit_position_bar->setGeometry(85,8,sizeHint().width()-200,14); @@ -88,7 +85,7 @@ RDCueEdit::RDCueEdit(QWidget *parent) label->setBackgroundColor(QColor(Qt::gray)); label->setLineWidth(1); label->setMidLineWidth(0); - label->setFrameStyle(Q3Frame::Box|Q3Frame::Plain); + label->setFrameStyle(QFrame::Box|QFrame::Plain); // // Audition Button diff --git a/lib/rdcueedit.h b/lib/rdcueedit.h index 3b62bbf4..39363709 100644 --- a/lib/rdcueedit.h +++ b/lib/rdcueedit.h @@ -2,7 +2,7 @@ // // Cueing Editor for RDLogLine-based Events // -// (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 @@ -21,9 +21,6 @@ #ifndef RDCUEEDIT_H #define RDCUEEDIT_H -#include -#include - #include #include #include diff --git a/lib/rdmarker_bar.cpp b/lib/rdmarker_bar.cpp index 90f003e0..4767ad53 100644 --- a/lib/rdmarker_bar.cpp +++ b/lib/rdmarker_bar.cpp @@ -2,7 +2,7 @@ // // A marker widget for the RDCueEdit widget. // -// (C) Copyright 2002-2013,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 General Public License version 2 as @@ -20,10 +20,6 @@ #include #include -//Added by qt3to4: -#include -#include -#include #include @@ -35,7 +31,7 @@ RDMarkerBar::RDMarkerBar(QWidget *parent) } setLineWidth(1); setMidLineWidth(0); - setFrameStyle(Q3Frame::Box|Q3Frame::Plain); + setFrameStyle(QFrame::Box|QFrame::Plain); } diff --git a/lib/rdtimeedit.cpp b/lib/rdtimeedit.cpp index a7368e53..da7e8840 100644 --- a/lib/rdtimeedit.cpp +++ b/lib/rdtimeedit.cpp @@ -2,7 +2,7 @@ // // A QTimeEdit with tenth-second precision. // -// (C) Copyright 2003,2016 Fred Gleason +// (C) Copyright 2003-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,26 +18,17 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -//Added by qt3to4: -#include -#include -#include -#include -#include -#include - -#include +#include "rdtimeedit.h" RDTimeEdit::RDTimeEdit(QWidget *parent) - : Q3Frame(parent) + : QFrame(parent) { edit_display=0; edit_section=0; edit_read_only=false; edit_digit=0; GetSizeHint(); - setFrameStyle(Q3Frame::StyledPanel|Q3Frame::Sunken); + setFrameStyle(QFrame::StyledPanel|QFrame::Sunken); setLineWidth(1); setMidLineWidth(3); setFocusPolicy(Qt::StrongFocus); @@ -117,7 +108,7 @@ bool RDTimeEdit::isReadOnly() const void RDTimeEdit::setFont(const QFont &f) { - Q3Frame::setFont(f); + QFrame::setFont(f); GetSizeHint(); } @@ -158,7 +149,7 @@ void RDTimeEdit::setDisplay(uint disp) void RDTimeEdit::setGeometry(int x,int y,int w,int h) { - Q3Frame::setGeometry(x,y,w,h); + QFrame::setGeometry(x,y,w,h); QFontMetrics fm(font()); int fy=h-fm.height(); int fx=contentsRect().x()+fy; @@ -230,7 +221,7 @@ void RDTimeEdit::setFocus() p.setColor(QPalette::Active,QColorGroup::Foreground, p.color(QPalette::Active,QColorGroup::HighlightedText)); edit_labels[edit_section]->setPalette(p); - Q3Frame::setFocus(); + QFrame::setFocus(); } @@ -431,18 +422,18 @@ void RDTimeEdit::keyPressEvent(QKeyEvent *e) void RDTimeEdit::focusInEvent(QFocusEvent *e) { - Q3Frame::focusInEvent(e); + QFrame::focusInEvent(e); } void RDTimeEdit::focusOutEvent(QFocusEvent *e) { - Q3Frame::focusOutEvent(e); + QFrame::focusOutEvent(e); QPalette p=palette(); for(int i=0;i<4;i++) { edit_labels[i]->setPalette(p); } - Q3Frame::focusOutEvent(e); + QFrame::focusOutEvent(e); } diff --git a/lib/rdtimeedit.h b/lib/rdtimeedit.h index 2f7b5b39..a9d9d058 100644 --- a/lib/rdtimeedit.h +++ b/lib/rdtimeedit.h @@ -2,7 +2,7 @@ // // A QTimeEdit with tenth-second precision. // -// (C) Copyright 2003,2016 Fred Gleason +// (C) Copyright 2003-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 @@ -21,18 +21,12 @@ #ifndef RDTIMEEDIT_H #define RDTIMEEDIT_H -#include -#include -#include -//Added by qt3to4: -#include -#include -#include -#include +#include +#include #include -class RDTimeEdit : public Q3Frame +class RDTimeEdit : public QFrame { Q_OBJECT public: @@ -86,4 +80,4 @@ class RDTimeEdit : public Q3Frame }; -#endif // RDTimeEdit +#endif // RDTIMEEDIT_H