diff --git a/ChangeLog b/ChangeLog index 2cc27d70..ff418807 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21013,3 +21013,5 @@ * Added 'RDMacroCartModel' * Refactored the macro cart editor dialog in rdlibrary(1) to use the model-based API. +2021-02-05 Fred Gleason + * Removed vestigal 'LibListview' class from rdairplay(1). diff --git a/rdairplay/Makefile.am b/rdairplay/Makefile.am index f3633eb8..4129e608 100644 --- a/rdairplay/Makefile.am +++ b/rdairplay/Makefile.am @@ -45,7 +45,6 @@ bin_PROGRAMS = rdairplay dist_rdairplay_SOURCES = button_log.cpp button_log.h\ edit_event.cpp edit_event.h\ hourselector.cpp hourselector.h\ - lib_listview.cpp lib_listview.h\ list_log.cpp list_log.h\ list_logs.cpp list_logs.h\ local_macros.cpp colors.h\ @@ -63,7 +62,6 @@ dist_rdairplay_SOURCES = button_log.cpp button_log.h\ nodist_rdairplay_SOURCES = moc_button_log.cpp\ moc_edit_event.cpp\ moc_hourselector.cpp\ - moc_lib_listview.cpp\ moc_list_log.cpp\ moc_list_logs.cpp\ moc_loglinebox.cpp\ diff --git a/rdairplay/lib_listview.cpp b/rdairplay/lib_listview.cpp deleted file mode 100644 index 10a2762b..00000000 --- a/rdairplay/lib_listview.cpp +++ /dev/null @@ -1,55 +0,0 @@ -// lib_listview.cpp -// -// The Log ListView widget for RDAirPlay's Full Log widget. -// -// (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 -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#include - -#include - -#include - -#include - -LibListView::LibListView(QWidget *parent) - : RDListView(parent) -{ - setAcceptDrops(true); -} - - -void LibListView::dragEnterEvent(QDragEnterEvent *e) -{ - e->accept(RD3CartDrag::canDecode(e)); -} - - -void LibListView::dropEvent(QDropEvent *e) -{ - RDLogLine ll; - int line=-1; - QPoint pos(e->pos().x(),e->pos().y()-header()->sectionRect(0).height()); - - if(RD3CartDrag::decode(e,&ll)) { - RDListViewItem *item=(RDListViewItem *)itemAt(pos); - if(item!=NULL) { - line=item->text(15).toInt(); - } - emit cartDropped(line,&ll); - } -} diff --git a/rdairplay/lib_listview.h b/rdairplay/lib_listview.h deleted file mode 100644 index fd161503..00000000 --- a/rdairplay/lib_listview.h +++ /dev/null @@ -1,42 +0,0 @@ -// lib_listview.h -// -// The Log ListView widget for RDAirPlay's Full Log widget. -// -// (C) Copyright 2002-2018 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 -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#ifndef LIB_LISTVIEW_H -#define LIB_LISTVIEW_H - -#include -#include - -class LibListView : public RDListView -{ - Q_OBJECT - public: - LibListView(QWidget *parent); - - signals: - void cartDropped(int line,RDLogLine *ll); - - protected: - void dragEnterEvent(QDragEnterEvent *e); - void dropEvent(QDropEvent *e); -}; - - -#endif // LIB_LISTVIEW_H diff --git a/rdairplay/list_log.h b/rdairplay/list_log.h index ba5f4770..026c7df0 100644 --- a/rdairplay/list_log.h +++ b/rdairplay/list_log.h @@ -26,7 +26,6 @@ #include "edit_event.h" #include "hourselector.h" -#include "lib_listview.h" #include "list_logs.h" #include "logtableview.h" diff --git a/rdairplay/rdairplay.pro b/rdairplay/rdairplay.pro index f12052fd..60462786 100644 --- a/rdairplay/rdairplay.pro +++ b/rdairplay/rdairplay.pro @@ -2,7 +2,7 @@ # # The QMake project file for RDAirPlay. # -# (C) Copyright 2003-2005,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 @@ -23,7 +23,6 @@ x11 { SOURCES += button_log.cpp SOURCES += edit_event.cpp SOURCES += hourselector.cpp - SOURCES += lib_listview.cpp SOURCES += list_log.cpp SOURCES += list_logs.cpp SOURCES += local_macros.cpp @@ -43,7 +42,6 @@ x11 { HEADERS += colors.h HEADERS += edit_event.h HEADERS += hourselector.h - HEADERS += lib_listview.h HEADERS += list_log.h HEADERS += list_logs.h HEADERS += loglinebox.h