TDE
/
k3b
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/k3b
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of classes to enhance compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent f3e58cb8bd
commit 08e6e3d01b
94 changed files with 637 additions and 637 deletions
Show Stats Download Patch File Download Diff File

4
k3bsetup/base_k3bsetup2.ui
Unescape View File

@ -135,7 +135,7 @@
<string>Check the devices whose permissions you want to be changed</string> <string>Check the devices whose permissions you want to be changed</string>
</property> </property>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Device</string> <string>Device</string>
@ -255,7 +255,7 @@
<string>Check the programs whose permissions you want to be changed</string> <string>Check the programs whose permissions you want to be changed</string>
</property> </property>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Program</string> <string>Program</string>

2
libk3b/cddb/k3bcddbmultientriesdialog.cpp
Unescape View File

@ -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 ); TQLabel* infoLabel = new TQLabel( i18n("K3b found multiple inexact CDDB entries. Please select one."), frame );
infoLabel->setAlignment( WordBreak ); infoLabel->setAlignment( WordBreak );
m_listBox = new KListBox( frame, "list_box"); m_listBox = new TDEListBox( frame, "list_box");
setMinimumSize( 280, 200 ); setMinimumSize( 280, 200 );
} }

4
libk3b/cddb/k3bcddbmultientriesdialog.h
Unescape View File

@ -24,7 +24,7 @@
class TQStringList; class TQStringList;
class KListBox; class TDEListBox;
/** /**
*@author Sebastian Trueg *@author Sebastian Trueg
@ -43,7 +43,7 @@ class K3bCddbMultiEntriesDialog : public KDialogBase
K3bCddbMultiEntriesDialog( TQWidget* parent = 0, const char* name = 0); K3bCddbMultiEntriesDialog( TQWidget* parent = 0, const char* name = 0);
private: private:
KListBox *m_listBox; TDEListBox *m_listBox;
}; };
#endif #endif

2
libk3b/projects/k3bdoc.h
Unescape View File

@ -39,7 +39,7 @@ class K3bBurnJob;
class TQDomDocument; class TQDomDocument;
class TQDomElement; class TQDomElement;
class TDEConfig; class TDEConfig;
class KActionCollection; class TDEActionCollection;
class K3bJobHandler; class K3bJobHandler;

40
libk3b/tools/k3blistview.cpp
Unescape View File

@ -98,25 +98,25 @@ public:
K3bListViewItem::K3bListViewItem(TQListView *parent) K3bListViewItem::K3bListViewItem(TQListView *parent)
: KListViewItem( parent ) : TDEListViewItem( parent )
{ {
init(); init();
} }
K3bListViewItem::K3bListViewItem(TQListViewItem *parent) K3bListViewItem::K3bListViewItem(TQListViewItem *parent)
: KListViewItem( parent ) : TDEListViewItem( parent )
{ {
init(); init();
} }
K3bListViewItem::K3bListViewItem(TQListView *parent, TQListViewItem *after) K3bListViewItem::K3bListViewItem(TQListView *parent, TQListViewItem *after)
: KListViewItem( parent, after ) : TDEListViewItem( parent, after )
{ {
init(); init();
} }
K3bListViewItem::K3bListViewItem(TQListViewItem *parent, TQListViewItem *after) K3bListViewItem::K3bListViewItem(TQListViewItem *parent, TQListViewItem *after)
: KListViewItem( parent, after ) : TDEListViewItem( parent, after )
{ {
init(); init();
} }
@ -127,7 +127,7 @@ K3bListViewItem::K3bListViewItem(TQListView *parent,
const TQString& s3, const TQString& s4, const TQString& s3, const TQString& s4,
const TQString& s5, const TQString& s6, const TQString& s5, const TQString& s6,
const TQString& s7, const TQString& s8) 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(); init();
} }
@ -138,7 +138,7 @@ K3bListViewItem::K3bListViewItem(TQListViewItem *parent,
const TQString& s3, const TQString& s4, const TQString& s3, const TQString& s4,
const TQString& s5, const TQString& s6, const TQString& s5, const TQString& s6,
const TQString& s7, const TQString& s8) 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(); init();
} }
@ -149,7 +149,7 @@ K3bListViewItem::K3bListViewItem(TQListView *parent, TQListViewItem *after,
const TQString& s3, const TQString& s4, const TQString& s3, const TQString& s4,
const TQString& s5, const TQString& s6, const TQString& s5, const TQString& s6,
const TQString& s7, const TQString& s8) 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(); init();
} }
@ -160,7 +160,7 @@ K3bListViewItem::K3bListViewItem(TQListViewItem *parent, TQListViewItem *after,
const TQString& s3, const TQString& s4, const TQString& s3, const TQString& s4,
const TQString& s5, const TQString& s6, const TQString& s5, const TQString& s6,
const TQString& s7, const TQString& s8) 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(); init();
} }
@ -186,7 +186,7 @@ void K3bListViewItem::init()
int K3bListViewItem::width( const TQFontMetrics& fm, const TQListView* lv, int c ) const 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() void K3bListViewItem::setup()
{ {
KListViewItem::setup(); TDEListViewItem::setup();
setHeight( height() + 2*m_vMargin ); 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(), p->fillRect( width-info->margin, 0, info->margin, height(),
cgh.brush( TQColorGroup::Highlight ) ); 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(), p->fillRect( 0, 0, info->margin, height(),
cgh.brush( TQColorGroup::Base ) ); cgh.brush( TQColorGroup::Base ) );
p->fillRect( width-info->margin, 0, info->margin, height(), p->fillRect( width-info->margin, 0, info->margin, height(),
@ -546,7 +546,7 @@ public:
K3bListView::K3bListView( TQWidget* parent, const char* name ) K3bListView::K3bListView( TQWidget* parent, const char* name )
: KListView( parent, name ), : TDEListView( parent, name ),
m_noItemVMargin( 20 ), m_noItemVMargin( 20 ),
m_noItemHMargin( 20 ) m_noItemHMargin( 20 )
{ {
@ -592,7 +592,7 @@ TQWidget* K3bListView::editor( K3bListViewItem::EditorType t ) const
void K3bListView::clear() void K3bListView::clear()
{ {
hideEditor(); hideEditor();
KListView::clear(); TDEListView::clear();
} }
@ -806,7 +806,7 @@ void K3bListView::setCurrentItem( TQListViewItem* i )
// doRename(); // doRename();
// hideEditor(); // hideEditor();
// m_currentEditItem = 0; // m_currentEditItem = 0;
KListView::setCurrentItem( i ); TDEListView::setCurrentItem( i );
} }
@ -819,14 +819,14 @@ void K3bListView::setNoItemText( const TQString& text )
void K3bListView::viewportPaintEvent( TQPaintEvent* e ) void K3bListView::viewportPaintEvent( TQPaintEvent* e )
{ {
KListView::viewportPaintEvent( e ); TDEListView::viewportPaintEvent( e );
} }
// FIXME: move this to viewportPaintEvent // FIXME: move this to viewportPaintEvent
void K3bListView::drawContentsOffset( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch ) 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()) { 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 ) void K3bListView::paintEmptyArea( TQPainter* p, const TQRect& rect )
{ {
KListView::paintEmptyArea( p, rect ); TDEListView::paintEmptyArea( p, rect );
// if( childCount() == 0 && !m_noItemText.isEmpty()) { // if( childCount() == 0 && !m_noItemText.isEmpty()) {
@ -869,7 +869,7 @@ void K3bListView::paintEmptyArea( TQPainter* p, const TQRect& rect )
void K3bListView::resizeEvent( TQResizeEvent* e ) void K3bListView::resizeEvent( TQResizeEvent* e )
{ {
KListView::resizeEvent( e ); TDEListView::resizeEvent( e );
updateEditorSize(); 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 ); viewport()->setPaletteBackgroundPixmap( bgPix );
} }
KListView::viewportResizeEvent( e ); TDEListView::viewportResizeEvent( e );
} }

8
libk3b/tools/k3blistview.h
Unescape View File

@ -39,7 +39,7 @@ class K3bMsfEdit;
class K3bListView; class K3bListView;
class LIBK3B_EXPORT K3bListViewItem : public KListViewItem class LIBK3B_EXPORT K3bListViewItem : public TDEListViewItem
{ {
public: public:
K3bListViewItem(TQListView *parent); K3bListViewItem(TQListView *parent);
@ -74,7 +74,7 @@ class LIBK3B_EXPORT K3bListViewItem : public KListViewItem
virtual ~K3bListViewItem(); virtual ~K3bListViewItem();
/** /**
* reimplemented from KListViewItem * reimplemented from TDEListViewItem
*/ */
void setup(); 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; friend class K3bListViewItem;
@ -234,7 +234,7 @@ class LIBK3B_EXPORT K3bListView : public KListView
protected: protected:
/** /**
* calls KListView::drawContentsOffset * calls TDEListView::drawContentsOffset
* and paints a the noItemText if no item is in the list * 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 ); virtual void drawContentsOffset ( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch );

4
libk3b/tools/k3bpushbutton.h
Unescape View File

@ -21,7 +21,7 @@
#include "k3b_export.h" #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 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 * 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* ); void setDelayedPopupMenu( TQPopupMenu* );

32
libk3b/tools/k3bradioaction.cpp
Unescape View File

@ -17,57 +17,57 @@
#include <ktoolbarbutton.h> #include <ktoolbarbutton.h>
K3bRadioAction::K3bRadioAction( const TQString& text, const KShortcut& cut, K3bRadioAction::K3bRadioAction( const TQString& text, const TDEShortcut& cut,
TQObject* parent, const char* name ) TQObject* parent, const char* name )
: KToggleAction( text, cut, parent, name ), : TDEToggleAction( text, cut, parent, name ),
m_alwaysEmit(false) 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, const TQObject* receiver, const char* slot,
TQObject* parent, const char* name ) TQObject* parent, const char* name )
: KToggleAction( text, cut, receiver, slot, parent, name ), : TDEToggleAction( text, cut, receiver, slot, parent, name ),
m_alwaysEmit(false) m_alwaysEmit(false)
{ {
} }
K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix, K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix,
const KShortcut& cut, const TDEShortcut& cut,
TQObject* parent, const char* name ) TQObject* parent, const char* name )
: KToggleAction( text, pix, cut, parent, name ), : TDEToggleAction( text, pix, cut, parent, name ),
m_alwaysEmit(false) m_alwaysEmit(false)
{ {
} }
K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix, K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix,
const KShortcut& cut, const TDEShortcut& cut,
TQObject* parent, const char* name ) TQObject* parent, const char* name )
: KToggleAction( text, pix, cut, parent, name ), : TDEToggleAction( text, pix, cut, parent, name ),
m_alwaysEmit(false) m_alwaysEmit(false)
{ {
} }
K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix, K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix,
const KShortcut& cut, const TDEShortcut& cut,
const TQObject* receiver, const char* slot, const TQObject* receiver, const char* slot,
TQObject* parent, const char* name ) TQObject* parent, const char* name )
: KToggleAction( text, pix, cut, receiver, slot, parent, name ), : TDEToggleAction( text, pix, cut, receiver, slot, parent, name ),
m_alwaysEmit(false) m_alwaysEmit(false)
{ {
} }
K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix, K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix,
const KShortcut& cut, const TDEShortcut& cut,
const TQObject* receiver, const char* slot, const TQObject* receiver, const char* slot,
TQObject* parent, const char* name ) TQObject* parent, const char* name )
: KToggleAction( text, pix, cut, receiver, slot, parent, name ), : TDEToggleAction( text, pix, cut, receiver, slot, parent, name ),
m_alwaysEmit(false) m_alwaysEmit(false)
{ {
} }
K3bRadioAction::K3bRadioAction( TQObject* parent, const char* name ) K3bRadioAction::K3bRadioAction( TQObject* parent, const char* name )
: KToggleAction( parent, name ), : TDEToggleAction( parent, name ),
m_alwaysEmit(false) m_alwaysEmit(false)
{ {
} }
@ -80,15 +80,15 @@ void K3bRadioAction::slotActivated()
const TQObject *senderObj = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); const TQObject *senderObj = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
if ( !senderObj || !::tqqt_cast<const KToolBarButton *>( senderObj ) ) if ( !senderObj || !::tqqt_cast<const TDEToolBarButton *>( senderObj ) )
return; return;
const_cast<KToolBarButton *>( static_cast<const KToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true ); const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true );
return; return;
} }
KToggleAction::slotActivated(); TDEToggleAction::slotActivated();
} }
#include "k3bradioaction.moc" #include "k3bradioaction.moc"

18
libk3b/tools/k3bradioaction.h
Unescape View File

@ -20,13 +20,13 @@
#include "k3b_export.h" #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 * flag which says if it should always emit the signals
* even if it was checked twice. * even if it was checked twice.
* *
* Docu copied from tdelibs * Docu copied from tdelibs
*/ */
class LIBK3B_EXPORT K3bRadioAction : public KToggleAction class LIBK3B_EXPORT K3bRadioAction : public TDEToggleAction
{ {
Q_OBJECT Q_OBJECT
@ -42,7 +42,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
* @param parent This action's parent. * @param parent This action's parent.
* @param name An internal name for this action. * @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. * @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 parent This action's parent.
* @param name An internal name for this action. * @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 ); 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 parent This action's parent.
* @param name An internal name for this action. * @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 ); TQObject* parent = 0, const char* name = 0 );
/** /**
@ -72,7 +72,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
* @param parent This action's parent. * @param parent This action's parent.
* @param name An internal name for this action. * @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 ); TQObject* parent = 0, const char* name = 0 );
/** /**
@ -84,7 +84,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
* @param parent This action's parent. * @param parent This action's parent.
* @param name An internal name for this action. * @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 ); 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 parent This action's parent.
* @param name An internal name for this action. * @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, const TQObject* receiver, const char* slot,
TQObject* parent, const char* name = 0 ); 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 * @param b if true the action will always emit the activated signal
* even if the toggled state did not change. The default is false. * 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; } void setAlwaysEmitActivated( bool b ) { m_alwaysEmit = b; }

10
libk3b/tools/k3btoolbox.cpp
Unescape View File

@ -77,7 +77,7 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* )
K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* parent ) K3bToolBoxButton::K3bToolBoxButton( TDEAction* action, TQWidget* parent )
: TQToolButton( parent ), : TQToolButton( parent ),
m_popupMenu(0) m_popupMenu(0)
{ {
@ -94,7 +94,7 @@ K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* parent )
else else
TQToolTip::add( this, action->toolTip() ); TQToolTip::add( this, action->toolTip() );
// if( KToggleAction* ta = dynamic_cast<KToggleAction*>( action ) ) { // if( TDEToggleAction* ta = dynamic_cast<TDEToggleAction*>( action ) ) {
// setToggleButton( true ); // setToggleButton( true );
// // initial state // // initial state
@ -106,7 +106,7 @@ K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* parent )
// } // }
// else // else
if( KActionMenu* am = dynamic_cast<KActionMenu*>( action ) ) { if( TDEActionMenu* am = dynamic_cast<TDEActionMenu*>( action ) ) {
m_popupMenu = am->popupMenu(); m_popupMenu = am->popupMenu();
connect( this, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotPopupActivated()) ); connect( this, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotPopupActivated()) );
setPopup( m_popupMenu ); 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 ) { if( action ) {
K3bToolBoxButton* b = new K3bToolBoxButton( action, this ); 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 ); return addButton( action );
} }

10
libk3b/tools/k3btoolbox.h
Unescape View File

@ -22,8 +22,8 @@
#include <tqptrlist.h> #include <tqptrlist.h>
#include "k3b_export.h" #include "k3b_export.h"
class KAction; class TDEAction;
class KToggleAction; class TDEToggleAction;
class KWidgetAction; class KWidgetAction;
class TQGridLayout; class TQGridLayout;
class TQPopupMenu; class TQPopupMenu;
@ -39,7 +39,7 @@ class LIBK3B_EXPORT K3bToolBoxButton : public TQToolButton
public: public:
K3bToolBoxButton( KAction*, TQWidget* parent ); K3bToolBoxButton( TDEAction*, TQWidget* parent );
K3bToolBoxButton( const TQString& text, const TQString& icon, K3bToolBoxButton( const TQString& text, const TQString& icon,
const TQString& tooltip, const TQString& whatsthis, const TQString& tooltip, const TQString& whatsthis,
TQObject* receiver, const char* slot, TQObject* receiver, const char* slot,
@ -69,8 +69,8 @@ class LIBK3B_EXPORT K3bToolBox : public TQFrame
const TQString& tooltip = TQString(), const TQString& whatsthis = TQString(), const TQString& tooltip = TQString(), const TQString& whatsthis = TQString(),
TQObject* receiver = 0, const char* slot = 0, TQObject* receiver = 0, const char* slot = 0,
bool forceTextLabel = false ); bool forceTextLabel = false );
K3bToolBoxButton* addButton( KAction*, bool forceTextLabel = false ); K3bToolBoxButton* addButton( TDEAction*, bool forceTextLabel = false );
K3bToolBoxButton* addToggleButton( KToggleAction* ); K3bToolBoxButton* addToggleButton( TDEToggleAction* );
void addWidgetAction( KWidgetAction* ); void addWidgetAction( KWidgetAction* );
/** /**

2
libk3b/tools/k3btoolbutton.h
Unescape View File

@ -27,7 +27,7 @@ class TQEvent;
/** /**
* the K3bToolButton is an enhanced TQToolButton which adds two functionalities: * the K3bToolButton is an enhanced TQToolButton which adds two functionalities:
* <li>A delayed popup menu is shown immiadetely once the mouse is dragged downwards * <li>A delayed popup menu is shown immiadetely once the mouse is dragged downwards
* much like the KToolBarButton * much like the TDEToolBarButton
* <li>If a popup menu is set a little arrow indicates this. * <li>If a popup menu is set a little arrow indicates this.
*/ */
class LIBK3B_EXPORT K3bToolButton : public TQToolButton class LIBK3B_EXPORT K3bToolButton : public TQToolButton

4
plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
Unescape View File

@ -183,7 +183,7 @@ void K3bAudioMetainfoRenamerPluginWidget::slotScanClicked()
// d->progressCounter = 0; // d->progressCounter = 0;
// create root item // create root item
KListViewItem* rootItem = new KListViewItem( d->viewFiles, "/" ); TDEListViewItem* rootItem = new TDEListViewItem( d->viewFiles, "/" );
// d->progressDialog->show(); // d->progressDialog->show();
scanDir( dir, rootItem ); scanDir( dir, rootItem );
@ -229,7 +229,7 @@ void K3bAudioMetainfoRenamerPluginWidget::scanDir( K3bDirItem* dir, TQListViewIt
} }
else if( item->isDir() ) { else if( item->isDir() ) {
// create dir item // create dir item
KListViewItem* dirViewItem = new KListViewItem( viewRoot, item->k3bName() ); TDEListViewItem* dirViewItem = new TDEListViewItem( viewRoot, item->k3bName() );
scanDir( (K3bDirItem*)item, dirViewItem ); scanDir( (K3bDirItem*)item, dirViewItem );
dirViewItem->setOpen(true); dirViewItem->setOpen(true);
} }

78
src/k3b.cpp
Unescape View File

@ -215,10 +215,10 @@ void K3bMainWindow::initActions()
actionFileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); actionFileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
actionFileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); actionFileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
actionFileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), 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" ); actionCollection(), "file_save_all" );
actionFileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); 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" ); actionCollection(), "file_close_all" );
actionFileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); actionFileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection());
actionViewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), actionCollection()); actionViewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), actionCollection());
@ -232,38 +232,38 @@ void K3bMainWindow::initActions()
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection() ); KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection() );
actionFileNewMenu = new KActionMenu( i18n("&New Project"), "filenew", actionCollection(), "file_new" ); actionFileNewMenu = new TDEActionMenu( i18n("&New Project"), "filenew", actionCollection(), "file_new" );
actionFileNewAudio = new KAction(i18n("New &Audio CD Project"), "audiocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewAudioDoc()), actionFileNewAudio = new TDEAction(i18n("New &Audio CD Project"), "audiocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewAudioDoc()),
actionCollection(), "file_new_audio"); 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"); 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"); 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"); 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"); 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"); 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"); 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"); 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" ); actionCollection(), "file_continue_multisession" );
actionFileNewMenu->setDelayed( false ); actionFileNewMenu->setDelayed( false );
actionFileNewMenu->insert( actionFileNewData ); actionFileNewMenu->insert( actionFileNewData );
actionFileNewMenu->insert( actionFileNewDvd ); actionFileNewMenu->insert( actionFileNewDvd );
actionFileNewMenu->insert( actionFileContinueMultisession ); actionFileNewMenu->insert( actionFileContinueMultisession );
actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
actionFileNewMenu->insert( actionFileNewAudio ); actionFileNewMenu->insert( actionFileNewAudio );
actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
actionFileNewMenu->insert( actionFileNewMixed ); actionFileNewMenu->insert( actionFileNewMixed );
actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
actionFileNewMenu->insert( actionFileNewVcd ); actionFileNewMenu->insert( actionFileNewVcd );
actionFileNewMenu->insert( actionFileNewVideoDvd ); actionFileNewMenu->insert( actionFileNewVideoDvd );
actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
actionFileNewMenu->insert( actionFileNewMovix ); actionFileNewMenu->insert( actionFileNewMovix );
actionFileNewMenu->insert( actionFileNewMovixDvd ); 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"); 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" ); 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"); 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"); 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"); 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" ); actionCollection(), "tools_blank_cdrw" );
KAction* actionToolsFormatDVD = new KAction( i18n("&Format DVD%1RW...").arg("<EFBFBD>"), "formatdvd", 0, TQT_TQOBJECT(this), TDEAction* actionToolsFormatDVD = new TDEAction( i18n("&Format DVD%1RW...").arg("<EFBFBD>"), "formatdvd", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" ); 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" ); 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" ); 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" ); 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" ); 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" ); 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" ); 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" ); 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" ); actionCollection(), "help_check_system" );
#ifdef HAVE_K3BSETUP #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" ); actionCollection(), "settings_k3bsetup" );
#endif #endif
#ifdef K3B_DEBUG #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(), TQT_SLOT(slotMediaSelectionTester()), actionCollection(),
"test_media_selection" ); "test_media_selection" );
#endif #endif
@ -456,7 +456,7 @@ void K3bMainWindow::initView()
0, 0, 0, 0, 0, 0,
actionCollection(), "quick_dir_selector" ); actionCollection(), "quick_dir_selector" );
fileTreeComboAction->setAutoSized(true); 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 ); 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 // 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 = new KSimpleConfig( saveDir + "list", false );
c->setGroup( "Saved Session" ); 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 // 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; delete c;
// ---------------------------------------------------------- // ----------------------------------------------------------
@ -678,7 +678,7 @@ void K3bMainWindow::readProperties( TDEConfig* c )
TQString saveDir = TDEGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); 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 // 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 = new KSimpleConfig( saveDir + "list", true );
c->setGroup( "Saved Session" ); c->setGroup( "Saved Session" );
@ -718,7 +718,7 @@ void K3bMainWindow::readProperties( TDEConfig* c )
TDEIO::del( KURL::fromPathOrURL(saveDir), false, false ); TDEIO::del( KURL::fromPathOrURL(saveDir), false, false );
// FIXME: for some reason the config entries are not properly stored when using the default // 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; delete c;
// ---------------------------------------------------------- // ----------------------------------------------------------
@ -935,7 +935,7 @@ void K3bMainWindow::fileSaveAs( K3bDoc* doc )
KURL url = dlg.selectedURL(); KURL url = dlg.selectedURL();
if( url.isValid() ) { if( url.isValid() ) {
KRecentDocument::add( url ); TDERecentDocument::add( url );
bool exists = TDEIO::NetAccess::exists( url, false, 0 ); bool exists = TDEIO::NetAccess::exists( url, false, 0 );
if( !exists || if( !exists ||

68
src/k3b.h
Unescape View File

@ -256,7 +256,7 @@ class K3bMainWindow : public KParts::DockMainWindow
/** read general Options again and initialize all variables like the recent file list */ /** read general Options again and initialize all variables like the recent file list */
void readOptions(); void readOptions();
/** initializes the KActions of the application */ /** initializes the TDEActions of the application */
void initActions(); void initActions();
/** sets up the statusbar for the main window by initialzing a statuslabel. /** 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 */ /** The MDI-Interface is managed by this tabbed view */
K3bProjectTabWidget* m_documentTab; K3bProjectTabWidget* m_documentTab;
// KAction pointers to enable/disable actions // TDEAction pointers to enable/disable actions
KActionMenu* actionFileNewMenu; TDEActionMenu* actionFileNewMenu;
KAction* actionFileNewAudio; TDEAction* actionFileNewAudio;
KAction* actionFileNewData; TDEAction* actionFileNewData;
KAction* actionFileNewMixed; TDEAction* actionFileNewMixed;
KAction* actionFileNewVcd; TDEAction* actionFileNewVcd;
KAction* actionFileNewMovix; TDEAction* actionFileNewMovix;
KAction* actionFileNewMovixDvd; TDEAction* actionFileNewMovixDvd;
KAction* actionFileNewDvd; TDEAction* actionFileNewDvd;
KAction* actionFileNewVideoDvd; TDEAction* actionFileNewVideoDvd;
KAction* actionFileContinueMultisession; TDEAction* actionFileContinueMultisession;
KAction* actionFileOpen; TDEAction* actionFileOpen;
KRecentFilesAction* actionFileOpenRecent; TDERecentFilesAction* actionFileOpenRecent;
KAction* actionFileSave; TDEAction* actionFileSave;
KAction* actionFileSaveAs; TDEAction* actionFileSaveAs;
KAction* actionFileSaveAll; TDEAction* actionFileSaveAll;
KAction* actionFileClose; TDEAction* actionFileClose;
KAction* actionFileCloseAll; TDEAction* actionFileCloseAll;
KAction* actionFileQuit; TDEAction* actionFileQuit;
KAction* actionSettingsConfigure; TDEAction* actionSettingsConfigure;
KAction* actionSettingsK3bSetup; TDEAction* actionSettingsK3bSetup;
KAction* actionToolsBlankCdrw; TDEAction* actionToolsBlankCdrw;
KAction* actionToolsWriteCdImage; TDEAction* actionToolsWriteCdImage;
KAction* actionToolsCddaRip; TDEAction* actionToolsCddaRip;
KAction* actionToolsVideoDvdRip; TDEAction* actionToolsVideoDvdRip;
KAction* actionToolsVideoCdRip; TDEAction* actionToolsVideoCdRip;
KAction* actionCdCopy; TDEAction* actionCdCopy;
KAction* actionProjectAddFiles; TDEAction* actionProjectAddFiles;
KToggleAction* actionViewStatusBar; TDEToggleAction* actionViewStatusBar;
KToggleAction* actionViewDirTreeView; TDEToggleAction* actionViewDirTreeView;
KToggleAction* actionViewContentsView; TDEToggleAction* actionViewContentsView;
KToggleAction* actionViewDocumentHeader; TDEToggleAction* actionViewDocumentHeader;
// project actions // project actions
TQPtrList<KAction> m_dataProjectActions; TQPtrList<TDEAction> m_dataProjectActions;
KDockWidget* mainDock; KDockWidget* mainDock;
KDockWidget* m_contentsDock; KDockWidget* m_contentsDock;

28
src/k3bappdevicemanager.cpp
Unescape View File

@ -38,25 +38,25 @@ K3bAppDeviceManager::K3bAppDeviceManager( TQObject* parent, const char* name )
{ {
// FIXME: should we pass the mainwindow as watch window here? // FIXME: should we pass the mainwindow as watch window here?
// Is there a proper way to insert this actioncollection into the mainwindow's? // 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 // setup actions
KActionMenu* devicePopupMenu = new KActionMenu( m_actionCollection, "device_popup" ); TDEActionMenu* devicePopupMenu = new TDEActionMenu( m_actionCollection, "device_popup" );
m_actionDiskInfo = new KAction( i18n("Media &Info"), "info", 0, this, TQT_SLOT(diskInfo()), m_actionDiskInfo = new TDEAction( i18n("Media &Info"), "info", 0, this, TQT_SLOT(diskInfo()),
m_actionCollection, "device_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_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_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_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"); 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" ); // 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_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_actionCollection, "device_set_read_speed" );
m_actionDiskInfo->setToolTip( i18n("Display generic medium information") ); 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") ); m_actionSetReadSpeed->setToolTip( i18n("Force the drive's read speed") );
devicePopupMenu->insert( m_actionDiskInfo ); devicePopupMenu->insert( m_actionDiskInfo );
devicePopupMenu->insert( new KActionSeparator( this ) ); devicePopupMenu->insert( new TDEActionSeparator( this ) );
devicePopupMenu->insert( m_actionUnmount ); devicePopupMenu->insert( m_actionUnmount );
devicePopupMenu->insert( m_actionMount ); devicePopupMenu->insert( m_actionMount );
devicePopupMenu->insert( new KActionSeparator( this ) ); devicePopupMenu->insert( new TDEActionSeparator( this ) );
devicePopupMenu->insert( m_actionEject ); devicePopupMenu->insert( m_actionEject );
devicePopupMenu->insert( m_actionLoad ); devicePopupMenu->insert( m_actionLoad );
// devicePopupMenu->insert( new KActionSeparator( this ) ); // devicePopupMenu->insert( new TDEActionSeparator( this ) );
// devicePopupMenu->insert( actionUnlock ); // devicePopupMenu->insert( actionUnlock );
// devicePopupMenu->insert( actionlock ); // devicePopupMenu->insert( actionlock );
devicePopupMenu->insert( new KActionSeparator( this ) ); devicePopupMenu->insert( new TDEActionSeparator( this ) );
devicePopupMenu->insert( m_actionSetReadSpeed ); devicePopupMenu->insert( m_actionSetReadSpeed );
setCurrentDevice( 0 ); setCurrentDevice( 0 );

20
src/k3bappdevicemanager.h
Unescape View File

@ -16,8 +16,8 @@
#ifndef _K3B_APP_DEVICE_MANAGER_H_ #ifndef _K3B_APP_DEVICE_MANAGER_H_
#define _K3B_APP_DEVICE_MANAGER_H_ #define _K3B_APP_DEVICE_MANAGER_H_
class KActionCollection; class TDEActionCollection;
class KAction; class TDEAction;
class K3bMediaCache; class K3bMediaCache;
namespace K3bDevice { namespace K3bDevice {
@ -47,7 +47,7 @@ class K3bAppDeviceManager : public K3bDevice::DeviceManager
~K3bAppDeviceManager(); ~K3bAppDeviceManager();
K3bDevice::Device* currentDevice() const; K3bDevice::Device* currentDevice() const;
KActionCollection* actionCollection() const { return m_actionCollection; } TDEActionCollection* actionCollection() const { return m_actionCollection; }
void setMediaCache( K3bMediaCache* c ); void setMediaCache( K3bMediaCache* c );
signals: signals:
@ -103,15 +103,15 @@ class K3bAppDeviceManager : public K3bDevice::DeviceManager
void slotMediumChanged( K3bDevice::Device* dev ); void slotMediumChanged( K3bDevice::Device* dev );
private: private:
KAction* m_actionDiskInfo; TDEAction* m_actionDiskInfo;
KAction* m_actionUnmount; TDEAction* m_actionUnmount;
KAction* m_actionMount; TDEAction* m_actionMount;
KAction* m_actionEject; TDEAction* m_actionEject;
KAction* m_actionLoad; TDEAction* m_actionLoad;
KAction* m_actionSetReadSpeed; TDEAction* m_actionSetReadSpeed;
mutable K3bDevice::Device* m_currentDevice; mutable K3bDevice::Device* m_currentDevice;
KActionCollection* m_actionCollection; TDEActionCollection* m_actionCollection;
K3bDevice::DiskInfoDetector* m_diskInfoDetector; K3bDevice::DiskInfoDetector* m_diskInfoDetector;
bool m_ejectRequested; bool m_ejectRequested;

26
src/k3baudioplayer.cpp
Unescape View File

@ -50,7 +50,7 @@
using namespace std; using namespace std;
K3bPlayListViewItem::K3bPlayListViewItem( const TQString& filename, TQListView* parent ) K3bPlayListViewItem::K3bPlayListViewItem( const TQString& filename, TQListView* parent )
: KListViewItem( parent ), m_filename( filename ) : TDEListViewItem( parent ), m_filename( filename )
{ {
m_length = 0; m_length = 0;
m_bActive = false; m_bActive = false;
@ -58,7 +58,7 @@ K3bPlayListViewItem::K3bPlayListViewItem( const TQString& filename, TQListView*
K3bPlayListViewItem::K3bPlayListViewItem( const TQString& filename, TQListView* parent, TQListViewItem* after ) 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_length = 0;
m_bActive = false; 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::Highlight, red );
newCg.setColor( TQColorGroup::HighlightedText, white ); newCg.setColor( TQColorGroup::HighlightedText, white );
KListViewItem::paintCell( p, newCg, c, w, a ); TDEListViewItem::paintCell( p, newCg, c, w, a );
} }
else else
KListViewItem::paintCell( p, cg, c, w, a ); TDEListViewItem::paintCell( p, cg, c, w, a );
} }
K3bPlayListView::K3bPlayListView( TQWidget* parent, const char* name ) K3bPlayListView::K3bPlayListView( TQWidget* parent, const char* name )
: KListView( parent, name ) : TDEListView( parent, name )
{ {
addColumn( i18n("Filename") ); addColumn( i18n("Filename") );
addColumn( i18n("Length") ); addColumn( i18n("Length") );
@ -132,8 +132,8 @@ K3bPlayListView::~K3bPlayListView()
bool K3bPlayListView::acceptDrag( TQDropEvent* e ) const bool K3bPlayListView::acceptDrag( TQDropEvent* e ) const
{ {
// we accept textdrag (urls) and moved items (supported by KListView) // we accept textdrag (urls) and moved items (supported by TDEListView)
return KURLDrag::canDecode(e) || KListView::acceptDrag(e); return KURLDrag::canDecode(e) || TDEListView::acceptDrag(e);
} }
@ -222,14 +222,14 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name )
// actions // actions
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", m_actionRemove = new TDEAction( i18n( "Remove" ), "editdelete",
Key_Delete, this, TQT_SLOT(slotRemoveSelected()), Key_Delete, this, TQT_SLOT(slotRemoveSelected()),
this, "audioplayer_remove" ); this, "audioplayer_remove" );
m_actionClear = new KAction( i18n( "Clear List" ), "editclear", m_actionClear = new TDEAction( i18n( "Clear List" ), "editclear",
0, this, TQT_SLOT(clear()), 0, this, TQT_SLOT(clear()),
this, "audioplayer_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_actionRemove);
m_contextMenu->insert(m_actionClear); m_contextMenu->insert(m_actionClear);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -237,8 +237,8 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name )
// connections // connections
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
connect( m_viewPlayList, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), connect( m_viewPlayList, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(slotShowContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); this, TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
connect( m_buttonPlay, TQT_SIGNAL(clicked()), this, TQT_SLOT(play()) ); connect( m_buttonPlay, TQT_SIGNAL(clicked()), this, TQT_SLOT(play()) );
connect( m_buttonStop, TQT_SIGNAL(clicked()), this, TQT_SLOT(stop()) ); 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 ) if( item )
m_actionRemove->setEnabled( true ); m_actionRemove->setEnabled( true );

16
src/k3baudioplayer.h
Unescape View File

@ -34,15 +34,15 @@ class TQPainter;
class TQColorGroup; class TQColorGroup;
class TQDropEvent; class TQDropEvent;
class TQDragObject; class TQDragObject;
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
/** /**
* Special ListViewItem for the K3bAudioPlayer playlist * Special ListViewItem for the K3bAudioPlayer playlist
* @author Sebastian Trueg * @author Sebastian Trueg
*/ */
class K3bPlayListViewItem : public KListViewItem class K3bPlayListViewItem : public TDEListViewItem
{ {
public: public:
K3bPlayListViewItem( const TQString&, TQListView* parent ); K3bPlayListViewItem( const TQString&, TQListView* parent );
@ -82,7 +82,7 @@ class K3bPlayListViewItem : public KListViewItem
* Playlistview just needed to accept * Playlistview just needed to accept
* url drags * url drags
*/ */
class K3bPlayListView : public KListView class K3bPlayListView : public TDEListView
{ {
Q_OBJECT Q_OBJECT
@ -172,7 +172,7 @@ Q_OBJECT
*/ */
void setCurrentItem( TQListViewItem* item ); void setCurrentItem( TQListViewItem* item );
void slotRemoveSelected(); void slotRemoveSelected();
void slotShowContextMenu( KListView*, TQListViewItem* item, const TQPoint& p ); void slotShowContextMenu( TDEListView*, TQListViewItem* item, const TQPoint& p );
private: private:
#ifdef WITH_ARTS #ifdef WITH_ARTS
@ -201,9 +201,9 @@ Q_OBJECT
bool m_bLengthReady; bool m_bLengthReady;
KAction* m_actionRemove; TDEAction* m_actionRemove;
KAction* m_actionClear; TDEAction* m_actionClear;
KActionMenu* m_contextMenu; TDEActionMenu* m_contextMenu;
}; };

12
src/k3bdiroperator.cpp
Unescape View File

@ -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 // disable the del-key since we still have a focus problem and users keep
// deleting files when they want to remove project entries // deleting files when they want to remove project entries
KAction* aDelete = actionCollection()->action("delete"); TDEAction* aDelete = actionCollection()->action("delete");
if( aDelete ) if( aDelete )
aDelete->setShortcut( 0 ); aDelete->setShortcut( 0 );
@ -49,10 +49,10 @@ K3bDirOperator::K3bDirOperator(const KURL& url, TQWidget* parent, const char* na
bmMan->setUpdate( true ); bmMan->setUpdate( true );
bmMan->setShowNSBookmarks( false ); 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 ); 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()), TQT_TQOBJECT(this), TQT_SLOT(slotAddFilesToProject()),
actionCollection(), "add_file_to_project"); actionCollection(), "add_file_to_project");
} }
@ -130,12 +130,12 @@ void K3bDirOperator::activatedMenu( const KFileItem*, const TQPoint& pos )
updateSelectionDependentActions(); updateSelectionDependentActions();
// insert our own actions // insert our own actions
KActionMenu* dirOpMenu = (KActionMenu*)actionCollection()->action("popupMenu"); TDEActionMenu* dirOpMenu = (TDEActionMenu*)actionCollection()->action("popupMenu");
dirOpMenu->insert( new KActionSeparator( actionCollection() ) ); dirOpMenu->insert( new TDEActionSeparator( actionCollection() ) );
dirOpMenu->insert( m_bmPopup ); dirOpMenu->insert( m_bmPopup );
dirOpMenu->insert( actionCollection()->action("add_file_to_project"), 0 ); 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() && bool hasSelection = view() && view()->selectedItems() &&
!view()->selectedItems()->isEmpty(); !view()->selectedItems()->isEmpty();

6
src/k3bdiroperator.h
Unescape View File

@ -23,7 +23,7 @@
class TQIconViewItem; class TQIconViewItem;
class TQListViewItem; class TQListViewItem;
class KBookmarkMenu; class KBookmarkMenu;
class KActionMenu; class TDEActionMenu;
@ -64,7 +64,7 @@ class K3bDirOperator : public KDirOperator, public KBookmarkOwner
*/ */
TQString currentURL() const; TQString currentURL() const;
KActionMenu* bookmarkMenu() const { return m_bmPopup; } TDEActionMenu* bookmarkMenu() const { return m_bmPopup; }
public slots: public slots:
void slotAddFilesToProject(); void slotAddFilesToProject();
@ -77,7 +77,7 @@ class K3bDirOperator : public KDirOperator, public KBookmarkOwner
private: private:
KBookmarkMenu* m_bmMenu; KBookmarkMenu* m_bmMenu;
KActionMenu* m_bmPopup; TDEActionMenu* m_bmPopup;
}; };
#endif #endif

4
src/k3bdirview.cpp
Unescape View File

@ -325,8 +325,8 @@ void K3bDirView::slotUnmountFinished( bool success )
void K3bDirView::slotFileTreeContextMenu( K3bDevice::Device* /*dev*/, const TQPoint& p ) void K3bDirView::slotFileTreeContextMenu( K3bDevice::Device* /*dev*/, const TQPoint& p )
{ {
KAction* a = k3bappcore->appDeviceManager()->actionCollection()->action( "device_popup" ); TDEAction* a = k3bappcore->appDeviceManager()->actionCollection()->action( "device_popup" );
if( KActionMenu* m = dynamic_cast<KActionMenu*>(a) ) if( TDEActionMenu* m = dynamic_cast<TDEActionMenu*>(a) )
m->popup( p ); m->popup( p );
} }

112
src/k3bdiskinfoview.cpp
Unescape View File

@ -48,55 +48,55 @@
// FIXME: use K3bListViewItem instead // FIXME: use K3bListViewItem instead
class K3bDiskInfoView::HeaderViewItem : public KListViewItem class K3bDiskInfoView::HeaderViewItem : public TDEListViewItem
{ {
public: public:
HeaderViewItem( TQListView* parent ) HeaderViewItem( TQListView* parent )
: KListViewItem( parent ) {} : TDEListViewItem( parent ) {}
HeaderViewItem( TQListViewItem* parent ) HeaderViewItem( TQListViewItem* parent )
: KListViewItem( parent ) {} : TDEListViewItem( parent ) {}
HeaderViewItem( TQListView* parent, TQListViewItem* after ) HeaderViewItem( TQListView* parent, TQListViewItem* after )
: KListViewItem( parent, after ) {} : TDEListViewItem( parent, after ) {}
HeaderViewItem( TQListViewItem* parent, TQListViewItem* after ) HeaderViewItem( TQListViewItem* parent, TQListViewItem* after )
: KListViewItem( parent, after ) {} : TDEListViewItem( parent, after ) {}
HeaderViewItem( TQListView* parent, const TQString& t1 ) HeaderViewItem( TQListView* parent, const TQString& t1 )
: KListViewItem( parent, t1 ) {} : TDEListViewItem( parent, t1 ) {}
HeaderViewItem( TQListViewItem* parent, const TQString& t1 ) HeaderViewItem( TQListViewItem* parent, const TQString& t1 )
: KListViewItem( parent, t1 ) {} : TDEListViewItem( parent, t1 ) {}
HeaderViewItem( TQListView* parent, TQListViewItem* after, const TQString& 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 ) 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 ) void paintCell( TQPainter* p, const TQColorGroup & cg, int column, int width, int align )
{ {
TQFont f ( p->font() ); TQFont f ( p->font() );
f.setBold( true ); f.setBold( true );
p->setFont( f ); 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: public:
TwoColumnViewItem( TQListView* parent ) TwoColumnViewItem( TQListView* parent )
: KListViewItem( parent ) {} : TDEListViewItem( parent ) {}
TwoColumnViewItem( TQListViewItem* parent ) TwoColumnViewItem( TQListViewItem* parent )
: KListViewItem( parent ) {} : TDEListViewItem( parent ) {}
TwoColumnViewItem( TQListView* parent, TQListViewItem* after ) TwoColumnViewItem( TQListView* parent, TQListViewItem* after )
: KListViewItem( parent, after ) {} : TDEListViewItem( parent, after ) {}
TwoColumnViewItem( TQListViewItem* parent, TQListViewItem* after ) TwoColumnViewItem( TQListViewItem* parent, TQListViewItem* after )
: KListViewItem( parent, after ) {} : TDEListViewItem( parent, after ) {}
TwoColumnViewItem( TQListView* parent, const TQString& t1 ) TwoColumnViewItem( TQListView* parent, const TQString& t1 )
: KListViewItem( parent, t1 ) {} : TDEListViewItem( parent, t1 ) {}
TwoColumnViewItem( TQListViewItem* parent, const TQString& t1 ) TwoColumnViewItem( TQListViewItem* parent, const TQString& t1 )
: KListViewItem( parent, t1 ) {} : TDEListViewItem( parent, t1 ) {}
TwoColumnViewItem( TQListView* parent, TQListViewItem* after, const TQString& 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 ) 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 ) void paintCell( TQPainter* p, const TQColorGroup & cg, int column, int width, int align )
{ {
@ -116,9 +116,9 @@ public:
// p->setClipRect( r ); // p->setClipRect( r );
p->setClipping( false ); p->setClipping( false );
KListViewItem::paintCell( p, cg, column, newWidth, align ); TDEListViewItem::paintCell( p, cg, column, newWidth, align );
} else if( column == 0 ) } 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, K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_COMPLETE|K3bDevice::STATE_UNKNOWN,
parent, name ) parent, name )
{ {
m_infoView = new KListView( this ); m_infoView = new TDEListView( this );
setMainWidget( m_infoView ); setMainWidget( m_infoView );
m_infoView->setSorting( -1 ); m_infoView->setSorting( -1 );
m_infoView->setAllColumnsShowFocus( true ); m_infoView->setAllColumnsShowFocus( true );
m_infoView->setSelectionMode( TQListView::NoSelection ); m_infoView->setSelectionMode( TQListView::NoSelection );
m_infoView->setResizeMode( KListView::AllColumns ); m_infoView->setResizeMode( TDEListView::AllColumns );
m_infoView->setAlternateBackground( TQColor() ); m_infoView->setAlternateBackground( TQColor() );
m_infoView->addColumn( "1" ); m_infoView->addColumn( "1" );
@ -202,7 +202,7 @@ void K3bDiskInfoView::reloadMedium()
// iso9660 info // iso9660 info
// ///////////////////////////////////////////////////////////////////////////////////// // /////////////////////////////////////////////////////////////////////////////////////
if( medium().content() & K3bMedium::CONTENT_DATA ) { 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() ); createIso9660InfoItems( medium().iso9660Descriptor() );
} }
@ -211,12 +211,12 @@ void K3bDiskInfoView::reloadMedium()
if( !medium().toc().isEmpty() ) { if( !medium().toc().isEmpty() ) {
if( m_infoView->childCount() ) 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 // create header item
KListViewItem* item = new KListViewItem( trackHeaderItem, TDEListViewItem* item = new TDEListViewItem( trackHeaderItem,
i18n("Type"), i18n("Type"),
i18n("Attributes"), i18n("Attributes"),
i18n("First-Last Sector"), i18n("First-Last Sector"),
@ -229,7 +229,7 @@ void K3bDiskInfoView::reloadMedium()
int lastSession = 0; int lastSession = 0;
// if we have multiple sessions we create a header item for every session // 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 ) { if( medium().diskInfo().numSessions() > 1 && medium().toc()[0].session() > 0 ) {
trackItem = new HeaderViewItem( trackHeaderItem, item, i18n("Session %1").arg(1) ); trackItem = new HeaderViewItem( trackHeaderItem, item, i18n("Session %1").arg(1) );
lastSession = 1; lastSession = 1;
@ -251,7 +251,7 @@ void K3bDiskInfoView::reloadMedium()
i18n("Session %1").arg(lastSession) ); i18n("Session %1").arg(lastSession) );
} }
item = new KListViewItem( trackItem, item ); item = new TDEListViewItem( trackItem, item );
TQString text; TQString text;
if( track.type() == K3bTrack::AUDIO ) { if( track.type() == K3bTrack::AUDIO ) {
item->setPixmap( 0, SmallIcon( "sound" ) ); item->setPixmap( 0, SmallIcon( "sound" ) );
@ -298,19 +298,19 @@ void K3bDiskInfoView::reloadMedium()
if( !medium().cdText().isEmpty() ) { if( !medium().cdText().isEmpty() ) {
medium().cdText().debug(); medium().cdText().debug();
if( m_infoView->childCount() ) 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(), m_infoView->lastChild(),
i18n("CD-TEXT (excerpt)") ); i18n("CD-TEXT (excerpt)") );
// create header item // create header item
KListViewItem* item = new KListViewItem( cdTextHeaderItem, TDEListViewItem* item = new TDEListViewItem( cdTextHeaderItem,
i18n("Performer"), i18n("Performer"),
i18n("Title"), i18n("Title"),
i18n("Songwriter"), i18n("Songwriter"),
i18n("Composer") ); i18n("Composer") );
item = new KListViewItem( cdTextHeaderItem, item ); item = new TDEListViewItem( cdTextHeaderItem, item );
item->setText( 0, i18n("CD:") + " " + item->setText( 0, i18n("CD:") + " " +
medium().cdText().performer() ); medium().cdText().performer() );
item->setText( 1, medium().cdText().title() ); item->setText( 1, medium().cdText().title() );
@ -319,7 +319,7 @@ void K3bDiskInfoView::reloadMedium()
int index = 1; int index = 1;
for( unsigned int i = 0; i < medium().cdText().count(); ++i ) { 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, ' ' ) + " " + item->setText( 0, TQString::number(index).rightJustify( 2, ' ' ) + " " +
medium().cdText().at(i).performer() ); medium().cdText().at(i).performer() );
item->setText( 1, medium().cdText().at(i).title() ); item->setText( 1, medium().cdText().at(i).title() );
@ -338,57 +338,57 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium )
{ {
const K3bDevice::DiskInfo& info = medium.diskInfo(); 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; TQString typeStr;
if( info.mediaType() != K3bDevice::MEDIA_UNKNOWN ) if( info.mediaType() != K3bDevice::MEDIA_UNKNOWN )
typeStr = K3bDevice::mediaTypeString( info.mediaType() ); typeStr = K3bDevice::mediaTypeString( info.mediaType() );
else else
typeStr = i18n("Unknown (probably CD-ROM)"); 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() ) if( info.isDvdMedia() )
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new TDEListViewItem( atipItem, atipChild,
i18n("Media ID:"), i18n("Media ID:"),
!info.mediaId().isEmpty() ? TQString::fromLatin1( info.mediaId() ) : i18n("unknown") ); !info.mediaId().isEmpty() ? TQString::fromLatin1( info.mediaId() ) : i18n("unknown") );
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new TDEListViewItem( atipItem, atipChild,
i18n("Capacity:"), i18n("Capacity:"),
i18n("%1 min").arg(info.capacity().toString()), i18n("%1 min").arg(info.capacity().toString()),
TDEIO::convertSize(info.capacity().mode1Bytes()) ); TDEIO::convertSize(info.capacity().mode1Bytes()) );
if( !info.empty() ) if( !info.empty() )
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new TDEListViewItem( atipItem, atipChild,
i18n("Used Capacity:"), i18n("Used Capacity:"),
i18n("%1 min").arg(info.size().toString()), i18n("%1 min").arg(info.size().toString()),
TDEIO::convertSize(info.size().mode1Bytes()) ); TDEIO::convertSize(info.size().mode1Bytes()) );
if( info.appendable() ) if( info.appendable() )
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new TDEListViewItem( atipItem, atipChild,
i18n("Remaining:"), i18n("Remaining:"),
i18n("%1 min").arg( info.remainingSize().toString() ), i18n("%1 min").arg( info.remainingSize().toString() ),
TDEIO::convertSize(info.remainingSize().mode1Bytes()) ); TDEIO::convertSize(info.remainingSize().mode1Bytes()) );
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new TDEListViewItem( atipItem, atipChild,
i18n("Rewritable:"), i18n("Rewritable:"),
info.rewritable() ? i18n("yes") : i18n("no") ); info.rewritable() ? i18n("yes") : i18n("no") );
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new TDEListViewItem( atipItem, atipChild,
i18n("Appendable:"), i18n("Appendable:"),
info.appendable() ? i18n("yes") : i18n("no") ); info.appendable() ? i18n("yes") : i18n("no") );
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new TDEListViewItem( atipItem, atipChild,
i18n("Empty:"), i18n("Empty:"),
info.empty() ? i18n("yes") : i18n("no") ); info.empty() ? i18n("yes") : i18n("no") );
if( info.isDvdMedia() ) if( info.isDvdMedia() )
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new TDEListViewItem( atipItem, atipChild,
i18n("Layers:"), i18n("Layers:"),
TQString::number( info.numLayers() ) ); TQString::number( info.numLayers() ) );
if( info.mediaType() == K3bDevice::MEDIA_DVD_PLUS_RW ) { if( info.mediaType() == K3bDevice::MEDIA_DVD_PLUS_RW ) {
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new TDEListViewItem( atipItem, atipChild,
i18n("Background Format:") ); i18n("Background Format:") );
switch( info.bgFormatState() ) { switch( info.bgFormatState() ) {
case K3bDevice::BG_FORMAT_NONE: 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:"), i18n("Sessions:"),
TQString::number( info.numSessions() ) ); TQString::number( info.numSessions() ) );
if( info.mediaType() & K3bDevice::MEDIA_WRITABLE ) { if( info.mediaType() & K3bDevice::MEDIA_WRITABLE ) {
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new TDEListViewItem( atipItem, atipChild,
i18n("Supported writing speeds:") ); i18n("Supported writing speeds:") );
TQString s; TQString s;
if( medium.writingSpeeds().isEmpty() ) if( medium.writingSpeeds().isEmpty() )
@ -439,41 +439,41 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium )
void K3bDiskInfoView::createIso9660InfoItems( const K3bIso9660SimplePrimaryDescriptor& iso ) 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") ); i18n("ISO9660 Filesystem Info") );
KListViewItem* iso9660Child = 0; TDEListViewItem* iso9660Child = 0;
iso9660Child = new KListViewItem( iso9660Item, iso9660Child, iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child,
i18n("System Id:"), i18n("System Id:"),
iso.systemId.isEmpty() iso.systemId.isEmpty()
? TQString("-") ? TQString("-")
: iso.systemId ); : iso.systemId );
iso9660Child = new KListViewItem( iso9660Item, iso9660Child, iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child,
i18n("Volume Id:"), i18n("Volume Id:"),
iso.volumeId.isEmpty() iso.volumeId.isEmpty()
? TQString("-") ? TQString("-")
: iso.volumeId ); : iso.volumeId );
iso9660Child = new KListViewItem( iso9660Item, iso9660Child, iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child,
i18n("Volume Set Id:"), i18n("Volume Set Id:"),
iso.volumeSetId.isEmpty() iso.volumeSetId.isEmpty()
? TQString("-") ? TQString("-")
: iso.volumeSetId ); : iso.volumeSetId );
iso9660Child = new KListViewItem( iso9660Item, iso9660Child, iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child,
i18n("Publisher Id:"), i18n("Publisher Id:"),
iso.publisherId.isEmpty() iso.publisherId.isEmpty()
? TQString("-") ? TQString("-")
: iso.publisherId ); : iso.publisherId );
iso9660Child = new KListViewItem( iso9660Item, iso9660Child, iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child,
i18n("Preparer Id:"), i18n("Preparer Id:"),
iso.preparerId.isEmpty() iso.preparerId.isEmpty()
? TQString("-") ? TQString("-")
: iso.preparerId ); : iso.preparerId );
iso9660Child = new KListViewItem( iso9660Item, iso9660Child, iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child,
i18n("Application Id:"), i18n("Application Id:"),
iso.applicationId.isEmpty() iso.applicationId.isEmpty()
? TQString("-") ? TQString("-")
: iso.applicationId ); : iso.applicationId );
// iso9660Child = new KListViewItem( iso9660Item, iso9660Child, // iso9660Child = new TDEListViewItem( iso9660Item, iso9660Child,
// i18n("Volume Size:"), // i18n("Volume Size:"),
// TQString( "%1 (%2*%3)" ) // TQString( "%1 (%2*%3)" )
// .arg(iso.logicalBlockSize // .arg(iso.logicalBlockSize

4
src/k3bdiskinfoview.h
Unescape View File

@ -22,7 +22,7 @@
#include "k3bmedium.h" #include "k3bmedium.h"
class TQLabel; class TQLabel;
class KListView; class TDEListView;
class K3bIso9660; class K3bIso9660;
namespace K3bDevice { namespace K3bDevice {
@ -47,7 +47,7 @@ class K3bDiskInfoView : public K3bMediaContentsView
void createMediaInfoItems( const K3bMedium& ); void createMediaInfoItems( const K3bMedium& );
void createIso9660InfoItems( const K3bIso9660SimplePrimaryDescriptor& ); void createIso9660InfoItems( const K3bIso9660SimplePrimaryDescriptor& );
KListView* m_infoView; TDEListView* m_infoView;
class HeaderViewItem; class HeaderViewItem;
class TwoColumnViewItem; class TwoColumnViewItem;

20
src/k3bfiletreeview.cpp
Unescape View File

@ -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(executed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) );
connect( this, TQT_SIGNAL(returnPressed(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& )), connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem* , const TQPoint& )),
this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem* , const TQPoint& )) ); this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem* , const TQPoint& )) );
// we always simulate the single click // we always simulate the single click
slotSettingsChangedK3b(TDEApplication::SETTINGS_MOUSE); slotSettingsChangedK3b(TDEApplication::SETTINGS_MOUSE);
@ -444,20 +444,20 @@ void K3bFileTreeView::clear()
void K3bFileTreeView::initActions() void K3bFileTreeView::initActions()
{ {
// m_actionCollection = new KActionCollection( this ); // m_actionCollection = new TDEActionCollection( this );
// m_devicePopupMenu = new KActionMenu( m_actionCollection, "device_popup_menu" ); // m_devicePopupMenu = new TDEActionMenu( m_actionCollection, "device_popup_menu" );
// m_urlPopupMenu = new KActionMenu( m_actionCollection, "url_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"); // 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"); // 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_actionCollection, "disk_eject");
// m_devicePopupMenu->insert( actionDiskInfo ); // m_devicePopupMenu->insert( actionDiskInfo );
// m_devicePopupMenu->insert( new KActionSeparator( this ) ); // m_devicePopupMenu->insert( new TDEActionSeparator( this ) );
// m_devicePopupMenu->insert( actionUnmount ); // m_devicePopupMenu->insert( actionUnmount );
// m_devicePopupMenu->insert( actionEject ); // 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<KFileTreeViewItem*>(item); KFileTreeViewItem* treeItem = dynamic_cast<KFileTreeViewItem*>(item);
if( treeItem ) { if( treeItem ) {

12
src/k3bfiletreeview.h
Unescape View File

@ -21,8 +21,8 @@
#include <tdefiletreeview.h> #include <tdefiletreeview.h>
class KFileTreeBranch; class KFileTreeBranch;
class KActionCollection; class TDEActionCollection;
class KActionMenu; class TDEActionMenu;
class TQPoint; class TQPoint;
class TQDropEvent; class TQDropEvent;
class TQDragEnterEvent; class TQDragEnterEvent;
@ -181,7 +181,7 @@ class K3bFileTreeView : public KFileTreeView
private slots: private slots:
void slotItemExecuted( TQListViewItem* item ); void slotItemExecuted( TQListViewItem* item );
void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ); void slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& );
void slotSettingsChangedK3b(int category); void slotSettingsChangedK3b(int category);
void slotMouseButtonClickedK3b( int btn, TQListViewItem *item, const TQPoint &pos, int c ); void slotMouseButtonClickedK3b( int btn, TQListViewItem *item, const TQPoint &pos, int c );
@ -192,9 +192,9 @@ class K3bFileTreeView : public KFileTreeView
Private* d; Private* d;
bool m_dirOnlyMode; bool m_dirOnlyMode;
KActionCollection* m_actionCollection; TDEActionCollection* m_actionCollection;
KActionMenu* m_devicePopupMenu; TDEActionMenu* m_devicePopupMenu;
KActionMenu* m_urlPopupMenu; TDEActionMenu* m_urlPopupMenu;
bool m_menuEnabled; bool m_menuEnabled;
}; };

10
src/k3bfileview.cpp
Unescape View File

@ -55,7 +55,7 @@ K3bFileView::~K3bFileView()
} }
KActionCollection* K3bFileView::actionCollection() const TDEActionCollection* K3bFileView::actionCollection() const
{ {
return m_dirOp->actionCollection(); return m_dirOp->actionCollection();
} }
@ -74,10 +74,10 @@ void K3bFileView::setupGUI()
layout->setStretchFactor( m_dirOp, 1 ); layout->setStretchFactor( m_dirOp, 1 );
// setup actions // setup actions
KAction* actionHome = m_dirOp->actionCollection()->action("home"); TDEAction* actionHome = m_dirOp->actionCollection()->action("home");
KAction* actionBack = m_dirOp->actionCollection()->action("back"); TDEAction* actionBack = m_dirOp->actionCollection()->action("back");
KAction* actionUp = m_dirOp->actionCollection()->action("up"); TDEAction* actionUp = m_dirOp->actionCollection()->action("up");
KAction* actionReload = m_dirOp->actionCollection()->action("reload"); TDEAction* actionReload = m_dirOp->actionCollection()->action("reload");
m_toolBox->addButton( actionUp ); m_toolBox->addButton( actionUp );
m_toolBox->addButton( actionBack ); m_toolBox->addButton( actionBack );

4
src/k3bfileview.h
Unescape View File

@ -26,7 +26,7 @@ class TQDragObject;
class KURL; class KURL;
class KFileFilterCombo; class KFileFilterCombo;
class KFileItem; class KFileItem;
class KActionCollection; class TDEActionCollection;
class TDEConfig; class TDEConfig;
class K3bToolBox; class K3bToolBox;
@ -46,7 +46,7 @@ class K3bFileView : public K3bContentsView
void setUrl( const KURL &url, bool forward = true ); void setUrl( const KURL &url, bool forward = true );
KURL url(); KURL url();
KActionCollection* actionCollection() const; TDEActionCollection* actionCollection() const;
void reload(); void reload();

2
src/k3bflatbutton.cpp
Unescape View File

@ -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*/ ), : TQFrame( parent, name/*, WNoAutoErase*/ ),
m_pressed(false) m_pressed(false)
{ {

4
src/k3bflatbutton.h
Unescape View File

@ -23,7 +23,7 @@
class TQEvent; class TQEvent;
class TQMouseEvent; class TQMouseEvent;
class TQPainter; class TQPainter;
class KAction; class TDEAction;
/** /**
@ -37,7 +37,7 @@ class K3bFlatButton : public TQFrame
public: public:
K3bFlatButton( TQWidget *parent = 0, const char *name = 0 ); K3bFlatButton( TQWidget *parent = 0, const char *name = 0 );
K3bFlatButton( const TQString& text, 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(); ~K3bFlatButton();

8
src/k3bjobprogressdialog.cpp
Unescape View File

@ -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( "" );
m_viewInfo->addColumn( i18n( "Message" ) ); m_viewInfo->addColumn( i18n( "Message" ) );
m_viewInfo->setFullWidth( true ); m_viewInfo->setFullWidth( true );
@ -291,7 +291,7 @@ void K3bJobProgressDialog::closeEvent( TQCloseEvent* e )
w->show(); w->show();
if( !m_plainCaption.isEmpty() ) if( !m_plainCaption.isEmpty() )
if( KMainWindow* w = dynamic_cast<KMainWindow*>(kapp->mainWidget()) ) if( TDEMainWindow* w = dynamic_cast<TDEMainWindow*>(kapp->mainWidget()) )
w->setPlainCaption( m_plainCaption ); w->setPlainCaption( m_plainCaption );
if( m_osd ) { if( m_osd ) {
@ -504,7 +504,7 @@ void K3bJobProgressDialog::slotStarted()
d->lastProgress = 0; d->lastProgress = 0;
m_timer->start( 1000 ); m_timer->start( 1000 );
m_startTime = TQTime::currentTime(); m_startTime = TQTime::currentTime();
if( KMainWindow* w = dynamic_cast<KMainWindow*>(kapp->mainWidget()) ) if( TDEMainWindow* w = dynamic_cast<TDEMainWindow*>(kapp->mainWidget()) )
m_plainCaption = w->caption(); m_plainCaption = w->caption();
m_logFile.open(); m_logFile.open();
@ -545,7 +545,7 @@ void K3bJobProgressDialog::slotProgress( int percent )
if( percent > d->lastProgress ) { if( percent > d->lastProgress ) {
d->lastProgress = percent; d->lastProgress = percent;
m_lastProgressUpdateTime = TQTime::currentTime(); m_lastProgressUpdateTime = TQTime::currentTime();
if( KMainWindow* w = dynamic_cast<KMainWindow*>(kapp->mainWidget()) ) { if( TDEMainWindow* w = dynamic_cast<TDEMainWindow*>(kapp->mainWidget()) ) {
w->setPlainCaption( TQString( "(%1%) %2" ).arg(percent).arg(m_plainCaption) ); w->setPlainCaption( TQString( "(%1%) %2" ).arg(percent).arg(m_plainCaption) );
} }

4
src/k3bjobprogressdialog.h
Unescape View File

@ -29,7 +29,7 @@
class TQVBoxLayout; class TQVBoxLayout;
class TQHBoxLayout; class TQHBoxLayout;
class TQGridLayout; class TQGridLayout;
class KListView; class TDEListView;
class TQFrame; class TQFrame;
class TQGroupBox; class TQGroupBox;
class TQLabel; class TQLabel;
@ -132,7 +132,7 @@ class K3bJobProgressDialog : public KDialog, public K3bJobHandler
K3bThemedLabel* m_labelJob; K3bThemedLabel* m_labelJob;
K3bThemedLabel* m_labelJobDetails; K3bThemedLabel* m_labelJobDetails;
KListView* m_viewInfo; TDEListView* m_viewInfo;
K3bThemedLabel* m_labelTask; K3bThemedLabel* m_labelTask;
K3bThemedLabel* m_labelElapsedTime; K3bThemedLabel* m_labelElapsedTime;
KCutLabel* m_labelSubTask; KCutLabel* m_labelSubTask;

2
src/k3bjobprogressosd.cpp
Unescape View File

@ -216,7 +216,7 @@ void K3bJobProgressOSD::mousePressEvent( TQMouseEvent* e )
m_dragging = true; m_dragging = true;
} }
else if( e->button() == Qt::RightButton ) { else if( e->button() == Qt::RightButton ) {
KPopupMenu m; TDEPopupMenu m;
if( m.insertItem( i18n("Hide OSD") ) == m.exec( e->globalPos() ) ) if( m.insertItem( i18n("Hide OSD") ) == m.exec( e->globalPos() ) )
hide(); hide();
} }

2
src/k3bmediacontentsview.h
Unescape View File

@ -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 * 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. * 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 class K3bMediaContentsView : public K3bContentsView
{ {

4
src/k3bprojecttabwidget.cpp
Unescape View File

@ -60,7 +60,7 @@ K3bProjectTabWidget::K3bProjectTabWidget( TQWidget *parent, const char *name, WF
tabBar()->setAcceptDrops(true); tabBar()->setAcceptDrops(true);
tabBar()->installEventFilter( this ); 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 ); m_projectActionMenu->insert( action );
} }

8
src/k3bprojecttabwidget.h
Unescape View File

@ -20,8 +20,8 @@
#include <tqtabwidget.h> #include <tqtabwidget.h>
#include <kurl.h> #include <kurl.h>
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
class K3bDoc; class K3bDoc;
@ -58,7 +58,7 @@ class K3bProjectTabWidget : public TQTabWidget
/** /**
* inserts the given action into the popup menu for the tabs * inserts the given action into the popup menu for the tabs
*/ */
void insertAction( KAction* ); void insertAction( TDEAction* );
bool eventFilter( TQObject* o, TQEvent* e ); bool eventFilter( TQObject* o, TQEvent* e );
@ -70,7 +70,7 @@ class K3bProjectTabWidget : public TQTabWidget
void slotDocSaved( K3bDoc* ); void slotDocSaved( K3bDoc* );
private: private:
KActionMenu* m_projectActionMenu; TDEActionMenu* m_projectActionMenu;
class ProjectData; class ProjectData;
TQMap<K3bDoc*, ProjectData> m_projectDataMap; TQMap<K3bDoc*, ProjectData> m_projectDataMap;

2
src/k3bsidepanel.cpp
Unescape View File

@ -85,7 +85,7 @@ TQFrame* K3bSidePanel::createPanel()
} }
void K3bSidePanel::addButton( TQFrame* frame, KAction* a ) void K3bSidePanel::addButton( TQFrame* frame, TDEAction* a )
{ {
if( a ) { if( a ) {
TQToolButton* b = new TQToolButton( frame ); TQToolButton* b = new TQToolButton( frame );

4
src/k3bsidepanel.h
Unescape View File

@ -21,7 +21,7 @@
class K3bMainWindow; class K3bMainWindow;
class K3bFileTreeView; class K3bFileTreeView;
class TQFrame; class TQFrame;
class KAction; class TDEAction;
class K3bSidePanel : public TQToolBox class K3bSidePanel : public TQToolBox
@ -44,7 +44,7 @@ class K3bSidePanel : public TQToolBox
K3bFileTreeView* m_fileTreeView; K3bFileTreeView* m_fileTreeView;
TQFrame* createPanel(); TQFrame* createPanel();
void addButton( TQFrame* frame, KAction* action ); void addButton( TQFrame* frame, TDEAction* action );
}; };
#endif #endif

2
src/k3bstatusbarmanager.cpp
Unescape View File

@ -156,7 +156,7 @@ bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e )
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_labelFreeTemp->parentWidget()) ) if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_labelFreeTemp->parentWidget()) )
m_mainWindow->showOptionDialog( 0 ); // FIXME: use an enumeration for the option pages m_mainWindow->showOptionDialog( 0 ); // FIXME: use an enumeration for the option pages
else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_versionBox) ) 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(); a->activate();
} }

28
src/k3bwelcomewidget.cpp
Unescape View File

@ -111,7 +111,7 @@ K3bWelcomeWidget::Display::~Display()
} }
void K3bWelcomeWidget::Display::addAction( KAction* action ) void K3bWelcomeWidget::Display::addAction( TDEAction* action )
{ {
if( action ) { if( action ) {
m_actions.append(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 ) { if( action ) {
m_actions.removeRef( action ); m_actions.removeRef( action );
@ -135,7 +135,7 @@ void K3bWelcomeWidget::Display::removeButton( K3bFlatButton* b )
} }
void K3bWelcomeWidget::Display::rebuildGui( const TQPtrList<KAction>& actions ) void K3bWelcomeWidget::Display::rebuildGui( const TQPtrList<TDEAction>& actions )
{ {
m_actions = actions; m_actions = actions;
rebuildGui(); rebuildGui();
@ -171,8 +171,8 @@ void K3bWelcomeWidget::Display::rebuildGui()
if( numActions > 0 ) { if( numActions > 0 ) {
// create buttons // create buttons
for( TQPtrListIterator<KAction> it( m_actions ); it.current(); ++it ) { for( TQPtrListIterator<TDEAction> it( m_actions ); it.current(); ++it ) {
KAction* a = it.current(); TDEAction* a = it.current();
K3bFlatButton* b = new K3bFlatButton( a, this ); K3bFlatButton* b = new K3bFlatButton( a, this );
@ -375,9 +375,9 @@ void K3bWelcomeWidget::loadConfig( TDEConfigBase* c )
sl.append( "tools_write_dvd_iso" ); sl.append( "tools_write_dvd_iso" );
} }
TQPtrList<KAction> actions; TQPtrList<TDEAction> actions;
for( TQStringList::const_iterator it = sl.begin(); it != sl.end(); ++it ) 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); actions.append(a);
main->rebuildGui( actions ); main->rebuildGui( actions );
@ -391,7 +391,7 @@ void K3bWelcomeWidget::saveConfig( TDEConfigBase* c )
TDEConfigGroup grp( c, "Welcome Widget" ); TDEConfigGroup grp( c, "Welcome Widget" );
TQStringList sl; TQStringList sl;
for( TQPtrListIterator<KAction> it( main->m_actions ); it.current(); ++it ) for( TQPtrListIterator<TDEAction> it( main->m_actions ); it.current(); ++it )
sl.append( it.current()->name() ); sl.append( it.current()->name() );
grp.writeEntry( "welcome_actions", sl ); grp.writeEntry( "welcome_actions", sl );
@ -426,12 +426,12 @@ void K3bWelcomeWidget::fixSize()
void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e ) void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e )
{ {
if( e->button() == Qt::RightButton ) { if( e->button() == Qt::RightButton ) {
TQMap<int, KAction*> map; TQMap<int, TDEAction*> map;
KPopupMenu addPop; TDEPopupMenu addPop;
for ( int i = 0; s_allActions[i]; ++i ) { for ( int i = 0; s_allActions[i]; ++i ) {
if ( s_allActions[i][0] != '_' ) { 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) ) { if ( a && !main->m_actions.containsRef(a) ) {
map.insert( addPop.insertItem( a->iconSet(), a->text() ), 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()); TQWidget* widgetAtPos = viewport()->childAt(e->pos());
if( widgetAtPos && widgetAtPos->inherits( "K3bFlatButton" ) ) { if( widgetAtPos && widgetAtPos->inherits( "K3bFlatButton" ) ) {
KPopupMenu pop; TDEPopupMenu pop;
removeAction = pop.insertItem( SmallIcon("remove"), i18n("Remove Button") ); removeAction = pop.insertItem( SmallIcon("remove"), i18n("Remove Button") );
if ( addPop.count() > 0 ) if ( addPop.count() > 0 )
pop.insertItem( i18n("Add Button"), &addPop ); pop.insertItem( i18n("Add Button"), &addPop );
@ -472,11 +472,11 @@ void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e )
void K3bWelcomeWidget::slotMoreActions() void K3bWelcomeWidget::slotMoreActions()
{ {
KPopupMenu popup; TDEPopupMenu popup;
for ( int i = 0; s_allActions[i]; ++i ) { for ( int i = 0; s_allActions[i]; ++i ) {
if ( s_allActions[i][0] == '_' ) { if ( s_allActions[i][0] == '_' ) {
(new KActionSeparator( TQT_TQOBJECT(&popup) ))->plug( &popup ); (new TDEActionSeparator( TQT_TQOBJECT(&popup) ))->plug( &popup );
} }
else { else {
m_mainWindow->actionCollection()->action( s_allActions[i] )->plug( &popup ); m_mainWindow->actionCollection()->action( s_allActions[i] )->plug( &popup );

10
src/k3bwelcomewidget.h
Unescape View File

@ -80,11 +80,11 @@ class K3bWelcomeWidget::Display : public TQWidget
TQSizePolicy sizePolicy () const; TQSizePolicy sizePolicy () const;
int heightForWidth ( int w ) const; int heightForWidth ( int w ) const;
void addAction( KAction* ); void addAction( TDEAction* );
void removeAction( KAction* ); void removeAction( TDEAction* );
void removeButton( K3bFlatButton* ); void removeButton( K3bFlatButton* );
void rebuildGui(); void rebuildGui();
void rebuildGui( const TQPtrList<KAction>& ); void rebuildGui( const TQPtrList<TDEAction>& );
signals: signals:
void dropped( const KURL::List& ); void dropped( const KURL::List& );
@ -109,9 +109,9 @@ class K3bWelcomeWidget::Display : public TQWidget
int m_cols; int m_cols;
int m_rows; int m_rows;
TQPtrList<KAction> m_actions; TQPtrList<TDEAction> m_actions;
TQPtrList<K3bFlatButton> m_buttons; TQPtrList<K3bFlatButton> m_buttons;
TQMap<K3bFlatButton*, KAction*> m_buttonMap; TQMap<K3bFlatButton*, TDEAction*> m_buttonMap;
K3bFlatButton* m_buttonMore; K3bFlatButton* m_buttonMore;

2
src/misc/k3bblankingdialog.h
Unescape View File

@ -23,7 +23,7 @@
class TQGroupBox; class TQGroupBox;
class TQComboBox; class TQComboBox;
class TQCloseEvent; class TQCloseEvent;
class KListView; class TDEListView;
class K3bWriterSelectionWidget; class K3bWriterSelectionWidget;
namespace K3bDevice { namespace K3bDevice {
class Device; class Device;

6
src/misc/k3bcdimagewritingdialog.cpp
Unescape View File

@ -224,8 +224,8 @@ void K3bCdImageWritingDialog::setupGui()
m_infoView->setFullWidth(true); m_infoView->setFullWidth(true);
m_infoView->setSelectionMode( TQListView::NoSelection ); m_infoView->setSelectionMode( TQListView::NoSelection );
connect( m_infoView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), connect( m_infoView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
m_writerSelectionWidget = new K3bWriterSelectionWidget( frame ); 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 ) if( !d->haveMd5Sum )
return; return;

4
src/misc/k3bcdimagewritingdialog.h
Unescape View File

@ -37,7 +37,7 @@ class K3bIso9660;
class K3bCueFileParser; class K3bCueFileParser;
class TQDragEnterEvent; class TQDragEnterEvent;
class TQDropEvent; class TQDropEvent;
class KListView; class TDEListView;
class TQListViewItem; class TQListViewItem;
class TQPoint; class TQPoint;
@ -61,7 +61,7 @@ class K3bCdImageWritingDialog : public K3bInteractionDialog
void slotMd5JobPercent( int ); void slotMd5JobPercent( int );
void slotMd5JobFinished( bool ); void slotMd5JobFinished( bool );
void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& pos ); void slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& pos );
void slotUpdateImage( const TQString& ); void slotUpdateImage( const TQString& );

6
src/misc/k3bisoimagewritingdialog.cpp
Unescape View File

@ -170,8 +170,8 @@ void K3bIsoImageWritingDialog::setupGui()
m_infoView->setFullWidth(true); m_infoView->setFullWidth(true);
m_infoView->setSelectionMode( TQListView::NoSelection ); m_infoView->setSelectionMode( TQListView::NoSelection );
connect( m_infoView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), connect( m_infoView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
m_writerSelectionWidget = new K3bWriterSelectionWidget( frame ); 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 ) if( !d->haveMd5Sum )
return; return;

4
src/misc/k3bisoimagewritingdialog.h
Unescape View File

@ -31,7 +31,7 @@ class K3bListView;
class TQSpinBox; class TQSpinBox;
class TQDragEnterEvent; class TQDragEnterEvent;
class TQDropEvent; class TQDropEvent;
class KListView; class TDEListView;
class TQListViewItem; class TQListViewItem;
class TQPoint; class TQPoint;
@ -56,7 +56,7 @@ class K3bIsoImageWritingDialog : public K3bInteractionDialog
void slotWriterChanged(); void slotWriterChanged();
void slotMd5JobPercent( int ); void slotMd5JobPercent( int );
void slotMd5JobFinished( bool ); void slotMd5JobFinished( bool );
void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& pos ); void slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& pos );
protected: protected:
void loadUserDefaults( TDEConfigBase* ); void loadUserDefaults( TDEConfigBase* );

4
src/option/base_k3bcddboptiontab.ui
Unescape View File

@ -102,7 +102,7 @@
<string>Directory:</string> <string>Directory:</string>
</property> </property>
</widget> </widget>
<widget class="KListView" row="1" column="0" rowspan="4" colspan="2"> <widget class="TDEListView" row="1" column="0" rowspan="4" colspan="2">
<column> <column>
<property name="text"> <property name="text">
<string>Directory</string> <string>Directory</string>
@ -256,7 +256,7 @@
<cstring>m_comboCddbType</cstring> <cstring>m_comboCddbType</cstring>
</property> </property>
</widget> </widget>
<widget class="KListView" row="1" column="0" rowspan="4" colspan="4"> <widget class="TDEListView" row="1" column="0" rowspan="4" colspan="4">
<column> <column>
<property name="text"> <property name="text">
<string>Type</string> <string>Type</string>

2
src/option/base_k3bthemeoptiontab.ui
Unescape View File

@ -31,7 +31,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Theme</string> <string>Theme</string>

10
src/option/k3bcddboptiontab.cpp
Unescape View File

@ -153,7 +153,7 @@ void K3bCddbOptionTab::readSettings()
localCddbDirs.append( "~/.cddb/" ); localCddbDirs.append( "~/.cddb/" );
for( TQStringList::const_iterator it = localCddbDirs.begin(); it != localCddbDirs.end(); ++it ) 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 // old config <= 0.7.3
@ -177,9 +177,9 @@ void K3bCddbOptionTab::readSettings()
TQString server = buf[0]; TQString server = buf[0];
int port = buf[1].toInt(); int port = buf[1].toInt();
if( s.startsWith("Http") ) 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 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(); enDisableButtons();
@ -236,7 +236,7 @@ void K3bCddbOptionTab::slotLocalDirAdd()
return; return;
++it; ++it;
} }
(void)new KListViewItem( m_viewLocalDir, m_viewLocalDir->lastItem(), (void)new TDEListViewItem( m_viewLocalDir, m_viewLocalDir->lastItem(),
localDir ); localDir );
enDisableButtons(); enDisableButtons();
@ -256,7 +256,7 @@ void K3bCddbOptionTab::slotLocalDirRemove()
void K3bCddbOptionTab::slotCddbServerAdd() void K3bCddbOptionTab::slotCddbServerAdd()
{ {
if( !m_editCddbServer->text().isEmpty() ) { 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_comboCddbType->currentText(),
m_editCddbServer->text(), m_editCddbServer->text(),
TQString::number( m_editCddbPort->value() ) ); TQString::number( m_editCddbPort->value() ) );

2
src/option/k3bexternalbinoptiontab.h
Unescape View File

@ -23,7 +23,7 @@
class TQPushButton; class TQPushButton;
class TQListViewItem; class TQListViewItem;
class KListView; class TDEListView;
class K3bExternalBinManager; class K3bExternalBinManager;
class K3bExternalBinWidget; class K3bExternalBinWidget;

2
src/option/k3bpluginoptiontab.cpp
Unescape View File

@ -37,7 +37,7 @@
class K3bPluginOptionTab::PluginViewItem : public K3bListViewItem class K3bPluginOptionTab::PluginViewItem : public K3bListViewItem
{ {
public: public:
PluginViewItem( K3bPlugin* p, KListViewItem* parent ) PluginViewItem( K3bPlugin* p, TDEListViewItem* parent )
: K3bListViewItem( parent ), : K3bListViewItem( parent ),
plugin(p) { plugin(p) {
const K3bPluginInfo& info = p->pluginInfo(); const K3bPluginInfo& info = p->pluginInfo();

4
src/option/k3bthemeoptiontab.cpp
Unescape View File

@ -43,11 +43,11 @@ public:
}; };
class ThemeViewItem : public KListViewItem class ThemeViewItem : public TDEListViewItem
{ {
public: public:
ThemeViewItem( K3bTheme* theme_, TQListView* parent, TQListViewItem* after ) ThemeViewItem( K3bTheme* theme_, TQListView* parent, TQListViewItem* after )
: KListViewItem( parent, after ), : TDEListViewItem( parent, after ),
theme(theme_) { theme(theme_) {
setText( 0, theme->name() ); setText( 0, theme->name() );
setText( 1, theme->author() ); setText( 1, theme->author() );

2
src/projects/base_k3badvanceddataimagesettings.ui
Unescape View File

@ -29,7 +29,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>ISO9660 Filesystem</string> <string>ISO9660 Filesystem</string>

2
src/projects/base_k3bbootimageview.ui
Unescape View File

@ -60,7 +60,7 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Emulation Type</string> <string>Emulation Type</string>

2
src/projects/k3baudiodatasourceviewitem.cpp
Unescape View File

@ -82,7 +82,7 @@ void K3bAudioDataSourceViewItem::setText( int col, const TQString& text )
} }
} }
else else
KListViewItem::setText( col, text ); TDEListViewItem::setText( col, text );
} }

46
src/projects/k3baudiotrackplayer.cpp
Unescape View File

@ -30,16 +30,16 @@
class K3bAudioTrackPlayer::Private class K3bAudioTrackPlayer::Private
{ {
public: public:
KAction* actionPlay; TDEAction* actionPlay;
KAction* actionPause; TDEAction* actionPause;
KAction* actionPlayPause; TDEAction* actionPlayPause;
KAction* actionStop; TDEAction* actionStop;
KAction* actionNext; TDEAction* actionNext;
KAction* actionPrev; TDEAction* actionPrev;
KAction* actionSeek; TDEAction* actionSeek;
// just to handle them easily; // just to handle them easily;
KActionCollection* actionCollection; TDEActionCollection* actionCollection;
TQSlider* seekSlider; TQSlider* seekSlider;
TQTimer sliderTimer; TQTimer sliderTimer;
@ -63,44 +63,44 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, co
d->playing = false; d->playing = false;
// TODO: handle the shortcuts: pass a widget to the action collection (perhaps the trackview?) // 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 // create the actions
// TODO: create shortcuts (is there a way to let the user change them?) // 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", "player_play",
KShortcut(), TDEShortcut(),
this, TQT_SLOT(playPause()), this, TQT_SLOT(playPause()),
d->actionCollection, d->actionCollection,
"play" ); "play" );
d->actionPause = new KAction( i18n("Pause"), d->actionPause = new TDEAction( i18n("Pause"),
"player_pause", "player_pause",
KShortcut(), TDEShortcut(),
this, TQT_SLOT(playPause()), this, TQT_SLOT(playPause()),
d->actionCollection, d->actionCollection,
"pause" ); "pause" );
d->actionPlayPause = new KAction( i18n("Play/Pause"), d->actionPlayPause = new TDEAction( i18n("Play/Pause"),
"player_play", "player_play",
KShortcut(), TDEShortcut(),
this, TQT_SLOT(playPause()), this, TQT_SLOT(playPause()),
d->actionCollection, d->actionCollection,
"play_pause" ); "play_pause" );
d->actionStop = new KAction( i18n("Stop"), d->actionStop = new TDEAction( i18n("Stop"),
"player_stop", "player_stop",
KShortcut(), TDEShortcut(),
this, TQT_SLOT(stop()), this, TQT_SLOT(stop()),
d->actionCollection, d->actionCollection,
"stop" ); "stop" );
d->actionNext = new KAction( i18n("Next"), d->actionNext = new TDEAction( i18n("Next"),
"player_end", "player_end",
KShortcut(), TDEShortcut(),
this, TQT_SLOT(next()), this, TQT_SLOT(next()),
d->actionCollection, d->actionCollection,
"next" ); "next" );
d->actionPrev = new KAction( i18n("Prev"), d->actionPrev = new TDEAction( i18n("Prev"),
"player_start", "player_start",
KShortcut(), TDEShortcut(),
this, TQT_SLOT(prev()), this, TQT_SLOT(prev()),
d->actionCollection, d->actionCollection,
"prev" ); "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. // the action into several toolboxes and also use it in some resizing or track splitting dialogs.
d->actionSeek = new KWidgetAction( d->seekSlider, d->actionSeek = new KWidgetAction( d->seekSlider,
i18n("Seek"), i18n("Seek"),
KShortcut(), TDEShortcut(),
0, 0,
0, 0,
d->actionCollection, d->actionCollection,
@ -156,7 +156,7 @@ K3bAudioTrackPlayer::~K3bAudioTrackPlayer()
} }
KAction* K3bAudioTrackPlayer::action( int action ) const TDEAction* K3bAudioTrackPlayer::action( int action ) const
{ {
switch( action ) { switch( action ) {
case ACTION_PLAY: case ACTION_PLAY:

4
src/projects/k3baudiotrackplayer.h
Unescape View File

@ -24,7 +24,7 @@
class K3bAudioDoc; class K3bAudioDoc;
class K3bAudioTrack; class K3bAudioTrack;
class KAction; class TDEAction;
class K3bAudioTrackPlayer : public TQObject, public K3bAudioClient class K3bAudioTrackPlayer : public TQObject, public K3bAudioClient
@ -49,7 +49,7 @@ class K3bAudioTrackPlayer : public TQObject, public K3bAudioClient
ACTION_SEEK ACTION_SEEK
}; };
KAction* action( int action ) const; TDEAction* action( int action ) const;
/** /**
* Reimplemented from K3bAudioClient * Reimplemented from K3bAudioClient

12
src/projects/k3baudiotracksplitdialog.cpp
Unescape View File

@ -90,15 +90,15 @@ K3bAudioTrackSplitDialog::~K3bAudioTrackSplitDialog()
void K3bAudioTrackSplitDialog::setupActions() void K3bAudioTrackSplitDialog::setupActions()
{ {
m_actionCollection = new KActionCollection( this ); m_actionCollection = new TDEActionCollection( this );
m_popupMenu = new KPopupMenu( this ); m_popupMenu = new TDEPopupMenu( this );
KAction* actionSplitHere = new KAction( i18n("Split Here"), 0, TDEAction* actionSplitHere = new TDEAction( i18n("Split Here"), 0,
KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitHere()), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitHere()),
actionCollection(), "range_split" ); actionCollection(), "range_split" );
// FIXME: after the message freeze give this action a proper name like "Remove track part" // FIXME: after the message freeze give this action a proper name like "Remove track part"
KAction* actionRemoveRange = new KAction( i18n("Remove this Range"), 0, TDEAction* actionRemoveRange = new TDEAction( i18n("Remove this Range"), 0,
KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRange()), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRange()),
actionCollection(), "range_remove" ); actionCollection(), "range_remove" );
actionSplitHere->plug( m_popupMenu ); actionSplitHere->plug( m_popupMenu );

10
src/projects/k3baudiotracksplitdialog.h
Unescape View File

@ -24,8 +24,8 @@ namespace K3b {
class K3bAudioTrack; class K3bAudioTrack;
class K3bAudioEditorWidget; class K3bAudioEditorWidget;
class K3bMsfEdit; class K3bMsfEdit;
class KActionCollection; class TDEActionCollection;
class KPopupMenu; class TDEPopupMenu;
/** /**
@ -42,7 +42,7 @@ class K3bAudioTrackSplitDialog : public KDialogBase
bool eventFilter( TQObject* o, TQEvent* e ); 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. * 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_msfEditStart;
K3bMsfEdit* m_msfEditEnd; K3bMsfEdit* m_msfEditEnd;
K3bAudioTrack* m_track; K3bAudioTrack* m_track;
KActionCollection* m_actionCollection; TDEActionCollection* m_actionCollection;
KPopupMenu* m_popupMenu; TDEPopupMenu* m_popupMenu;
TQPoint m_lastClickPosition; TQPoint m_lastClickPosition;
}; };

48
src/projects/k3baudiotrackview.cpp
Unescape View File

@ -79,8 +79,8 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const
setDropVisualizer( true ); setDropVisualizer( true );
setAllColumnsShowFocus( true ); setAllColumnsShowFocus( true );
setDragEnabled( true ); setDragEnabled( true );
// setSelectionModeExt( KListView::Konqueror ); // FileManager in KDE3 // setSelectionModeExt( TDEListView::Konqueror ); // FileManager in KDE3
setSelectionModeExt( KListView::Extended ); setSelectionModeExt( TDEListView::Extended );
setItemsMovable( false ); setItemsMovable( false );
setAlternateBackground( TQColor() ); // disable alternate colors setAlternateBackground( TQColor() ); // disable alternate colors
@ -100,8 +100,8 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const
connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) );
connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(showPopupMenu(KListView*, TQListViewItem*, const TQPoint&)) ); this, TQT_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)),
this, TQT_SLOT(slotProperties()) ); this, TQT_SLOT(slotProperties()) );
@ -151,36 +151,36 @@ void K3bAudioTrackView::setupColumns()
void K3bAudioTrackView::setupActions() void K3bAudioTrackView::setupActions()
{ {
m_actionCollection = new KActionCollection( this ); m_actionCollection = new TDEActionCollection( this );
m_popupMenu = new KPopupMenu( this ); m_popupMenu = new TDEPopupMenu( this );
m_actionProperties = new KAction( i18n("Properties"), "misc", m_actionProperties = new TDEAction( i18n("Properties"), "misc",
KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()),
actionCollection(), "track_properties" ); 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()), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()),
actionCollection(), "track_remove" ); actionCollection(), "track_remove" );
m_actionAddSilence = new KAction( i18n("Add Silence") + "...", "misc", m_actionAddSilence = new TDEAction( i18n("Add Silence") + "...", "misc",
KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddSilence()), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddSilence()),
actionCollection(), "track_add_silence" ); actionCollection(), "track_add_silence" );
m_actionMergeTracks = new KAction( i18n("Merge Tracks"), "misc", m_actionMergeTracks = new TDEAction( i18n("Merge Tracks"), "misc",
KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotMergeTracks()), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotMergeTracks()),
actionCollection(), "track_merge" ); actionCollection(), "track_merge" );
m_actionSplitSource = new KAction( i18n("Source to Track"), "misc", m_actionSplitSource = new TDEAction( i18n("Source to Track"), "misc",
KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitSource()), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitSource()),
actionCollection(), "source_split" ); actionCollection(), "source_split" );
m_actionSplitTrack = new KAction( i18n("Split Track..."), 0, m_actionSplitTrack = new TDEAction( i18n("Split Track..."), 0,
KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitTrack()), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitTrack()),
actionCollection(), "track_split" ); actionCollection(), "track_split" );
m_actionEditSource = new KAction( i18n("Edit Source..."), 0, m_actionEditSource = new TDEAction( i18n("Edit Source..."), 0,
KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditSource()), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditSource()),
actionCollection(), "source_edit" ); actionCollection(), "source_edit" );
m_actionPlayTrack = new KAction( i18n("Play Track"), "player_play", m_actionPlayTrack = new TDEAction( i18n("Play Track"), "player_play",
KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotPlayTrack()), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotPlayTrack()),
actionCollection(), "track_play" ); actionCollection(), "track_play" );
#ifdef HAVE_MUSICBRAINZ #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()), TQT_SLOT(slotQueryMusicBrainz()),
actionCollection(), "project_audio_musicbrainz" ); actionCollection(), "project_audio_musicbrainz" );
mbAction->setToolTip( i18n("Try to determine meta information over the internet") ); mbAction->setToolTip( i18n("Try to determine meta information over the internet") );
@ -191,7 +191,7 @@ void K3bAudioTrackView::setupActions()
bool K3bAudioTrackView::acceptDrag(TQDropEvent* e) const 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 // 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<K3bAudioTrack> tracks; TQPtrList<K3bAudioTrack> tracks;
TQPtrList<K3bAudioDataSource> sources; TQPtrList<K3bAudioDataSource> sources;

30
src/projects/k3baudiotrackview.h
Unescape View File

@ -26,15 +26,15 @@ class K3bAudioTrack;
class K3bAudioTrackViewItem; class K3bAudioTrackViewItem;
class K3bAudioDataSource; class K3bAudioDataSource;
class K3bAudioDoc; class K3bAudioDoc;
class KActionCollection; class TDEActionCollection;
class KAction; class TDEAction;
class TQDropEvent; class TQDropEvent;
class TQKeyEvent; class TQKeyEvent;
class TQFocusEvent; class TQFocusEvent;
class TQMouseEvent; class TQMouseEvent;
class TQDragMoveEvent; class TQDragMoveEvent;
class TQTimer; class TQTimer;
class KPopupMenu; class TDEPopupMenu;
class TQPainter; class TQPainter;
class K3bListViewItemAnimator; class K3bListViewItemAnimator;
class K3bAudioTrackPlayer; class K3bAudioTrackPlayer;
@ -49,7 +49,7 @@ class K3bAudioTrackView : public K3bListView
K3bAudioTrackView( K3bAudioDoc*, TQWidget* parent, const char* name = 0 ); K3bAudioTrackView( K3bAudioDoc*, TQWidget* parent, const char* name = 0 );
~K3bAudioTrackView(); ~K3bAudioTrackView();
KActionCollection* actionCollection() const { return m_actionCollection; } TDEActionCollection* actionCollection() const { return m_actionCollection; }
K3bAudioTrackPlayer* player() const { return m_player; } K3bAudioTrackPlayer* player() const { return m_player; }
@ -70,15 +70,15 @@ class K3bAudioTrackView : public K3bListView
K3bAudioDoc* m_doc; K3bAudioDoc* m_doc;
KAction* m_actionProperties; TDEAction* m_actionProperties;
KAction* m_actionRemove; TDEAction* m_actionRemove;
KAction* m_actionAddSilence; TDEAction* m_actionAddSilence;
KAction* m_actionMergeTracks; TDEAction* m_actionMergeTracks;
KAction* m_actionSplitSource; TDEAction* m_actionSplitSource;
KAction* m_actionSplitTrack; TDEAction* m_actionSplitTrack;
KAction* m_actionEditSource; TDEAction* m_actionEditSource;
KAction* m_actionPlayTrack; TDEAction* m_actionPlayTrack;
KActionCollection* m_actionCollection; TDEActionCollection* m_actionCollection;
bool m_updatingColumnWidths; bool m_updatingColumnWidths;
@ -88,7 +88,7 @@ class K3bAudioTrackView : public K3bListView
TQTimer* m_autoOpenTrackTimer; TQTimer* m_autoOpenTrackTimer;
TQTimer* m_animationTimer; TQTimer* m_animationTimer;
KPopupMenu* m_popupMenu; TDEPopupMenu* m_popupMenu;
K3bAudioTrackPlayer* m_player; K3bAudioTrackPlayer* m_player;
@ -118,7 +118,7 @@ class K3bAudioTrackView : public K3bListView
void slotMergeTracks(); void slotMergeTracks();
void slotSplitSource(); void slotSplitSource();
void slotSplitTrack(); void slotSplitTrack();
void showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& pos ); void showPopupMenu( TDEListView*, TQListViewItem* item, const TQPoint& pos );
void slotProperties(); void slotProperties();
void slotPlayTrack(); void slotPlayTrack();
void slotQueryMusicBrainz(); void slotQueryMusicBrainz();

4
src/projects/k3baudiotrackviewitem.cpp
Unescape View File

@ -128,7 +128,7 @@ TQString K3bAudioTrackViewItem::text(int i) const
else else
return m_track->firstSource()->sourceComment(); return m_track->firstSource()->sourceComment();
default: 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 ); m_track->setTitle( text );
} }
KListViewItem::setText( col, text ); TDEListViewItem::setText( col, text );
} }

2
src/projects/k3baudioview.cpp
Unescape View File

@ -59,7 +59,7 @@ K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, TQWidget* parent, const char *nam
fillStatusDisplay()->showTime(); fillStatusDisplay()->showTime();
// add button for the audio conversion // 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" ); actionCollection(), "project_audio_convert" );
conversionAction->setToolTip( i18n("Convert audio tracks to other audio formats." ) ); conversionAction->setToolTip( i18n("Convert audio tracks to other audio formats." ) );

6
src/projects/k3bbootimageview.cpp
Unescape View File

@ -36,17 +36,17 @@
class K3bBootImageView::PrivateBootImageViewItem : public KListViewItem class K3bBootImageView::PrivateBootImageViewItem : public TDEListViewItem
{ {
public: public:
PrivateBootImageViewItem( K3bBootItem* image, TQListView* parent ) PrivateBootImageViewItem( K3bBootItem* image, TQListView* parent )
: KListViewItem( parent ), : TDEListViewItem( parent ),
m_image( image ) { m_image( image ) {
} }
PrivateBootImageViewItem( K3bBootItem* image, TQListView* parent, TQListViewItem* after ) PrivateBootImageViewItem( K3bBootItem* image, TQListView* parent, TQListViewItem* after )
: KListViewItem( parent, after ), : TDEListViewItem( parent, after ),
m_image( image ) { m_image( image ) {
} }

26
src/projects/k3bdatadirtreeview.cpp
Unescape View File

@ -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( 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(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) );
connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) );
connect( this, TQT_SIGNAL(contextMenu(KListView*,TQListViewItem*, const TQPoint&)), connect( this, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(showPopupMenu(KListView*,TQListViewItem*, const TQPoint&)) ); this, TQT_SLOT(showPopupMenu(TDEListView*,TQListViewItem*, const TQPoint&)) );
connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) );
@ -278,31 +278,31 @@ void K3bDataDirTreeView::setCurrentDir( K3bDirItem* dirItem )
void K3bDataDirTreeView::setupActions() 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" ); 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" ); 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" ); actionCollection(), "remove" );
KShortcut renameShortCut( Key_F2 ); TDEShortcut renameShortCut( Key_F2 );
renameShortCut.append( KShortcut(CTRL+Key_R) ); // backwards compatibility renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility
m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()),
actionCollection(), "rename" ); 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_actionRename );
m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionRemove );
m_popupMenu->insert( m_actionNewDir ); 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( 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") ); 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( item ) {
if( K3bDataViewItem* di = dynamic_cast<K3bDataViewItem*>(item) ) { if( K3bDataViewItem* di = dynamic_cast<K3bDataViewItem*>(item) ) {

22
src/projects/k3bdatadirtreeview.h
Unescape View File

@ -29,9 +29,9 @@ class K3bDataDirViewItem;
class K3bDirItem; class K3bDirItem;
class K3bDataItem; class K3bDataItem;
class K3bDataFileView; class K3bDataFileView;
class KActionCollection; class TDEActionCollection;
class KActionMenu; class TDEActionMenu;
class KAction; class TDEAction;
class K3bView; class K3bView;
class TQDragMoveEvent; class TQDragMoveEvent;
class TQDragLeaveEvent; class TQDragLeaveEvent;
@ -54,7 +54,7 @@ class K3bDataDirTreeView : public K3bListView
void setFileView( K3bDataFileView* view ) { m_fileView = view; } void setFileView( K3bDataFileView* view ) { m_fileView = view; }
KActionCollection* actionCollection() const { return m_actionCollection; } TDEActionCollection* actionCollection() const { return m_actionCollection; }
public slots: public slots:
void checkForNewItems(); void checkForNewItems();
@ -69,12 +69,12 @@ class K3bDataDirTreeView : public K3bListView
void contentsDragMoveEvent( TQDragMoveEvent* e ); void contentsDragMoveEvent( TQDragMoveEvent* e );
void contentsDragLeaveEvent( TQDragLeaveEvent* e ); void contentsDragLeaveEvent( TQDragLeaveEvent* e );
KActionCollection* m_actionCollection; TDEActionCollection* m_actionCollection;
KActionMenu* m_popupMenu; TDEActionMenu* m_popupMenu;
KAction* m_actionRemove; TDEAction* m_actionRemove;
KAction* m_actionRename; TDEAction* m_actionRename;
KAction* m_actionNewDir; TDEAction* m_actionNewDir;
KAction* m_actionProperties; TDEAction* m_actionProperties;
protected slots: protected slots:
virtual void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* parent ); virtual void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* parent );
@ -102,7 +102,7 @@ class K3bDataDirTreeView : public K3bListView
private slots: private slots:
void slotExecuted( TQListViewItem* ); void slotExecuted( TQListViewItem* );
void slotDataItemRemoved( K3bDataItem* ); void slotDataItemRemoved( K3bDataItem* );
void showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& ); void showPopupMenu( TDEListView*, TQListViewItem* _item, const TQPoint& );
void slotRenameItem(); void slotRenameItem();
void slotRemoveItem(); void slotRemoveItem();
void slotNewDir(); void slotNewDir();

36
src/projects/k3bdatafileview.cpp
Unescape View File

@ -73,7 +73,7 @@ K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView
addColumn( i18n("Local Path") ); addColumn( i18n("Local Path") );
addColumn( i18n("Link") ); addColumn( i18n("Link") );
setSelectionModeExt( KListView::Extended ); setSelectionModeExt( TDEListView::Extended );
m_doc = doc; m_doc = doc;
m_currentDir = doc->root(); 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(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) );
connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(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(executed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) );
connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(showPopupMenu(KListView*, TQListViewItem*, const TQPoint&)) ); this, TQT_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) );
connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)),
@ -317,39 +317,39 @@ void K3bDataFileView::slotExecuted( TQListViewItem* item )
void K3bDataFileView::setupActions() 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" ); 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" ); 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" ); actionCollection(), "remove" );
KShortcut renameShortCut( Key_F2 ); TDEShortcut renameShortCut( Key_F2 );
renameShortCut.append( KShortcut(CTRL+Key_R) ); // backwards compatibility renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility
m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()),
actionCollection(), "rename" ); 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" ); 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" ); actionCollection(), "open" );
m_popupMenu = new KActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu = new TDEActionMenu( m_actionCollection, "contextMenu" );
m_popupMenu->insert( m_actionParentDir ); 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_actionRename );
m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionRemove );
m_popupMenu->insert( m_actionNewDir ); 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( 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( 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") ); 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 ) { if( item ) {
K3bDataItem* di = static_cast<K3bDataViewItem*>(item)->dataItem(); K3bDataItem* di = static_cast<K3bDataViewItem*>(item)->dataItem();

26
src/projects/k3bdatafileview.h
Unescape View File

@ -30,9 +30,9 @@ class K3bDataView;
class K3bDataViewItem; class K3bDataViewItem;
class K3bDataItem; class K3bDataItem;
class TQDropEvent; class TQDropEvent;
class KActionCollection; class TDEActionCollection;
class KActionMenu; class TDEActionMenu;
class KAction; class TDEAction;
class K3bDataDirTreeView; class K3bDataDirTreeView;
class K3bDataDirViewItem; class K3bDataDirViewItem;
class K3bView; class K3bView;
@ -55,7 +55,7 @@ class K3bDataFileView : public K3bListView
K3bDirItem* currentDir() const; K3bDirItem* currentDir() const;
KActionCollection* actionCollection() const { return m_actionCollection; } TDEActionCollection* actionCollection() const { return m_actionCollection; }
signals: signals:
void dirSelected( K3bDirItem* ); void dirSelected( K3bDirItem* );
@ -68,7 +68,7 @@ class K3bDataFileView : public K3bListView
void slotDataItemRemoved( K3bDataItem* ); void slotDataItemRemoved( K3bDataItem* );
void slotExecuted( TQListViewItem* ); void slotExecuted( TQListViewItem* );
void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* parent ); 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 slotRenameItem();
void slotRemoveItem(); void slotRemoveItem();
void slotNewDir(); void slotNewDir();
@ -89,14 +89,14 @@ class K3bDataFileView : public K3bListView
void clearItems(); void clearItems();
void setupActions(); void setupActions();
KActionCollection* m_actionCollection; TDEActionCollection* m_actionCollection;
KActionMenu* m_popupMenu; TDEActionMenu* m_popupMenu;
KAction* m_actionParentDir; TDEAction* m_actionParentDir;
KAction* m_actionRemove; TDEAction* m_actionRemove;
KAction* m_actionRename; TDEAction* m_actionRename;
KAction* m_actionNewDir; TDEAction* m_actionNewDir;
KAction* m_actionProperties; TDEAction* m_actionProperties;
KAction* m_actionOpen; TDEAction* m_actionOpen;
K3bView* m_view; K3bView* m_view;

2
src/projects/k3bdatasessionimportdialog.h
Unescape View File

@ -25,7 +25,7 @@
class TQLabel; class TQLabel;
class KListBox; class TDEListBox;
class K3bDataDoc; class K3bDataDoc;
class K3bMediaSelectionComboBox; class K3bMediaSelectionComboBox;

6
src/projects/k3bdataview.cpp
Unescape View File

@ -75,12 +75,12 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *parent, const char *name )
// the data actions // 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" ); 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(), TQT_SLOT(clearImportedSession()), actionCollection(),
"project_data_clear_imported_session" ); "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(), TQT_SLOT(editBootImages()), actionCollection(),
"project_data_edit_boot_images" ); "project_data_edit_boot_images" );

54
src/projects/k3bfillstatusdisplay.cpp
Unescape View File

@ -299,22 +299,22 @@ private:
class K3bFillStatusDisplay::Private class K3bFillStatusDisplay::Private
{ {
public: public:
KActionCollection* actionCollection; TDEActionCollection* actionCollection;
KRadioAction* actionShowMinutes; TDERadioAction* actionShowMinutes;
KRadioAction* actionShowMegs; TDERadioAction* actionShowMegs;
KRadioAction* actionAuto; TDERadioAction* actionAuto;
KRadioAction* action74Min; TDERadioAction* action74Min;
KRadioAction* action80Min; TDERadioAction* action80Min;
KRadioAction* action100Min; TDERadioAction* action100Min;
KRadioAction* actionDvd4_7GB; TDERadioAction* actionDvd4_7GB;
KRadioAction* actionDvdDoubleLayer; TDERadioAction* actionDvdDoubleLayer;
K3bRadioAction* actionCustomSize; K3bRadioAction* actionCustomSize;
K3bRadioAction* actionDetermineSize; K3bRadioAction* actionDetermineSize;
KAction* actionSaveUserDefaults; TDEAction* actionSaveUserDefaults;
KAction* actionLoadUserDefaults; TDEAction* actionLoadUserDefaults;
KPopupMenu* popup; TDEPopupMenu* popup;
KPopupMenu* dvdPopup; TDEPopupMenu* dvdPopup;
TQToolButton* buttonMenu; TQToolButton* buttonMenu;
@ -372,31 +372,31 @@ K3bFillStatusDisplay::~K3bFillStatusDisplay()
void K3bFillStatusDisplay::setupPopupMenu() void K3bFillStatusDisplay::setupPopupMenu()
{ {
d->actionCollection = new KActionCollection( this ); d->actionCollection = new TDEActionCollection( this );
// we use a nother popup for the dvd sizes // we use a nother popup for the dvd sizes
d->popup = new KPopupMenu( this, "popup" ); d->popup = new TDEPopupMenu( this, "popup" );
d->dvdPopup = new KPopupMenu( this, "dvdpopup" ); 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->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->actionCollection, "fillstatus_show_megabytes" );
d->actionShowMegs->setExclusiveGroup( "show_size_in" ); d->actionShowMegs->setExclusiveGroup( "show_size_in" );
d->actionShowMinutes->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->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->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->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->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->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()), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdDoubleLayer()),
d->actionCollection, "fillstatus_dvd_double_layer" ); d->actionCollection, "fillstatus_dvd_double_layer" );
d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()), 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->actionCustomSize->setExclusiveGroup( "cd_size" );
d->actionDetermineSize->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()), TQT_TQOBJECT(this), TQT_SLOT(slotLoadUserDefaults()),
d->actionCollection, "load_user_defaults" ); 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()), TQT_TQOBJECT(this), TQT_SLOT(slotSaveUserDefaults()),
d->actionCollection, "save_user_defaults" ); 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()), TQT_TQOBJECT(this), TQT_SLOT(slotWhy44()),
d->actionCollection, "why_44_gb" ); d->actionCollection, "why_44_gb" );

8
src/projects/k3bfillstatusdisplay.h
Unescape View File

@ -25,10 +25,10 @@
class TQPaintEvent; class TQPaintEvent;
class TQMouseEvent; class TQMouseEvent;
class K3bDoc; class K3bDoc;
class KToggleAction; class TDEToggleAction;
class KAction; class TDEAction;
class KActionCollection; class TDEActionCollection;
class KPopupMenu; class TDEPopupMenu;
class TQToolButton; class TQToolButton;
namespace K3bDevice { namespace K3bDevice {

8
src/projects/k3bmovixlistview.cpp
Unescape View File

@ -182,7 +182,7 @@ K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, TQWidget* parent, const ch
setAllColumnsShowFocus( true ); setAllColumnsShowFocus( true );
setDragEnabled( true ); setDragEnabled( true );
setItemsMovable( false ); setItemsMovable( false );
setSelectionModeExt( KListView::Extended ); setSelectionModeExt( TDEListView::Extended );
setSorting(0); setSorting(0);
setNoItemText( i18n("Use drag'n'drop to add files to the project.") +"\n" 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(newMovixFileItems()), this, TQT_SLOT(slotNewFileItems()) );
connect( m_doc, TQT_SIGNAL(movixItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotFileItemRemoved(K3bMovixFileItem*)) ); 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( m_doc, TQT_SIGNAL(subTitleItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotSubTitleItemRemoved(K3bMovixFileItem*)) );
connect( this, TQT_SIGNAL(dropped(KListView*, TQDropEvent*, TQListViewItem*)), connect( this, TQT_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*)),
this, TQT_SLOT(slotDropped(KListView*, TQDropEvent*, TQListViewItem*)) ); this, TQT_SLOT(slotDropped(TDEListView*, TQDropEvent*, TQListViewItem*)) );
// let's see what the doc already has // let's see what the doc already has
slotNewFileItems(); 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() ) if( !e->isAccepted() )
return; return;

2
src/projects/k3bmovixlistview.h
Unescape View File

@ -89,7 +89,7 @@ class K3bMovixListView : public K3bListView
void slotNewFileItems(); void slotNewFileItems();
void slotFileItemRemoved( K3bMovixFileItem* ); void slotFileItemRemoved( K3bMovixFileItem* );
void slotSubTitleItemRemoved( K3bMovixFileItem* ); void slotSubTitleItemRemoved( K3bMovixFileItem* );
void slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ); void slotDropped( TDEListView*, TQDropEvent* e, TQListViewItem* after );
void slotChanged(); void slotChanged();
private: private:

10
src/projects/k3bmovixview.cpp
Unescape View File

@ -50,20 +50,20 @@ K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* parent, const char* name
// setup actions // setup actions
m_actionProperties = new KAction( i18n("Properties"), "misc", m_actionProperties = new TDEAction( i18n("Properties"), "misc",
0, TQT_TQOBJECT(this), TQT_SLOT(showPropertiesDialog()), 0, TQT_TQOBJECT(this), TQT_SLOT(showPropertiesDialog()),
actionCollection(), "movix_show_props" ); 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()), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItems()),
actionCollection(), "movix_remove_item" ); 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()), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveSubTitleItems()),
actionCollection(), "movix_remove_subtitle_item" ); 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()), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSubTitleFile()),
actionCollection(), "movix_add_subtitle" ); actionCollection(), "movix_add_subtitle" );
m_popupMenu = new KPopupMenu( this ); m_popupMenu = new TDEPopupMenu( this );
m_actionRemove->plug( m_popupMenu ); m_actionRemove->plug( m_popupMenu );
m_actionRemoveSubTitle->plug( m_popupMenu ); m_actionRemoveSubTitle->plug( m_popupMenu );
m_actionAddSubTitle->plug( m_popupMenu ); m_actionAddSubTitle->plug( m_popupMenu );

14
src/projects/k3bmovixview.h
Unescape View File

@ -22,8 +22,8 @@
class K3bMovixDoc; class K3bMovixDoc;
class K3bMovixListView; class K3bMovixListView;
class KAction; class TDEAction;
class KPopupMenu; class TDEPopupMenu;
class TQListViewItem; class TQListViewItem;
class TQPoint; class TQPoint;
class TQLineEdit; class TQLineEdit;
@ -54,11 +54,11 @@ class K3bMovixView : public K3bView
private: private:
K3bMovixDoc* m_doc; K3bMovixDoc* m_doc;
KAction* m_actionProperties; TDEAction* m_actionProperties;
KAction* m_actionRemove; TDEAction* m_actionRemove;
KAction* m_actionRemoveSubTitle; TDEAction* m_actionRemoveSubTitle;
KAction* m_actionAddSubTitle; TDEAction* m_actionAddSubTitle;
KPopupMenu* m_popupMenu; TDEPopupMenu* m_popupMenu;
TQLineEdit* m_volumeIDEdit; TQLineEdit* m_volumeIDEdit;
}; };

26
src/projects/k3bvcdlistview.cpp
Unescape View File

@ -46,7 +46,7 @@ K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *parent,
setDropVisualizer( true ); setDropVisualizer( true );
setAllColumnsShowFocus( true ); setAllColumnsShowFocus( true );
setDragEnabled( true ); setDragEnabled( true );
setSelectionModeExt( KListView::Extended ); setSelectionModeExt( TDEListView::Extended );
setItemsMovable( false ); setItemsMovable( false );
setNoItemText( i18n( "Use drag'n'drop to add MPEG video files to the project." ) + "\n" 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(); setupColumns();
header() ->setClickEnabled( false ); header() ->setClickEnabled( false );
connect( this, TQT_SIGNAL( dropped( KListView*, TQDropEvent*, TQListViewItem* ) ), connect( this, TQT_SIGNAL( dropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ),
this, TQT_SLOT( slotDropped( KListView*, TQDropEvent*, TQListViewItem* ) ) ); this, TQT_SLOT( slotDropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ) );
connect( this, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), connect( this, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ),
this, TQT_SLOT( showPopupMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); this, TQT_SLOT( showPopupMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) );
connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ),
this, TQT_SLOT( showPropertiesDialog() ) ); this, TQT_SLOT( showPropertiesDialog() ) );
@ -93,9 +93,9 @@ void K3bVcdListView::setupColumns()
void K3bVcdListView::setupActions() void K3bVcdListView::setupActions()
{ {
m_actionCollection = new KActionCollection( this ); m_actionCollection = new TDEActionCollection( this );
m_actionProperties = new KAction( i18n( "Properties" ), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT( showPropertiesDialog() ), actionCollection() ); m_actionProperties = new TDEAction( 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_actionRemove = new TDEAction( i18n( "Remove" ), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTracks() ), actionCollection() );
// disabled by default // disabled by default
m_actionRemove->setEnabled( false ); m_actionRemove->setEnabled( false );
@ -104,7 +104,7 @@ void K3bVcdListView::setupActions()
void K3bVcdListView::setupPopupMenu() void K3bVcdListView::setupPopupMenu()
{ {
m_popupMenu = new KPopupMenu( this, "VcdViewPopupMenu" ); m_popupMenu = new TDEPopupMenu( this, "VcdViewPopupMenu" );
m_actionRemove->plug( m_popupMenu ); m_actionRemove->plug( m_popupMenu );
m_popupMenu->insertSeparator(); m_popupMenu->insertSeparator();
m_actionProperties->plug( m_popupMenu ); m_actionProperties->plug( m_popupMenu );
@ -116,7 +116,7 @@ void K3bVcdListView::setupPopupMenu()
bool K3bVcdListView::acceptDrag( TQDropEvent* e ) const bool K3bVcdListView::acceptDrag( TQDropEvent* e ) const
{ {
// the first is for built-in item moving, the second for dropping urls // 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() ) if ( !e->isAccepted() )
return ; return ;
@ -172,7 +172,7 @@ void K3bVcdListView::slotDropped( KListView*, TQDropEvent* e, TQListViewItem* af
void K3bVcdListView::insertItem( TQListViewItem* item ) void K3bVcdListView::insertItem( TQListViewItem* item )
{ {
KListView::insertItem( item ); TDEListView::insertItem( item );
// make sure at least one item is selected // make sure at least one item is selected
if ( selectedItems().isEmpty() ) { 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 ) { if ( _item ) {
m_actionRemove->setEnabled( true ); m_actionRemove->setEnabled( true );

22
src/projects/k3bvcdlistview.h
Unescape View File

@ -25,12 +25,12 @@ class TQDragEnterEvent;
class TQDragObject; class TQDragObject;
class TQDropEvent; class TQDropEvent;
class TQTimer; class TQTimer;
class KPopupMenu; class TDEPopupMenu;
class KAction; class TDEAction;
class K3bVcdDoc; class K3bVcdDoc;
class K3bView; class K3bView;
class K3bVcdTrack; class K3bVcdTrack;
class KActionCollection; class TDEActionCollection;
class K3bVcdListViewItem; class K3bVcdListViewItem;
class TQPainter; class TQPainter;
@ -45,11 +45,11 @@ class K3bVcdListView : public K3bListView
~K3bVcdListView(); ~K3bVcdListView();
/** /**
* reimplemented from KListView * reimplemented from TDEListView
*/ */
void insertItem( TQListViewItem* ); void insertItem( TQListViewItem* );
KActionCollection* actionCollection() const TDEActionCollection* actionCollection() const
{ {
return m_actionCollection; return m_actionCollection;
} }
@ -67,18 +67,18 @@ class K3bVcdListView : public K3bListView
K3bVcdDoc* m_doc; K3bVcdDoc* m_doc;
K3bView* m_view; K3bView* m_view;
KAction* m_actionProperties; TDEAction* m_actionProperties;
KAction* m_actionRemove; TDEAction* m_actionRemove;
KActionCollection* m_actionCollection; TDEActionCollection* m_actionCollection;
KPopupMenu* m_popupMenu; TDEPopupMenu* m_popupMenu;
TQMap<K3bVcdTrack*, K3bVcdListViewItem*> m_itemMap; TQMap<K3bVcdTrack*, K3bVcdListViewItem*> m_itemMap;
private slots: private slots:
void slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ); void slotDropped( TDEListView*, TQDropEvent* e, TQListViewItem* after );
void slotUpdateItems(); void slotUpdateItems();
void showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& ); void showPopupMenu( TDEListView*, TQListViewItem* item, const TQPoint& );
void showPropertiesDialog(); void showPropertiesDialog();
void slotRemoveTracks(); void slotRemoveTracks();
void slotTrackRemoved( K3bVcdTrack* ); void slotTrackRemoved( K3bVcdTrack* );

4
src/projects/k3bvcdlistviewitem.cpp
Unescape View File

@ -78,7 +78,7 @@ TQString K3bVcdListViewItem::text( int i ) const
return m_track->fileName(); return m_track->fileName();
default: 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 ); m_track->setTitle( text );
} }
KListViewItem::setText( col, text ); TDEListViewItem::setText( col, text );
} }

2
src/projects/k3bvcdview.h
Unescape View File

@ -28,7 +28,7 @@ class TQWidget;
class K3bVcdDoc; class K3bVcdDoc;
class K3bVcdTrack; class K3bVcdTrack;
class TQListViewItem; class TQListViewItem;
class KListView; class TDEListView;
class K3bVcdBurnDialog; class K3bVcdBurnDialog;
class K3bProjectBurnDialog; class K3bProjectBurnDialog;

6
src/projects/k3bview.cpp
Unescape View File

@ -57,10 +57,10 @@ K3bView::K3bView( K3bDoc* pDoc, TQWidget *parent, const char* name )
grid->setSpacing( 5 ); grid->setSpacing( 5 );
grid->setMargin( 2 ); 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"); actionCollection(), "project_burn");
burnAction->setToolTip( i18n("Open the burn dialog for the current project") ); 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"); actionCollection(), "project_properties");
propAction->setToolTip( i18n("Open the properties dialog") ); 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; // return m_actionCollection;
// } // }

2
src/projects/k3bview.h
Unescape View File

@ -29,7 +29,7 @@
#include <kurl.h> #include <kurl.h>
class K3bDoc; class K3bDoc;
class KActionCollection; class TDEActionCollection;
class K3bFillStatusDisplay; class K3bFillStatusDisplay;
class K3bProjectBurnDialog; class K3bProjectBurnDialog;
class K3bToolBox; class K3bToolBox;

2
src/rip/k3baudiocdlistview.h
Unescape View File

@ -35,7 +35,7 @@ class K3bAudioCdListView : public K3bListView
protected: protected:
/** /**
* @reimpl from KListView * @reimpl from TDEListView
*/ */
TQDragObject* dragObject(); TQDragObject* dragObject();

30
src/rip/k3baudiocdview.cpp
Unescape View File

@ -121,8 +121,8 @@ K3bAudioCdView::K3bAudioCdView( TQWidget* parent, const char *name )
connect( m_trackView, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), connect( m_trackView, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)),
this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString&, int)) ); this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString&, int)) );
connect( m_trackView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), connect( m_trackView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
// connect( m_trackView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), // connect( m_trackView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
// this, TQT_SLOT(slotTrackSelectionChanged(TQListViewItem*)) ); // this, TQT_SLOT(slotTrackSelectionChanged(TQListViewItem*)) );
@ -224,41 +224,41 @@ void K3bAudioCdView::reloadMedium()
void K3bAudioCdView::initActions() 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(), TQT_SLOT(slotCheckAll()), actionCollection(),
"check_all" ); "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(), TQT_SLOT(slotUncheckAll()), actionCollection(),
"uncheck_all" ); "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(), TQT_SLOT(slotSelect()), actionCollection(),
"select_track" ); "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(), TQT_SLOT(slotDeselect()), actionCollection(),
"deselect_track" ); "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(), TQT_SLOT(slotEditTrackCddb()), actionCollection(),
"edit_track_cddb" ); "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(), TQT_SLOT(slotEditAlbumCddb()), actionCollection(),
"edit_album_cddb" ); "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" ); 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" ); 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" ); TQT_SLOT(slotSaveCddbLocally()), actionCollection(), "save_cddb_local" );
// TODO: set the actions tooltips and whatsthis infos // TODO: set the actions tooltips and whatsthis infos
// setup the popup menu // setup the popup menu
m_popupMenu = new KActionMenu( actionCollection(), "popup_menu" ); m_popupMenu = new TDEActionMenu( actionCollection(), "popup_menu" );
KAction* separator = new KActionSeparator( actionCollection(), "separator" ); TDEAction* separator = new TDEActionSeparator( actionCollection(), "separator" );
m_popupMenu->insert( actionSelect ); m_popupMenu->insert( actionSelect );
m_popupMenu->insert( actionDeselect ); m_popupMenu->insert( actionDeselect );
m_popupMenu->insert( actionSelectAll ); 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); m_popupMenu->popup(p);
} }

14
src/rip/k3baudiocdview.h
Unescape View File

@ -25,11 +25,11 @@
#include <k3bcdtext.h> #include <k3bcdtext.h>
class K3bListView; class K3bListView;
class KListView; class TDEListView;
class TQListViewItem; class TQListViewItem;
class TQPoint; class TQPoint;
class KActionCollection; class TDEActionCollection;
class KActionMenu; class TDEActionMenu;
class K3bCddb; class K3bCddb;
class TQLabel; class TQLabel;
class K3bToolBox; class K3bToolBox;
@ -50,7 +50,7 @@ class K3bAudioCdView : public K3bMediaContentsView
K3bAudioCdView( TQWidget* parent = 0, const char * name = 0 ); K3bAudioCdView( TQWidget* parent = 0, const char * name = 0 );
~K3bAudioCdView(); ~K3bAudioCdView();
KActionCollection* actionCollection() const { return m_actionCollection; } TDEActionCollection* actionCollection() const { return m_actionCollection; }
/** /**
* internal * internal
@ -61,7 +61,7 @@ class K3bAudioCdView : public K3bMediaContentsView
void queryCddb(); void queryCddb();
private slots: private slots:
void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ); void slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& );
void slotItemRenamed( TQListViewItem*, const TQString&, int ); void slotItemRenamed( TQListViewItem*, const TQString&, int );
void slotCddbQueryFinished( int ); void slotCddbQueryFinished( int );
void slotTrackSelectionChanged( TQListViewItem* ); void slotTrackSelectionChanged( TQListViewItem* );
@ -88,8 +88,8 @@ class K3bAudioCdView : public K3bMediaContentsView
K3bCddbResultEntry m_cddbInfo; K3bCddbResultEntry m_cddbInfo;
KActionCollection* m_actionCollection; TDEActionCollection* m_actionCollection;
KActionMenu* m_popupMenu; TDEActionMenu* m_popupMenu;
K3bListView* m_trackView; K3bListView* m_trackView;
K3bToolBox* m_toolBox; K3bToolBox* m_toolBox;

8
src/rip/k3baudioprojectconvertingdialog.cpp
Unescape View File

@ -241,7 +241,7 @@ void K3bAudioProjectConvertingDialog::refresh()
m_patternWidget->blankReplaceString() ); m_patternWidget->blankReplaceString() );
(void)new KListViewItem( m_viewTracks, (void)new TDEListViewItem( m_viewTracks,
m_viewTracks->lastItem(), m_viewTracks->lastItem(),
filename + "." + extension, filename + "." + extension,
m_doc->length().toString(), m_doc->length().toString(),
@ -251,7 +251,7 @@ void K3bAudioProjectConvertingDialog::refresh()
if( m_optionWidget->createCueFile() ) { if( m_optionWidget->createCueFile() ) {
d->cueFilename = K3b::fixupPath( baseDir + "/" + filename + ".cue" ); d->cueFilename = K3b::fixupPath( baseDir + "/" + filename + ".cue" );
(void)new KListViewItem( m_viewTracks, (void)new TDEListViewItem( m_viewTracks,
m_viewTracks->lastItem(), m_viewTracks->lastItem(),
filename + ".cue", filename + ".cue",
"-", "-",
@ -279,7 +279,7 @@ void K3bAudioProjectConvertingDialog::refresh()
m_patternWidget->replaceBlanks(), m_patternWidget->replaceBlanks(),
m_patternWidget->blankReplaceString() ) + "." + extension; m_patternWidget->blankReplaceString() ) + "." + extension;
(void)new KListViewItem( m_viewTracks, (void)new TDEListViewItem( m_viewTracks,
m_viewTracks->lastItem(), m_viewTracks->lastItem(),
filename, filename,
track->length().toString(), track->length().toString(),
@ -299,7 +299,7 @@ void K3bAudioProjectConvertingDialog::refresh()
m_patternWidget->replaceBlanks(), m_patternWidget->replaceBlanks(),
m_patternWidget->blankReplaceString() ) + ".m3u"; m_patternWidget->blankReplaceString() ) + ".m3u";
(void)new KListViewItem( m_viewTracks, (void)new TDEListViewItem( m_viewTracks,
m_viewTracks->lastItem(), m_viewTracks->lastItem(),
filename, filename,
"-", "-",

10
src/rip/k3baudiorippingdialog.cpp
Unescape View File

@ -123,7 +123,7 @@ void K3bAudioRippingDialog::setupGui()
Form1Layout->setSpacing( KDialog::spacingHint() ); Form1Layout->setSpacing( KDialog::spacingHint() );
Form1Layout->setMargin( 0 ); 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( "Filename") );
m_viewTracks->addColumn(i18n( "Length") ); m_viewTracks->addColumn(i18n( "Length") );
m_viewTracks->addColumn(i18n( "File Size") ); m_viewTracks->addColumn(i18n( "File Size") );
@ -330,7 +330,7 @@ void K3bAudioRippingDialog::refresh()
filename = d->fsInfo.fixupPath( filename ); filename = d->fsInfo.fixupPath( filename );
(void)new KListViewItem( m_viewTracks, (void)new TDEListViewItem( m_viewTracks,
m_viewTracks->lastItem(), m_viewTracks->lastItem(),
filename + "." + extension, filename + "." + extension,
K3b::Msf(length).toString(), K3b::Msf(length).toString(),
@ -339,7 +339,7 @@ void K3bAudioRippingDialog::refresh()
d->filenames.append( baseDir + "/" + filename + "." + extension ); d->filenames.append( baseDir + "/" + filename + "." + extension );
if( m_optionWidget->createCueFile() ) if( m_optionWidget->createCueFile() )
(void)new KListViewItem( m_viewTracks, (void)new TDEListViewItem( m_viewTracks,
m_viewTracks->lastItem(), m_viewTracks->lastItem(),
filename + ".cue", filename + ".cue",
"-", "-",
@ -388,7 +388,7 @@ void K3bAudioRippingDialog::refresh()
filename = d->fsInfo.fixupPath( filename ); filename = d->fsInfo.fixupPath( filename );
(void)new KListViewItem( m_viewTracks, (void)new TDEListViewItem( m_viewTracks,
m_viewTracks->lastItem(), m_viewTracks->lastItem(),
filename, filename,
trackLength.toString(), trackLength.toString(),
@ -406,7 +406,7 @@ void K3bAudioRippingDialog::refresh()
m_patternWidget->replaceBlanks(), m_patternWidget->replaceBlanks(),
m_patternWidget->blankReplaceString() ) + ".m3u"; m_patternWidget->blankReplaceString() ) + ".m3u";
(void)new KListViewItem( m_viewTracks, (void)new TDEListViewItem( m_viewTracks,
m_viewTracks->lastItem(), m_viewTracks->lastItem(),
filename, filename,
"-", "-",

4
src/rip/k3baudiorippingdialog.h
Unescape View File

@ -29,7 +29,7 @@ namespace K3bDevice {
} }
class KListView; class TDEListView;
class TQCheckBox; class TQCheckBox;
class TQSpinBox; class TQSpinBox;
class TQComboBox; class TQComboBox;
@ -66,7 +66,7 @@ class K3bAudioRippingDialog : public K3bInteractionDialog
K3bCddbResultEntry m_cddbEntry; K3bCddbResultEntry m_cddbEntry;
TQValueList<int> m_trackNumbers; TQValueList<int> m_trackNumbers;
KListView* m_viewTracks; TDEListView* m_viewTracks;
TQComboBox* m_comboParanoiaMode; TQComboBox* m_comboParanoiaMode;
TQSpinBox* m_spinRetries; TQSpinBox* m_spinRetries;

2
src/rip/k3bvideocdrippingdialog.h
Unescape View File

@ -23,7 +23,7 @@
#include <k3bdiskinfo.h> #include <k3bdiskinfo.h>
#include "k3bvideocdrippingoptions.h" #include "k3bvideocdrippingoptions.h"
class KListView; class TDEListView;
class TQCheckBox; class TQCheckBox;
class TQLabel; class TQLabel;
class TQSpinBox; class TQSpinBox;

22
src/rip/k3bvideocdview.cpp
Unescape View File

@ -173,8 +173,8 @@ K3bVideoCdView::K3bVideoCdView( TQWidget* parent, const char *name )
m_trackView->setItemsRenameable( false ); m_trackView->setItemsRenameable( false );
m_trackView->setRootIsDecorated( true ); m_trackView->setRootIsDecorated( true );
connect( m_trackView, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), connect( m_trackView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ),
this, TQT_SLOT( slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); this, TQT_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) );
connect( m_trackView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), connect( m_trackView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
this, TQT_SLOT( slotTrackSelectionChanged( TQListViewItem* ) ) ); this, TQT_SLOT( slotTrackSelectionChanged( TQListViewItem* ) ) );
connect( m_trackView, TQT_SIGNAL( clicked( TQListViewItem* ) ), connect( m_trackView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
@ -320,28 +320,28 @@ void K3bVideoCdView::updateDisplay()
void K3bVideoCdView::initActions() 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" ); 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" ); m_actionCollection, "deselect_all" );
actionDeselectAll->setText( i18n( "Dese&lect 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(), TQT_SLOT( slotSelect() ), actionCollection(),
"select_track" ); "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(), TQT_SLOT( slotDeselect() ), actionCollection(),
"deselect_track" ); "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" ); TQT_SLOT( startRip() ), actionCollection(), "start_rip" );
// TODO: set the actions tooltips and whatsthis infos // TODO: set the actions tooltips and whatsthis infos
// setup the popup menu // setup the popup menu
m_popupMenu = new KActionMenu( actionCollection(), "popup_menu" ); m_popupMenu = new TDEActionMenu( actionCollection(), "popup_menu" );
KAction* separator = new KActionSeparator( actionCollection(), "separator" ); TDEAction* separator = new TDEActionSeparator( actionCollection(), "separator" );
m_popupMenu->insert( actionSelect ); m_popupMenu->insert( actionSelect );
m_popupMenu->insert( actionDeselect ); m_popupMenu->insert( actionDeselect );
m_popupMenu->insert( actionSelectAll ); 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 ); m_popupMenu->popup( p );
} }

14
src/rip/k3bvideocdview.h
Unescape View File

@ -24,9 +24,9 @@
#include "k3bvideocdinfo.h" #include "k3bvideocdinfo.h"
class KActionCollection; class TDEActionCollection;
class KActionMenu; class TDEActionMenu;
class KListView; class TDEListView;
class TQLabel; class TQLabel;
class TQListViewItem; class TQListViewItem;
@ -52,13 +52,13 @@ class K3bVideoCdView : public K3bMediaContentsView
K3bVideoCdView( TQWidget* parent = 0, const char * name = 0 ); K3bVideoCdView( TQWidget* parent = 0, const char * name = 0 );
~K3bVideoCdView(); ~K3bVideoCdView();
KActionCollection* actionCollection() const TDEActionCollection* actionCollection() const
{ {
return m_actionCollection; return m_actionCollection;
} }
private slots: private slots:
void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ); void slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& );
void slotTrackSelectionChanged( TQListViewItem* ); void slotTrackSelectionChanged( TQListViewItem* );
void slotStateChanged( TQListViewItem* ); void slotStateChanged( TQListViewItem* );
void slotVideoCdInfoFinished( bool ); void slotVideoCdInfoFinished( bool );
@ -83,8 +83,8 @@ class K3bVideoCdView : public K3bMediaContentsView
K3bDevice::Toc m_toc; K3bDevice::Toc m_toc;
KActionCollection* m_actionCollection; TDEActionCollection* m_actionCollection;
KActionMenu* m_popupMenu; TDEActionMenu* m_popupMenu;
K3bVideoCdInfoResult m_videocdinfoResult; K3bVideoCdInfoResult m_videocdinfoResult;
K3bVideoCdInfo* m_videocdinfo; K3bVideoCdInfo* m_videocdinfo;

2
src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
Unescape View File

@ -28,7 +28,7 @@
<string>Please select the audio streams you want to include in every ripped title</string> <string>Please select the audio streams you want to include in every ripped title</string>
</property> </property>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<property name="name"> <property name="name">
<cstring>m_titleView</cstring> <cstring>m_titleView</cstring>
</property> </property>

22
src/rip/videodvd/k3bvideodvdrippingview.cpp
Unescape View File

@ -62,8 +62,8 @@ K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * n
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
m_titleView = new K3bVideoDVDRippingTitleListView( mainWidget() ); m_titleView = new K3bVideoDVDRippingTitleListView( mainWidget() );
connect( m_titleView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), connect( m_titleView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
// general layout // 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); m_popupMenu->popup(p);
} }
@ -216,28 +216,28 @@ void K3bVideoDVDRippingView::slotUncheck()
void K3bVideoDVDRippingView::initActions() 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(), TQT_SLOT(slotCheckAll()), actionCollection(),
"check_all" ); "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(), TQT_SLOT(slotUncheckAll()), actionCollection(),
"uncheck_all" ); "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(), TQT_SLOT(slotCheck()), actionCollection(),
"select_track" ); "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(), TQT_SLOT(slotUncheck()), actionCollection(),
"deselect_track" ); "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" ); TQT_SLOT(slotStartRipping()), m_actionCollection, "start_rip" );
actionStartRip->setToolTip( i18n("Open the Video DVD ripping dialog") ); actionStartRip->setToolTip( i18n("Open the Video DVD ripping dialog") );
// setup the popup menu // setup the popup menu
m_popupMenu = new KActionMenu( actionCollection(), "popup_menu" ); m_popupMenu = new TDEActionMenu( actionCollection(), "popup_menu" );
KAction* separator = new KActionSeparator( actionCollection(), "separator" ); TDEAction* separator = new TDEActionSeparator( actionCollection(), "separator" );
m_popupMenu->insert( actionSelect ); m_popupMenu->insert( actionSelect );
m_popupMenu->insert( actionDeselect ); m_popupMenu->insert( actionDeselect );
m_popupMenu->insert( actionSelectAll ); m_popupMenu->insert( actionSelectAll );

14
src/rip/videodvd/k3bvideodvdrippingview.h
Unescape View File

@ -23,9 +23,9 @@
class K3bVideoDVDRippingTitleListView; class K3bVideoDVDRippingTitleListView;
class K3bToolBox; class K3bToolBox;
class TQLabel; class TQLabel;
class KActionCollection; class TDEActionCollection;
class KActionMenu; class TDEActionMenu;
class KListView; class TDEListView;
class TQListViewItem; class TQListViewItem;
class K3bVideoDVDRippingView : public K3bMediaContentsView class K3bVideoDVDRippingView : public K3bMediaContentsView
@ -37,12 +37,12 @@ class K3bVideoDVDRippingView : public K3bMediaContentsView
K3bVideoDVDRippingView( TQWidget* parent = 0, const char * name = 0 ); K3bVideoDVDRippingView( TQWidget* parent = 0, const char * name = 0 );
~K3bVideoDVDRippingView(); ~K3bVideoDVDRippingView();
KActionCollection* actionCollection() const { return m_actionCollection; } TDEActionCollection* actionCollection() const { return m_actionCollection; }
private slots: private slots:
void slotStartRipping(); void slotStartRipping();
void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ); void slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& );
void slotCheckAll(); void slotCheckAll();
void slotUncheckAll(); void slotUncheckAll();
@ -54,8 +54,8 @@ class K3bVideoDVDRippingView : public K3bMediaContentsView
void enableInteraction( bool enable ); void enableInteraction( bool enable );
void initActions(); void initActions();
KActionCollection* m_actionCollection; TDEActionCollection* m_actionCollection;
KActionMenu* m_popupMenu; TDEActionMenu* m_popupMenu;
K3bToolBox* m_toolBox; K3bToolBox* m_toolBox;
TQLabel* m_labelLength; TQLabel* m_labelLength;

Write Preview
Loading…
Cancel
Save