From 08e6e3d01bc56d3b55c1512164f48d3db762bd53 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 14:59:16 -0600 Subject: [PATCH] Rename a number of classes to enhance compatibility with KDE4 --- k3bsetup/base_k3bsetup2.ui | 4 +- libk3b/cddb/k3bcddbmultientriesdialog.cpp | 2 +- libk3b/cddb/k3bcddbmultientriesdialog.h | 4 +- libk3b/projects/k3bdoc.h | 2 +- libk3b/tools/k3blistview.cpp | 40 +++---- libk3b/tools/k3blistview.h | 8 +- libk3b/tools/k3bpushbutton.h | 4 +- libk3b/tools/k3bradioaction.cpp | 32 ++--- libk3b/tools/k3bradioaction.h | 18 +-- libk3b/tools/k3btoolbox.cpp | 10 +- libk3b/tools/k3btoolbox.h | 10 +- libk3b/tools/k3btoolbutton.h | 2 +- .../k3baudiometainforenamerplugin.cpp | 4 +- src/k3b.cpp | 78 ++++++------ src/k3b.h | 68 +++++------ src/k3bappdevicemanager.cpp | 28 ++--- src/k3bappdevicemanager.h | 20 ++-- src/k3baudioplayer.cpp | 26 ++-- src/k3baudioplayer.h | 16 +-- src/k3bdiroperator.cpp | 12 +- src/k3bdiroperator.h | 6 +- src/k3bdirview.cpp | 4 +- src/k3bdiskinfoview.cpp | 112 +++++++++--------- src/k3bdiskinfoview.h | 4 +- src/k3bfiletreeview.cpp | 20 ++-- src/k3bfiletreeview.h | 12 +- src/k3bfileview.cpp | 10 +- src/k3bfileview.h | 4 +- src/k3bflatbutton.cpp | 2 +- src/k3bflatbutton.h | 4 +- src/k3bjobprogressdialog.cpp | 8 +- src/k3bjobprogressdialog.h | 4 +- src/k3bjobprogressosd.cpp | 2 +- src/k3bmediacontentsview.h | 2 +- src/k3bprojecttabwidget.cpp | 4 +- src/k3bprojecttabwidget.h | 8 +- src/k3bsidepanel.cpp | 2 +- src/k3bsidepanel.h | 4 +- src/k3bstatusbarmanager.cpp | 2 +- src/k3bwelcomewidget.cpp | 28 ++--- src/k3bwelcomewidget.h | 10 +- src/misc/k3bblankingdialog.h | 2 +- src/misc/k3bcdimagewritingdialog.cpp | 6 +- src/misc/k3bcdimagewritingdialog.h | 4 +- src/misc/k3bisoimagewritingdialog.cpp | 6 +- src/misc/k3bisoimagewritingdialog.h | 4 +- src/option/base_k3bcddboptiontab.ui | 4 +- src/option/base_k3bthemeoptiontab.ui | 2 +- src/option/k3bcddboptiontab.cpp | 10 +- src/option/k3bexternalbinoptiontab.h | 2 +- src/option/k3bpluginoptiontab.cpp | 2 +- src/option/k3bthemeoptiontab.cpp | 4 +- .../base_k3badvanceddataimagesettings.ui | 2 +- src/projects/base_k3bbootimageview.ui | 2 +- src/projects/k3baudiodatasourceviewitem.cpp | 2 +- src/projects/k3baudiotrackplayer.cpp | 46 +++---- src/projects/k3baudiotrackplayer.h | 4 +- src/projects/k3baudiotracksplitdialog.cpp | 12 +- src/projects/k3baudiotracksplitdialog.h | 10 +- src/projects/k3baudiotrackview.cpp | 48 ++++---- src/projects/k3baudiotrackview.h | 30 ++--- src/projects/k3baudiotrackviewitem.cpp | 4 +- src/projects/k3baudioview.cpp | 2 +- src/projects/k3bbootimageview.cpp | 6 +- src/projects/k3bdatadirtreeview.cpp | 26 ++-- src/projects/k3bdatadirtreeview.h | 22 ++-- src/projects/k3bdatafileview.cpp | 36 +++--- src/projects/k3bdatafileview.h | 26 ++-- src/projects/k3bdatasessionimportdialog.h | 2 +- src/projects/k3bdataview.cpp | 6 +- src/projects/k3bfillstatusdisplay.cpp | 54 ++++----- src/projects/k3bfillstatusdisplay.h | 8 +- src/projects/k3bmovixlistview.cpp | 8 +- src/projects/k3bmovixlistview.h | 2 +- src/projects/k3bmovixview.cpp | 10 +- src/projects/k3bmovixview.h | 14 +-- src/projects/k3bvcdlistview.cpp | 26 ++-- src/projects/k3bvcdlistview.h | 22 ++-- src/projects/k3bvcdlistviewitem.cpp | 4 +- src/projects/k3bvcdview.h | 2 +- src/projects/k3bview.cpp | 6 +- src/projects/k3bview.h | 2 +- src/rip/k3baudiocdlistview.h | 2 +- src/rip/k3baudiocdview.cpp | 30 ++--- src/rip/k3baudiocdview.h | 14 +-- src/rip/k3baudioprojectconvertingdialog.cpp | 8 +- src/rip/k3baudiorippingdialog.cpp | 10 +- src/rip/k3baudiorippingdialog.h | 4 +- src/rip/k3bvideocdrippingdialog.h | 2 +- src/rip/k3bvideocdview.cpp | 22 ++-- src/rip/k3bvideocdview.h | 14 +-- .../videodvd/base_k3bvideodvdrippingwidget.ui | 2 +- src/rip/videodvd/k3bvideodvdrippingview.cpp | 22 ++-- src/rip/videodvd/k3bvideodvdrippingview.h | 14 +-- 94 files changed, 637 insertions(+), 637 deletions(-) diff --git a/k3bsetup/base_k3bsetup2.ui b/k3bsetup/base_k3bsetup2.ui index 25df4e2..9605f84 100644 --- a/k3bsetup/base_k3bsetup2.ui +++ b/k3bsetup/base_k3bsetup2.ui @@ -135,7 +135,7 @@ Check the devices whose permissions you want to be changed - + Device @@ -255,7 +255,7 @@ Check the programs whose permissions you want to be changed - + Program diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.cpp b/libk3b/cddb/k3bcddbmultientriesdialog.cpp index ddcd9e4..6687c94 100644 --- a/libk3b/cddb/k3bcddbmultientriesdialog.cpp +++ b/libk3b/cddb/k3bcddbmultientriesdialog.cpp @@ -37,7 +37,7 @@ K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* parent, const ch TQLabel* infoLabel = new TQLabel( i18n("K3b found multiple inexact CDDB entries. Please select one."), frame ); infoLabel->setAlignment( WordBreak ); - m_listBox = new KListBox( frame, "list_box"); + m_listBox = new TDEListBox( frame, "list_box"); setMinimumSize( 280, 200 ); } diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.h b/libk3b/cddb/k3bcddbmultientriesdialog.h index b99af3b..ee8a274 100644 --- a/libk3b/cddb/k3bcddbmultientriesdialog.h +++ b/libk3b/cddb/k3bcddbmultientriesdialog.h @@ -24,7 +24,7 @@ class TQStringList; -class KListBox; +class TDEListBox; /** *@author Sebastian Trueg @@ -43,7 +43,7 @@ class K3bCddbMultiEntriesDialog : public KDialogBase K3bCddbMultiEntriesDialog( TQWidget* parent = 0, const char* name = 0); private: - KListBox *m_listBox; + TDEListBox *m_listBox; }; #endif diff --git a/libk3b/projects/k3bdoc.h b/libk3b/projects/k3bdoc.h index 11d97c0..116974e 100644 --- a/libk3b/projects/k3bdoc.h +++ b/libk3b/projects/k3bdoc.h @@ -39,7 +39,7 @@ class K3bBurnJob; class TQDomDocument; class TQDomElement; class TDEConfig; -class KActionCollection; +class TDEActionCollection; class K3bJobHandler; diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp index 048f2ee..552c218 100644 --- a/libk3b/tools/k3blistview.cpp +++ b/libk3b/tools/k3blistview.cpp @@ -98,25 +98,25 @@ public: K3bListViewItem::K3bListViewItem(TQListView *parent) - : KListViewItem( parent ) + : TDEListViewItem( parent ) { init(); } K3bListViewItem::K3bListViewItem(TQListViewItem *parent) - : KListViewItem( parent ) + : TDEListViewItem( parent ) { init(); } K3bListViewItem::K3bListViewItem(TQListView *parent, TQListViewItem *after) - : KListViewItem( parent, after ) + : TDEListViewItem( parent, after ) { init(); } K3bListViewItem::K3bListViewItem(TQListViewItem *parent, TQListViewItem *after) - : KListViewItem( parent, after ) + : TDEListViewItem( parent, after ) { init(); } @@ -127,7 +127,7 @@ K3bListViewItem::K3bListViewItem(TQListView *parent, const TQString& s3, const TQString& s4, const TQString& s5, const TQString& s6, const TQString& s7, const TQString& s8) - : KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 ) + : TDEListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } @@ -138,7 +138,7 @@ K3bListViewItem::K3bListViewItem(TQListViewItem *parent, const TQString& s3, const TQString& s4, const TQString& s5, const TQString& s6, const TQString& s7, const TQString& s8) - : KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 ) + : TDEListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } @@ -149,7 +149,7 @@ K3bListViewItem::K3bListViewItem(TQListView *parent, TQListViewItem *after, const TQString& s3, const TQString& s4, const TQString& s5, const TQString& s6, const TQString& s7, const TQString& s8) - : KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) + : TDEListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } @@ -160,7 +160,7 @@ K3bListViewItem::K3bListViewItem(TQListViewItem *parent, TQListViewItem *after, const TQString& s3, const TQString& s4, const TQString& s5, const TQString& s6, const TQString& s7, const TQString& s8) - : KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) + : TDEListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } @@ -186,7 +186,7 @@ void K3bListViewItem::init() int K3bListViewItem::width( const TQFontMetrics& fm, const TQListView* lv, int c ) const { - return KListViewItem::width( fm, lv, c ) + getColumnInfo(c)->margin*2; + return TDEListViewItem::width( fm, lv, c ) + getColumnInfo(c)->margin*2; } @@ -343,7 +343,7 @@ int K3bListViewItem::marginVertical() const void K3bListViewItem::setup() { - KListViewItem::setup(); + TDEListViewItem::setup(); setHeight( height() + 2*m_vMargin ); } @@ -374,7 +374,7 @@ void K3bListViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int col, p->fillRect( width-info->margin, 0, info->margin, height(), cgh.brush( TQColorGroup::Highlight ) ); } - else { // in case we use the KListView alternate color stuff + else { // in case we use the TDEListView alternate color stuff p->fillRect( 0, 0, info->margin, height(), cgh.brush( TQColorGroup::Base ) ); p->fillRect( width-info->margin, 0, info->margin, height(), @@ -546,7 +546,7 @@ public: K3bListView::K3bListView( TQWidget* parent, const char* name ) - : KListView( parent, name ), + : TDEListView( parent, name ), m_noItemVMargin( 20 ), m_noItemHMargin( 20 ) { @@ -592,7 +592,7 @@ TQWidget* K3bListView::editor( K3bListViewItem::EditorType t ) const void K3bListView::clear() { hideEditor(); - KListView::clear(); + TDEListView::clear(); } @@ -806,7 +806,7 @@ void K3bListView::setCurrentItem( TQListViewItem* i ) // doRename(); // hideEditor(); // m_currentEditItem = 0; - KListView::setCurrentItem( i ); + TDEListView::setCurrentItem( i ); } @@ -819,14 +819,14 @@ void K3bListView::setNoItemText( const TQString& text ) void K3bListView::viewportPaintEvent( TQPaintEvent* e ) { - KListView::viewportPaintEvent( e ); + TDEListView::viewportPaintEvent( e ); } // FIXME: move this to viewportPaintEvent void K3bListView::drawContentsOffset( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ) { - KListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch ); + TDEListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch ); if( childCount() == 0 && !m_noItemText.isEmpty()) { @@ -846,7 +846,7 @@ void K3bListView::drawContentsOffset( TQPainter * p, int ox, int oy, int cx, int void K3bListView::paintEmptyArea( TQPainter* p, const TQRect& rect ) { - KListView::paintEmptyArea( p, rect ); + TDEListView::paintEmptyArea( p, rect ); // if( childCount() == 0 && !m_noItemText.isEmpty()) { @@ -869,7 +869,7 @@ void K3bListView::paintEmptyArea( TQPainter* p, const TQRect& rect ) void K3bListView::resizeEvent( TQResizeEvent* e ) { - KListView::resizeEvent( e ); + TDEListView::resizeEvent( e ); updateEditorSize(); } @@ -1150,7 +1150,7 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) } } - return KListView::eventFilter( o, e ); + return TDEListView::eventFilter( o, e ); } @@ -1202,7 +1202,7 @@ void K3bListView::viewportResizeEvent( TQResizeEvent* e ) viewport()->setPaletteBackgroundPixmap( bgPix ); } - KListView::viewportResizeEvent( e ); + TDEListView::viewportResizeEvent( e ); } diff --git a/libk3b/tools/k3blistview.h b/libk3b/tools/k3blistview.h index 6c5727e..333b9f0 100644 --- a/libk3b/tools/k3blistview.h +++ b/libk3b/tools/k3blistview.h @@ -39,7 +39,7 @@ class K3bMsfEdit; class K3bListView; -class LIBK3B_EXPORT K3bListViewItem : public KListViewItem +class LIBK3B_EXPORT K3bListViewItem : public TDEListViewItem { public: K3bListViewItem(TQListView *parent); @@ -74,7 +74,7 @@ class LIBK3B_EXPORT K3bListViewItem : public KListViewItem virtual ~K3bListViewItem(); /** - * reimplemented from KListViewItem + * reimplemented from TDEListViewItem */ void setup(); @@ -153,7 +153,7 @@ class LIBK3B_EXPORT K3bCheckListViewItem : public K3bListViewItem -class LIBK3B_EXPORT K3bListView : public KListView +class LIBK3B_EXPORT K3bListView : public TDEListView { friend class K3bListViewItem; @@ -234,7 +234,7 @@ class LIBK3B_EXPORT K3bListView : public KListView protected: /** - * calls KListView::drawContentsOffset + * calls TDEListView::drawContentsOffset * and paints a the noItemText if no item is in the list */ virtual void drawContentsOffset ( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ); diff --git a/libk3b/tools/k3bpushbutton.h b/libk3b/tools/k3bpushbutton.h index dc130f3..13a8fec 100644 --- a/libk3b/tools/k3bpushbutton.h +++ b/libk3b/tools/k3bpushbutton.h @@ -21,7 +21,7 @@ #include "k3b_export.h" /** - * A pushbutton with delayed popu pmenu support just like the KToolBarButton + * A pushbutton with delayed popu pmenu support just like the TDEToolBarButton */ class LIBK3B_EXPORT K3bPushButton : public KPushButton { @@ -58,7 +58,7 @@ class LIBK3B_EXPORT K3bPushButton : public KPushButton /** * The popup menu will show if the button is pressed down for about half a second - * or if the mouse is moved while pressed just like the KToolBarButton. + * or if the mouse is moved while pressed just like the TDEToolBarButton. */ void setDelayedPopupMenu( TQPopupMenu* ); diff --git a/libk3b/tools/k3bradioaction.cpp b/libk3b/tools/k3bradioaction.cpp index 4293322..a70b5be 100644 --- a/libk3b/tools/k3bradioaction.cpp +++ b/libk3b/tools/k3bradioaction.cpp @@ -17,57 +17,57 @@ #include -K3bRadioAction::K3bRadioAction( const TQString& text, const KShortcut& cut, +K3bRadioAction::K3bRadioAction( const TQString& text, const TDEShortcut& cut, TQObject* parent, const char* name ) - : KToggleAction( text, cut, parent, name ), + : TDEToggleAction( text, cut, parent, name ), m_alwaysEmit(false) { } -K3bRadioAction::K3bRadioAction( const TQString& text, const KShortcut& cut, +K3bRadioAction::K3bRadioAction( const TQString& text, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KToggleAction( text, cut, receiver, slot, parent, name ), + : TDEToggleAction( text, cut, receiver, slot, parent, name ), m_alwaysEmit(false) { } K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix, - const KShortcut& cut, + const TDEShortcut& cut, TQObject* parent, const char* name ) - : KToggleAction( text, pix, cut, parent, name ), + : TDEToggleAction( text, pix, cut, parent, name ), m_alwaysEmit(false) { } K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix, - const KShortcut& cut, + const TDEShortcut& cut, TQObject* parent, const char* name ) - : KToggleAction( text, pix, cut, parent, name ), + : TDEToggleAction( text, pix, cut, parent, name ), m_alwaysEmit(false) { } K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix, - const KShortcut& cut, + const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KToggleAction( text, pix, cut, receiver, slot, parent, name ), + : TDEToggleAction( text, pix, cut, receiver, slot, parent, name ), m_alwaysEmit(false) { } K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix, - const KShortcut& cut, + const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KToggleAction( text, pix, cut, receiver, slot, parent, name ), + : TDEToggleAction( text, pix, cut, receiver, slot, parent, name ), m_alwaysEmit(false) { } K3bRadioAction::K3bRadioAction( TQObject* parent, const char* name ) - : KToggleAction( parent, name ), + : TDEToggleAction( parent, name ), m_alwaysEmit(false) { } @@ -80,15 +80,15 @@ void K3bRadioAction::slotActivated() const TQObject *senderObj = TQT_TQOBJECT_CONST(const_cast(sender())); - if ( !senderObj || !::tqqt_cast( senderObj ) ) + if ( !senderObj || !::tqqt_cast( senderObj ) ) return; - const_cast( static_cast( TQT_TQWIDGET_CONST(senderObj) ) )->on( true ); + const_cast( static_cast( TQT_TQWIDGET_CONST(senderObj) ) )->on( true ); return; } - KToggleAction::slotActivated(); + TDEToggleAction::slotActivated(); } #include "k3bradioaction.moc" diff --git a/libk3b/tools/k3bradioaction.h b/libk3b/tools/k3bradioaction.h index 2613b7f..cf77f88 100644 --- a/libk3b/tools/k3bradioaction.h +++ b/libk3b/tools/k3bradioaction.h @@ -20,13 +20,13 @@ #include "k3b_export.h" /** - * This differs from KRadioAction only in the boolean + * This differs from TDERadioAction only in the boolean * flag which says if it should always emit the signals * even if it was checked twice. * * Docu copied from tdelibs */ -class LIBK3B_EXPORT K3bRadioAction : public KToggleAction +class LIBK3B_EXPORT K3bRadioAction : public TDEToggleAction { Q_OBJECT @@ -42,7 +42,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction * @param parent This action's parent. * @param name An internal name for this action. */ - K3bRadioAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); + K3bRadioAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 ); /** * @param text The text that will be displayed. @@ -52,7 +52,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction * @param parent This action's parent. * @param name An internal name for this action. */ - K3bRadioAction( const TQString& text, const KShortcut& cut, + K3bRadioAction( const TQString& text, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); /** @@ -62,7 +62,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction * @param parent This action's parent. * @param name An internal name for this action. */ - K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(), + K3bRadioAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 ); /** @@ -72,7 +72,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction * @param parent This action's parent. * @param name An internal name for this action. */ - K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(), + K3bRadioAction( const TQString& text, const TQString& pix, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 ); /** @@ -84,7 +84,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction * @param parent This action's parent. * @param name An internal name for this action. */ - K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, + K3bRadioAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); /** @@ -96,7 +96,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction * @param parent This action's parent. * @param name An internal name for this action. */ - K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut, + K3bRadioAction( const TQString& text, const TQString& pix, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); @@ -109,7 +109,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction /** * @param b if true the action will always emit the activated signal * even if the toggled state did not change. The default is false. - * which is the same behaviour as KRadioAction + * which is the same behaviour as TDERadioAction */ void setAlwaysEmitActivated( bool b ) { m_alwaysEmit = b; } diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp index 58764be..22b7a94 100644 --- a/libk3b/tools/k3btoolbox.cpp +++ b/libk3b/tools/k3btoolbox.cpp @@ -77,7 +77,7 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* ) -K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* parent ) +K3bToolBoxButton::K3bToolBoxButton( TDEAction* action, TQWidget* parent ) : TQToolButton( parent ), m_popupMenu(0) { @@ -94,7 +94,7 @@ K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* parent ) else TQToolTip::add( this, action->toolTip() ); -// if( KToggleAction* ta = dynamic_cast( action ) ) { +// if( TDEToggleAction* ta = dynamic_cast( action ) ) { // setToggleButton( true ); // // initial state @@ -106,7 +106,7 @@ K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* parent ) // } // else - if( KActionMenu* am = dynamic_cast( action ) ) { + if( TDEActionMenu* am = dynamic_cast( action ) ) { m_popupMenu = am->popupMenu(); connect( this, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotPopupActivated()) ); setPopup( m_popupMenu ); @@ -185,7 +185,7 @@ K3bToolBox::~K3bToolBox() } -K3bToolBoxButton* K3bToolBox::addButton( KAction* action, bool forceText ) +K3bToolBoxButton* K3bToolBox::addButton( TDEAction* action, bool forceText ) { if( action ) { K3bToolBoxButton* b = new K3bToolBoxButton( action, this ); @@ -266,7 +266,7 @@ void K3bToolBox::addWidget( TQWidget* w ) } -K3bToolBoxButton* K3bToolBox::addToggleButton( KToggleAction* action ) +K3bToolBoxButton* K3bToolBox::addToggleButton( TDEToggleAction* action ) { return addButton( action ); } diff --git a/libk3b/tools/k3btoolbox.h b/libk3b/tools/k3btoolbox.h index 09635aa..45621c1 100644 --- a/libk3b/tools/k3btoolbox.h +++ b/libk3b/tools/k3btoolbox.h @@ -22,8 +22,8 @@ #include #include "k3b_export.h" -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class KWidgetAction; class TQGridLayout; class TQPopupMenu; @@ -39,7 +39,7 @@ class LIBK3B_EXPORT K3bToolBoxButton : public TQToolButton public: - K3bToolBoxButton( KAction*, TQWidget* parent ); + K3bToolBoxButton( TDEAction*, TQWidget* parent ); K3bToolBoxButton( const TQString& text, const TQString& icon, const TQString& tooltip, const TQString& whatsthis, TQObject* receiver, const char* slot, @@ -69,8 +69,8 @@ class LIBK3B_EXPORT K3bToolBox : public TQFrame const TQString& tooltip = TQString(), const TQString& whatsthis = TQString(), TQObject* receiver = 0, const char* slot = 0, bool forceTextLabel = false ); - K3bToolBoxButton* addButton( KAction*, bool forceTextLabel = false ); - K3bToolBoxButton* addToggleButton( KToggleAction* ); + K3bToolBoxButton* addButton( TDEAction*, bool forceTextLabel = false ); + K3bToolBoxButton* addToggleButton( TDEToggleAction* ); void addWidgetAction( KWidgetAction* ); /** diff --git a/libk3b/tools/k3btoolbutton.h b/libk3b/tools/k3btoolbutton.h index 6b2057d..40655e4 100644 --- a/libk3b/tools/k3btoolbutton.h +++ b/libk3b/tools/k3btoolbutton.h @@ -27,7 +27,7 @@ class TQEvent; /** * the K3bToolButton is an enhanced TQToolButton which adds two functionalities: *
  • A delayed popup menu is shown immiadetely once the mouse is dragged downwards - * much like the KToolBarButton + * much like the TDEToolBarButton *
  • If a popup menu is set a little arrow indicates this. */ class LIBK3B_EXPORT K3bToolButton : public TQToolButton diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp index 24a21a6..47dfa44 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp @@ -183,7 +183,7 @@ void K3bAudioMetainfoRenamerPluginWidget::slotScanClicked() // d->progressCounter = 0; // create root item - KListViewItem* rootItem = new KListViewItem( d->viewFiles, "/" ); + TDEListViewItem* rootItem = new TDEListViewItem( d->viewFiles, "/" ); // d->progressDialog->show(); scanDir( dir, rootItem ); @@ -229,7 +229,7 @@ void K3bAudioMetainfoRenamerPluginWidget::scanDir( K3bDirItem* dir, TQListViewIt } else if( item->isDir() ) { // create dir item - KListViewItem* dirViewItem = new KListViewItem( viewRoot, item->k3bName() ); + TDEListViewItem* dirViewItem = new TDEListViewItem( viewRoot, item->k3bName() ); scanDir( (K3bDirItem*)item, dirViewItem ); dirViewItem->setOpen(true); } diff --git a/src/k3b.cpp b/src/k3b.cpp index 95695ed..8d19aec 100644 --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -215,10 +215,10 @@ void K3bMainWindow::initActions() actionFileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); actionFileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); actionFileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); - actionFileSaveAll = new KAction( i18n("Save All"), "save_all", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAll()), + actionFileSaveAll = new TDEAction( i18n("Save All"), "save_all", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAll()), actionCollection(), "file_save_all" ); actionFileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); - actionFileCloseAll = new KAction( i18n("Close All"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileCloseAll()), + actionFileCloseAll = new TDEAction( i18n("Close All"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileCloseAll()), actionCollection(), "file_close_all" ); actionFileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); actionViewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), actionCollection()); @@ -232,38 +232,38 @@ void K3bMainWindow::initActions() setStandardToolBarMenuEnabled(true); KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection() ); - actionFileNewMenu = new KActionMenu( i18n("&New Project"), "filenew", actionCollection(), "file_new" ); - actionFileNewAudio = new KAction(i18n("New &Audio CD Project"), "audiocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewAudioDoc()), + actionFileNewMenu = new TDEActionMenu( i18n("&New Project"), "filenew", actionCollection(), "file_new" ); + actionFileNewAudio = new TDEAction(i18n("New &Audio CD Project"), "audiocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewAudioDoc()), actionCollection(), "file_new_audio"); - actionFileNewData = new KAction(i18n("New Data &CD Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDataDoc()), + actionFileNewData = new TDEAction(i18n("New Data &CD Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDataDoc()), actionCollection(), "file_new_data"); - actionFileNewMixed = new KAction(i18n("New &Mixed Mode CD Project"), "mixedcd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMixedDoc()), + actionFileNewMixed = new TDEAction(i18n("New &Mixed Mode CD Project"), "mixedcd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMixedDoc()), actionCollection(), "file_new_mixed"); - actionFileNewVcd = new KAction(i18n("New &Video CD Project"), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVcdDoc()), + actionFileNewVcd = new TDEAction(i18n("New &Video CD Project"), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVcdDoc()), actionCollection(), "file_new_vcd"); - actionFileNewMovix = new KAction(i18n("New &eMovix CD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDoc()), + actionFileNewMovix = new TDEAction(i18n("New &eMovix CD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDoc()), actionCollection(), "file_new_movix"); - actionFileNewMovixDvd = new KAction(i18n("New &eMovix DVD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDvdDoc()), + actionFileNewMovixDvd = new TDEAction(i18n("New &eMovix DVD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDvdDoc()), actionCollection(), "file_new_movix_dvd"); - actionFileNewDvd = new KAction(i18n("New Data &DVD Project"), "datadvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDvdDoc()), + actionFileNewDvd = new TDEAction(i18n("New Data &DVD Project"), "datadvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDvdDoc()), actionCollection(), "file_new_dvd"); - actionFileNewVideoDvd = new KAction(i18n("New V&ideo DVD Project"), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVideoDvdDoc()), + actionFileNewVideoDvd = new TDEAction(i18n("New V&ideo DVD Project"), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVideoDvdDoc()), actionCollection(), "file_new_video_dvd"); - actionFileContinueMultisession = new KAction( i18n("Continue Multisession Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinueMultisession()), + actionFileContinueMultisession = new TDEAction( i18n("Continue Multisession Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinueMultisession()), actionCollection(), "file_continue_multisession" ); actionFileNewMenu->setDelayed( false ); actionFileNewMenu->insert( actionFileNewData ); actionFileNewMenu->insert( actionFileNewDvd ); actionFileNewMenu->insert( actionFileContinueMultisession ); - actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); actionFileNewMenu->insert( actionFileNewAudio ); - actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); actionFileNewMenu->insert( actionFileNewMixed ); - actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); actionFileNewMenu->insert( actionFileNewVcd ); actionFileNewMenu->insert( actionFileNewVideoDvd ); - actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); actionFileNewMenu->insert( actionFileNewMovix ); actionFileNewMenu->insert( actionFileNewMovixDvd ); @@ -271,53 +271,53 @@ void K3bMainWindow::initActions() - actionProjectAddFiles = new KAction( i18n("&Add Files..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectAddFiles()), + actionProjectAddFiles = new TDEAction( i18n("&Add Files..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectAddFiles()), actionCollection(), "project_add_files"); - KAction* actionClearProject = new KAction( i18n("&Clear Project"), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, + TDEAction* actionClearProject = new TDEAction( i18n("&Clear Project"), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(this), TQT_SLOT(slotClearProject()), actionCollection(), "project_clear_project" ); - actionViewDirTreeView = new KToggleAction(i18n("Show Directories"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowDirTreeView()), + actionViewDirTreeView = new TDEToggleAction(i18n("Show Directories"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowDirTreeView()), actionCollection(), "view_dir_tree"); - actionViewContentsView = new KToggleAction(i18n("Show Contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowContentsView()), + actionViewContentsView = new TDEToggleAction(i18n("Show Contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowContentsView()), actionCollection(), "view_contents"); - actionViewDocumentHeader = new KToggleAction(i18n("Show Document Header"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewDocumentHeader()), + actionViewDocumentHeader = new TDEToggleAction(i18n("Show Document Header"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewDocumentHeader()), actionCollection(), "view_document_header"); - actionToolsBlankCdrw = new KAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()), + actionToolsBlankCdrw = new TDEAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()), actionCollection(), "tools_blank_cdrw" ); - KAction* actionToolsFormatDVD = new KAction( i18n("&Format DVD%1RW...").arg("�"), "formatdvd", 0, TQT_TQOBJECT(this), + TDEAction* actionToolsFormatDVD = new TDEAction( i18n("&Format DVD%1RW...").arg("�"), "formatdvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" ); - actionToolsWriteCdImage = new KAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()), + actionToolsWriteCdImage = new TDEAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()), actionCollection(), "tools_write_cd_image" ); - KAction* actionToolsWriteDvdImage = new KAction(i18n("&Burn DVD ISO Image..."), "burn_dvdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteDvdIsoImage()), + TDEAction* actionToolsWriteDvdImage = new TDEAction(i18n("&Burn DVD ISO Image..."), "burn_dvdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteDvdIsoImage()), actionCollection(), "tools_write_dvd_iso" ); - actionCdCopy = new KAction(i18n("&Copy CD..."), "cdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCdCopy()), + actionCdCopy = new TDEAction(i18n("&Copy CD..."), "cdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCdCopy()), actionCollection(), "tools_copy_cd" ); - KAction* actionToolsDvdCopy = new KAction(i18n("Copy &DVD..."), "dvdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdCopy()), + TDEAction* actionToolsDvdCopy = new TDEAction(i18n("Copy &DVD..."), "dvdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdCopy()), actionCollection(), "tools_copy_dvd" ); - actionToolsCddaRip = new KAction( i18n("Rip Audio CD..."), "cddarip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCddaRip()), + actionToolsCddaRip = new TDEAction( i18n("Rip Audio CD..."), "cddarip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCddaRip()), actionCollection(), "tools_cdda_rip" ); - actionToolsVideoDvdRip = new KAction( i18n("Rip Video DVD..."), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoDvdRip()), + actionToolsVideoDvdRip = new TDEAction( i18n("Rip Video DVD..."), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoDvdRip()), actionCollection(), "tools_videodvd_rip" ); - actionToolsVideoCdRip = new KAction( i18n("Rip Video CD..."), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoCdRip()), + actionToolsVideoCdRip = new TDEAction( i18n("Rip Video CD..."), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoCdRip()), actionCollection(), "tools_videocd_rip" ); - (void)new KAction( i18n("System Check"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystem()), + (void)new TDEAction( i18n("System Check"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystem()), actionCollection(), "help_check_system" ); #ifdef HAVE_K3BSETUP - actionSettingsK3bSetup = new KAction(i18n("&Setup System Permissions..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotK3bSetup()), + actionSettingsK3bSetup = new TDEAction(i18n("&Setup System Permissions..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotK3bSetup()), actionCollection(), "settings_k3bsetup" ); #endif #ifdef K3B_DEBUG - (void)new KAction( "Test Media Selection ComboBox", 0, 0, TQT_TQOBJECT(this), + (void)new TDEAction( "Test Media Selection ComboBox", 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMediaSelectionTester()), actionCollection(), "test_media_selection" ); #endif @@ -456,7 +456,7 @@ void K3bMainWindow::initView() 0, 0, 0, actionCollection(), "quick_dir_selector" ); fileTreeComboAction->setAutoSized(true); - (void)new KAction( i18n("Go"), "key_enter", 0, TQT_TQOBJECT(m_fileTreeComboBox), TQT_SLOT(slotGoUrl()), actionCollection(), "go_url" ); + (void)new TDEAction( i18n("Go"), "key_enter", 0, TQT_TQOBJECT(m_fileTreeComboBox), TQT_SLOT(slotGoUrl()), actionCollection(), "go_url" ); // --------------------------------------------------------------------------------------------- } @@ -623,7 +623,7 @@ void K3bMainWindow::saveProperties( TDEConfig* c ) TQString saveDir = TDEGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); // FIXME: for some reason the config entries are not properly stored when using the default - // KMainWindow session config. Since I was not able to find the bug I use another config object + // TDEMainWindow session config. Since I was not able to find the bug I use another config object // ---------------------------------------------------------- c = new KSimpleConfig( saveDir + "list", false ); c->setGroup( "Saved Session" ); @@ -657,7 +657,7 @@ void K3bMainWindow::saveProperties( TDEConfig* c ) } // FIXME: for some reason the config entries are not properly stored when using the default - // KMainWindow session config. Since I was not able to find the bug I use another config object + // TDEMainWindow session config. Since I was not able to find the bug I use another config object // ---------------------------------------------------------- delete c; // ---------------------------------------------------------- @@ -678,7 +678,7 @@ void K3bMainWindow::readProperties( TDEConfig* c ) TQString saveDir = TDEGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); // FIXME: for some reason the config entries are not properly stored when using the default - // KMainWindow session config. Since I was not able to find the bug I use another config object + // TDEMainWindow session config. Since I was not able to find the bug I use another config object // ---------------------------------------------------------- c = new KSimpleConfig( saveDir + "list", true ); c->setGroup( "Saved Session" ); @@ -718,7 +718,7 @@ void K3bMainWindow::readProperties( TDEConfig* c ) TDEIO::del( KURL::fromPathOrURL(saveDir), false, false ); // FIXME: for some reason the config entries are not properly stored when using the default - // KMainWindow session config. Since I was not able to find the bug I use another config object + // TDEMainWindow session config. Since I was not able to find the bug I use another config object // ---------------------------------------------------------- delete c; // ---------------------------------------------------------- @@ -935,7 +935,7 @@ void K3bMainWindow::fileSaveAs( K3bDoc* doc ) KURL url = dlg.selectedURL(); if( url.isValid() ) { - KRecentDocument::add( url ); + TDERecentDocument::add( url ); bool exists = TDEIO::NetAccess::exists( url, false, 0 ); if( !exists || diff --git a/src/k3b.h b/src/k3b.h index a73b23d..a9ed38b 100644 --- a/src/k3b.h +++ b/src/k3b.h @@ -256,7 +256,7 @@ class K3bMainWindow : public KParts::DockMainWindow /** read general Options again and initialize all variables like the recent file list */ void readOptions(); - /** initializes the KActions of the application */ + /** initializes the TDEActions of the application */ void initActions(); /** sets up the statusbar for the main window by initialzing a statuslabel. @@ -271,41 +271,41 @@ class K3bMainWindow : public KParts::DockMainWindow /** The MDI-Interface is managed by this tabbed view */ K3bProjectTabWidget* m_documentTab; - // KAction pointers to enable/disable actions - KActionMenu* actionFileNewMenu; - KAction* actionFileNewAudio; - KAction* actionFileNewData; - KAction* actionFileNewMixed; - KAction* actionFileNewVcd; - KAction* actionFileNewMovix; - KAction* actionFileNewMovixDvd; - KAction* actionFileNewDvd; - KAction* actionFileNewVideoDvd; - KAction* actionFileContinueMultisession; - KAction* actionFileOpen; - KRecentFilesAction* actionFileOpenRecent; - KAction* actionFileSave; - KAction* actionFileSaveAs; - KAction* actionFileSaveAll; - KAction* actionFileClose; - KAction* actionFileCloseAll; - KAction* actionFileQuit; - KAction* actionSettingsConfigure; - KAction* actionSettingsK3bSetup; - KAction* actionToolsBlankCdrw; - KAction* actionToolsWriteCdImage; - KAction* actionToolsCddaRip; - KAction* actionToolsVideoDvdRip; - KAction* actionToolsVideoCdRip; - KAction* actionCdCopy; - KAction* actionProjectAddFiles; - KToggleAction* actionViewStatusBar; - KToggleAction* actionViewDirTreeView; - KToggleAction* actionViewContentsView; - KToggleAction* actionViewDocumentHeader; + // TDEAction pointers to enable/disable actions + TDEActionMenu* actionFileNewMenu; + TDEAction* actionFileNewAudio; + TDEAction* actionFileNewData; + TDEAction* actionFileNewMixed; + TDEAction* actionFileNewVcd; + TDEAction* actionFileNewMovix; + TDEAction* actionFileNewMovixDvd; + TDEAction* actionFileNewDvd; + TDEAction* actionFileNewVideoDvd; + TDEAction* actionFileContinueMultisession; + TDEAction* actionFileOpen; + TDERecentFilesAction* actionFileOpenRecent; + TDEAction* actionFileSave; + TDEAction* actionFileSaveAs; + TDEAction* actionFileSaveAll; + TDEAction* actionFileClose; + TDEAction* actionFileCloseAll; + TDEAction* actionFileQuit; + TDEAction* actionSettingsConfigure; + TDEAction* actionSettingsK3bSetup; + TDEAction* actionToolsBlankCdrw; + TDEAction* actionToolsWriteCdImage; + TDEAction* actionToolsCddaRip; + TDEAction* actionToolsVideoDvdRip; + TDEAction* actionToolsVideoCdRip; + TDEAction* actionCdCopy; + TDEAction* actionProjectAddFiles; + TDEToggleAction* actionViewStatusBar; + TDEToggleAction* actionViewDirTreeView; + TDEToggleAction* actionViewContentsView; + TDEToggleAction* actionViewDocumentHeader; // project actions - TQPtrList m_dataProjectActions; + TQPtrList m_dataProjectActions; KDockWidget* mainDock; KDockWidget* m_contentsDock; diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp index 4a9d346..04da69f 100644 --- a/src/k3bappdevicemanager.cpp +++ b/src/k3bappdevicemanager.cpp @@ -38,25 +38,25 @@ K3bAppDeviceManager::K3bAppDeviceManager( TQObject* parent, const char* name ) { // FIXME: should we pass the mainwindow as watch window here? // Is there a proper way to insert this actioncollection into the mainwindow's? - m_actionCollection = new KActionCollection( this ); + m_actionCollection = new TDEActionCollection( this ); // setup actions - KActionMenu* devicePopupMenu = new KActionMenu( m_actionCollection, "device_popup" ); - m_actionDiskInfo = new KAction( i18n("Media &Info"), "info", 0, this, TQT_SLOT(diskInfo()), + TDEActionMenu* devicePopupMenu = new TDEActionMenu( m_actionCollection, "device_popup" ); + m_actionDiskInfo = new TDEAction( i18n("Media &Info"), "info", 0, this, TQT_SLOT(diskInfo()), m_actionCollection, "device_diskinfo"); - m_actionUnmount = new KAction( i18n("&Unmount"), "cdrom_unmount", 0, this, TQT_SLOT(unmountDisk()), + m_actionUnmount = new TDEAction( i18n("&Unmount"), "cdrom_unmount", 0, this, TQT_SLOT(unmountDisk()), m_actionCollection, "device_unmount"); - m_actionMount = new KAction( i18n("&Mount"), "cdrom_mount", 0, this, TQT_SLOT(mountDisk()), + m_actionMount = new TDEAction( i18n("&Mount"), "cdrom_mount", 0, this, TQT_SLOT(mountDisk()), m_actionCollection, "device_mount"); - m_actionEject = new KAction( i18n("&Eject"), "", 0, this, TQT_SLOT(ejectDisk()), + m_actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQT_SLOT(ejectDisk()), m_actionCollection, "device_eject"); - m_actionLoad = new KAction( i18n("L&oad"), "", 0, this, TQT_SLOT(loadDisk()), + m_actionLoad = new TDEAction( i18n("L&oad"), "", 0, this, TQT_SLOT(loadDisk()), m_actionCollection, "device_load"); -// KAction* actionUnlock = new KAction( i18n("Un&lock"), "", 0, this, TQT_SLOT(unlockDevice()), +// TDEAction* actionUnlock = new TDEAction( i18n("Un&lock"), "", 0, this, TQT_SLOT(unlockDevice()), // m_actionCollection, "device_unlock" ); -// KAction* actionlock = new KAction( i18n("Loc&k"), "", 0, this, TQT_SLOT(lockDevice()), +// TDEAction* actionlock = new TDEAction( i18n("Loc&k"), "", 0, this, TQT_SLOT(lockDevice()), // m_actionCollection, "device_lock" ); - m_actionSetReadSpeed = new KAction( i18n("Set Read Speed..."), "", 0, this, TQT_SLOT(setReadSpeed()), + m_actionSetReadSpeed = new TDEAction( i18n("Set Read Speed..."), "", 0, this, TQT_SLOT(setReadSpeed()), m_actionCollection, "device_set_read_speed" ); m_actionDiskInfo->setToolTip( i18n("Display generic medium information") ); @@ -67,16 +67,16 @@ K3bAppDeviceManager::K3bAppDeviceManager( TQObject* parent, const char* name ) m_actionSetReadSpeed->setToolTip( i18n("Force the drive's read speed") ); devicePopupMenu->insert( m_actionDiskInfo ); - devicePopupMenu->insert( new KActionSeparator( this ) ); + devicePopupMenu->insert( new TDEActionSeparator( this ) ); devicePopupMenu->insert( m_actionUnmount ); devicePopupMenu->insert( m_actionMount ); - devicePopupMenu->insert( new KActionSeparator( this ) ); + devicePopupMenu->insert( new TDEActionSeparator( this ) ); devicePopupMenu->insert( m_actionEject ); devicePopupMenu->insert( m_actionLoad ); -// devicePopupMenu->insert( new KActionSeparator( this ) ); +// devicePopupMenu->insert( new TDEActionSeparator( this ) ); // devicePopupMenu->insert( actionUnlock ); // devicePopupMenu->insert( actionlock ); - devicePopupMenu->insert( new KActionSeparator( this ) ); + devicePopupMenu->insert( new TDEActionSeparator( this ) ); devicePopupMenu->insert( m_actionSetReadSpeed ); setCurrentDevice( 0 ); diff --git a/src/k3bappdevicemanager.h b/src/k3bappdevicemanager.h index 78d6f99..19d7aa3 100644 --- a/src/k3bappdevicemanager.h +++ b/src/k3bappdevicemanager.h @@ -16,8 +16,8 @@ #ifndef _K3B_APP_DEVICE_MANAGER_H_ #define _K3B_APP_DEVICE_MANAGER_H_ -class KActionCollection; -class KAction; +class TDEActionCollection; +class TDEAction; class K3bMediaCache; namespace K3bDevice { @@ -47,7 +47,7 @@ class K3bAppDeviceManager : public K3bDevice::DeviceManager ~K3bAppDeviceManager(); K3bDevice::Device* currentDevice() const; - KActionCollection* actionCollection() const { return m_actionCollection; } + TDEActionCollection* actionCollection() const { return m_actionCollection; } void setMediaCache( K3bMediaCache* c ); signals: @@ -103,15 +103,15 @@ class K3bAppDeviceManager : public K3bDevice::DeviceManager void slotMediumChanged( K3bDevice::Device* dev ); private: - KAction* m_actionDiskInfo; - KAction* m_actionUnmount; - KAction* m_actionMount; - KAction* m_actionEject; - KAction* m_actionLoad; - KAction* m_actionSetReadSpeed; + TDEAction* m_actionDiskInfo; + TDEAction* m_actionUnmount; + TDEAction* m_actionMount; + TDEAction* m_actionEject; + TDEAction* m_actionLoad; + TDEAction* m_actionSetReadSpeed; mutable K3bDevice::Device* m_currentDevice; - KActionCollection* m_actionCollection; + TDEActionCollection* m_actionCollection; K3bDevice::DiskInfoDetector* m_diskInfoDetector; bool m_ejectRequested; diff --git a/src/k3baudioplayer.cpp b/src/k3baudioplayer.cpp index a44a368..74b8c15 100644 --- a/src/k3baudioplayer.cpp +++ b/src/k3baudioplayer.cpp @@ -50,7 +50,7 @@ using namespace std; K3bPlayListViewItem::K3bPlayListViewItem( const TQString& filename, TQListView* parent ) - : KListViewItem( parent ), m_filename( filename ) + : TDEListViewItem( parent ), m_filename( filename ) { m_length = 0; m_bActive = false; @@ -58,7 +58,7 @@ K3bPlayListViewItem::K3bPlayListViewItem( const TQString& filename, TQListView* K3bPlayListViewItem::K3bPlayListViewItem( const TQString& filename, TQListView* parent, TQListViewItem* after ) - : KListViewItem( parent, after ), m_filename( filename ) + : TDEListViewItem( parent, after ), m_filename( filename ) { m_length = 0; m_bActive = false; @@ -103,15 +103,15 @@ void K3bPlayListViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int c newCg.setColor( TQColorGroup::Highlight, red ); newCg.setColor( TQColorGroup::HighlightedText, white ); - KListViewItem::paintCell( p, newCg, c, w, a ); + TDEListViewItem::paintCell( p, newCg, c, w, a ); } else - KListViewItem::paintCell( p, cg, c, w, a ); + TDEListViewItem::paintCell( p, cg, c, w, a ); } K3bPlayListView::K3bPlayListView( TQWidget* parent, const char* name ) - : KListView( parent, name ) + : TDEListView( parent, name ) { addColumn( i18n("Filename") ); addColumn( i18n("Length") ); @@ -132,8 +132,8 @@ K3bPlayListView::~K3bPlayListView() bool K3bPlayListView::acceptDrag( TQDropEvent* e ) const { - // we accept textdrag (urls) and moved items (supported by KListView) - return KURLDrag::canDecode(e) || KListView::acceptDrag(e); + // we accept textdrag (urls) and moved items (supported by TDEListView) + return KURLDrag::canDecode(e) || TDEListView::acceptDrag(e); } @@ -222,14 +222,14 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name ) // actions // ------------------------------------------------------------------------ - m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", + m_actionRemove = new TDEAction( i18n( "Remove" ), "editdelete", Key_Delete, this, TQT_SLOT(slotRemoveSelected()), this, "audioplayer_remove" ); - m_actionClear = new KAction( i18n( "Clear List" ), "editclear", + m_actionClear = new TDEAction( i18n( "Clear List" ), "editclear", 0, this, TQT_SLOT(clear()), this, "audioplayer_clear" ); - m_contextMenu = new KActionMenu( this, "audio_player_menu" ); + m_contextMenu = new TDEActionMenu( this, "audio_player_menu" ); m_contextMenu->insert(m_actionRemove); m_contextMenu->insert(m_actionClear); // ------------------------------------------------------------------------ @@ -237,8 +237,8 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name ) // connections // ------------------------------------------------------------------------ - connect( m_viewPlayList, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotShowContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( m_viewPlayList, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); connect( m_buttonPlay, TQT_SIGNAL(clicked()), this, TQT_SLOT(play()) ); connect( m_buttonStop, TQT_SIGNAL(clicked()), this, TQT_SLOT(stop()) ); @@ -649,7 +649,7 @@ void K3bAudioPlayer::slotRemoveSelected() } -void K3bAudioPlayer::slotShowContextMenu( KListView*, TQListViewItem* item, const TQPoint& p ) +void K3bAudioPlayer::slotShowContextMenu( TDEListView*, TQListViewItem* item, const TQPoint& p ) { if( item ) m_actionRemove->setEnabled( true ); diff --git a/src/k3baudioplayer.h b/src/k3baudioplayer.h index ae10638..387aa53 100644 --- a/src/k3baudioplayer.h +++ b/src/k3baudioplayer.h @@ -34,15 +34,15 @@ class TQPainter; class TQColorGroup; class TQDropEvent; class TQDragObject; -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; /** * Special ListViewItem for the K3bAudioPlayer playlist * @author Sebastian Trueg */ -class K3bPlayListViewItem : public KListViewItem +class K3bPlayListViewItem : public TDEListViewItem { public: K3bPlayListViewItem( const TQString&, TQListView* parent ); @@ -82,7 +82,7 @@ class K3bPlayListViewItem : public KListViewItem * Playlistview just needed to accept * url drags */ -class K3bPlayListView : public KListView +class K3bPlayListView : public TDEListView { Q_OBJECT @@ -172,7 +172,7 @@ Q_OBJECT */ void setCurrentItem( TQListViewItem* item ); void slotRemoveSelected(); - void slotShowContextMenu( KListView*, TQListViewItem* item, const TQPoint& p ); + void slotShowContextMenu( TDEListView*, TQListViewItem* item, const TQPoint& p ); private: #ifdef WITH_ARTS @@ -201,9 +201,9 @@ Q_OBJECT bool m_bLengthReady; - KAction* m_actionRemove; - KAction* m_actionClear; - KActionMenu* m_contextMenu; + TDEAction* m_actionRemove; + TDEAction* m_actionClear; + TDEActionMenu* m_contextMenu; }; diff --git a/src/k3bdiroperator.cpp b/src/k3bdiroperator.cpp index acf42dc..16893ff 100644 --- a/src/k3bdiroperator.cpp +++ b/src/k3bdiroperator.cpp @@ -39,7 +39,7 @@ K3bDirOperator::K3bDirOperator(const KURL& url, TQWidget* parent, const char* na // disable the del-key since we still have a focus problem and users keep // deleting files when they want to remove project entries - KAction* aDelete = actionCollection()->action("delete"); + TDEAction* aDelete = actionCollection()->action("delete"); if( aDelete ) aDelete->setShortcut( 0 ); @@ -49,10 +49,10 @@ K3bDirOperator::K3bDirOperator(const KURL& url, TQWidget* parent, const char* na bmMan->setUpdate( true ); bmMan->setShowNSBookmarks( false ); - m_bmPopup = new KActionMenu( i18n("Bookmarks"), "bookmark", TQT_TQOBJECT(this), "bookmarks" ); + m_bmPopup = new TDEActionMenu( i18n("Bookmarks"), "bookmark", TQT_TQOBJECT(this), "bookmarks" ); m_bmMenu = new KBookmarkMenu( bmMan, this, m_bmPopup->popupMenu(), actionCollection(), true ); - (void)new KAction( i18n("&Add to Project"), SHIFT+Key_Return, + (void)new TDEAction( i18n("&Add to Project"), SHIFT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotAddFilesToProject()), actionCollection(), "add_file_to_project"); } @@ -130,12 +130,12 @@ void K3bDirOperator::activatedMenu( const KFileItem*, const TQPoint& pos ) updateSelectionDependentActions(); // insert our own actions - KActionMenu* dirOpMenu = (KActionMenu*)actionCollection()->action("popupMenu"); - dirOpMenu->insert( new KActionSeparator( actionCollection() ) ); + TDEActionMenu* dirOpMenu = (TDEActionMenu*)actionCollection()->action("popupMenu"); + dirOpMenu->insert( new TDEActionSeparator( actionCollection() ) ); dirOpMenu->insert( m_bmPopup ); dirOpMenu->insert( actionCollection()->action("add_file_to_project"), 0 ); - dirOpMenu->insert( new KActionSeparator( actionCollection() ), 1 ); + dirOpMenu->insert( new TDEActionSeparator( actionCollection() ), 1 ); bool hasSelection = view() && view()->selectedItems() && !view()->selectedItems()->isEmpty(); diff --git a/src/k3bdiroperator.h b/src/k3bdiroperator.h index 8d16e27..db6254b 100644 --- a/src/k3bdiroperator.h +++ b/src/k3bdiroperator.h @@ -23,7 +23,7 @@ class TQIconViewItem; class TQListViewItem; class KBookmarkMenu; -class KActionMenu; +class TDEActionMenu; @@ -64,7 +64,7 @@ class K3bDirOperator : public KDirOperator, public KBookmarkOwner */ TQString currentURL() const; - KActionMenu* bookmarkMenu() const { return m_bmPopup; } + TDEActionMenu* bookmarkMenu() const { return m_bmPopup; } public slots: void slotAddFilesToProject(); @@ -77,7 +77,7 @@ class K3bDirOperator : public KDirOperator, public KBookmarkOwner private: KBookmarkMenu* m_bmMenu; - KActionMenu* m_bmPopup; + TDEActionMenu* m_bmPopup; }; #endif diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp index fe74f45..5b57939 100644 --- a/src/k3bdirview.cpp +++ b/src/k3bdirview.cpp @@ -325,8 +325,8 @@ void K3bDirView::slotUnmountFinished( bool success ) void K3bDirView::slotFileTreeContextMenu( K3bDevice::Device* /*dev*/, const TQPoint& p ) { - KAction* a = k3bappcore->appDeviceManager()->actionCollection()->action( "device_popup" ); - if( KActionMenu* m = dynamic_cast(a) ) + TDEAction* a = k3bappcore->appDeviceManager()->actionCollection()->action( "device_popup" ); + if( TDEActionMenu* m = dynamic_cast(a) ) m->popup( p ); } diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp index fd37b08..397e309 100644 --- a/src/k3bdiskinfoview.cpp +++ b/src/k3bdiskinfoview.cpp @@ -48,55 +48,55 @@ // FIXME: use K3bListViewItem instead -class K3bDiskInfoView::HeaderViewItem : public KListViewItem +class K3bDiskInfoView::HeaderViewItem : public TDEListViewItem { public: HeaderViewItem( TQListView* parent ) - : KListViewItem( parent ) {} + : TDEListViewItem( parent ) {} HeaderViewItem( TQListViewItem* parent ) - : KListViewItem( parent ) {} + : TDEListViewItem( parent ) {} HeaderViewItem( TQListView* parent, TQListViewItem* after ) - : KListViewItem( parent, after ) {} + : TDEListViewItem( parent, after ) {} HeaderViewItem( TQListViewItem* parent, TQListViewItem* after ) - : KListViewItem( parent, after ) {} + : TDEListViewItem( parent, after ) {} HeaderViewItem( TQListView* parent, const TQString& t1 ) - : KListViewItem( parent, t1 ) {} + : TDEListViewItem( parent, t1 ) {} HeaderViewItem( TQListViewItem* parent, const TQString& t1 ) - : KListViewItem( parent, t1 ) {} + : TDEListViewItem( parent, t1 ) {} HeaderViewItem( TQListView* parent, TQListViewItem* after, const TQString& t1 ) - : KListViewItem( parent, after, t1 ) {} + : TDEListViewItem( parent, after, t1 ) {} HeaderViewItem( TQListViewItem* parent, TQListViewItem* after, const TQString& t1 ) - : KListViewItem( parent, after, t1 ) {} + : TDEListViewItem( parent, after, t1 ) {} void paintCell( TQPainter* p, const TQColorGroup & cg, int column, int width, int align ) { TQFont f ( p->font() ); f.setBold( true ); p->setFont( f ); - KListViewItem::paintCell( p, cg, column, width, align ); + TDEListViewItem::paintCell( p, cg, column, width, align ); } }; -class K3bDiskInfoView::TwoColumnViewItem : public KListViewItem +class K3bDiskInfoView::TwoColumnViewItem : public TDEListViewItem { public: TwoColumnViewItem( TQListView* parent ) - : KListViewItem( parent ) {} + : TDEListViewItem( parent ) {} TwoColumnViewItem( TQListViewItem* parent ) - : KListViewItem( parent ) {} + : TDEListViewItem( parent ) {} TwoColumnViewItem( TQListView* parent, TQListViewItem* after ) - : KListViewItem( parent, after ) {} + : TDEListViewItem( parent, after ) {} TwoColumnViewItem( TQListViewItem* parent, TQListViewItem* after ) - : KListViewItem( parent, after ) {} + : TDEListViewItem( parent, after ) {} TwoColumnViewItem( TQListView* parent, const TQString& t1 ) - : KListViewItem( parent, t1 ) {} + : TDEListViewItem( parent, t1 ) {} TwoColumnViewItem( TQListViewItem* parent, const TQString& t1 ) - : KListViewItem( parent, t1 ) {} + : TDEListViewItem( parent, t1 ) {} TwoColumnViewItem( TQListView* parent, TQListViewItem* after, const TQString& t1 ) - : KListViewItem( parent, after, t1 ) {} + : TDEListViewItem( parent, after, t1 ) {} TwoColumnViewItem( TQListViewItem* parent, TQListViewItem* after, const TQString& t1 ) - : KListViewItem( parent, after, t1 ) {} + : TDEListViewItem( parent, after, t1 ) {} void paintCell( TQPainter* p, const TQColorGroup & cg, int column, int width, int align ) { @@ -116,9 +116,9 @@ public: // p->setClipRect( r ); p->setClipping( false ); - KListViewItem::paintCell( p, cg, column, newWidth, align ); + TDEListViewItem::paintCell( p, cg, column, newWidth, align ); } else if( column == 0 ) - KListViewItem::paintCell( p, cg, column, width, align ); + TDEListViewItem::paintCell( p, cg, column, width, align ); } }; @@ -131,13 +131,13 @@ K3bDiskInfoView::K3bDiskInfoView( TQWidget* parent, const char* name ) K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_COMPLETE|K3bDevice::STATE_UNKNOWN, parent, name ) { - m_infoView = new KListView( this ); + m_infoView = new TDEListView( this ); setMainWidget( m_infoView ); m_infoView->setSorting( -1 ); m_infoView->setAllColumnsShowFocus( true ); m_infoView->setSelectionMode( TQListView::NoSelection ); - m_infoView->setResizeMode( KListView::AllColumns ); + m_infoView->setResizeMode( TDEListView::AllColumns ); m_infoView->setAlternateBackground( TQColor() ); m_infoView->addColumn( "1" ); @@ -202,7 +202,7 @@ void K3bDiskInfoView::reloadMedium() // iso9660 info // ///////////////////////////////////////////////////////////////////////////////////// if( medium().content() & K3bMedium::CONTENT_DATA ) { - (void)new KListViewItem( m_infoView, m_infoView->lastChild() ); // empty spacer item + (void)new TDEListViewItem( m_infoView, m_infoView->lastChild() ); // empty spacer item createIso9660InfoItems( medium().iso9660Descriptor() ); } @@ -211,12 +211,12 @@ void K3bDiskInfoView::reloadMedium() if( !medium().toc().isEmpty() ) { if( m_infoView->childCount() ) - (void)new KListViewItem( m_infoView, m_infoView->lastChild() ); // empty spacer item + (void)new TDEListViewItem( m_infoView, m_infoView->lastChild() ); // empty spacer item - KListViewItem* trackHeaderItem = new HeaderViewItem( m_infoView, m_infoView->lastChild(), i18n("Tracks") ); + TDEListViewItem* trackHeaderItem = new HeaderViewItem( m_infoView, m_infoView->lastChild(), i18n("Tracks") ); // create header item - KListViewItem* item = new KListViewItem( trackHeaderItem, + TDEListViewItem* item = new TDEListViewItem( trackHeaderItem, i18n("Type"), i18n("Attributes"), i18n("First-Last Sector"), @@ -229,7 +229,7 @@ void K3bDiskInfoView::reloadMedium() int lastSession = 0; // if we have multiple sessions we create a header item for every session - KListViewItem* trackItem = 0; + TDEListViewItem* trackItem = 0; if( medium().diskInfo().numSessions() > 1 && medium().toc()[0].session() > 0 ) { trackItem = new HeaderViewItem( trackHeaderItem, item, i18n("Session %1").arg(1) ); lastSession = 1; @@ -251,7 +251,7 @@ void K3bDiskInfoView::reloadMedium() i18n("Session %1").arg(lastSession) ); } - item = new KListViewItem( trackItem, item ); + item = new TDEListViewItem( trackItem, item ); TQString text; if( track.type() == K3bTrack::AUDIO ) { item->setPixmap( 0, SmallIcon( "sound" ) ); @@ -298,19 +298,19 @@ void K3bDiskInfoView::reloadMedium() if( !medium().cdText().isEmpty() ) { medium().cdText().debug(); if( m_infoView->childCount() ) - (void)new KListViewItem( m_infoView, m_infoView->lastChild() ); // empty spacer item + (void)new TDEListViewItem( m_infoView, m_infoView->lastChild() ); // empty spacer item - KListViewItem* cdTextHeaderItem = new HeaderViewItem( m_infoView, + TDEListViewItem* cdTextHeaderItem = new HeaderViewItem( m_infoView, m_infoView->lastChild(), i18n("CD-TEXT (excerpt)") ); // create header item - KListViewItem* item = new KListViewItem( cdTextHeaderItem, + TDEListViewItem* item = new TDEListViewItem( cdTextHeaderItem, i18n("Performer"), i18n("Title"), i18n("Songwriter"), i18n("Composer") ); - item = new KListViewItem( cdTextHeaderItem, item ); + item = new TDEListViewItem( cdTextHeaderItem, item ); item->setText( 0, i18n("CD:") + " " + medium().cdText().performer() ); item->setText( 1, medium().cdText().title() ); @@ -319,7 +319,7 @@ void K3bDiskInfoView::reloadMedium() int index = 1; for( unsigned int i = 0; i < medium().cdText().count(); ++i ) { - item = new KListViewItem( cdTextHeaderItem, item ); + item = new TDEListViewItem( cdTextHeaderItem, item ); item->setText( 0, TQString::number(index).rightJustify( 2, ' ' ) + " " + medium().cdText().at(i).performer() ); item->setText( 1, medium().cdText().at(i).title() ); @@ -338,57 +338,57 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium ) { const K3bDevice::DiskInfo& info = medium.diskInfo(); - KListViewItem* atipItem = new HeaderViewItem( m_infoView, m_infoView->lastItem(), i18n("Medium") ); + TDEListViewItem* atipItem = new HeaderViewItem( m_infoView, m_infoView->lastItem(), i18n("Medium") ); TQString typeStr; if( info.mediaType() != K3bDevice::MEDIA_UNKNOWN ) typeStr = K3bDevice::mediaTypeString( info.mediaType() ); else typeStr = i18n("Unknown (probably CD-ROM)"); - KListViewItem* atipChild = new KListViewItem( atipItem, i18n("Type:"), typeStr ); + TDEListViewItem* atipChild = new TDEListViewItem( atipItem, i18n("Type:"), typeStr ); if( info.isDvdMedia() ) - atipChild = new KListViewItem( atipItem, atipChild, + atipChild = new TDEListViewItem( atipItem, atipChild, i18n("Media ID:"), !info.mediaId().isEmpty() ? TQString::fromLatin1( info.mediaId() ) : i18n("unknown") ); - atipChild = new KListViewItem( atipItem, atipChild, + atipChild = new TDEListViewItem( atipItem, atipChild, i18n("Capacity:"), i18n("%1 min").arg(info.capacity().toString()), TDEIO::convertSize(info.capacity().mode1Bytes()) ); if( !info.empty() ) - atipChild = new KListViewItem( atipItem, atipChild, + atipChild = new TDEListViewItem( atipItem, atipChild, i18n("Used Capacity:"), i18n("%1 min").arg(info.size().toString()), TDEIO::convertSize(info.size().mode1Bytes()) ); if( info.appendable() ) - atipChild = new KListViewItem( atipItem, atipChild, + atipChild = new TDEListViewItem( atipItem, atipChild, i18n("Remaining:"), i18n("%1 min").arg( info.remainingSize().toString() ), TDEIO::convertSize(info.remainingSize().mode1Bytes()) ); - atipChild = new KListViewItem( atipItem, atipChild, + atipChild = new TDEListViewItem( atipItem, atipChild, i18n("Rewritable:"), info.rewritable() ? i18n("yes") : i18n("no") ); - atipChild = new KListViewItem( atipItem, atipChild, + atipChild = new TDEListViewItem( atipItem, atipChild, i18n("Appendable:"), info.appendable() ? i18n("yes") : i18n("no") ); - atipChild = new KListViewItem( atipItem, atipChild, + atipChild = new TDEListViewItem( atipItem, atipChild, i18n("Empty:"), info.empty() ? i18n("yes") : i18n("no") ); if( info.isDvdMedia() ) - atipChild = new KListViewItem( atipItem, atipChild, + atipChild = new TDEListViewItem( atipItem, atipChild, i18n("Layers:"), TQString::number( info.numLayers() ) ); if( info.mediaType() == K3bDevice::MEDIA_DVD_PLUS_RW ) { - atipChild = new KListViewItem( atipItem, atipChild, + atipChild = new TDEListViewItem( atipItem, atipChild, i18n("Background Format:") ); switch( info.bgFormatState() ) { case K3bDevice::BG_FORMAT_NONE: @@ -406,12 +406,12 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium ) } } - atipChild = new KListViewItem( atipItem, atipChild, + atipChild = new TDEListViewItem( atipItem, atipChild, i18n("Sessions:"), TQString::number( info.numSessions() ) ); if( info.mediaType() & K3bDevice::MEDIA_WRITABLE ) { - atipChild = new KListViewItem( atipItem, atipChild, + atipChild = new TDEListViewItem( atipItem, atipChild, i18n("Supported writing speeds:") ); TQString s; if( medium.writingSpeeds().isEmpty() ) @@ -439,41 +439,41 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium ) void K3bDiskInfoView::createIso9660InfoItems( const K3bIso9660SimplePrimaryDescriptor& iso ) { - KListViewItem* iso9660Item = new HeaderViewItem( m_infoView, m_infoView->lastChild(), + TDEListViewItem* iso9660Item = new HeaderViewItem( m_infoView, m_infoView->lastChild(), i18n("ISO9660 Filesystem Info") ); - KListViewItem* iso9660Child = 0; + TDEListViewItem* iso9660Child = 0; - iso9660Child = new KListViewItem( iso9660Item, iso9660Child, + iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child, i18n("System Id:"), iso.systemId.isEmpty() ? TQString("-") : iso.systemId ); - iso9660Child = new KListViewItem( iso9660Item, iso9660Child, + iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child, i18n("Volume Id:"), iso.volumeId.isEmpty() ? TQString("-") : iso.volumeId ); - iso9660Child = new KListViewItem( iso9660Item, iso9660Child, + iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child, i18n("Volume Set Id:"), iso.volumeSetId.isEmpty() ? TQString("-") : iso.volumeSetId ); - iso9660Child = new KListViewItem( iso9660Item, iso9660Child, + iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child, i18n("Publisher Id:"), iso.publisherId.isEmpty() ? TQString("-") : iso.publisherId ); - iso9660Child = new KListViewItem( iso9660Item, iso9660Child, + iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child, i18n("Preparer Id:"), iso.preparerId.isEmpty() ? TQString("-") : iso.preparerId ); - iso9660Child = new KListViewItem( iso9660Item, iso9660Child, + iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child, i18n("Application Id:"), iso.applicationId.isEmpty() ? TQString("-") : iso.applicationId ); -// iso9660Child = new KListViewItem( iso9660Item, iso9660Child, +// iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child, // i18n("Volume Size:"), // TQString( "%1 (%2*%3)" ) // .arg(iso.logicalBlockSize diff --git a/src/k3bdiskinfoview.h b/src/k3bdiskinfoview.h index c78db9f..fb45fac 100644 --- a/src/k3bdiskinfoview.h +++ b/src/k3bdiskinfoview.h @@ -22,7 +22,7 @@ #include "k3bmedium.h" class TQLabel; -class KListView; +class TDEListView; class K3bIso9660; namespace K3bDevice { @@ -47,7 +47,7 @@ class K3bDiskInfoView : public K3bMediaContentsView void createMediaInfoItems( const K3bMedium& ); void createIso9660InfoItems( const K3bIso9660SimplePrimaryDescriptor& ); - KListView* m_infoView; + TDEListView* m_infoView; class HeaderViewItem; class TwoColumnViewItem; diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp index d6dfe91..23d6ac2 100644 --- a/src/k3bfiletreeview.cpp +++ b/src/k3bfiletreeview.cpp @@ -415,8 +415,8 @@ K3bFileTreeView::K3bFileTreeView( TQWidget *parent, const char *name ) connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem* , const TQPoint& )), - this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem* , const TQPoint& )) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem* , const TQPoint& )), + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem* , const TQPoint& )) ); // we always simulate the single click slotSettingsChangedK3b(TDEApplication::SETTINGS_MOUSE); @@ -444,20 +444,20 @@ void K3bFileTreeView::clear() void K3bFileTreeView::initActions() { -// m_actionCollection = new KActionCollection( this ); +// m_actionCollection = new TDEActionCollection( this ); -// m_devicePopupMenu = new KActionMenu( m_actionCollection, "device_popup_menu" ); -// m_urlPopupMenu = new KActionMenu( m_actionCollection, "url_popup_menu" ); +// m_devicePopupMenu = new TDEActionMenu( m_actionCollection, "device_popup_menu" ); +// m_urlPopupMenu = new TDEActionMenu( m_actionCollection, "url_popup_menu" ); -// KAction* actionDiskInfo = new KAction( i18n("&Disk Info"), "info", 0, this, TQT_SLOT(slotShowDiskInfo()), +// TDEAction* actionDiskInfo = new TDEAction( i18n("&Disk Info"), "info", 0, this, TQT_SLOT(slotShowDiskInfo()), // m_actionCollection, "disk_info"); -// KAction* actionUnmount = new KAction( i18n("&Unmount"), "cdrom_unmount", 0, this, TQT_SLOT(slotUnmountDisk()), +// TDEAction* actionUnmount = new TDEAction( i18n("&Unmount"), "cdrom_unmount", 0, this, TQT_SLOT(slotUnmountDisk()), // m_actionCollection, "disk_unmount"); -// KAction* actionEject = new KAction( i18n("&Eject"), "", 0, this, TQT_SLOT(slotEjectDisk()), +// TDEAction* actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQT_SLOT(slotEjectDisk()), // m_actionCollection, "disk_eject"); // m_devicePopupMenu->insert( actionDiskInfo ); -// m_devicePopupMenu->insert( new KActionSeparator( this ) ); +// m_devicePopupMenu->insert( new TDEActionSeparator( this ) ); // m_devicePopupMenu->insert( actionUnmount ); // m_devicePopupMenu->insert( actionEject ); @@ -612,7 +612,7 @@ void K3bFileTreeView::followUrl( const KURL& url ) } -void K3bFileTreeView::slotContextMenu( KListView*, TQListViewItem* item, const TQPoint& p ) +void K3bFileTreeView::slotContextMenu( TDEListView*, TQListViewItem* item, const TQPoint& p ) { KFileTreeViewItem* treeItem = dynamic_cast(item); if( treeItem ) { diff --git a/src/k3bfiletreeview.h b/src/k3bfiletreeview.h index a86a84e..371f2df 100644 --- a/src/k3bfiletreeview.h +++ b/src/k3bfiletreeview.h @@ -21,8 +21,8 @@ #include class KFileTreeBranch; -class KActionCollection; -class KActionMenu; +class TDEActionCollection; +class TDEActionMenu; class TQPoint; class TQDropEvent; class TQDragEnterEvent; @@ -181,7 +181,7 @@ class K3bFileTreeView : public KFileTreeView private slots: void slotItemExecuted( TQListViewItem* item ); - void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ); + void slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ); void slotSettingsChangedK3b(int category); void slotMouseButtonClickedK3b( int btn, TQListViewItem *item, const TQPoint &pos, int c ); @@ -192,9 +192,9 @@ class K3bFileTreeView : public KFileTreeView Private* d; bool m_dirOnlyMode; - KActionCollection* m_actionCollection; - KActionMenu* m_devicePopupMenu; - KActionMenu* m_urlPopupMenu; + TDEActionCollection* m_actionCollection; + TDEActionMenu* m_devicePopupMenu; + TDEActionMenu* m_urlPopupMenu; bool m_menuEnabled; }; diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp index 314294a..b38b994 100644 --- a/src/k3bfileview.cpp +++ b/src/k3bfileview.cpp @@ -55,7 +55,7 @@ K3bFileView::~K3bFileView() } -KActionCollection* K3bFileView::actionCollection() const +TDEActionCollection* K3bFileView::actionCollection() const { return m_dirOp->actionCollection(); } @@ -74,10 +74,10 @@ void K3bFileView::setupGUI() layout->setStretchFactor( m_dirOp, 1 ); // setup actions - KAction* actionHome = m_dirOp->actionCollection()->action("home"); - KAction* actionBack = m_dirOp->actionCollection()->action("back"); - KAction* actionUp = m_dirOp->actionCollection()->action("up"); - KAction* actionReload = m_dirOp->actionCollection()->action("reload"); + TDEAction* actionHome = m_dirOp->actionCollection()->action("home"); + TDEAction* actionBack = m_dirOp->actionCollection()->action("back"); + TDEAction* actionUp = m_dirOp->actionCollection()->action("up"); + TDEAction* actionReload = m_dirOp->actionCollection()->action("reload"); m_toolBox->addButton( actionUp ); m_toolBox->addButton( actionBack ); diff --git a/src/k3bfileview.h b/src/k3bfileview.h index 761191c..c0d4bd8 100644 --- a/src/k3bfileview.h +++ b/src/k3bfileview.h @@ -26,7 +26,7 @@ class TQDragObject; class KURL; class KFileFilterCombo; class KFileItem; -class KActionCollection; +class TDEActionCollection; class TDEConfig; class K3bToolBox; @@ -46,7 +46,7 @@ class K3bFileView : public K3bContentsView void setUrl( const KURL &url, bool forward = true ); KURL url(); - KActionCollection* actionCollection() const; + TDEActionCollection* actionCollection() const; void reload(); diff --git a/src/k3bflatbutton.cpp b/src/k3bflatbutton.cpp index e46c0b3..b574b0f 100644 --- a/src/k3bflatbutton.cpp +++ b/src/k3bflatbutton.cpp @@ -44,7 +44,7 @@ K3bFlatButton::K3bFlatButton( const TQString& text, TQWidget *parent, const char } -K3bFlatButton::K3bFlatButton( KAction* a, TQWidget *parent, const char *name ) +K3bFlatButton::K3bFlatButton( TDEAction* a, TQWidget *parent, const char *name ) : TQFrame( parent, name/*, WNoAutoErase*/ ), m_pressed(false) { diff --git a/src/k3bflatbutton.h b/src/k3bflatbutton.h index 9645213..4de1f9d 100644 --- a/src/k3bflatbutton.h +++ b/src/k3bflatbutton.h @@ -23,7 +23,7 @@ class TQEvent; class TQMouseEvent; class TQPainter; -class KAction; +class TDEAction; /** @@ -37,7 +37,7 @@ class K3bFlatButton : public TQFrame public: K3bFlatButton( TQWidget *parent = 0, const char *name = 0 ); K3bFlatButton( const TQString& text, TQWidget *parent = 0, const char *name = 0 ); - K3bFlatButton( KAction*, TQWidget *parent = 0, const char *name = 0 ); + K3bFlatButton( TDEAction*, TQWidget *parent = 0, const char *name = 0 ); ~K3bFlatButton(); diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp index 7e2f77f..ed912f9 100644 --- a/src/k3bjobprogressdialog.cpp +++ b/src/k3bjobprogressdialog.cpp @@ -155,7 +155,7 @@ void K3bJobProgressDialog::setupGUI() // ------------------------------------------------------------------------------------------ - m_viewInfo = new KListView( this, "m_viewInfo" ); + m_viewInfo = new TDEListView( this, "m_viewInfo" ); m_viewInfo->addColumn( "" ); m_viewInfo->addColumn( i18n( "Message" ) ); m_viewInfo->setFullWidth( true ); @@ -291,7 +291,7 @@ void K3bJobProgressDialog::closeEvent( TQCloseEvent* e ) w->show(); if( !m_plainCaption.isEmpty() ) - if( KMainWindow* w = dynamic_cast(kapp->mainWidget()) ) + if( TDEMainWindow* w = dynamic_cast(kapp->mainWidget()) ) w->setPlainCaption( m_plainCaption ); if( m_osd ) { @@ -504,7 +504,7 @@ void K3bJobProgressDialog::slotStarted() d->lastProgress = 0; m_timer->start( 1000 ); m_startTime = TQTime::currentTime(); - if( KMainWindow* w = dynamic_cast(kapp->mainWidget()) ) + if( TDEMainWindow* w = dynamic_cast(kapp->mainWidget()) ) m_plainCaption = w->caption(); m_logFile.open(); @@ -545,7 +545,7 @@ void K3bJobProgressDialog::slotProgress( int percent ) if( percent > d->lastProgress ) { d->lastProgress = percent; m_lastProgressUpdateTime = TQTime::currentTime(); - if( KMainWindow* w = dynamic_cast(kapp->mainWidget()) ) { + if( TDEMainWindow* w = dynamic_cast(kapp->mainWidget()) ) { w->setPlainCaption( TQString( "(%1%) %2" ).arg(percent).arg(m_plainCaption) ); } diff --git a/src/k3bjobprogressdialog.h b/src/k3bjobprogressdialog.h index 9b3afa7..160c980 100644 --- a/src/k3bjobprogressdialog.h +++ b/src/k3bjobprogressdialog.h @@ -29,7 +29,7 @@ class TQVBoxLayout; class TQHBoxLayout; class TQGridLayout; -class KListView; +class TDEListView; class TQFrame; class TQGroupBox; class TQLabel; @@ -132,7 +132,7 @@ class K3bJobProgressDialog : public KDialog, public K3bJobHandler K3bThemedLabel* m_labelJob; K3bThemedLabel* m_labelJobDetails; - KListView* m_viewInfo; + TDEListView* m_viewInfo; K3bThemedLabel* m_labelTask; K3bThemedLabel* m_labelElapsedTime; KCutLabel* m_labelSubTask; diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp index 79dae3b..f3151c9 100644 --- a/src/k3bjobprogressosd.cpp +++ b/src/k3bjobprogressosd.cpp @@ -216,7 +216,7 @@ void K3bJobProgressOSD::mousePressEvent( TQMouseEvent* e ) m_dragging = true; } else if( e->button() == Qt::RightButton ) { - KPopupMenu m; + TDEPopupMenu m; if( m.insertItem( i18n("Hide OSD") ) == m.exec( e->globalPos() ) ) hide(); } diff --git a/src/k3bmediacontentsview.h b/src/k3bmediacontentsview.h index a8d8e2a..f888c33 100644 --- a/src/k3bmediacontentsview.h +++ b/src/k3bmediacontentsview.h @@ -29,7 +29,7 @@ class K3bThemedHeader; * the selected device and reloads the contents if a new usable medium is inserted or disables the controls if the * medium is just ejected. For this to work the proper content types have to be set. * - * TODO: how about giving this one a KActionCollection so it can handle the toolbar automatically + * TODO: how about giving this one a TDEActionCollection so it can handle the toolbar automatically */ class K3bMediaContentsView : public K3bContentsView { diff --git a/src/k3bprojecttabwidget.cpp b/src/k3bprojecttabwidget.cpp index 4cc74d3..eb2f1a9 100644 --- a/src/k3bprojecttabwidget.cpp +++ b/src/k3bprojecttabwidget.cpp @@ -60,7 +60,7 @@ K3bProjectTabWidget::K3bProjectTabWidget( TQWidget *parent, const char *name, WF tabBar()->setAcceptDrops(true); tabBar()->installEventFilter( this ); - m_projectActionMenu = new KActionMenu( i18n("Project"), TQT_TQOBJECT(this) ); + m_projectActionMenu = new TDEActionMenu( i18n("Project"), TQT_TQOBJECT(this) ); } @@ -133,7 +133,7 @@ void K3bProjectTabWidget::insertTab( K3bDoc* doc ) } -void K3bProjectTabWidget::insertAction( KAction* action ) +void K3bProjectTabWidget::insertAction( TDEAction* action ) { m_projectActionMenu->insert( action ); } diff --git a/src/k3bprojecttabwidget.h b/src/k3bprojecttabwidget.h index 537bb34..717f84b 100644 --- a/src/k3bprojecttabwidget.h +++ b/src/k3bprojecttabwidget.h @@ -20,8 +20,8 @@ #include #include -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class K3bDoc; @@ -58,7 +58,7 @@ class K3bProjectTabWidget : public TQTabWidget /** * inserts the given action into the popup menu for the tabs */ - void insertAction( KAction* ); + void insertAction( TDEAction* ); bool eventFilter( TQObject* o, TQEvent* e ); @@ -70,7 +70,7 @@ class K3bProjectTabWidget : public TQTabWidget void slotDocSaved( K3bDoc* ); private: - KActionMenu* m_projectActionMenu; + TDEActionMenu* m_projectActionMenu; class ProjectData; TQMap m_projectDataMap; diff --git a/src/k3bsidepanel.cpp b/src/k3bsidepanel.cpp index 459b139..2c8526e 100644 --- a/src/k3bsidepanel.cpp +++ b/src/k3bsidepanel.cpp @@ -85,7 +85,7 @@ TQFrame* K3bSidePanel::createPanel() } -void K3bSidePanel::addButton( TQFrame* frame, KAction* a ) +void K3bSidePanel::addButton( TQFrame* frame, TDEAction* a ) { if( a ) { TQToolButton* b = new TQToolButton( frame ); diff --git a/src/k3bsidepanel.h b/src/k3bsidepanel.h index 42731ac..e337561 100644 --- a/src/k3bsidepanel.h +++ b/src/k3bsidepanel.h @@ -21,7 +21,7 @@ class K3bMainWindow; class K3bFileTreeView; class TQFrame; -class KAction; +class TDEAction; class K3bSidePanel : public TQToolBox @@ -44,7 +44,7 @@ class K3bSidePanel : public TQToolBox K3bFileTreeView* m_fileTreeView; TQFrame* createPanel(); - void addButton( TQFrame* frame, KAction* action ); + void addButton( TQFrame* frame, TDEAction* action ); }; #endif diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp index f23f785..c654a90 100644 --- a/src/k3bstatusbarmanager.cpp +++ b/src/k3bstatusbarmanager.cpp @@ -156,7 +156,7 @@ bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e ) if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_labelFreeTemp->parentWidget()) ) m_mainWindow->showOptionDialog( 0 ); // FIXME: use an enumeration for the option pages else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_versionBox) ) - if( KAction* a = m_mainWindow->action( "help_about_app" ) ) + if( TDEAction* a = m_mainWindow->action( "help_about_app" ) ) a->activate(); } diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp index 9d717fc..92c9fa7 100644 --- a/src/k3bwelcomewidget.cpp +++ b/src/k3bwelcomewidget.cpp @@ -111,7 +111,7 @@ K3bWelcomeWidget::Display::~Display() } -void K3bWelcomeWidget::Display::addAction( KAction* action ) +void K3bWelcomeWidget::Display::addAction( TDEAction* action ) { if( action ) { m_actions.append(action); @@ -120,7 +120,7 @@ void K3bWelcomeWidget::Display::addAction( KAction* action ) } -void K3bWelcomeWidget::Display::removeAction( KAction* action ) +void K3bWelcomeWidget::Display::removeAction( TDEAction* action ) { if( action ) { m_actions.removeRef( action ); @@ -135,7 +135,7 @@ void K3bWelcomeWidget::Display::removeButton( K3bFlatButton* b ) } -void K3bWelcomeWidget::Display::rebuildGui( const TQPtrList& actions ) +void K3bWelcomeWidget::Display::rebuildGui( const TQPtrList& actions ) { m_actions = actions; rebuildGui(); @@ -171,8 +171,8 @@ void K3bWelcomeWidget::Display::rebuildGui() if( numActions > 0 ) { // create buttons - for( TQPtrListIterator it( m_actions ); it.current(); ++it ) { - KAction* a = it.current(); + for( TQPtrListIterator it( m_actions ); it.current(); ++it ) { + TDEAction* a = it.current(); K3bFlatButton* b = new K3bFlatButton( a, this ); @@ -375,9 +375,9 @@ void K3bWelcomeWidget::loadConfig( TDEConfigBase* c ) sl.append( "tools_write_dvd_iso" ); } - TQPtrList actions; + TQPtrList actions; for( TQStringList::const_iterator it = sl.begin(); it != sl.end(); ++it ) - if( KAction* a = m_mainWindow->actionCollection()->action( (*it).latin1() ) ) + if( TDEAction* a = m_mainWindow->actionCollection()->action( (*it).latin1() ) ) actions.append(a); main->rebuildGui( actions ); @@ -391,7 +391,7 @@ void K3bWelcomeWidget::saveConfig( TDEConfigBase* c ) TDEConfigGroup grp( c, "Welcome Widget" ); TQStringList sl; - for( TQPtrListIterator it( main->m_actions ); it.current(); ++it ) + for( TQPtrListIterator it( main->m_actions ); it.current(); ++it ) sl.append( it.current()->name() ); grp.writeEntry( "welcome_actions", sl ); @@ -426,12 +426,12 @@ void K3bWelcomeWidget::fixSize() void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e ) { if( e->button() == Qt::RightButton ) { - TQMap map; - KPopupMenu addPop; + TQMap map; + TDEPopupMenu addPop; for ( int i = 0; s_allActions[i]; ++i ) { if ( s_allActions[i][0] != '_' ) { - KAction* a = m_mainWindow->actionCollection()->action( s_allActions[i] ); + TDEAction* a = m_mainWindow->actionCollection()->action( s_allActions[i] ); if ( a && !main->m_actions.containsRef(a) ) { map.insert( addPop.insertItem( a->iconSet(), a->text() ), a ); } @@ -445,7 +445,7 @@ void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e ) TQWidget* widgetAtPos = viewport()->childAt(e->pos()); if( widgetAtPos && widgetAtPos->inherits( "K3bFlatButton" ) ) { - KPopupMenu pop; + TDEPopupMenu pop; removeAction = pop.insertItem( SmallIcon("remove"), i18n("Remove Button") ); if ( addPop.count() > 0 ) pop.insertItem( i18n("Add Button"), &addPop ); @@ -472,11 +472,11 @@ void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e ) void K3bWelcomeWidget::slotMoreActions() { - KPopupMenu popup; + TDEPopupMenu popup; for ( int i = 0; s_allActions[i]; ++i ) { if ( s_allActions[i][0] == '_' ) { - (new KActionSeparator( TQT_TQOBJECT(&popup) ))->plug( &popup ); + (new TDEActionSeparator( TQT_TQOBJECT(&popup) ))->plug( &popup ); } else { m_mainWindow->actionCollection()->action( s_allActions[i] )->plug( &popup ); diff --git a/src/k3bwelcomewidget.h b/src/k3bwelcomewidget.h index 940d951..48d585f 100644 --- a/src/k3bwelcomewidget.h +++ b/src/k3bwelcomewidget.h @@ -80,11 +80,11 @@ class K3bWelcomeWidget::Display : public TQWidget TQSizePolicy sizePolicy () const; int heightForWidth ( int w ) const; - void addAction( KAction* ); - void removeAction( KAction* ); + void addAction( TDEAction* ); + void removeAction( TDEAction* ); void removeButton( K3bFlatButton* ); void rebuildGui(); - void rebuildGui( const TQPtrList& ); + void rebuildGui( const TQPtrList& ); signals: void dropped( const KURL::List& ); @@ -109,9 +109,9 @@ class K3bWelcomeWidget::Display : public TQWidget int m_cols; int m_rows; - TQPtrList m_actions; + TQPtrList m_actions; TQPtrList m_buttons; - TQMap m_buttonMap; + TQMap m_buttonMap; K3bFlatButton* m_buttonMore; diff --git a/src/misc/k3bblankingdialog.h b/src/misc/k3bblankingdialog.h index 0816c1d..c78d51c 100644 --- a/src/misc/k3bblankingdialog.h +++ b/src/misc/k3bblankingdialog.h @@ -23,7 +23,7 @@ class TQGroupBox; class TQComboBox; class TQCloseEvent; -class KListView; +class TDEListView; class K3bWriterSelectionWidget; namespace K3bDevice { class Device; diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index f134104..0ffe095 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -224,8 +224,8 @@ void K3bCdImageWritingDialog::setupGui() m_infoView->setFullWidth(true); m_infoView->setSelectionMode( TQListView::NoSelection ); - connect( m_infoView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( m_infoView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); m_writerSelectionWidget = new K3bWriterSelectionWidget( frame ); @@ -879,7 +879,7 @@ void K3bCdImageWritingDialog::slotMd5JobFinished( bool success ) } -void K3bCdImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, const TQPoint& pos ) +void K3bCdImageWritingDialog::slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& pos ) { if( !d->haveMd5Sum ) return; diff --git a/src/misc/k3bcdimagewritingdialog.h b/src/misc/k3bcdimagewritingdialog.h index 85dbc05..69830fb 100644 --- a/src/misc/k3bcdimagewritingdialog.h +++ b/src/misc/k3bcdimagewritingdialog.h @@ -37,7 +37,7 @@ class K3bIso9660; class K3bCueFileParser; class TQDragEnterEvent; class TQDropEvent; -class KListView; +class TDEListView; class TQListViewItem; class TQPoint; @@ -61,7 +61,7 @@ class K3bCdImageWritingDialog : public K3bInteractionDialog void slotMd5JobPercent( int ); void slotMd5JobFinished( bool ); - void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& pos ); + void slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& pos ); void slotUpdateImage( const TQString& ); diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index e3eb2fc..242ab1a 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -170,8 +170,8 @@ void K3bIsoImageWritingDialog::setupGui() m_infoView->setFullWidth(true); m_infoView->setSelectionMode( TQListView::NoSelection ); - connect( m_infoView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( m_infoView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); m_writerSelectionWidget = new K3bWriterSelectionWidget( frame ); @@ -481,7 +481,7 @@ void K3bIsoImageWritingDialog::slotMd5JobFinished( bool success ) } -void K3bIsoImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, const TQPoint& pos ) +void K3bIsoImageWritingDialog::slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& pos ) { if( !d->haveMd5Sum ) return; diff --git a/src/misc/k3bisoimagewritingdialog.h b/src/misc/k3bisoimagewritingdialog.h index 68b277b..050a4f2 100644 --- a/src/misc/k3bisoimagewritingdialog.h +++ b/src/misc/k3bisoimagewritingdialog.h @@ -31,7 +31,7 @@ class K3bListView; class TQSpinBox; class TQDragEnterEvent; class TQDropEvent; -class KListView; +class TDEListView; class TQListViewItem; class TQPoint; @@ -56,7 +56,7 @@ class K3bIsoImageWritingDialog : public K3bInteractionDialog void slotWriterChanged(); void slotMd5JobPercent( int ); void slotMd5JobFinished( bool ); - void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& pos ); + void slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& pos ); protected: void loadUserDefaults( TDEConfigBase* ); diff --git a/src/option/base_k3bcddboptiontab.ui b/src/option/base_k3bcddboptiontab.ui index 09cb8a8..507b846 100644 --- a/src/option/base_k3bcddboptiontab.ui +++ b/src/option/base_k3bcddboptiontab.ui @@ -102,7 +102,7 @@ Directory: - + Directory @@ -256,7 +256,7 @@ m_comboCddbType - + Type diff --git a/src/option/base_k3bthemeoptiontab.ui b/src/option/base_k3bthemeoptiontab.ui index cad57b1..daf0f18 100644 --- a/src/option/base_k3bthemeoptiontab.ui +++ b/src/option/base_k3bthemeoptiontab.ui @@ -31,7 +31,7 @@ unnamed - + Theme diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp index b0d845e..b944073 100644 --- a/src/option/k3bcddboptiontab.cpp +++ b/src/option/k3bcddboptiontab.cpp @@ -153,7 +153,7 @@ void K3bCddbOptionTab::readSettings() localCddbDirs.append( "~/.cddb/" ); for( TQStringList::const_iterator it = localCddbDirs.begin(); it != localCddbDirs.end(); ++it ) - (void)new KListViewItem( m_viewLocalDir, m_viewLocalDir->lastItem(), *it ); + (void)new TDEListViewItem( m_viewLocalDir, m_viewLocalDir->lastItem(), *it ); // old config <= 0.7.3 @@ -177,9 +177,9 @@ void K3bCddbOptionTab::readSettings() TQString server = buf[0]; int port = buf[1].toInt(); if( s.startsWith("Http") ) - (void)new KListViewItem( m_viewCddbServer, m_viewCddbServer->lastItem(), "Http", server, TQString::number(port) ); + (void)new TDEListViewItem( m_viewCddbServer, m_viewCddbServer->lastItem(), "Http", server, TQString::number(port) ); else - (void)new KListViewItem( m_viewCddbServer, m_viewCddbServer->lastItem(), "Cddbp", server, TQString::number(port) ); + (void)new TDEListViewItem( m_viewCddbServer, m_viewCddbServer->lastItem(), "Cddbp", server, TQString::number(port) ); } enDisableButtons(); @@ -236,7 +236,7 @@ void K3bCddbOptionTab::slotLocalDirAdd() return; ++it; } - (void)new KListViewItem( m_viewLocalDir, m_viewLocalDir->lastItem(), + (void)new TDEListViewItem( m_viewLocalDir, m_viewLocalDir->lastItem(), localDir ); enDisableButtons(); @@ -256,7 +256,7 @@ void K3bCddbOptionTab::slotLocalDirRemove() void K3bCddbOptionTab::slotCddbServerAdd() { if( !m_editCddbServer->text().isEmpty() ) { - (void)new KListViewItem( m_viewCddbServer, m_viewCddbServer->lastItem(), + (void)new TDEListViewItem( m_viewCddbServer, m_viewCddbServer->lastItem(), m_comboCddbType->currentText(), m_editCddbServer->text(), TQString::number( m_editCddbPort->value() ) ); diff --git a/src/option/k3bexternalbinoptiontab.h b/src/option/k3bexternalbinoptiontab.h index 595c30d..651e040 100644 --- a/src/option/k3bexternalbinoptiontab.h +++ b/src/option/k3bexternalbinoptiontab.h @@ -23,7 +23,7 @@ class TQPushButton; class TQListViewItem; -class KListView; +class TDEListView; class K3bExternalBinManager; class K3bExternalBinWidget; diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp index 6a7e4ec..d367584 100644 --- a/src/option/k3bpluginoptiontab.cpp +++ b/src/option/k3bpluginoptiontab.cpp @@ -37,7 +37,7 @@ class K3bPluginOptionTab::PluginViewItem : public K3bListViewItem { public: - PluginViewItem( K3bPlugin* p, KListViewItem* parent ) + PluginViewItem( K3bPlugin* p, TDEListViewItem* parent ) : K3bListViewItem( parent ), plugin(p) { const K3bPluginInfo& info = p->pluginInfo(); diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp index edf3f64..b61c81b 100644 --- a/src/option/k3bthemeoptiontab.cpp +++ b/src/option/k3bthemeoptiontab.cpp @@ -43,11 +43,11 @@ public: }; -class ThemeViewItem : public KListViewItem +class ThemeViewItem : public TDEListViewItem { public: ThemeViewItem( K3bTheme* theme_, TQListView* parent, TQListViewItem* after ) - : KListViewItem( parent, after ), + : TDEListViewItem( parent, after ), theme(theme_) { setText( 0, theme->name() ); setText( 1, theme->author() ); diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui index 17bb26f..a5a6f03 100644 --- a/src/projects/base_k3badvanceddataimagesettings.ui +++ b/src/projects/base_k3badvanceddataimagesettings.ui @@ -29,7 +29,7 @@ unnamed - + ISO9660 Filesystem diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui index 1d4e8c4..439ac16 100644 --- a/src/projects/base_k3bbootimageview.ui +++ b/src/projects/base_k3bbootimageview.ui @@ -60,7 +60,7 @@ - + Emulation Type diff --git a/src/projects/k3baudiodatasourceviewitem.cpp b/src/projects/k3baudiodatasourceviewitem.cpp index 2f0b7a5..37aa372 100644 --- a/src/projects/k3baudiodatasourceviewitem.cpp +++ b/src/projects/k3baudiodatasourceviewitem.cpp @@ -82,7 +82,7 @@ void K3bAudioDataSourceViewItem::setText( int col, const TQString& text ) } } else - KListViewItem::setText( col, text ); + TDEListViewItem::setText( col, text ); } diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp index c73342c..ec1e815 100644 --- a/src/projects/k3baudiotrackplayer.cpp +++ b/src/projects/k3baudiotrackplayer.cpp @@ -30,16 +30,16 @@ class K3bAudioTrackPlayer::Private { public: - KAction* actionPlay; - KAction* actionPause; - KAction* actionPlayPause; - KAction* actionStop; - KAction* actionNext; - KAction* actionPrev; - KAction* actionSeek; + TDEAction* actionPlay; + TDEAction* actionPause; + TDEAction* actionPlayPause; + TDEAction* actionStop; + TDEAction* actionNext; + TDEAction* actionPrev; + TDEAction* actionSeek; // just to handle them easily; - KActionCollection* actionCollection; + TDEActionCollection* actionCollection; TQSlider* seekSlider; TQTimer sliderTimer; @@ -63,44 +63,44 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, co d->playing = false; // TODO: handle the shortcuts: pass a widget to the action collection (perhaps the trackview?) - d->actionCollection = new KActionCollection( 0, this ); + d->actionCollection = new TDEActionCollection( 0, this ); // create the actions // TODO: create shortcuts (is there a way to let the user change them?) - d->actionPlay = new KAction( i18n("Play"), + d->actionPlay = new TDEAction( i18n("Play"), "player_play", - KShortcut(), + TDEShortcut(), this, TQT_SLOT(playPause()), d->actionCollection, "play" ); - d->actionPause = new KAction( i18n("Pause"), + d->actionPause = new TDEAction( i18n("Pause"), "player_pause", - KShortcut(), + TDEShortcut(), this, TQT_SLOT(playPause()), d->actionCollection, "pause" ); - d->actionPlayPause = new KAction( i18n("Play/Pause"), + d->actionPlayPause = new TDEAction( i18n("Play/Pause"), "player_play", - KShortcut(), + TDEShortcut(), this, TQT_SLOT(playPause()), d->actionCollection, "play_pause" ); - d->actionStop = new KAction( i18n("Stop"), + d->actionStop = new TDEAction( i18n("Stop"), "player_stop", - KShortcut(), + TDEShortcut(), this, TQT_SLOT(stop()), d->actionCollection, "stop" ); - d->actionNext = new KAction( i18n("Next"), + d->actionNext = new TDEAction( i18n("Next"), "player_end", - KShortcut(), + TDEShortcut(), this, TQT_SLOT(next()), d->actionCollection, "next" ); - d->actionPrev = new KAction( i18n("Prev"), + d->actionPrev = new TDEAction( i18n("Prev"), "player_start", - KShortcut(), + TDEShortcut(), this, TQT_SLOT(prev()), d->actionCollection, "prev" ); @@ -112,7 +112,7 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, co // the action into several toolboxes and also use it in some resizing or track splitting dialogs. d->actionSeek = new KWidgetAction( d->seekSlider, i18n("Seek"), - KShortcut(), + TDEShortcut(), 0, 0, d->actionCollection, @@ -156,7 +156,7 @@ K3bAudioTrackPlayer::~K3bAudioTrackPlayer() } -KAction* K3bAudioTrackPlayer::action( int action ) const +TDEAction* K3bAudioTrackPlayer::action( int action ) const { switch( action ) { case ACTION_PLAY: diff --git a/src/projects/k3baudiotrackplayer.h b/src/projects/k3baudiotrackplayer.h index 360fde4..a7583be 100644 --- a/src/projects/k3baudiotrackplayer.h +++ b/src/projects/k3baudiotrackplayer.h @@ -24,7 +24,7 @@ class K3bAudioDoc; class K3bAudioTrack; -class KAction; +class TDEAction; class K3bAudioTrackPlayer : public TQObject, public K3bAudioClient @@ -49,7 +49,7 @@ class K3bAudioTrackPlayer : public TQObject, public K3bAudioClient ACTION_SEEK }; - KAction* action( int action ) const; + TDEAction* action( int action ) const; /** * Reimplemented from K3bAudioClient diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp index b57ab32..2569add 100644 --- a/src/projects/k3baudiotracksplitdialog.cpp +++ b/src/projects/k3baudiotracksplitdialog.cpp @@ -90,15 +90,15 @@ K3bAudioTrackSplitDialog::~K3bAudioTrackSplitDialog() void K3bAudioTrackSplitDialog::setupActions() { - m_actionCollection = new KActionCollection( this ); - m_popupMenu = new KPopupMenu( this ); + m_actionCollection = new TDEActionCollection( this ); + m_popupMenu = new TDEPopupMenu( this ); - KAction* actionSplitHere = new KAction( i18n("Split Here"), 0, - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitHere()), + TDEAction* actionSplitHere = new TDEAction( i18n("Split Here"), 0, + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitHere()), actionCollection(), "range_split" ); // FIXME: after the message freeze give this action a proper name like "Remove track part" - KAction* actionRemoveRange = new KAction( i18n("Remove this Range"), 0, - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRange()), + TDEAction* actionRemoveRange = new TDEAction( i18n("Remove this Range"), 0, + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRange()), actionCollection(), "range_remove" ); actionSplitHere->plug( m_popupMenu ); diff --git a/src/projects/k3baudiotracksplitdialog.h b/src/projects/k3baudiotracksplitdialog.h index c122d52..937688b 100644 --- a/src/projects/k3baudiotracksplitdialog.h +++ b/src/projects/k3baudiotracksplitdialog.h @@ -24,8 +24,8 @@ namespace K3b { class K3bAudioTrack; class K3bAudioEditorWidget; class K3bMsfEdit; -class KActionCollection; -class KPopupMenu; +class TDEActionCollection; +class TDEPopupMenu; /** @@ -42,7 +42,7 @@ class K3bAudioTrackSplitDialog : public KDialogBase bool eventFilter( TQObject* o, TQEvent* e ); - KActionCollection* actionCollection() const { return m_actionCollection; } + TDEActionCollection* actionCollection() const { return m_actionCollection; } /** * if this method returns true val is filled with the user selected value. @@ -64,8 +64,8 @@ class K3bAudioTrackSplitDialog : public KDialogBase K3bMsfEdit* m_msfEditStart; K3bMsfEdit* m_msfEditEnd; K3bAudioTrack* m_track; - KActionCollection* m_actionCollection; - KPopupMenu* m_popupMenu; + TDEActionCollection* m_actionCollection; + TDEPopupMenu* m_popupMenu; TQPoint m_lastClickPosition; }; diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index 2e67aee..7539aa8 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -79,8 +79,8 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const setDropVisualizer( true ); setAllColumnsShowFocus( true ); setDragEnabled( true ); - // setSelectionModeExt( KListView::Konqueror ); // FileManager in KDE3 - setSelectionModeExt( KListView::Extended ); + // setSelectionModeExt( TDEListView::Konqueror ); // FileManager in KDE3 + setSelectionModeExt( TDEListView::Extended ); setItemsMovable( false ); setAlternateBackground( TQColor() ); // disable alternate colors @@ -100,8 +100,8 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(showPopupMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotProperties()) ); @@ -151,36 +151,36 @@ void K3bAudioTrackView::setupColumns() void K3bAudioTrackView::setupActions() { - m_actionCollection = new KActionCollection( this ); - m_popupMenu = new KPopupMenu( this ); + m_actionCollection = new TDEActionCollection( this ); + m_popupMenu = new TDEPopupMenu( this ); - m_actionProperties = new KAction( i18n("Properties"), "misc", - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + m_actionProperties = new TDEAction( i18n("Properties"), "misc", + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "track_properties" ); - m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", + m_actionRemove = new TDEAction( i18n( "Remove" ), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "track_remove" ); - m_actionAddSilence = new KAction( i18n("Add Silence") + "...", "misc", - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddSilence()), + m_actionAddSilence = new TDEAction( i18n("Add Silence") + "...", "misc", + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddSilence()), actionCollection(), "track_add_silence" ); - m_actionMergeTracks = new KAction( i18n("Merge Tracks"), "misc", - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotMergeTracks()), + m_actionMergeTracks = new TDEAction( i18n("Merge Tracks"), "misc", + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotMergeTracks()), actionCollection(), "track_merge" ); - m_actionSplitSource = new KAction( i18n("Source to Track"), "misc", - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitSource()), + m_actionSplitSource = new TDEAction( i18n("Source to Track"), "misc", + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitSource()), actionCollection(), "source_split" ); - m_actionSplitTrack = new KAction( i18n("Split Track..."), 0, - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitTrack()), + m_actionSplitTrack = new TDEAction( i18n("Split Track..."), 0, + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitTrack()), actionCollection(), "track_split" ); - m_actionEditSource = new KAction( i18n("Edit Source..."), 0, - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditSource()), + m_actionEditSource = new TDEAction( i18n("Edit Source..."), 0, + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditSource()), actionCollection(), "source_edit" ); - m_actionPlayTrack = new KAction( i18n("Play Track"), "player_play", - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotPlayTrack()), + m_actionPlayTrack = new TDEAction( i18n("Play Track"), "player_play", + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotPlayTrack()), actionCollection(), "track_play" ); #ifdef HAVE_MUSICBRAINZ - KAction* mbAction = new KAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, TQT_TQOBJECT(this), + TDEAction* mbAction = new TDEAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQueryMusicBrainz()), actionCollection(), "project_audio_musicbrainz" ); mbAction->setToolTip( i18n("Try to determine meta information over the internet") ); @@ -191,7 +191,7 @@ void K3bAudioTrackView::setupActions() bool K3bAudioTrackView::acceptDrag(TQDropEvent* e) const { // the first is for built-in item moving, the second for dropping urls, the third for dropping audio tracks - return ( KListView::acceptDrag(e) || KURLDrag::canDecode(e) || K3bAudioCdTrackDrag::canDecode(e) ); + return ( TDEListView::acceptDrag(e) || KURLDrag::canDecode(e) || K3bAudioCdTrackDrag::canDecode(e) ); } @@ -868,7 +868,7 @@ void K3bAudioTrackView::slotEditSource() } -void K3bAudioTrackView::showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& pos ) +void K3bAudioTrackView::showPopupMenu( TDEListView*, TQListViewItem* item, const TQPoint& pos ) { TQPtrList tracks; TQPtrList sources; diff --git a/src/projects/k3baudiotrackview.h b/src/projects/k3baudiotrackview.h index 8ad2664..f64e4ee 100644 --- a/src/projects/k3baudiotrackview.h +++ b/src/projects/k3baudiotrackview.h @@ -26,15 +26,15 @@ class K3bAudioTrack; class K3bAudioTrackViewItem; class K3bAudioDataSource; class K3bAudioDoc; -class KActionCollection; -class KAction; +class TDEActionCollection; +class TDEAction; class TQDropEvent; class TQKeyEvent; class TQFocusEvent; class TQMouseEvent; class TQDragMoveEvent; class TQTimer; -class KPopupMenu; +class TDEPopupMenu; class TQPainter; class K3bListViewItemAnimator; class K3bAudioTrackPlayer; @@ -49,7 +49,7 @@ class K3bAudioTrackView : public K3bListView K3bAudioTrackView( K3bAudioDoc*, TQWidget* parent, const char* name = 0 ); ~K3bAudioTrackView(); - KActionCollection* actionCollection() const { return m_actionCollection; } + TDEActionCollection* actionCollection() const { return m_actionCollection; } K3bAudioTrackPlayer* player() const { return m_player; } @@ -70,15 +70,15 @@ class K3bAudioTrackView : public K3bListView K3bAudioDoc* m_doc; - KAction* m_actionProperties; - KAction* m_actionRemove; - KAction* m_actionAddSilence; - KAction* m_actionMergeTracks; - KAction* m_actionSplitSource; - KAction* m_actionSplitTrack; - KAction* m_actionEditSource; - KAction* m_actionPlayTrack; - KActionCollection* m_actionCollection; + TDEAction* m_actionProperties; + TDEAction* m_actionRemove; + TDEAction* m_actionAddSilence; + TDEAction* m_actionMergeTracks; + TDEAction* m_actionSplitSource; + TDEAction* m_actionSplitTrack; + TDEAction* m_actionEditSource; + TDEAction* m_actionPlayTrack; + TDEActionCollection* m_actionCollection; bool m_updatingColumnWidths; @@ -88,7 +88,7 @@ class K3bAudioTrackView : public K3bListView TQTimer* m_autoOpenTrackTimer; TQTimer* m_animationTimer; - KPopupMenu* m_popupMenu; + TDEPopupMenu* m_popupMenu; K3bAudioTrackPlayer* m_player; @@ -118,7 +118,7 @@ class K3bAudioTrackView : public K3bListView void slotMergeTracks(); void slotSplitSource(); void slotSplitTrack(); - void showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& pos ); + void showPopupMenu( TDEListView*, TQListViewItem* item, const TQPoint& pos ); void slotProperties(); void slotPlayTrack(); void slotQueryMusicBrainz(); diff --git a/src/projects/k3baudiotrackviewitem.cpp b/src/projects/k3baudiotrackviewitem.cpp index 67483ad..6fca977 100644 --- a/src/projects/k3baudiotrackviewitem.cpp +++ b/src/projects/k3baudiotrackviewitem.cpp @@ -128,7 +128,7 @@ TQString K3bAudioTrackViewItem::text(int i) const else return m_track->firstSource()->sourceComment(); default: - return KListViewItem::text(i); + return TDEListViewItem::text(i); } } @@ -152,7 +152,7 @@ void K3bAudioTrackViewItem::setText( int col, const TQString& text ) m_track->setTitle( text ); } - KListViewItem::setText( col, text ); + TDEListViewItem::setText( col, text ); } diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp index c0019b9..cdfaaea 100644 --- a/src/projects/k3baudioview.cpp +++ b/src/projects/k3baudioview.cpp @@ -59,7 +59,7 @@ K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, TQWidget* parent, const char *nam fillStatusDisplay()->showTime(); // add button for the audio conversion - KAction* conversionAction = new KAction( i18n("Convert Tracks"), "redo", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAudioConversion()), + TDEAction* conversionAction = new TDEAction( i18n("Convert Tracks"), "redo", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAudioConversion()), actionCollection(), "project_audio_convert" ); conversionAction->setToolTip( i18n("Convert audio tracks to other audio formats." ) ); diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp index 9b4dd27..9f95d7c 100644 --- a/src/projects/k3bbootimageview.cpp +++ b/src/projects/k3bbootimageview.cpp @@ -36,17 +36,17 @@ -class K3bBootImageView::PrivateBootImageViewItem : public KListViewItem +class K3bBootImageView::PrivateBootImageViewItem : public TDEListViewItem { public: PrivateBootImageViewItem( K3bBootItem* image, TQListView* parent ) - : KListViewItem( parent ), + : TDEListViewItem( parent ), m_image( image ) { } PrivateBootImageViewItem( K3bBootItem* image, TQListView* parent, TQListViewItem* after ) - : KListViewItem( parent, after ), + : TDEListViewItem( parent, after ), m_image( image ) { } diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp index 04c6cb9..cd35c2f 100644 --- a/src/projects/k3bdatadirtreeview.cpp +++ b/src/projects/k3bdatadirtreeview.cpp @@ -94,8 +94,8 @@ K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, TQWidget connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(KListView*,TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(showPopupMenu(KListView*,TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopupMenu(TDEListView*,TQListViewItem*, const TQPoint&)) ); connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); @@ -278,31 +278,31 @@ void K3bDataDirTreeView::setCurrentDir( K3bDirItem* dirItem ) void K3bDataDirTreeView::setupActions() { - m_actionCollection = new KActionCollection( this ); + m_actionCollection = new TDEActionCollection( this ); - m_actionProperties = new KAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new KAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), + m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new KAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), + m_actionRemove = new TDEAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), actionCollection(), "remove" ); - KShortcut renameShortCut( Key_F2 ); - renameShortCut.append( KShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), + TDEShortcut renameShortCut( Key_F2 ); + renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility + m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), actionCollection(), "rename" ); - m_popupMenu = new KActionMenu( m_actionCollection, "contextMenu" ); + m_popupMenu = new TDEActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } -void K3bDataDirTreeView::showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& point ) +void K3bDataDirTreeView::showPopupMenu( TDEListView*, TQListViewItem* item, const TQPoint& point ) { if( item ) { if( K3bDataViewItem* di = dynamic_cast(item) ) { diff --git a/src/projects/k3bdatadirtreeview.h b/src/projects/k3bdatadirtreeview.h index 2c57fd9..dd9f543 100644 --- a/src/projects/k3bdatadirtreeview.h +++ b/src/projects/k3bdatadirtreeview.h @@ -29,9 +29,9 @@ class K3bDataDirViewItem; class K3bDirItem; class K3bDataItem; class K3bDataFileView; -class KActionCollection; -class KActionMenu; -class KAction; +class TDEActionCollection; +class TDEActionMenu; +class TDEAction; class K3bView; class TQDragMoveEvent; class TQDragLeaveEvent; @@ -54,7 +54,7 @@ class K3bDataDirTreeView : public K3bListView void setFileView( K3bDataFileView* view ) { m_fileView = view; } - KActionCollection* actionCollection() const { return m_actionCollection; } + TDEActionCollection* actionCollection() const { return m_actionCollection; } public slots: void checkForNewItems(); @@ -69,12 +69,12 @@ class K3bDataDirTreeView : public K3bListView void contentsDragMoveEvent( TQDragMoveEvent* e ); void contentsDragLeaveEvent( TQDragLeaveEvent* e ); - KActionCollection* m_actionCollection; - KActionMenu* m_popupMenu; - KAction* m_actionRemove; - KAction* m_actionRename; - KAction* m_actionNewDir; - KAction* m_actionProperties; + TDEActionCollection* m_actionCollection; + TDEActionMenu* m_popupMenu; + TDEAction* m_actionRemove; + TDEAction* m_actionRename; + TDEAction* m_actionNewDir; + TDEAction* m_actionProperties; protected slots: virtual void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* parent ); @@ -102,7 +102,7 @@ class K3bDataDirTreeView : public K3bListView private slots: void slotExecuted( TQListViewItem* ); void slotDataItemRemoved( K3bDataItem* ); - void showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& ); + void showPopupMenu( TDEListView*, TQListViewItem* _item, const TQPoint& ); void slotRenameItem(); void slotRemoveItem(); void slotNewDir(); diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp index afe94a3..c4b625a 100644 --- a/src/projects/k3bdatafileview.cpp +++ b/src/projects/k3bdatafileview.cpp @@ -73,7 +73,7 @@ K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView addColumn( i18n("Local Path") ); addColumn( i18n("Link") ); - setSelectionModeExt( KListView::Extended ); + setSelectionModeExt( TDEListView::Extended ); m_doc = doc; m_currentDir = doc->root(); @@ -83,8 +83,8 @@ K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); connect( this, TQT_SIGNAL(executed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(showPopupMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), @@ -317,39 +317,39 @@ void K3bDataFileView::slotExecuted( TQListViewItem* item ) void K3bDataFileView::setupActions() { - m_actionCollection = new KActionCollection( this ); + m_actionCollection = new TDEActionCollection( this ); - m_actionProperties = new KAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new KAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), + m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new KAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), + m_actionRemove = new TDEAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), actionCollection(), "remove" ); - KShortcut renameShortCut( Key_F2 ); - renameShortCut.append( KShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), + TDEShortcut renameShortCut( Key_F2 ); + renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility + m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), actionCollection(), "rename" ); - m_actionParentDir = new KAction( i18n("Parent Directory"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()), + m_actionParentDir = new TDEAction( i18n("Parent Directory"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()), actionCollection(), "parent_dir" ); - m_actionOpen = new KAction( i18n("Open"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()), + m_actionOpen = new TDEAction( i18n("Open"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()), actionCollection(), "open" ); - m_popupMenu = new KActionMenu( m_actionCollection, "contextMenu" ); + m_popupMenu = new TDEActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionParentDir ); - m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionOpen ); - m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } -void K3bDataFileView::showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& point ) +void K3bDataFileView::showPopupMenu( TDEListView*, TQListViewItem* item, const TQPoint& point ) { if( item ) { K3bDataItem* di = static_cast(item)->dataItem(); diff --git a/src/projects/k3bdatafileview.h b/src/projects/k3bdatafileview.h index 8876252..8775aba 100644 --- a/src/projects/k3bdatafileview.h +++ b/src/projects/k3bdatafileview.h @@ -30,9 +30,9 @@ class K3bDataView; class K3bDataViewItem; class K3bDataItem; class TQDropEvent; -class KActionCollection; -class KActionMenu; -class KAction; +class TDEActionCollection; +class TDEActionMenu; +class TDEAction; class K3bDataDirTreeView; class K3bDataDirViewItem; class K3bView; @@ -55,7 +55,7 @@ class K3bDataFileView : public K3bListView K3bDirItem* currentDir() const; - KActionCollection* actionCollection() const { return m_actionCollection; } + TDEActionCollection* actionCollection() const { return m_actionCollection; } signals: void dirSelected( K3bDirItem* ); @@ -68,7 +68,7 @@ class K3bDataFileView : public K3bListView void slotDataItemRemoved( K3bDataItem* ); void slotExecuted( TQListViewItem* ); void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* parent ); - void showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& ); + void showPopupMenu( TDEListView*, TQListViewItem* _item, const TQPoint& ); void slotRenameItem(); void slotRemoveItem(); void slotNewDir(); @@ -89,14 +89,14 @@ class K3bDataFileView : public K3bListView void clearItems(); void setupActions(); - KActionCollection* m_actionCollection; - KActionMenu* m_popupMenu; - KAction* m_actionParentDir; - KAction* m_actionRemove; - KAction* m_actionRename; - KAction* m_actionNewDir; - KAction* m_actionProperties; - KAction* m_actionOpen; + TDEActionCollection* m_actionCollection; + TDEActionMenu* m_popupMenu; + TDEAction* m_actionParentDir; + TDEAction* m_actionRemove; + TDEAction* m_actionRename; + TDEAction* m_actionNewDir; + TDEAction* m_actionProperties; + TDEAction* m_actionOpen; K3bView* m_view; diff --git a/src/projects/k3bdatasessionimportdialog.h b/src/projects/k3bdatasessionimportdialog.h index 8c27238..4cfb6de 100644 --- a/src/projects/k3bdatasessionimportdialog.h +++ b/src/projects/k3bdatasessionimportdialog.h @@ -25,7 +25,7 @@ class TQLabel; -class KListBox; +class TDEListBox; class K3bDataDoc; class K3bMediaSelectionComboBox; diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index d71d256..d59e55b 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -75,12 +75,12 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *parent, const char *name ) // the data actions - KAction* actionImportSession = new KAction(i18n("&Import Session..."), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(importSession()), + TDEAction* actionImportSession = new TDEAction(i18n("&Import Session..."), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(importSession()), actionCollection(), "project_data_import_session" ); - KAction* actionClearSession = new KAction(i18n("&Clear Imported Session"), "gear", 0, TQT_TQOBJECT(this), + TDEAction* actionClearSession = new TDEAction(i18n("&Clear Imported Session"), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(clearImportedSession()), actionCollection(), "project_data_clear_imported_session" ); - KAction* actionEditBootImages = new KAction(i18n("&Edit Boot Images..."), "cdtrack", 0, TQT_TQOBJECT(this), + TDEAction* actionEditBootImages = new TDEAction(i18n("&Edit Boot Images..."), "cdtrack", 0, TQT_TQOBJECT(this), TQT_SLOT(editBootImages()), actionCollection(), "project_data_edit_boot_images" ); diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 88d5ba9..29324a8 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -299,22 +299,22 @@ private: class K3bFillStatusDisplay::Private { public: - KActionCollection* actionCollection; - KRadioAction* actionShowMinutes; - KRadioAction* actionShowMegs; - KRadioAction* actionAuto; - KRadioAction* action74Min; - KRadioAction* action80Min; - KRadioAction* action100Min; - KRadioAction* actionDvd4_7GB; - KRadioAction* actionDvdDoubleLayer; + TDEActionCollection* actionCollection; + TDERadioAction* actionShowMinutes; + TDERadioAction* actionShowMegs; + TDERadioAction* actionAuto; + TDERadioAction* action74Min; + TDERadioAction* action80Min; + TDERadioAction* action100Min; + TDERadioAction* actionDvd4_7GB; + TDERadioAction* actionDvdDoubleLayer; K3bRadioAction* actionCustomSize; K3bRadioAction* actionDetermineSize; - KAction* actionSaveUserDefaults; - KAction* actionLoadUserDefaults; + TDEAction* actionSaveUserDefaults; + TDEAction* actionLoadUserDefaults; - KPopupMenu* popup; - KPopupMenu* dvdPopup; + TDEPopupMenu* popup; + TDEPopupMenu* dvdPopup; TQToolButton* buttonMenu; @@ -372,31 +372,31 @@ K3bFillStatusDisplay::~K3bFillStatusDisplay() void K3bFillStatusDisplay::setupPopupMenu() { - d->actionCollection = new KActionCollection( this ); + d->actionCollection = new TDEActionCollection( this ); // we use a nother popup for the dvd sizes - d->popup = new KPopupMenu( this, "popup" ); - d->dvdPopup = new KPopupMenu( this, "dvdpopup" ); + d->popup = new TDEPopupMenu( this, "popup" ); + d->dvdPopup = new TDEPopupMenu( this, "dvdpopup" ); - d->actionShowMinutes = new KRadioAction( i18n("Minutes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showTime()), + d->actionShowMinutes = new TDERadioAction( i18n("Minutes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showTime()), d->actionCollection, "fillstatus_show_minutes" ); - d->actionShowMegs = new KRadioAction( i18n("Megabytes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showSize()), + d->actionShowMegs = new TDERadioAction( i18n("Megabytes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showSize()), d->actionCollection, "fillstatus_show_megabytes" ); d->actionShowMegs->setExclusiveGroup( "show_size_in" ); d->actionShowMinutes->setExclusiveGroup( "show_size_in" ); - d->actionAuto = new KRadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()), + d->actionAuto = new TDERadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()), d->actionCollection, "fillstatus_auto" ); - d->action74Min = new KRadioAction( i18n("%1 MB").arg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()), + d->action74Min = new TDERadioAction( i18n("%1 MB").arg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()), d->actionCollection, "fillstatus_74minutes" ); - d->action80Min = new KRadioAction( i18n("%1 MB").arg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()), + d->action80Min = new TDERadioAction( i18n("%1 MB").arg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()), d->actionCollection, "fillstatus_80minutes" ); - d->action100Min = new KRadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()), + d->action100Min = new TDERadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()), d->actionCollection, "fillstatus_100minutes" ); - d->actionDvd4_7GB = new KRadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()), + d->actionDvd4_7GB = new TDERadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()), d->actionCollection, "fillstatus_dvd_4_7gb" ); - d->actionDvdDoubleLayer = new KRadioAction( TDEIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)), + d->actionDvdDoubleLayer = new TDERadioAction( TDEIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdDoubleLayer()), d->actionCollection, "fillstatus_dvd_double_layer" ); d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()), @@ -416,14 +416,14 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionCustomSize->setExclusiveGroup( "cd_size" ); d->actionDetermineSize->setExclusiveGroup( "cd_size" ); - d->actionLoadUserDefaults = new KAction( i18n("User Defaults"), "", 0, + d->actionLoadUserDefaults = new TDEAction( i18n("User Defaults"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotLoadUserDefaults()), d->actionCollection, "load_user_defaults" ); - d->actionSaveUserDefaults = new KAction( i18n("Save User Defaults"), "", 0, + d->actionSaveUserDefaults = new TDEAction( i18n("Save User Defaults"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveUserDefaults()), d->actionCollection, "save_user_defaults" ); - KAction* dvdSizeInfoAction = new KAction( i18n("Why 4.4 instead of 4.7?"), "", 0, + TDEAction* dvdSizeInfoAction = new TDEAction( i18n("Why 4.4 instead of 4.7?"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWhy44()), d->actionCollection, "why_44_gb" ); diff --git a/src/projects/k3bfillstatusdisplay.h b/src/projects/k3bfillstatusdisplay.h index 78c22ee..95f0940 100644 --- a/src/projects/k3bfillstatusdisplay.h +++ b/src/projects/k3bfillstatusdisplay.h @@ -25,10 +25,10 @@ class TQPaintEvent; class TQMouseEvent; class K3bDoc; -class KToggleAction; -class KAction; -class KActionCollection; -class KPopupMenu; +class TDEToggleAction; +class TDEAction; +class TDEActionCollection; +class TDEPopupMenu; class TQToolButton; namespace K3bDevice { diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp index 2f3fc31..980c0f7 100644 --- a/src/projects/k3bmovixlistview.cpp +++ b/src/projects/k3bmovixlistview.cpp @@ -182,7 +182,7 @@ K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, TQWidget* parent, const ch setAllColumnsShowFocus( true ); setDragEnabled( true ); setItemsMovable( false ); - setSelectionModeExt( KListView::Extended ); + setSelectionModeExt( TDEListView::Extended ); setSorting(0); setNoItemText( i18n("Use drag'n'drop to add files to the project.") +"\n" @@ -193,8 +193,8 @@ K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, TQWidget* parent, const ch connect( m_doc, TQT_SIGNAL(newMovixFileItems()), this, TQT_SLOT(slotNewFileItems()) ); connect( m_doc, TQT_SIGNAL(movixItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotFileItemRemoved(K3bMovixFileItem*)) ); connect( m_doc, TQT_SIGNAL(subTitleItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotSubTitleItemRemoved(K3bMovixFileItem*)) ); - connect( this, TQT_SIGNAL(dropped(KListView*, TQDropEvent*, TQListViewItem*)), - this, TQT_SLOT(slotDropped(KListView*, TQDropEvent*, TQListViewItem*)) ); + connect( this, TQT_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*)), + this, TQT_SLOT(slotDropped(TDEListView*, TQDropEvent*, TQListViewItem*)) ); // let's see what the doc already has slotNewFileItems(); @@ -258,7 +258,7 @@ void K3bMovixListView::slotSubTitleItemRemoved( K3bMovixFileItem* item ) } -void K3bMovixListView::slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ) +void K3bMovixListView::slotDropped( TDEListView*, TQDropEvent* e, TQListViewItem* after ) { if( !e->isAccepted() ) return; diff --git a/src/projects/k3bmovixlistview.h b/src/projects/k3bmovixlistview.h index be5750f..c2b4005 100644 --- a/src/projects/k3bmovixlistview.h +++ b/src/projects/k3bmovixlistview.h @@ -89,7 +89,7 @@ class K3bMovixListView : public K3bListView void slotNewFileItems(); void slotFileItemRemoved( K3bMovixFileItem* ); void slotSubTitleItemRemoved( K3bMovixFileItem* ); - void slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ); + void slotDropped( TDEListView*, TQDropEvent* e, TQListViewItem* after ); void slotChanged(); private: diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp index 6e86212..58c4f3c 100644 --- a/src/projects/k3bmovixview.cpp +++ b/src/projects/k3bmovixview.cpp @@ -50,20 +50,20 @@ K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* parent, const char* name // setup actions - m_actionProperties = new KAction( i18n("Properties"), "misc", + m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(showPropertiesDialog()), actionCollection(), "movix_show_props" ); - m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", + m_actionRemove = new TDEAction( i18n( "Remove" ), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItems()), actionCollection(), "movix_remove_item" ); - m_actionRemoveSubTitle = new KAction( i18n( "Remove Subtitle File" ), "editdelete", + m_actionRemoveSubTitle = new TDEAction( i18n( "Remove Subtitle File" ), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveSubTitleItems()), actionCollection(), "movix_remove_subtitle_item" ); - m_actionAddSubTitle = new KAction( i18n("Add Subtitle File..."), "", + m_actionAddSubTitle = new TDEAction( i18n("Add Subtitle File..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSubTitleFile()), actionCollection(), "movix_add_subtitle" ); - m_popupMenu = new KPopupMenu( this ); + m_popupMenu = new TDEPopupMenu( this ); m_actionRemove->plug( m_popupMenu ); m_actionRemoveSubTitle->plug( m_popupMenu ); m_actionAddSubTitle->plug( m_popupMenu ); diff --git a/src/projects/k3bmovixview.h b/src/projects/k3bmovixview.h index b17c8c0..4f29c91 100644 --- a/src/projects/k3bmovixview.h +++ b/src/projects/k3bmovixview.h @@ -22,8 +22,8 @@ class K3bMovixDoc; class K3bMovixListView; -class KAction; -class KPopupMenu; +class TDEAction; +class TDEPopupMenu; class TQListViewItem; class TQPoint; class TQLineEdit; @@ -54,11 +54,11 @@ class K3bMovixView : public K3bView private: K3bMovixDoc* m_doc; - KAction* m_actionProperties; - KAction* m_actionRemove; - KAction* m_actionRemoveSubTitle; - KAction* m_actionAddSubTitle; - KPopupMenu* m_popupMenu; + TDEAction* m_actionProperties; + TDEAction* m_actionRemove; + TDEAction* m_actionRemoveSubTitle; + TDEAction* m_actionAddSubTitle; + TDEPopupMenu* m_popupMenu; TQLineEdit* m_volumeIDEdit; }; diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp index 19f49fb..b2c5508 100644 --- a/src/projects/k3bvcdlistview.cpp +++ b/src/projects/k3bvcdlistview.cpp @@ -46,7 +46,7 @@ K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *parent, setDropVisualizer( true ); setAllColumnsShowFocus( true ); setDragEnabled( true ); - setSelectionModeExt( KListView::Extended ); + setSelectionModeExt( TDEListView::Extended ); setItemsMovable( false ); setNoItemText( i18n( "Use drag'n'drop to add MPEG video files to the project." ) + "\n" @@ -60,10 +60,10 @@ K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *parent, setupColumns(); header() ->setClickEnabled( false ); - connect( this, TQT_SIGNAL( dropped( KListView*, TQDropEvent*, TQListViewItem* ) ), - this, TQT_SLOT( slotDropped( KListView*, TQDropEvent*, TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( showPopupMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( this, TQT_SIGNAL( dropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ), + this, TQT_SLOT( slotDropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ) ); + connect( this, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( showPopupMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQT_SLOT( showPropertiesDialog() ) ); @@ -93,9 +93,9 @@ void K3bVcdListView::setupColumns() void K3bVcdListView::setupActions() { - m_actionCollection = new KActionCollection( this ); - m_actionProperties = new KAction( i18n( "Properties" ), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT( showPropertiesDialog() ), actionCollection() ); - m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTracks() ), actionCollection() ); + m_actionCollection = new TDEActionCollection( this ); + m_actionProperties = new TDEAction( i18n( "Properties" ), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT( showPropertiesDialog() ), actionCollection() ); + m_actionRemove = new TDEAction( i18n( "Remove" ), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTracks() ), actionCollection() ); // disabled by default m_actionRemove->setEnabled( false ); @@ -104,7 +104,7 @@ void K3bVcdListView::setupActions() void K3bVcdListView::setupPopupMenu() { - m_popupMenu = new KPopupMenu( this, "VcdViewPopupMenu" ); + m_popupMenu = new TDEPopupMenu( this, "VcdViewPopupMenu" ); m_actionRemove->plug( m_popupMenu ); m_popupMenu->insertSeparator(); m_actionProperties->plug( m_popupMenu ); @@ -116,7 +116,7 @@ void K3bVcdListView::setupPopupMenu() bool K3bVcdListView::acceptDrag( TQDropEvent* e ) const { // the first is for built-in item moving, the second for dropping urls - return ( KListView::acceptDrag( e ) || KURLDrag::canDecode( e ) ); + return ( TDEListView::acceptDrag( e ) || KURLDrag::canDecode( e ) ); } @@ -137,7 +137,7 @@ TQDragObject* K3bVcdListView::dragObject() } -void K3bVcdListView::slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ) +void K3bVcdListView::slotDropped( TDEListView*, TQDropEvent* e, TQListViewItem* after ) { if ( !e->isAccepted() ) return ; @@ -172,7 +172,7 @@ void K3bVcdListView::slotDropped( KListView*, TQDropEvent* e, TQListViewItem* af void K3bVcdListView::insertItem( TQListViewItem* item ) { - KListView::insertItem( item ); + TDEListView::insertItem( item ); // make sure at least one item is selected if ( selectedItems().isEmpty() ) { @@ -180,7 +180,7 @@ void K3bVcdListView::insertItem( TQListViewItem* item ) } } -void K3bVcdListView::showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& _point ) +void K3bVcdListView::showPopupMenu( TDEListView*, TQListViewItem* _item, const TQPoint& _point ) { if ( _item ) { m_actionRemove->setEnabled( true ); diff --git a/src/projects/k3bvcdlistview.h b/src/projects/k3bvcdlistview.h index d3eca48..4693a5b 100644 --- a/src/projects/k3bvcdlistview.h +++ b/src/projects/k3bvcdlistview.h @@ -25,12 +25,12 @@ class TQDragEnterEvent; class TQDragObject; class TQDropEvent; class TQTimer; -class KPopupMenu; -class KAction; +class TDEPopupMenu; +class TDEAction; class K3bVcdDoc; class K3bView; class K3bVcdTrack; -class KActionCollection; +class TDEActionCollection; class K3bVcdListViewItem; class TQPainter; @@ -45,11 +45,11 @@ class K3bVcdListView : public K3bListView ~K3bVcdListView(); /** - * reimplemented from KListView + * reimplemented from TDEListView */ void insertItem( TQListViewItem* ); - KActionCollection* actionCollection() const + TDEActionCollection* actionCollection() const { return m_actionCollection; } @@ -67,18 +67,18 @@ class K3bVcdListView : public K3bListView K3bVcdDoc* m_doc; K3bView* m_view; - KAction* m_actionProperties; - KAction* m_actionRemove; - KActionCollection* m_actionCollection; + TDEAction* m_actionProperties; + TDEAction* m_actionRemove; + TDEActionCollection* m_actionCollection; - KPopupMenu* m_popupMenu; + TDEPopupMenu* m_popupMenu; TQMap m_itemMap; private slots: - void slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ); + void slotDropped( TDEListView*, TQDropEvent* e, TQListViewItem* after ); void slotUpdateItems(); - void showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& ); + void showPopupMenu( TDEListView*, TQListViewItem* item, const TQPoint& ); void showPropertiesDialog(); void slotRemoveTracks(); void slotTrackRemoved( K3bVcdTrack* ); diff --git a/src/projects/k3bvcdlistviewitem.cpp b/src/projects/k3bvcdlistviewitem.cpp index 363068c..128d6b0 100644 --- a/src/projects/k3bvcdlistviewitem.cpp +++ b/src/projects/k3bvcdlistviewitem.cpp @@ -78,7 +78,7 @@ TQString K3bVcdListViewItem::text( int i ) const return m_track->fileName(); default: - return KListViewItem::text( i ); + return TDEListViewItem::text( i ); } } @@ -89,7 +89,7 @@ void K3bVcdListViewItem::setText( int col, const TQString& text ) m_track->setTitle( text ); } - KListViewItem::setText( col, text ); + TDEListViewItem::setText( col, text ); } diff --git a/src/projects/k3bvcdview.h b/src/projects/k3bvcdview.h index c7b151a..0dcbe87 100644 --- a/src/projects/k3bvcdview.h +++ b/src/projects/k3bvcdview.h @@ -28,7 +28,7 @@ class TQWidget; class K3bVcdDoc; class K3bVcdTrack; class TQListViewItem; -class KListView; +class TDEListView; class K3bVcdBurnDialog; class K3bProjectBurnDialog; diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp index bddc819..86e97e3 100644 --- a/src/projects/k3bview.cpp +++ b/src/projects/k3bview.cpp @@ -57,10 +57,10 @@ K3bView::K3bView( K3bDoc* pDoc, TQWidget *parent, const char* name ) grid->setSpacing( 5 ); grid->setMargin( 2 ); - KAction* burnAction = new KAction( i18n("&Burn"), "cdburn", CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotBurn()), + TDEAction* burnAction = new TDEAction( i18n("&Burn"), "cdburn", CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotBurn()), actionCollection(), "project_burn"); burnAction->setToolTip( i18n("Open the burn dialog for the current project") ); - KAction* propAction = new KAction( i18n("&Properties"), "edit", CTRL + Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + TDEAction* propAction = new TDEAction( i18n("&Properties"), "edit", CTRL + Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "project_properties"); propAction->setToolTip( i18n("Open the properties dialog") ); @@ -123,7 +123,7 @@ void K3bView::slotProperties() } -// KActionCollection* K3bView::actionCollection() const +// TDEActionCollection* K3bView::actionCollection() const // { // return m_actionCollection; // } diff --git a/src/projects/k3bview.h b/src/projects/k3bview.h index 279d7d1..7c9ab9a 100644 --- a/src/projects/k3bview.h +++ b/src/projects/k3bview.h @@ -29,7 +29,7 @@ #include class K3bDoc; -class KActionCollection; +class TDEActionCollection; class K3bFillStatusDisplay; class K3bProjectBurnDialog; class K3bToolBox; diff --git a/src/rip/k3baudiocdlistview.h b/src/rip/k3baudiocdlistview.h index 658222e..bb7c7ea 100644 --- a/src/rip/k3baudiocdlistview.h +++ b/src/rip/k3baudiocdlistview.h @@ -35,7 +35,7 @@ class K3bAudioCdListView : public K3bListView protected: /** - * @reimpl from KListView + * @reimpl from TDEListView */ TQDragObject* dragObject(); diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp index 7cdf686..d083af6 100644 --- a/src/rip/k3baudiocdview.cpp +++ b/src/rip/k3baudiocdview.cpp @@ -121,8 +121,8 @@ K3bAudioCdView::K3bAudioCdView( TQWidget* parent, const char *name ) connect( m_trackView, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString&, int)) ); - connect( m_trackView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( m_trackView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); // connect( m_trackView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), // this, TQT_SLOT(slotTrackSelectionChanged(TQListViewItem*)) ); @@ -224,41 +224,41 @@ void K3bAudioCdView::reloadMedium() void K3bAudioCdView::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(slotSelect()), 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(slotDeselect()), actionCollection(), "deselect_track" ); - KAction* actionEditTrackCddbInfo = new KAction( i18n("Edit Track cddb Info"), "edit", 0, TQT_TQOBJECT(this), + TDEAction* actionEditTrackCddbInfo = new TDEAction( i18n("Edit Track cddb Info"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditTrackCddb()), actionCollection(), "edit_track_cddb" ); - KAction* actionEditAlbumCddbInfo = new KAction( i18n("Edit Album cddb Info"), "edit", 0, TQT_TQOBJECT(this), + TDEAction* actionEditAlbumCddbInfo = new TDEAction( i18n("Edit Album cddb Info"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditAlbumCddb()), actionCollection(), "edit_album_cddb" ); - KAction* actionStartRip = new KAction( i18n("Start Ripping"), "cddarip", 0, TQT_TQOBJECT(this), + TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "cddarip", 0, TQT_TQOBJECT(this), TQT_SLOT(startRip()), actionCollection(), "start_rip" ); - KAction* actionQueryCddb = new KAction( i18n("Query cddb"), "reload", 0, TQT_TQOBJECT(this), + TDEAction* actionQueryCddb = new TDEAction( i18n("Query cddb"), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT(queryCddb()), actionCollection(), "query_cddb" ); - KAction* actionSaveCddbLocally = new KAction( i18n("Save Cddb Entry Locally"), "filesave", 0, TQT_TQOBJECT(this), + TDEAction* actionSaveCddbLocally = new TDEAction( i18n("Save Cddb Entry Locally"), "filesave", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveCddbLocally()), actionCollection(), "save_cddb_local" ); // TODO: set the actions tooltips and whatsthis infos // 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 ); @@ -279,7 +279,7 @@ void K3bAudioCdView::initActions() } -void K3bAudioCdView::slotContextMenu( KListView*, TQListViewItem*, const TQPoint& p ) +void K3bAudioCdView::slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& p ) { m_popupMenu->popup(p); } diff --git a/src/rip/k3baudiocdview.h b/src/rip/k3baudiocdview.h index 03ec0ed..b86135a 100644 --- a/src/rip/k3baudiocdview.h +++ b/src/rip/k3baudiocdview.h @@ -25,11 +25,11 @@ #include class K3bListView; -class KListView; +class TDEListView; class TQListViewItem; class TQPoint; -class KActionCollection; -class KActionMenu; +class TDEActionCollection; +class TDEActionMenu; class K3bCddb; class TQLabel; class K3bToolBox; @@ -50,7 +50,7 @@ class K3bAudioCdView : public K3bMediaContentsView K3bAudioCdView( TQWidget* parent = 0, const char * name = 0 ); ~K3bAudioCdView(); - KActionCollection* actionCollection() const { return m_actionCollection; } + TDEActionCollection* actionCollection() const { return m_actionCollection; } /** * internal @@ -61,7 +61,7 @@ class K3bAudioCdView : public K3bMediaContentsView void queryCddb(); private slots: - void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ); + void slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ); void slotItemRenamed( TQListViewItem*, const TQString&, int ); void slotCddbQueryFinished( int ); void slotTrackSelectionChanged( TQListViewItem* ); @@ -88,8 +88,8 @@ class K3bAudioCdView : public K3bMediaContentsView K3bCddbResultEntry m_cddbInfo; - KActionCollection* m_actionCollection; - KActionMenu* m_popupMenu; + TDEActionCollection* m_actionCollection; + TDEActionMenu* m_popupMenu; K3bListView* m_trackView; K3bToolBox* m_toolBox; diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp index 43fe621..f9bcfdb 100644 --- a/src/rip/k3baudioprojectconvertingdialog.cpp +++ b/src/rip/k3baudioprojectconvertingdialog.cpp @@ -241,7 +241,7 @@ void K3bAudioProjectConvertingDialog::refresh() m_patternWidget->blankReplaceString() ); - (void)new KListViewItem( m_viewTracks, + (void)new TDEListViewItem( m_viewTracks, m_viewTracks->lastItem(), filename + "." + extension, m_doc->length().toString(), @@ -251,7 +251,7 @@ void K3bAudioProjectConvertingDialog::refresh() if( m_optionWidget->createCueFile() ) { d->cueFilename = K3b::fixupPath( baseDir + "/" + filename + ".cue" ); - (void)new KListViewItem( m_viewTracks, + (void)new TDEListViewItem( m_viewTracks, m_viewTracks->lastItem(), filename + ".cue", "-", @@ -279,7 +279,7 @@ void K3bAudioProjectConvertingDialog::refresh() m_patternWidget->replaceBlanks(), m_patternWidget->blankReplaceString() ) + "." + extension; - (void)new KListViewItem( m_viewTracks, + (void)new TDEListViewItem( m_viewTracks, m_viewTracks->lastItem(), filename, track->length().toString(), @@ -299,7 +299,7 @@ void K3bAudioProjectConvertingDialog::refresh() m_patternWidget->replaceBlanks(), m_patternWidget->blankReplaceString() ) + ".m3u"; - (void)new KListViewItem( m_viewTracks, + (void)new TDEListViewItem( m_viewTracks, m_viewTracks->lastItem(), filename, "-", diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp index aace387..876d91f 100644 --- a/src/rip/k3baudiorippingdialog.cpp +++ b/src/rip/k3baudiorippingdialog.cpp @@ -123,7 +123,7 @@ void K3bAudioRippingDialog::setupGui() Form1Layout->setSpacing( KDialog::spacingHint() ); Form1Layout->setMargin( 0 ); - m_viewTracks = new KListView( frame, "m_viewTracks" ); + m_viewTracks = new TDEListView( frame, "m_viewTracks" ); m_viewTracks->addColumn(i18n( "Filename") ); m_viewTracks->addColumn(i18n( "Length") ); m_viewTracks->addColumn(i18n( "File Size") ); @@ -330,7 +330,7 @@ void K3bAudioRippingDialog::refresh() filename = d->fsInfo.fixupPath( filename ); - (void)new KListViewItem( m_viewTracks, + (void)new TDEListViewItem( m_viewTracks, m_viewTracks->lastItem(), filename + "." + extension, K3b::Msf(length).toString(), @@ -339,7 +339,7 @@ void K3bAudioRippingDialog::refresh() d->filenames.append( baseDir + "/" + filename + "." + extension ); if( m_optionWidget->createCueFile() ) - (void)new KListViewItem( m_viewTracks, + (void)new TDEListViewItem( m_viewTracks, m_viewTracks->lastItem(), filename + ".cue", "-", @@ -388,7 +388,7 @@ void K3bAudioRippingDialog::refresh() filename = d->fsInfo.fixupPath( filename ); - (void)new KListViewItem( m_viewTracks, + (void)new TDEListViewItem( m_viewTracks, m_viewTracks->lastItem(), filename, trackLength.toString(), @@ -406,7 +406,7 @@ void K3bAudioRippingDialog::refresh() m_patternWidget->replaceBlanks(), m_patternWidget->blankReplaceString() ) + ".m3u"; - (void)new KListViewItem( m_viewTracks, + (void)new TDEListViewItem( m_viewTracks, m_viewTracks->lastItem(), filename, "-", diff --git a/src/rip/k3baudiorippingdialog.h b/src/rip/k3baudiorippingdialog.h index f660efe..2a77d3f 100644 --- a/src/rip/k3baudiorippingdialog.h +++ b/src/rip/k3baudiorippingdialog.h @@ -29,7 +29,7 @@ namespace K3bDevice { } -class KListView; +class TDEListView; class TQCheckBox; class TQSpinBox; class TQComboBox; @@ -66,7 +66,7 @@ class K3bAudioRippingDialog : public K3bInteractionDialog K3bCddbResultEntry m_cddbEntry; TQValueList m_trackNumbers; - KListView* m_viewTracks; + TDEListView* m_viewTracks; TQComboBox* m_comboParanoiaMode; TQSpinBox* m_spinRetries; diff --git a/src/rip/k3bvideocdrippingdialog.h b/src/rip/k3bvideocdrippingdialog.h index 1d2aafd..454f4c3 100644 --- a/src/rip/k3bvideocdrippingdialog.h +++ b/src/rip/k3bvideocdrippingdialog.h @@ -23,7 +23,7 @@ #include #include "k3bvideocdrippingoptions.h" -class KListView; +class TDEListView; class TQCheckBox; class TQLabel; class TQSpinBox; diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp index 1924d23..c7799bd 100644 --- a/src/rip/k3bvideocdview.cpp +++ b/src/rip/k3bvideocdview.cpp @@ -173,8 +173,8 @@ K3bVideoCdView::K3bVideoCdView( TQWidget* parent, const char *name ) m_trackView->setItemsRenameable( false ); m_trackView->setRootIsDecorated( true ); - connect( m_trackView, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( m_trackView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); connect( m_trackView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), this, TQT_SLOT( slotTrackSelectionChanged( TQListViewItem* ) ) ); connect( m_trackView, TQT_SIGNAL( clicked( TQListViewItem* ) ), @@ -320,28 +320,28 @@ void K3bVideoCdView::updateDisplay() void K3bVideoCdView::initActions() { - m_actionCollection = new KActionCollection( this ); + m_actionCollection = new TDEActionCollection( this ); - KAction* actionSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), + TDEAction* actionSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), m_actionCollection, "select_all" ); - KAction* actionDeselectAll = KStdAction::deselect( TQT_TQOBJECT(this), TQT_SLOT( slotDeselectAll() ), + TDEAction* actionDeselectAll = KStdAction::deselect( TQT_TQOBJECT(this), TQT_SLOT( slotDeselectAll() ), m_actionCollection, "deselect_all" ); actionDeselectAll->setText( i18n( "Dese&lect All" ) ); - KAction* actionSelect = new KAction( i18n( "Select Track" ), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionSelect = new TDEAction( i18n( "Select Track" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotSelect() ), actionCollection(), "select_track" ); - KAction* actionDeselect = new KAction( i18n( "Deselect Track" ), 0, 0, TQT_TQOBJECT(this), + TDEAction* actionDeselect = new TDEAction( i18n( "Deselect Track" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotDeselect() ), actionCollection(), "deselect_track" ); - KAction* actionStartRip = new KAction( i18n( "Start Ripping" ), "run", 0, TQT_TQOBJECT(this), + TDEAction* actionStartRip = new TDEAction( i18n( "Start Ripping" ), "run", 0, TQT_TQOBJECT(this), TQT_SLOT( startRip() ), actionCollection(), "start_rip" ); // TODO: set the actions tooltips and whatsthis infos // 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 ); @@ -354,7 +354,7 @@ void K3bVideoCdView::initActions() } -void K3bVideoCdView::slotContextMenu( KListView*, TQListViewItem*, const TQPoint& p ) +void K3bVideoCdView::slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& p ) { m_popupMenu->popup( p ); } diff --git a/src/rip/k3bvideocdview.h b/src/rip/k3bvideocdview.h index a7fab7f..7e8a992 100644 --- a/src/rip/k3bvideocdview.h +++ b/src/rip/k3bvideocdview.h @@ -24,9 +24,9 @@ #include "k3bvideocdinfo.h" -class KActionCollection; -class KActionMenu; -class KListView; +class TDEActionCollection; +class TDEActionMenu; +class TDEListView; class TQLabel; class TQListViewItem; @@ -52,13 +52,13 @@ class K3bVideoCdView : public K3bMediaContentsView K3bVideoCdView( TQWidget* parent = 0, const char * name = 0 ); ~K3bVideoCdView(); - KActionCollection* actionCollection() const + TDEActionCollection* actionCollection() const { return m_actionCollection; } private slots: - void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ); + void slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ); void slotTrackSelectionChanged( TQListViewItem* ); void slotStateChanged( TQListViewItem* ); void slotVideoCdInfoFinished( bool ); @@ -83,8 +83,8 @@ class K3bVideoCdView : public K3bMediaContentsView K3bDevice::Toc m_toc; - KActionCollection* m_actionCollection; - KActionMenu* m_popupMenu; + TDEActionCollection* m_actionCollection; + TDEActionMenu* m_popupMenu; K3bVideoCdInfoResult m_videocdinfoResult; K3bVideoCdInfo* m_videocdinfo; 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;