Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-10 16:43:35 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Removed the 'Q3Frame' dependency from 'RDCueEdit'.
	* Removed the 'Q3Frame' dependency from 'RDMarkerBar'.
	* Removed the 'Q3Frame' dependency from 'RDTimeEdit'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-15 09:52:01 -05:00
parent b9641e45fe
commit 95a304c6fe
6 changed files with 25 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -21137,3 +21137,7 @@
* Fixed a regression in 'RDCae' that broke the build.
2021-02-15 Fred Gleason <fredg@paravelsystems.com>
* Removed 'Q3SocketDevice' dependencies from 'RDMulticaster'.
2021-02-15 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Q3Frame' dependency from 'RDCueEdit'.
* Removed the 'Q3Frame' dependency from 'RDMarkerBar'.
* Removed the 'Q3Frame' dependency from 'RDTimeEdit'.

9
lib/rdcueedit.cpp
View File

@@ -18,10 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qpainter.h>
#include <qmessagebox.h>
#include <q3frame.h>
//#include <q3frame.h>
#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

5
lib/rdcueedit.h
View File

@@ -2,7 +2,7 @@
//
// Cueing Editor for RDLogLine-based Events
//
// (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
@@ -21,9 +21,6 @@
#ifndef RDCUEEDIT_H
#define RDCUEEDIT_H
#include <qlabel.h>
#include <qtimer.h>
#include <rdcae.h>
#include <rdevent_player.h>
#include <rdplay_deck.h>

8
lib/rdmarker_bar.cpp
View File

@@ -2,7 +2,7 @@
//
// A marker widget for the RDCueEdit widget.
//
// (C) Copyright 2002-2013,2016 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
@@ -20,10 +20,6 @@
#include <qpainter.h>
#include <q3pointarray.h>
//Added by qt3to4:
#include <Q3Frame>
#include <QPixmap>
#include <QLabel>
#include <rdmarker_bar.h>
@@ -35,7 +31,7 @@ RDMarkerBar::RDMarkerBar(QWidget *parent)
}
setLineWidth(1);
setMidLineWidth(0);
setFrameStyle(Q3Frame::Box|Q3Frame::Plain);
setFrameStyle(QFrame::Box|QFrame::Plain);
}

29
lib/rdtimeedit.cpp
View File

@@ -2,7 +2,7 @@
//
// A QTimeEdit with tenth-second precision.
//
// (C) Copyright 2003,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2003-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,26 +18,17 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qfontmetrics.h>
//Added by qt3to4:
#include <QWheelEvent>
#include <QFocusEvent>
#include <Q3Frame>
#include <QLabel>
#include <QMouseEvent>
#include <QKeyEvent>
#include <rdtimeedit.h>
#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);
}

16
lib/rdtimeedit.h
View File

@@ -2,7 +2,7 @@
//
// A QTimeEdit with tenth-second precision.
//
// (C) Copyright 2003,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2003-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
@@ -21,18 +21,12 @@
#ifndef RDTIMEEDIT_H
#define RDTIMEEDIT_H
#include <q3frame.h>
#include <qdatetime.h>
#include <qlabel.h>
//Added by qt3to4:
#include <QWheelEvent>
#include <QMouseEvent>
#include <QKeyEvent>
#include <QFocusEvent>
#include <QDateTime>
#include <QLabel>
#include <rdtransportbutton.h>
class RDTimeEdit : public Q3Frame
class RDTimeEdit : public QFrame
{
Q_OBJECT
public:
@@ -86,4 +80,4 @@ class RDTimeEdit : public Q3Frame
};
#endif // RDTimeEdit
#endif // RDTIMEEDIT_H