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 11 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>
</property>
</widget>
<widget class="KListView">
<widget class="TDEListView">
<column>
<property name="text">
<string>Device</string>
@ -255,7 +255,7 @@
<string>Check the programs whose permissions you want to be changed</string>
</property>
</widget>
<widget class="KListView">
<widget class="TDEListView">
<column>
<property name="text">
<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 );
infoLabel->setAlignment( WordBreak );
m_listBox = new KListBox( frame, "list_box");
m_listBox = new TDEListBox( frame, "list_box");
setMinimumSize( 280, 200 );
}

4
libk3b/cddb/k3bcddbmultientriesdialog.h
Unescape View File

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

2
libk3b/projects/k3bdoc.h
Unescape View File

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

40
libk3b/tools/k3blistview.cpp
Unescape View File

@ -98,25 +98,25 @@ public:
K3bListViewItem::K3bListViewItem(TQListView *parent)
: KListViewItem( parent )
: TDEListViewItem( parent )
{
init();
}
K3bListViewItem::K3bListViewItem(TQListViewItem *parent)
: KListViewItem( parent )
: TDEListViewItem( parent )
{
init();
}
K3bListViewItem::K3bListViewItem(TQListView *parent, TQListViewItem *after)
: KListViewItem( parent, after )
: TDEListViewItem( parent, after )
{
init();
}
K3bListViewItem::K3bListViewItem(TQListViewItem *parent, TQListViewItem *after)
: KListViewItem( parent, after )
: TDEListViewItem( parent, after )
{
init();
}
@ -127,7 +127,7 @@ K3bListViewItem::K3bListViewItem(TQListView *parent,
const TQString& s3, const TQString& s4,
const TQString& s5, const TQString& s6,
const TQString& s7, const TQString& s8)
: KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 )
: TDEListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 )
{
init();
}
@ -138,7 +138,7 @@ K3bListViewItem::K3bListViewItem(TQListViewItem *parent,
const TQString& s3, const TQString& s4,
const TQString& s5, const TQString& s6,
const TQString& s7, const TQString& s8)
: KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 )
: TDEListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 )
{
init();
}
@ -149,7 +149,7 @@ K3bListViewItem::K3bListViewItem(TQListView *parent, TQListViewItem *after,
const TQString& s3, const TQString& s4,
const TQString& s5, const TQString& s6,
const TQString& s7, const TQString& s8)
: KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 )
: TDEListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 )
{
init();
}
@ -160,7 +160,7 @@ K3bListViewItem::K3bListViewItem(TQListViewItem *parent, TQListViewItem *after,
const TQString& s3, const TQString& s4,
const TQString& s5, const TQString& s6,
const TQString& s7, const TQString& s8)
: KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 )
: TDEListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 )
{
init();
}
@ -186,7 +186,7 @@ void K3bListViewItem::init()
int K3bListViewItem::width( const TQFontMetrics& fm, const TQListView* lv, int c ) const
{
return KListViewItem::width( fm, lv, c ) + getColumnInfo(c)->margin*2;
return TDEListViewItem::width( fm, lv, c ) + getColumnInfo(c)->margin*2;
}
@ -343,7 +343,7 @@ int K3bListViewItem::marginVertical() const
void K3bListViewItem::setup()
{
KListViewItem::setup();
TDEListViewItem::setup();
setHeight( height() + 2*m_vMargin );
}
@ -374,7 +374,7 @@ void K3bListViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int col,
p->fillRect( width-info->margin, 0, info->margin, height(),
cgh.brush( TQColorGroup::Highlight ) );
}
else { // in case we use the KListView alternate color stuff
else { // in case we use the TDEListView alternate color stuff
p->fillRect( 0, 0, info->margin, height(),
cgh.brush( TQColorGroup::Base ) );
p->fillRect( width-info->margin, 0, info->margin, height(),
@ -546,7 +546,7 @@ public:
K3bListView::K3bListView( TQWidget* parent, const char* name )
: KListView( parent, name ),
: TDEListView( parent, name ),
m_noItemVMargin( 20 ),
m_noItemHMargin( 20 )
{
@ -592,7 +592,7 @@ TQWidget* K3bListView::editor( K3bListViewItem::EditorType t ) const
void K3bListView::clear()
{
hideEditor();
KListView::clear();
TDEListView::clear();
}
@ -806,7 +806,7 @@ void K3bListView::setCurrentItem( TQListViewItem* i )
// doRename();
// hideEditor();
// m_currentEditItem = 0;
KListView::setCurrentItem( i );
TDEListView::setCurrentItem( i );
}
@ -819,14 +819,14 @@ void K3bListView::setNoItemText( const TQString& text )
void K3bListView::viewportPaintEvent( TQPaintEvent* e )
{
KListView::viewportPaintEvent( e );
TDEListView::viewportPaintEvent( e );
}
// FIXME: move this to viewportPaintEvent
void K3bListView::drawContentsOffset( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch )
{
KListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch );
TDEListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch );
if( childCount() == 0 && !m_noItemText.isEmpty()) {
@ -846,7 +846,7 @@ void K3bListView::drawContentsOffset( TQPainter * p, int ox, int oy, int cx, int
void K3bListView::paintEmptyArea( TQPainter* p, const TQRect& rect )
{
KListView::paintEmptyArea( p, rect );
TDEListView::paintEmptyArea( p, rect );
// if( childCount() == 0 && !m_noItemText.isEmpty()) {
@ -869,7 +869,7 @@ void K3bListView::paintEmptyArea( TQPainter* p, const TQRect& rect )
void K3bListView::resizeEvent( TQResizeEvent* e )
{
KListView::resizeEvent( e );
TDEListView::resizeEvent( e );
updateEditorSize();
}
@ -1150,7 +1150,7 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
}
}
return KListView::eventFilter( o, e );
return TDEListView::eventFilter( o, e );
}
@ -1202,7 +1202,7 @@ void K3bListView::viewportResizeEvent( TQResizeEvent* e )
viewport()->setPaletteBackgroundPixmap( bgPix );
}
KListView::viewportResizeEvent( e );
TDEListView::viewportResizeEvent( e );
}

8
libk3b/tools/k3blistview.h
Unescape View File

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

4
libk3b/tools/k3bpushbutton.h
Unescape View File

@ -21,7 +21,7 @@
#include "k3b_export.h"
/**
* A pushbutton with delayed popu pmenu support just like the KToolBarButton
* A pushbutton with delayed popu pmenu support just like the TDEToolBarButton
*/
class LIBK3B_EXPORT K3bPushButton : public KPushButton
{
@ -58,7 +58,7 @@ class LIBK3B_EXPORT K3bPushButton : public KPushButton
/**
* The popup menu will show if the button is pressed down for about half a second
* or if the mouse is moved while pressed just like the KToolBarButton.
* or if the mouse is moved while pressed just like the TDEToolBarButton.
*/
void setDelayedPopupMenu( TQPopupMenu* );

32
libk3b/tools/k3bradioaction.cpp
Unescape View File

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

18
libk3b/tools/k3bradioaction.h
Unescape View File

@ -20,13 +20,13 @@
#include "k3b_export.h"
/**
* This differs from KRadioAction only in the boolean
* This differs from TDERadioAction only in the boolean
* flag which says if it should always emit the signals
* even if it was checked twice.
*
* Docu copied from tdelibs
*/
class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
class LIBK3B_EXPORT K3bRadioAction : public TDEToggleAction
{
Q_OBJECT
@ -42,7 +42,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
* @param parent This action's parent.
* @param name An internal name for this action.
*/
K3bRadioAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 );
K3bRadioAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 );
/**
* @param text The text that will be displayed.
@ -52,7 +52,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
* @param parent This action's parent.
* @param name An internal name for this action.
*/
K3bRadioAction( const TQString& text, const KShortcut& cut,
K3bRadioAction( const TQString& text, const TDEShortcut& cut,
const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
/**
@ -62,7 +62,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
* @param parent This action's parent.
* @param name An internal name for this action.
*/
K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(),
K3bRadioAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut = TDEShortcut(),
TQObject* parent = 0, const char* name = 0 );
/**
@ -72,7 +72,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
* @param parent This action's parent.
* @param name An internal name for this action.
*/
K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(),
K3bRadioAction( const TQString& text, const TQString& pix, const TDEShortcut& cut = TDEShortcut(),
TQObject* parent = 0, const char* name = 0 );
/**
@ -84,7 +84,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
* @param parent This action's parent.
* @param name An internal name for this action.
*/
K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
K3bRadioAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut,
const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
/**
@ -96,7 +96,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
* @param parent This action's parent.
* @param name An internal name for this action.
*/
K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut,
K3bRadioAction( const TQString& text, const TQString& pix, const TDEShortcut& cut,
const TQObject* receiver, const char* slot,
TQObject* parent, const char* name = 0 );
@ -109,7 +109,7 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
/**
* @param b if true the action will always emit the activated signal
* even if the toggled state did not change. The default is false.
* which is the same behaviour as KRadioAction
* which is the same behaviour as TDERadioAction
*/
void setAlwaysEmitActivated( bool b ) { m_alwaysEmit = b; }

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

10
libk3b/tools/k3btoolbox.h
Unescape View File

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

2
libk3b/tools/k3btoolbutton.h
Unescape View File

@ -27,7 +27,7 @@ class TQEvent;
/**
* the K3bToolButton is an enhanced TQToolButton which adds two functionalities:
* <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.
*/
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;
// create root item
KListViewItem* rootItem = new KListViewItem( d->viewFiles, "/" );
TDEListViewItem* rootItem = new TDEListViewItem( d->viewFiles, "/" );
// d->progressDialog->show();
scanDir( dir, rootItem );
@ -229,7 +229,7 @@ void K3bAudioMetainfoRenamerPluginWidget::scanDir( K3bDirItem* dir, TQListViewIt
}
else if( item->isDir() ) {
// create dir item
KListViewItem* dirViewItem = new KListViewItem( viewRoot, item->k3bName() );
TDEListViewItem* dirViewItem = new TDEListViewItem( viewRoot, item->k3bName() );
scanDir( (K3bDirItem*)item, dirViewItem );
dirViewItem->setOpen(true);
}

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());
actionFileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
actionFileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection());
actionFileSaveAll = new KAction( i18n("Save All"), "save_all", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAll()),
actionFileSaveAll = new TDEAction( i18n("Save All"), "save_all", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAll()),
actionCollection(), "file_save_all" );
actionFileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection());
actionFileCloseAll = new KAction( i18n("Close All"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileCloseAll()),
actionFileCloseAll = new TDEAction( i18n("Close All"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileCloseAll()),
actionCollection(), "file_close_all" );
actionFileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection());
actionViewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), actionCollection());
@ -232,38 +232,38 @@ void K3bMainWindow::initActions()
setStandardToolBarMenuEnabled(true);
KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection() );
actionFileNewMenu = new KActionMenu( i18n("&New Project"), "filenew", actionCollection(), "file_new" );
actionFileNewAudio = new KAction(i18n("New &Audio CD Project"), "audiocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewAudioDoc()),
actionFileNewMenu = new TDEActionMenu( i18n("&New Project"), "filenew", actionCollection(), "file_new" );
actionFileNewAudio = new TDEAction(i18n("New &Audio CD Project"), "audiocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewAudioDoc()),
actionCollection(), "file_new_audio");
actionFileNewData = new KAction(i18n("New Data &CD Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDataDoc()),
actionFileNewData = new TDEAction(i18n("New Data &CD Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDataDoc()),
actionCollection(), "file_new_data");
actionFileNewMixed = new KAction(i18n("New &Mixed Mode CD Project"), "mixedcd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMixedDoc()),
actionFileNewMixed = new TDEAction(i18n("New &Mixed Mode CD Project"), "mixedcd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMixedDoc()),
actionCollection(), "file_new_mixed");
actionFileNewVcd = new KAction(i18n("New &Video CD Project"), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVcdDoc()),
actionFileNewVcd = new TDEAction(i18n("New &Video CD Project"), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVcdDoc()),
actionCollection(), "file_new_vcd");
actionFileNewMovix = new KAction(i18n("New &eMovix CD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDoc()),
actionFileNewMovix = new TDEAction(i18n("New &eMovix CD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDoc()),
actionCollection(), "file_new_movix");
actionFileNewMovixDvd = new KAction(i18n("New &eMovix DVD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDvdDoc()),
actionFileNewMovixDvd = new TDEAction(i18n("New &eMovix DVD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDvdDoc()),
actionCollection(), "file_new_movix_dvd");
actionFileNewDvd = new KAction(i18n("New Data &DVD Project"), "datadvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDvdDoc()),
actionFileNewDvd = new TDEAction(i18n("New Data &DVD Project"), "datadvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDvdDoc()),
actionCollection(), "file_new_dvd");
actionFileNewVideoDvd = new KAction(i18n("New V&ideo DVD Project"), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVideoDvdDoc()),
actionFileNewVideoDvd = new TDEAction(i18n("New V&ideo DVD Project"), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVideoDvdDoc()),
actionCollection(), "file_new_video_dvd");
actionFileContinueMultisession = new KAction( i18n("Continue Multisession Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinueMultisession()),
actionFileContinueMultisession = new TDEAction( i18n("Continue Multisession Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinueMultisession()),
actionCollection(), "file_continue_multisession" );
actionFileNewMenu->setDelayed( false );
actionFileNewMenu->insert( actionFileNewData );
actionFileNewMenu->insert( actionFileNewDvd );
actionFileNewMenu->insert( actionFileContinueMultisession );
actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) );
actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
actionFileNewMenu->insert( actionFileNewAudio );
actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) );
actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
actionFileNewMenu->insert( actionFileNewMixed );
actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) );
actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
actionFileNewMenu->insert( actionFileNewVcd );
actionFileNewMenu->insert( actionFileNewVideoDvd );
actionFileNewMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) );
actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
actionFileNewMenu->insert( actionFileNewMovix );
actionFileNewMenu->insert( actionFileNewMovixDvd );
@ -271,53 +271,53 @@ void K3bMainWindow::initActions()
actionProjectAddFiles = new KAction( i18n("&Add Files..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectAddFiles()),
actionProjectAddFiles = new TDEAction( i18n("&Add Files..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectAddFiles()),
actionCollection(), "project_add_files");
KAction* actionClearProject = new KAction( i18n("&Clear Project"), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0,
TDEAction* actionClearProject = new TDEAction( i18n("&Clear Project"), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotClearProject()), actionCollection(), "project_clear_project" );
actionViewDirTreeView = new KToggleAction(i18n("Show Directories"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowDirTreeView()),
actionViewDirTreeView = new TDEToggleAction(i18n("Show Directories"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowDirTreeView()),
actionCollection(), "view_dir_tree");
actionViewContentsView = new KToggleAction(i18n("Show Contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowContentsView()),
actionViewContentsView = new TDEToggleAction(i18n("Show Contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowContentsView()),
actionCollection(), "view_contents");
actionViewDocumentHeader = new KToggleAction(i18n("Show Document Header"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewDocumentHeader()),
actionViewDocumentHeader = new TDEToggleAction(i18n("Show Document Header"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewDocumentHeader()),
actionCollection(), "view_document_header");
actionToolsBlankCdrw = new KAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()),
actionToolsBlankCdrw = new TDEAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()),
actionCollection(), "tools_blank_cdrw" );
KAction* actionToolsFormatDVD = new KAction( i18n("&Format DVD%1RW...").arg("<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" );
actionToolsWriteCdImage = new KAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()),
actionToolsWriteCdImage = new TDEAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()),
actionCollection(), "tools_write_cd_image" );
KAction* actionToolsWriteDvdImage = new KAction(i18n("&Burn DVD ISO Image..."), "burn_dvdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteDvdIsoImage()),
TDEAction* actionToolsWriteDvdImage = new TDEAction(i18n("&Burn DVD ISO Image..."), "burn_dvdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteDvdIsoImage()),
actionCollection(), "tools_write_dvd_iso" );
actionCdCopy = new KAction(i18n("&Copy CD..."), "cdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCdCopy()),
actionCdCopy = new TDEAction(i18n("&Copy CD..."), "cdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCdCopy()),
actionCollection(), "tools_copy_cd" );
KAction* actionToolsDvdCopy = new KAction(i18n("Copy &DVD..."), "dvdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdCopy()),
TDEAction* actionToolsDvdCopy = new TDEAction(i18n("Copy &DVD..."), "dvdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdCopy()),
actionCollection(), "tools_copy_dvd" );
actionToolsCddaRip = new KAction( i18n("Rip Audio CD..."), "cddarip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCddaRip()),
actionToolsCddaRip = new TDEAction( i18n("Rip Audio CD..."), "cddarip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCddaRip()),
actionCollection(), "tools_cdda_rip" );
actionToolsVideoDvdRip = new KAction( i18n("Rip Video DVD..."), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoDvdRip()),
actionToolsVideoDvdRip = new TDEAction( i18n("Rip Video DVD..."), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoDvdRip()),
actionCollection(), "tools_videodvd_rip" );
actionToolsVideoCdRip = new KAction( i18n("Rip Video CD..."), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoCdRip()),
actionToolsVideoCdRip = new TDEAction( i18n("Rip Video CD..."), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoCdRip()),
actionCollection(), "tools_videocd_rip" );
(void)new KAction( i18n("System Check"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystem()),
(void)new TDEAction( i18n("System Check"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystem()),
actionCollection(), "help_check_system" );
#ifdef HAVE_K3BSETUP
actionSettingsK3bSetup = new KAction(i18n("&Setup System Permissions..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotK3bSetup()),
actionSettingsK3bSetup = new TDEAction(i18n("&Setup System Permissions..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotK3bSetup()),
actionCollection(), "settings_k3bsetup" );
#endif
#ifdef K3B_DEBUG
(void)new KAction( "Test Media Selection ComboBox", 0, 0, TQT_TQOBJECT(this),
(void)new TDEAction( "Test Media Selection ComboBox", 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMediaSelectionTester()), actionCollection(),
"test_media_selection" );
#endif
@ -456,7 +456,7 @@ void K3bMainWindow::initView()
0, 0, 0,
actionCollection(), "quick_dir_selector" );
fileTreeComboAction->setAutoSized(true);
(void)new KAction( i18n("Go"), "key_enter", 0, TQT_TQOBJECT(m_fileTreeComboBox), TQT_SLOT(slotGoUrl()), actionCollection(), "go_url" );
(void)new TDEAction( i18n("Go"), "key_enter", 0, TQT_TQOBJECT(m_fileTreeComboBox), TQT_SLOT(slotGoUrl()), actionCollection(), "go_url" );
// ---------------------------------------------------------------------------------------------
}
@ -623,7 +623,7 @@ void K3bMainWindow::saveProperties( TDEConfig* c )
TQString saveDir = TDEGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
// FIXME: for some reason the config entries are not properly stored when using the default
// KMainWindow session config. Since I was not able to find the bug I use another config object
// TDEMainWindow session config. Since I was not able to find the bug I use another config object
// ----------------------------------------------------------
c = new KSimpleConfig( saveDir + "list", false );
c->setGroup( "Saved Session" );
@ -657,7 +657,7 @@ void K3bMainWindow::saveProperties( TDEConfig* c )
}
// FIXME: for some reason the config entries are not properly stored when using the default
// KMainWindow session config. Since I was not able to find the bug I use another config object
// TDEMainWindow session config. Since I was not able to find the bug I use another config object
// ----------------------------------------------------------
delete c;
// ----------------------------------------------------------
@ -678,7 +678,7 @@ void K3bMainWindow::readProperties( TDEConfig* c )
TQString saveDir = TDEGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
// FIXME: for some reason the config entries are not properly stored when using the default
// KMainWindow session config. Since I was not able to find the bug I use another config object
// TDEMainWindow session config. Since I was not able to find the bug I use another config object
// ----------------------------------------------------------
c = new KSimpleConfig( saveDir + "list", true );
c->setGroup( "Saved Session" );
@ -718,7 +718,7 @@ void K3bMainWindow::readProperties( TDEConfig* c )
TDEIO::del( KURL::fromPathOrURL(saveDir), false, false );
// FIXME: for some reason the config entries are not properly stored when using the default
// KMainWindow session config. Since I was not able to find the bug I use another config object
// TDEMainWindow session config. Since I was not able to find the bug I use another config object
// ----------------------------------------------------------
delete c;
// ----------------------------------------------------------
@ -935,7 +935,7 @@ void K3bMainWindow::fileSaveAs( K3bDoc* doc )
KURL url = dlg.selectedURL();
if( url.isValid() ) {
KRecentDocument::add( url );
TDERecentDocument::add( url );
bool exists = TDEIO::NetAccess::exists( url, false, 0 );
if( !exists ||

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 */
void readOptions();
/** initializes the KActions of the application */
/** initializes the TDEActions of the application */
void initActions();
/** sets up the statusbar for the main window by initialzing a statuslabel.
@ -271,41 +271,41 @@ class K3bMainWindow : public KParts::DockMainWindow
/** The MDI-Interface is managed by this tabbed view */
K3bProjectTabWidget* m_documentTab;
// KAction pointers to enable/disable actions
KActionMenu* actionFileNewMenu;
KAction* actionFileNewAudio;
KAction* actionFileNewData;
KAction* actionFileNewMixed;
KAction* actionFileNewVcd;
KAction* actionFileNewMovix;
KAction* actionFileNewMovixDvd;
KAction* actionFileNewDvd;
KAction* actionFileNewVideoDvd;
KAction* actionFileContinueMultisession;
KAction* actionFileOpen;
KRecentFilesAction* actionFileOpenRecent;
KAction* actionFileSave;
KAction* actionFileSaveAs;
KAction* actionFileSaveAll;
KAction* actionFileClose;
KAction* actionFileCloseAll;
KAction* actionFileQuit;
KAction* actionSettingsConfigure;
KAction* actionSettingsK3bSetup;
KAction* actionToolsBlankCdrw;
KAction* actionToolsWriteCdImage;
KAction* actionToolsCddaRip;
KAction* actionToolsVideoDvdRip;
KAction* actionToolsVideoCdRip;
KAction* actionCdCopy;
KAction* actionProjectAddFiles;
KToggleAction* actionViewStatusBar;
KToggleAction* actionViewDirTreeView;
KToggleAction* actionViewContentsView;
KToggleAction* actionViewDocumentHeader;
// TDEAction pointers to enable/disable actions
TDEActionMenu* actionFileNewMenu;
TDEAction* actionFileNewAudio;
TDEAction* actionFileNewData;
TDEAction* actionFileNewMixed;
TDEAction* actionFileNewVcd;
TDEAction* actionFileNewMovix;
TDEAction* actionFileNewMovixDvd;
TDEAction* actionFileNewDvd;
TDEAction* actionFileNewVideoDvd;
TDEAction* actionFileContinueMultisession;
TDEAction* actionFileOpen;
TDERecentFilesAction* actionFileOpenRecent;
TDEAction* actionFileSave;
TDEAction* actionFileSaveAs;
TDEAction* actionFileSaveAll;
TDEAction* actionFileClose;
TDEAction* actionFileCloseAll;
TDEAction* actionFileQuit;
TDEAction* actionSettingsConfigure;
TDEAction* actionSettingsK3bSetup;
TDEAction* actionToolsBlankCdrw;
TDEAction* actionToolsWriteCdImage;
TDEAction* actionToolsCddaRip;
TDEAction* actionToolsVideoDvdRip;
TDEAction* actionToolsVideoCdRip;
TDEAction* actionCdCopy;
TDEAction* actionProjectAddFiles;
TDEToggleAction* actionViewStatusBar;
TDEToggleAction* actionViewDirTreeView;
TDEToggleAction* actionViewContentsView;
TDEToggleAction* actionViewDocumentHeader;
// project actions
TQPtrList<KAction> m_dataProjectActions;
TQPtrList<TDEAction> m_dataProjectActions;
KDockWidget* mainDock;
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?
// Is there a proper way to insert this actioncollection into the mainwindow's?
m_actionCollection = new KActionCollection( this );
m_actionCollection = new TDEActionCollection( this );
// setup actions
KActionMenu* devicePopupMenu = new KActionMenu( m_actionCollection, "device_popup" );
m_actionDiskInfo = new KAction( i18n("Media &Info"), "info", 0, this, TQT_SLOT(diskInfo()),
TDEActionMenu* devicePopupMenu = new TDEActionMenu( m_actionCollection, "device_popup" );
m_actionDiskInfo = new TDEAction( i18n("Media &Info"), "info", 0, this, TQT_SLOT(diskInfo()),
m_actionCollection, "device_diskinfo");
m_actionUnmount = new KAction( i18n("&Unmount"), "cdrom_unmount", 0, this, TQT_SLOT(unmountDisk()),
m_actionUnmount = new TDEAction( i18n("&Unmount"), "cdrom_unmount", 0, this, TQT_SLOT(unmountDisk()),
m_actionCollection, "device_unmount");
m_actionMount = new KAction( i18n("&Mount"), "cdrom_mount", 0, this, TQT_SLOT(mountDisk()),
m_actionMount = new TDEAction( i18n("&Mount"), "cdrom_mount", 0, this, TQT_SLOT(mountDisk()),
m_actionCollection, "device_mount");
m_actionEject = new KAction( i18n("&Eject"), "", 0, this, TQT_SLOT(ejectDisk()),
m_actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQT_SLOT(ejectDisk()),
m_actionCollection, "device_eject");
m_actionLoad = new KAction( i18n("L&oad"), "", 0, this, TQT_SLOT(loadDisk()),
m_actionLoad = new TDEAction( i18n("L&oad"), "", 0, this, TQT_SLOT(loadDisk()),
m_actionCollection, "device_load");
// KAction* actionUnlock = new KAction( i18n("Un&lock"), "", 0, this, TQT_SLOT(unlockDevice()),
// TDEAction* actionUnlock = new TDEAction( i18n("Un&lock"), "", 0, this, TQT_SLOT(unlockDevice()),
// m_actionCollection, "device_unlock" );
// KAction* actionlock = new KAction( i18n("Loc&k"), "", 0, this, TQT_SLOT(lockDevice()),
// TDEAction* actionlock = new TDEAction( i18n("Loc&k"), "", 0, this, TQT_SLOT(lockDevice()),
// m_actionCollection, "device_lock" );
m_actionSetReadSpeed = new KAction( i18n("Set Read Speed..."), "", 0, this, TQT_SLOT(setReadSpeed()),
m_actionSetReadSpeed = new TDEAction( i18n("Set Read Speed..."), "", 0, this, TQT_SLOT(setReadSpeed()),
m_actionCollection, "device_set_read_speed" );
m_actionDiskInfo->setToolTip( i18n("Display generic medium information") );
@ -67,16 +67,16 @@ K3bAppDeviceManager::K3bAppDeviceManager( TQObject* parent, const char* name )
m_actionSetReadSpeed->setToolTip( i18n("Force the drive's read speed") );
devicePopupMenu->insert( m_actionDiskInfo );
devicePopupMenu->insert( new KActionSeparator( this ) );
devicePopupMenu->insert( new TDEActionSeparator( this ) );
devicePopupMenu->insert( m_actionUnmount );
devicePopupMenu->insert( m_actionMount );
devicePopupMenu->insert( new KActionSeparator( this ) );
devicePopupMenu->insert( new TDEActionSeparator( this ) );
devicePopupMenu->insert( m_actionEject );
devicePopupMenu->insert( m_actionLoad );
// devicePopupMenu->insert( new KActionSeparator( this ) );
// devicePopupMenu->insert( new TDEActionSeparator( this ) );
// devicePopupMenu->insert( actionUnlock );
// devicePopupMenu->insert( actionlock );
devicePopupMenu->insert( new KActionSeparator( this ) );
devicePopupMenu->insert( new TDEActionSeparator( this ) );
devicePopupMenu->insert( m_actionSetReadSpeed );
setCurrentDevice( 0 );

20
src/k3bappdevicemanager.h
Unescape View File

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

26
src/k3baudioplayer.cpp
Unescape View File

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

16
src/k3baudioplayer.h
Unescape View File

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

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
// deleting files when they want to remove project entries
KAction* aDelete = actionCollection()->action("delete");
TDEAction* aDelete = actionCollection()->action("delete");
if( aDelete )
aDelete->setShortcut( 0 );
@ -49,10 +49,10 @@ K3bDirOperator::K3bDirOperator(const KURL& url, TQWidget* parent, const char* na
bmMan->setUpdate( true );
bmMan->setShowNSBookmarks( false );
m_bmPopup = new KActionMenu( i18n("Bookmarks"), "bookmark", TQT_TQOBJECT(this), "bookmarks" );
m_bmPopup = new TDEActionMenu( i18n("Bookmarks"), "bookmark", TQT_TQOBJECT(this), "bookmarks" );
m_bmMenu = new KBookmarkMenu( bmMan, this, m_bmPopup->popupMenu(), actionCollection(), true );
(void)new KAction( i18n("&Add to Project"), SHIFT+Key_Return,
(void)new TDEAction( i18n("&Add to Project"), SHIFT+Key_Return,
TQT_TQOBJECT(this), TQT_SLOT(slotAddFilesToProject()),
actionCollection(), "add_file_to_project");
}
@ -130,12 +130,12 @@ void K3bDirOperator::activatedMenu( const KFileItem*, const TQPoint& pos )
updateSelectionDependentActions();
// insert our own actions
KActionMenu* dirOpMenu = (KActionMenu*)actionCollection()->action("popupMenu");
dirOpMenu->insert( new KActionSeparator( actionCollection() ) );
TDEActionMenu* dirOpMenu = (TDEActionMenu*)actionCollection()->action("popupMenu");
dirOpMenu->insert( new TDEActionSeparator( actionCollection() ) );
dirOpMenu->insert( m_bmPopup );