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

* Removed 'RD3CartDrag' dependency from rdairplay(1).
	* Removed 'RD3CartDrag' dependency from rdcartslots(1).
	* Removed 'RD3CartDrag' dependency from rdlogedit(1).
	* Removed 'RD3CartDrag' dependency from rdpanel(1).
	* Removed 'RD3CartDrag'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-09 13:31:34 -05:00
parent 26352326f0
commit 17ed26f066
13 changed files with 58 additions and 227 deletions

View File

@@ -21,6 +21,7 @@
#include <QMouseEvent>
#include <QPainter>
#include <rdcartdrag.h>
#include <rdconf.h>
#include "colors.h"
@@ -793,11 +794,14 @@ void LogLineBox::mouseMoveEvent(QMouseEvent *e)
line_move_count--;
if(line_move_count==0) {
if(line_allow_drags&&(line_logline!=NULL)) {
RD3CartDrag *d=
new RD3CartDrag(line_logline->cartNumber(),line_icon_label->pixmap(),
line_group_label->palette().
color(QColorGroup::Foreground),this);
d->dragCopy();
QDrag *drag=new QDrag(this);
RDCartDrag *cd=new RDCartDrag(line_logline->cartNumber(),
line_logline->title(),
line_group_label->palette().
color(QColorGroup::Foreground));
drag->setMimeData(cd);
drag->setPixmap(*(line_icon_label->pixmap()));
drag->exec();
}
}
}
@@ -834,7 +838,7 @@ void LogLineBox::paintEvent(QPaintEvent *e)
void LogLineBox::dragEnterEvent(QDragEnterEvent *e)
{
e->accept(RD3CartDrag::canDecode(e)&&
e->accept(RDCartDrag::canDecode(e)&&
((line_status==RDLogLine::Scheduled)||
(line_status==RDLogLine::Paused)));
}
@@ -844,7 +848,7 @@ void LogLineBox::dropEvent(QDropEvent *e)
{
RDLogLine ll;
if(RD3CartDrag::decode(e,&ll)) {
if(RDCartDrag::decode(e,&ll)) {
emit cartDropped(log_line,&ll);
}
}

View File

@@ -26,7 +26,6 @@
#include <qprogressbar.h>
#include <rdairplay_conf.h>
#include <rd3cartdrag.h>
#include <rdlog_line.h>
#include <rdwidget.h>

View File

@@ -19,7 +19,7 @@
//
//
#include <rd3cartdrag.h>
#include <rdcartdrag.h>
#include <rdlogplay.h>
#include "logtableview.h"
@@ -33,13 +33,13 @@ LogTableView::LogTableView(QWidget *parent)
void LogTableView::dragEnterEvent(QDragEnterEvent *e)
{
e->accept(RD3CartDrag::canDecode(e));
e->accept(RDCartDrag::canDecode(e));
}
void LogTableView::dragMoveEvent(QDragMoveEvent *e)
{
e->accept(RD3CartDrag::canDecode(e));
e->accept(RDCartDrag::canDecode(e));
}
@@ -49,7 +49,7 @@ void LogTableView::dropEvent(QDropEvent *e)
int line=-1;
int y_pos=e->pos().y();
if(RD3CartDrag::decode(e,&ll)) {
if(RDCartDrag::decode(e,&ll)) {
line=rowAt(y_pos);
emit cartDropped(line,&ll);
}