From 08e6e3d01bc56d3b55c1512164f48d3db762bd53 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 14:59:16 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- src/rip/videodvd/base_k3bvideodvdrippingwidget.ui | 2 +- src/rip/videodvd/k3bvideodvdrippingview.cpp | 22 +++++++++++----------- src/rip/videodvd/k3bvideodvdrippingview.h | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/rip/videodvd') diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui index 5c22e83..3195f3c 100644 --- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui +++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui @@ -28,7 +28,7 @@ Please select the audio streams you want to include in every ripped title - + m_titleView diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp index ca9e467..9567afd 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp @@ -62,8 +62,8 @@ K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * n // ---------------------------------------------------------------------------------- m_titleView = new K3bVideoDVDRippingTitleListView( mainWidget() ); - connect( m_titleView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( m_titleView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); // general layout // ---------------------------------------------------------------------------------- @@ -176,7 +176,7 @@ void K3bVideoDVDRippingView::slotStartRipping() } -void K3bVideoDVDRippingView::slotContextMenu( KListView*, TQListViewItem*, const TQPoint& p ) +void K3bVideoDVDRippingView::slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& p ) { m_popupMenu->popup(p); } @@ -216,28 +216,28 @@ void K3bVideoDVDRippingView::slotUncheck() void K3bVideoDVDRippingView::initActions() { - m_actionCollection = new KActionCollection( this ); + m_actionCollection = new TDEActionCollection( this ); - KAction* actionSelectAll = new KAction( i18n("Check All"), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionSelectAll = new TDEAction( i18n("Check All"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckAll()), actionCollection(), "check_all" ); - KAction* actionDeselectAll = new KAction( i18n("Uncheck All"), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionDeselectAll = new TDEAction( i18n("Uncheck All"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotUncheckAll()), actionCollection(), "uncheck_all" ); - KAction* actionSelect = new KAction( i18n("Check Track"), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionSelect = new TDEAction( i18n("Check Track"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheck()), actionCollection(), "select_track" ); - KAction* actionDeselect = new KAction( i18n("Uncheck Track"), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionDeselect = new TDEAction( i18n("Uncheck Track"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotUncheck()), actionCollection(), "deselect_track" ); - KAction* actionStartRip = new KAction( i18n("Start Ripping"), "gear", 0, TQT_TQOBJECT(this), + TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStartRipping()), m_actionCollection, "start_rip" ); actionStartRip->setToolTip( i18n("Open the Video DVD ripping dialog") ); // setup the popup menu - m_popupMenu = new KActionMenu( actionCollection(), "popup_menu" ); - KAction* separator = new KActionSeparator( actionCollection(), "separator" ); + m_popupMenu = new TDEActionMenu( actionCollection(), "popup_menu" ); + TDEAction* separator = new TDEActionSeparator( actionCollection(), "separator" ); m_popupMenu->insert( actionSelect ); m_popupMenu->insert( actionDeselect ); m_popupMenu->insert( actionSelectAll ); diff --git a/src/rip/videodvd/k3bvideodvdrippingview.h b/src/rip/videodvd/k3bvideodvdrippingview.h index b0f2b64..a7820ca 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.h +++ b/src/rip/videodvd/k3bvideodvdrippingview.h @@ -23,9 +23,9 @@ class K3bVideoDVDRippingTitleListView; class K3bToolBox; class TQLabel; -class KActionCollection; -class KActionMenu; -class KListView; +class TDEActionCollection; +class TDEActionMenu; +class TDEListView; class TQListViewItem; class K3bVideoDVDRippingView : public K3bMediaContentsView @@ -37,12 +37,12 @@ class K3bVideoDVDRippingView : public K3bMediaContentsView K3bVideoDVDRippingView( TQWidget* parent = 0, const char * name = 0 ); ~K3bVideoDVDRippingView(); - KActionCollection* actionCollection() const { return m_actionCollection; } + TDEActionCollection* actionCollection() const { return m_actionCollection; } private slots: void slotStartRipping(); - void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ); + void slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ); void slotCheckAll(); void slotUncheckAll(); @@ -54,8 +54,8 @@ class K3bVideoDVDRippingView : public K3bMediaContentsView void enableInteraction( bool enable ); void initActions(); - KActionCollection* m_actionCollection; - KActionMenu* m_popupMenu; + TDEActionCollection* m_actionCollection; + TDEActionMenu* m_popupMenu; K3bToolBox* m_toolBox; TQLabel* m_labelLength; -- cgit v1.2.1