diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 14:59:16 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 14:59:16 -0600 |
commit | 08e6e3d01bc56d3b55c1512164f48d3db762bd53 (patch) | |
tree | 5280c4cb6c471a7f2d79e42246fdcda85cc4adfe /src/projects | |
parent | f3e58cb8bdc777ffad67ac52847bb63c27e7e436 (diff) | |
download | k3b-08e6e3d01bc56d3b55c1512164f48d3db762bd53.tar.gz k3b-08e6e3d01bc56d3b55c1512164f48d3db762bd53.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'src/projects')
30 files changed, 222 insertions, 222 deletions
diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui index 17bb26f..a5a6f03 100644 --- a/src/projects/base_k3badvanceddataimagesettings.ui +++ b/src/projects/base_k3badvanceddataimagesettings.ui @@ -29,7 +29,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>ISO9660 Filesystem</string> diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui index 1d4e8c4..439ac16 100644 --- a/src/projects/base_k3bbootimageview.ui +++ b/src/projects/base_k3bbootimageview.ui @@ -60,7 +60,7 @@ </widget> </hbox> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Emulation Type</string> diff --git a/src/projects/k3baudiodatasourceviewitem.cpp b/src/projects/k3baudiodatasourceviewitem.cpp index 2f0b7a5..37aa372 100644 --- a/src/projects/k3baudiodatasourceviewitem.cpp +++ b/src/projects/k3baudiodatasourceviewitem.cpp @@ -82,7 +82,7 @@ void K3bAudioDataSourceViewItem::setText( int col, const TQString& text ) } } else - KListViewItem::setText( col, text ); + TDEListViewItem::setText( col, text ); } diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp index c73342c..ec1e815 100644 --- a/src/projects/k3baudiotrackplayer.cpp +++ b/src/projects/k3baudiotrackplayer.cpp @@ -30,16 +30,16 @@ class K3bAudioTrackPlayer::Private { public: - KAction* actionPlay; - KAction* actionPause; - KAction* actionPlayPause; - KAction* actionStop; - KAction* actionNext; - KAction* actionPrev; - KAction* actionSeek; + TDEAction* actionPlay; + TDEAction* actionPause; + TDEAction* actionPlayPause; + TDEAction* actionStop; + TDEAction* actionNext; + TDEAction* actionPrev; + TDEAction* actionSeek; // just to handle them easily; - KActionCollection* actionCollection; + TDEActionCollection* actionCollection; TQSlider* seekSlider; TQTimer sliderTimer; @@ -63,44 +63,44 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, co d->playing = false; // TODO: handle the shortcuts: pass a widget to the action collection (perhaps the trackview?) - d->actionCollection = new KActionCollection( 0, this ); + d->actionCollection = new TDEActionCollection( 0, this ); // create the actions // TODO: create shortcuts (is there a way to let the user change them?) - d->actionPlay = new KAction( i18n("Play"), + d->actionPlay = new TDEAction( i18n("Play"), "player_play", - KShortcut(), + TDEShortcut(), this, TQT_SLOT(playPause()), d->actionCollection, "play" ); - d->actionPause = new KAction( i18n("Pause"), + d->actionPause = new TDEAction( i18n("Pause"), "player_pause", - KShortcut(), + TDEShortcut(), this, TQT_SLOT(playPause()), d->actionCollection, "pause" ); - d->actionPlayPause = new KAction( i18n("Play/Pause"), + d->actionPlayPause = new TDEAction( i18n("Play/Pause"), "player_play", - KShortcut(), + TDEShortcut(), this, TQT_SLOT(playPause()), d->actionCollection, "play_pause" ); - d->actionStop = new KAction( i18n("Stop"), + d->actionStop = new TDEAction( i18n("Stop"), "player_stop", - KShortcut(), + TDEShortcut(), this, TQT_SLOT(stop()), d->actionCollection, "stop" ); - d->actionNext = new KAction( i18n("Next"), + d->actionNext = new TDEAction( i18n("Next"), "player_end", - KShortcut(), + TDEShortcut(), this, TQT_SLOT(next()), d->actionCollection, "next" ); - d->actionPrev = new KAction( i18n("Prev"), + d->actionPrev = new TDEAction( i18n("Prev"), "player_start", - KShortcut(), + TDEShortcut(), this, TQT_SLOT(prev()), d->actionCollection, "prev" ); @@ -112,7 +112,7 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, co // the action into several toolboxes and also use it in some resizing or track splitting dialogs. d->actionSeek = new KWidgetAction( d->seekSlider, i18n("Seek"), - KShortcut(), + TDEShortcut(), 0, 0, d->actionCollection, @@ -156,7 +156,7 @@ K3bAudioTrackPlayer::~K3bAudioTrackPlayer() } -KAction* K3bAudioTrackPlayer::action( int action ) const +TDEAction* K3bAudioTrackPlayer::action( int action ) const { switch( action ) { case ACTION_PLAY: diff --git a/src/projects/k3baudiotrackplayer.h b/src/projects/k3baudiotrackplayer.h index 360fde4..a7583be 100644 --- a/src/projects/k3baudiotrackplayer.h +++ b/src/projects/k3baudiotrackplayer.h @@ -24,7 +24,7 @@ class K3bAudioDoc; class K3bAudioTrack; -class KAction; +class TDEAction; class K3bAudioTrackPlayer : public TQObject, public K3bAudioClient @@ -49,7 +49,7 @@ class K3bAudioTrackPlayer : public TQObject, public K3bAudioClient ACTION_SEEK }; - KAction* action( int action ) const; + TDEAction* action( int action ) const; /** * Reimplemented from K3bAudioClient diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp index b57ab32..2569add 100644 --- a/src/projects/k3baudiotracksplitdialog.cpp +++ b/src/projects/k3baudiotracksplitdialog.cpp @@ -90,15 +90,15 @@ K3bAudioTrackSplitDialog::~K3bAudioTrackSplitDialog() void K3bAudioTrackSplitDialog::setupActions() { - m_actionCollection = new KActionCollection( this ); - m_popupMenu = new KPopupMenu( this ); + m_actionCollection = new TDEActionCollection( this ); + m_popupMenu = new TDEPopupMenu( this ); - KAction* actionSplitHere = new KAction( i18n("Split Here"), 0, - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitHere()), + TDEAction* actionSplitHere = new TDEAction( i18n("Split Here"), 0, + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitHere()), actionCollection(), "range_split" ); // FIXME: after the message freeze give this action a proper name like "Remove track part" - KAction* actionRemoveRange = new KAction( i18n("Remove this Range"), 0, - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRange()), + TDEAction* actionRemoveRange = new TDEAction( i18n("Remove this Range"), 0, + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRange()), actionCollection(), "range_remove" ); actionSplitHere->plug( m_popupMenu ); diff --git a/src/projects/k3baudiotracksplitdialog.h b/src/projects/k3baudiotracksplitdialog.h index c122d52..937688b 100644 --- a/src/projects/k3baudiotracksplitdialog.h +++ b/src/projects/k3baudiotracksplitdialog.h @@ -24,8 +24,8 @@ namespace K3b { class K3bAudioTrack; class K3bAudioEditorWidget; class K3bMsfEdit; -class KActionCollection; -class KPopupMenu; +class TDEActionCollection; +class TDEPopupMenu; /** @@ -42,7 +42,7 @@ class K3bAudioTrackSplitDialog : public KDialogBase bool eventFilter( TQObject* o, TQEvent* e ); - KActionCollection* actionCollection() const { return m_actionCollection; } + TDEActionCollection* actionCollection() const { return m_actionCollection; } /** * if this method returns true val is filled with the user selected value. @@ -64,8 +64,8 @@ class K3bAudioTrackSplitDialog : public KDialogBase K3bMsfEdit* m_msfEditStart; K3bMsfEdit* m_msfEditEnd; K3bAudioTrack* m_track; - KActionCollection* m_actionCollection; - KPopupMenu* m_popupMenu; + TDEActionCollection* m_actionCollection; + TDEPopupMenu* m_popupMenu; TQPoint m_lastClickPosition; }; diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index 2e67aee..7539aa8 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -79,8 +79,8 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const setDropVisualizer( true ); setAllColumnsShowFocus( true ); setDragEnabled( true ); - // setSelectionModeExt( KListView::Konqueror ); // FileManager in KDE3 - setSelectionModeExt( KListView::Extended ); + // setSelectionModeExt( TDEListView::Konqueror ); // FileManager in KDE3 + setSelectionModeExt( TDEListView::Extended ); setItemsMovable( false ); setAlternateBackground( TQColor() ); // disable alternate colors @@ -100,8 +100,8 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(showPopupMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotProperties()) ); @@ -151,36 +151,36 @@ void K3bAudioTrackView::setupColumns() void K3bAudioTrackView::setupActions() { - m_actionCollection = new KActionCollection( this ); - m_popupMenu = new KPopupMenu( this ); + m_actionCollection = new TDEActionCollection( this ); + m_popupMenu = new TDEPopupMenu( this ); - m_actionProperties = new KAction( i18n("Properties"), "misc", - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + m_actionProperties = new TDEAction( i18n("Properties"), "misc", + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "track_properties" ); - m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", + m_actionRemove = new TDEAction( i18n( "Remove" ), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "track_remove" ); - m_actionAddSilence = new KAction( i18n("Add Silence") + "...", "misc", - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddSilence()), + m_actionAddSilence = new TDEAction( i18n("Add Silence") + "...", "misc", + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddSilence()), actionCollection(), "track_add_silence" ); - m_actionMergeTracks = new KAction( i18n("Merge Tracks"), "misc", - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotMergeTracks()), + m_actionMergeTracks = new TDEAction( i18n("Merge Tracks"), "misc", + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotMergeTracks()), actionCollection(), "track_merge" ); - m_actionSplitSource = new KAction( i18n("Source to Track"), "misc", - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitSource()), + m_actionSplitSource = new TDEAction( i18n("Source to Track"), "misc", + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitSource()), actionCollection(), "source_split" ); - m_actionSplitTrack = new KAction( i18n("Split Track..."), 0, - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitTrack()), + m_actionSplitTrack = new TDEAction( i18n("Split Track..."), 0, + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitTrack()), actionCollection(), "track_split" ); - m_actionEditSource = new KAction( i18n("Edit Source..."), 0, - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditSource()), + m_actionEditSource = new TDEAction( i18n("Edit Source..."), 0, + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditSource()), actionCollection(), "source_edit" ); - m_actionPlayTrack = new KAction( i18n("Play Track"), "player_play", - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotPlayTrack()), + m_actionPlayTrack = new TDEAction( i18n("Play Track"), "player_play", + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotPlayTrack()), actionCollection(), "track_play" ); #ifdef HAVE_MUSICBRAINZ - KAction* mbAction = new KAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, TQT_TQOBJECT(this), + TDEAction* mbAction = new TDEAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQueryMusicBrainz()), actionCollection(), "project_audio_musicbrainz" ); mbAction->setToolTip( i18n("Try to determine meta information over the internet") ); @@ -191,7 +191,7 @@ void K3bAudioTrackView::setupActions() bool K3bAudioTrackView::acceptDrag(TQDropEvent* e) const { // the first is for built-in item moving, the second for dropping urls, the third for dropping audio tracks - return ( KListView::acceptDrag(e) || KURLDrag::canDecode(e) || K3bAudioCdTrackDrag::canDecode(e) ); + return ( TDEListView::acceptDrag(e) || KURLDrag::canDecode(e) || K3bAudioCdTrackDrag::canDecode(e) ); } @@ -868,7 +868,7 @@ void K3bAudioTrackView::slotEditSource() } -void K3bAudioTrackView::showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& pos ) +void K3bAudioTrackView::showPopupMenu( TDEListView*, TQListViewItem* item, const TQPoint& pos ) { TQPtrList<K3bAudioTrack> tracks; TQPtrList<K3bAudioDataSource> sources; diff --git a/src/projects/k3baudiotrackview.h b/src/projects/k3baudiotrackview.h index 8ad2664..f64e4ee 100644 --- a/src/projects/k3baudiotrackview.h +++ b/src/projects/k3baudiotrackview.h @@ -26,15 +26,15 @@ class K3bAudioTrack; class K3bAudioTrackViewItem; class K3bAudioDataSource; class K3bAudioDoc; -class KActionCollection; -class KAction; +class TDEActionCollection; +class TDEAction; class TQDropEvent; class TQKeyEvent; class TQFocusEvent; class TQMouseEvent; class TQDragMoveEvent; class TQTimer; -class KPopupMenu; +class TDEPopupMenu; class TQPainter; class K3bListViewItemAnimator; class K3bAudioTrackPlayer; @@ -49,7 +49,7 @@ class K3bAudioTrackView : public K3bListView K3bAudioTrackView( K3bAudioDoc*, TQWidget* parent, const char* name = 0 ); ~K3bAudioTrackView(); - KActionCollection* actionCollection() const { return m_actionCollection; } + TDEActionCollection* actionCollection() const { return m_actionCollection; } K3bAudioTrackPlayer* player() const { return m_player; } @@ -70,15 +70,15 @@ class K3bAudioTrackView : public K3bListView K3bAudioDoc* m_doc; - KAction* m_actionProperties; - KAction* m_actionRemove; - KAction* m_actionAddSilence; - KAction* m_actionMergeTracks; - KAction* m_actionSplitSource; - KAction* m_actionSplitTrack; - KAction* m_actionEditSource; - KAction* m_actionPlayTrack; - KActionCollection* m_actionCollection; + TDEAction* m_actionProperties; + TDEAction* m_actionRemove; + TDEAction* m_actionAddSilence; + TDEAction* m_actionMergeTracks; + TDEAction* m_actionSplitSource; + TDEAction* m_actionSplitTrack; + TDEAction* m_actionEditSource; + TDEAction* m_actionPlayTrack; + TDEActionCollection* m_actionCollection; bool m_updatingColumnWidths; @@ -88,7 +88,7 @@ class K3bAudioTrackView : public K3bListView TQTimer* m_autoOpenTrackTimer; TQTimer* m_animationTimer; - KPopupMenu* m_popupMenu; + TDEPopupMenu* m_popupMenu; K3bAudioTrackPlayer* m_player; @@ -118,7 +118,7 @@ class K3bAudioTrackView : public K3bListView void slotMergeTracks(); void slotSplitSource(); void slotSplitTrack(); - void showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& pos ); + void showPopupMenu( TDEListView*, TQListViewItem* item, const TQPoint& pos ); void slotProperties(); void slotPlayTrack(); void slotQueryMusicBrainz(); diff --git a/src/projects/k3baudiotrackviewitem.cpp b/src/projects/k3baudiotrackviewitem.cpp index 67483ad..6fca977 100644 --- a/src/projects/k3baudiotrackviewitem.cpp +++ b/src/projects/k3baudiotrackviewitem.cpp @@ -128,7 +128,7 @@ TQString K3bAudioTrackViewItem::text(int i) const else return m_track->firstSource()->sourceComment(); default: - return KListViewItem::text(i); + return TDEListViewItem::text(i); } } @@ -152,7 +152,7 @@ void K3bAudioTrackViewItem::setText( int col, const TQString& text ) m_track->setTitle( text ); } - KListViewItem::setText( col, text ); + TDEListViewItem::setText( col, text ); } diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp index c0019b9..cdfaaea 100644 --- a/src/projects/k3baudioview.cpp +++ b/src/projects/k3baudioview.cpp @@ -59,7 +59,7 @@ K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, TQWidget* parent, const char *nam fillStatusDisplay()->showTime(); // add button for the audio conversion - KAction* conversionAction = new KAction( i18n("Convert Tracks"), "redo", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAudioConversion()), + TDEAction* conversionAction = new TDEAction( i18n("Convert Tracks"), "redo", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAudioConversion()), actionCollection(), "project_audio_convert" ); conversionAction->setToolTip( i18n("Convert audio tracks to other audio formats." ) ); diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp index 9b4dd27..9f95d7c 100644 --- a/src/projects/k3bbootimageview.cpp +++ b/src/projects/k3bbootimageview.cpp @@ -36,17 +36,17 @@ -class K3bBootImageView::PrivateBootImageViewItem : public KListViewItem +class K3bBootImageView::PrivateBootImageViewItem : public TDEListViewItem { public: PrivateBootImageViewItem( K3bBootItem* image, TQListView* parent ) - : KListViewItem( parent ), + : TDEListViewItem( parent ), m_image( image ) { } PrivateBootImageViewItem( K3bBootItem* image, TQListView* parent, TQListViewItem* after ) - : KListViewItem( parent, after ), + : TDEListViewItem( parent, after ), m_image( image ) { } diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp index 04c6cb9..cd35c2f 100644 --- a/src/projects/k3bdatadirtreeview.cpp +++ b/src/projects/k3bdatadirtreeview.cpp @@ -94,8 +94,8 @@ K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, TQWidget connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(KListView*,TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(showPopupMenu(KListView*,TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopupMenu(TDEListView*,TQListViewItem*, const TQPoint&)) ); connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); @@ -278,31 +278,31 @@ void K3bDataDirTreeView::setCurrentDir( K3bDirItem* dirItem ) void K3bDataDirTreeView::setupActions() { - m_actionCollection = new KActionCollection( this ); + m_actionCollection = new TDEActionCollection( this ); - m_actionProperties = new KAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new KAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), + m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new KAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), + m_actionRemove = new TDEAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), actionCollection(), "remove" ); - KShortcut renameShortCut( Key_F2 ); - renameShortCut.append( KShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), + TDEShortcut renameShortCut( Key_F2 ); + renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility + m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), actionCollection(), "rename" ); - m_popupMenu = new KActionMenu( m_actionCollection, "contextMenu" ); + m_popupMenu = new TDEActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } -void K3bDataDirTreeView::showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& point ) +void K3bDataDirTreeView::showPopupMenu( TDEListView*, TQListViewItem* item, const TQPoint& point ) { if( item ) { if( K3bDataViewItem* di = dynamic_cast<K3bDataViewItem*>(item) ) { diff --git a/src/projects/k3bdatadirtreeview.h b/src/projects/k3bdatadirtreeview.h index 2c57fd9..dd9f543 100644 --- a/src/projects/k3bdatadirtreeview.h +++ b/src/projects/k3bdatadirtreeview.h @@ -29,9 +29,9 @@ class K3bDataDirViewItem; class K3bDirItem; class K3bDataItem; class K3bDataFileView; -class KActionCollection; -class KActionMenu; -class KAction; +class TDEActionCollection; +class TDEActionMenu; +class TDEAction; class K3bView; class TQDragMoveEvent; class TQDragLeaveEvent; @@ -54,7 +54,7 @@ class K3bDataDirTreeView : public K3bListView void setFileView( K3bDataFileView* view ) { m_fileView = view; } - KActionCollection* actionCollection() const { return m_actionCollection; } + TDEActionCollection* actionCollection() const { return m_actionCollection; } public slots: void checkForNewItems(); @@ -69,12 +69,12 @@ class K3bDataDirTreeView : public K3bListView void contentsDragMoveEvent( TQDragMoveEvent* e ); void contentsDragLeaveEvent( TQDragLeaveEvent* e ); - KActionCollection* m_actionCollection; - KActionMenu* m_popupMenu; - KAction* m_actionRemove; - KAction* m_actionRename; - KAction* m_actionNewDir; - KAction* m_actionProperties; + TDEActionCollection* m_actionCollection; + TDEActionMenu* m_popupMenu; + TDEAction* m_actionRemove; + TDEAction* m_actionRename; + TDEAction* m_actionNewDir; + TDEAction* m_actionProperties; protected slots: virtual void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* parent ); @@ -102,7 +102,7 @@ class K3bDataDirTreeView : public K3bListView private slots: void slotExecuted( TQListViewItem* ); void slotDataItemRemoved( K3bDataItem* ); - void showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& ); + void showPopupMenu( TDEListView*, TQListViewItem* _item, const TQPoint& ); void slotRenameItem(); void slotRemoveItem(); void slotNewDir(); diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp index afe94a3..c4b625a 100644 --- a/src/projects/k3bdatafileview.cpp +++ b/src/projects/k3bdatafileview.cpp @@ -73,7 +73,7 @@ K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView addColumn( i18n("Local Path") ); addColumn( i18n("Link") ); - setSelectionModeExt( KListView::Extended ); + setSelectionModeExt( TDEListView::Extended ); m_doc = doc; m_currentDir = doc->root(); @@ -83,8 +83,8 @@ K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); connect( this, TQT_SIGNAL(executed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(showPopupMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), @@ -317,39 +317,39 @@ void K3bDataFileView::slotExecuted( TQListViewItem* item ) void K3bDataFileView::setupActions() { - m_actionCollection = new KActionCollection( this ); + m_actionCollection = new TDEActionCollection( this ); - m_actionProperties = new KAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new KAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), + m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new KAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), + m_actionRemove = new TDEAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), actionCollection(), "remove" ); - KShortcut renameShortCut( Key_F2 ); - renameShortCut.append( KShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new KAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), + TDEShortcut renameShortCut( Key_F2 ); + renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility + m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), actionCollection(), "rename" ); - m_actionParentDir = new KAction( i18n("Parent Directory"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()), + m_actionParentDir = new TDEAction( i18n("Parent Directory"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()), actionCollection(), "parent_dir" ); - m_actionOpen = new KAction( i18n("Open"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()), + m_actionOpen = new TDEAction( i18n("Open"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()), actionCollection(), "open" ); - m_popupMenu = new KActionMenu( m_actionCollection, "contextMenu" ); + m_popupMenu = new TDEActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionParentDir ); - m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionOpen ); - m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } -void K3bDataFileView::showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& point ) +void K3bDataFileView::showPopupMenu( TDEListView*, TQListViewItem* item, const TQPoint& point ) { if( item ) { K3bDataItem* di = static_cast<K3bDataViewItem*>(item)->dataItem(); diff --git a/src/projects/k3bdatafileview.h b/src/projects/k3bdatafileview.h index 8876252..8775aba 100644 --- a/src/projects/k3bdatafileview.h +++ b/src/projects/k3bdatafileview.h @@ -30,9 +30,9 @@ class K3bDataView; class K3bDataViewItem; class K3bDataItem; class TQDropEvent; -class KActionCollection; -class KActionMenu; -class KAction; +class TDEActionCollection; +class TDEActionMenu; +class TDEAction; class K3bDataDirTreeView; class K3bDataDirViewItem; class K3bView; @@ -55,7 +55,7 @@ class K3bDataFileView : public K3bListView K3bDirItem* currentDir() const; - KActionCollection* actionCollection() const { return m_actionCollection; } + TDEActionCollection* actionCollection() const { return m_actionCollection; } signals: void dirSelected( K3bDirItem* ); @@ -68,7 +68,7 @@ class K3bDataFileView : public K3bListView void slotDataItemRemoved( K3bDataItem* ); void slotExecuted( TQListViewItem* ); void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* parent ); - void showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& ); + void showPopupMenu( TDEListView*, TQListViewItem* _item, const TQPoint& ); void slotRenameItem(); void slotRemoveItem(); void slotNewDir(); @@ -89,14 +89,14 @@ class K3bDataFileView : public K3bListView void clearItems(); void setupActions(); - KActionCollection* m_actionCollection; - KActionMenu* m_popupMenu; - KAction* m_actionParentDir; - KAction* m_actionRemove; - KAction* m_actionRename; - KAction* m_actionNewDir; - KAction* m_actionProperties; - KAction* m_actionOpen; + TDEActionCollection* m_actionCollection; + TDEActionMenu* m_popupMenu; + TDEAction* m_actionParentDir; + TDEAction* m_actionRemove; + TDEAction* m_actionRename; + TDEAction* m_actionNewDir; + TDEAction* m_actionProperties; + TDEAction* m_actionOpen; K3bView* m_view; diff --git a/src/projects/k3bdatasessionimportdialog.h b/src/projects/k3bdatasessionimportdialog.h index 8c27238..4cfb6de 100644 --- a/src/projects/k3bdatasessionimportdialog.h +++ b/src/projects/k3bdatasessionimportdialog.h @@ -25,7 +25,7 @@ class TQLabel; -class KListBox; +class TDEListBox; class K3bDataDoc; class K3bMediaSelectionComboBox; diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index d71d256..d59e55b 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -75,12 +75,12 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *parent, const char *name ) // the data actions - KAction* actionImportSession = new KAction(i18n("&Import Session..."), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(importSession()), + TDEAction* actionImportSession = new TDEAction(i18n("&Import Session..."), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(importSession()), actionCollection(), "project_data_import_session" ); - KAction* actionClearSession = new KAction(i18n("&Clear Imported Session"), "gear", 0, TQT_TQOBJECT(this), + TDEAction* actionClearSession = new TDEAction(i18n("&Clear Imported Session"), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(clearImportedSession()), actionCollection(), "project_data_clear_imported_session" ); - KAction* actionEditBootImages = new KAction(i18n("&Edit Boot Images..."), "cdtrack", 0, TQT_TQOBJECT(this), + TDEAction* actionEditBootImages = new TDEAction(i18n("&Edit Boot Images..."), "cdtrack", 0, TQT_TQOBJECT(this), TQT_SLOT(editBootImages()), actionCollection(), "project_data_edit_boot_images" ); diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 88d5ba9..29324a8 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -299,22 +299,22 @@ private: class K3bFillStatusDisplay::Private { public: - KActionCollection* actionCollection; - KRadioAction* actionShowMinutes; - KRadioAction* actionShowMegs; - KRadioAction* actionAuto; - KRadioAction* action74Min; - KRadioAction* action80Min; - KRadioAction* action100Min; - KRadioAction* actionDvd4_7GB; - KRadioAction* actionDvdDoubleLayer; + TDEActionCollection* actionCollection; + TDERadioAction* actionShowMinutes; + TDERadioAction* actionShowMegs; + TDERadioAction* actionAuto; + TDERadioAction* action74Min; + TDERadioAction* action80Min; + TDERadioAction* action100Min; + TDERadioAction* actionDvd4_7GB; + TDERadioAction* actionDvdDoubleLayer; K3bRadioAction* actionCustomSize; K3bRadioAction* actionDetermineSize; - KAction* actionSaveUserDefaults; - KAction* actionLoadUserDefaults; + TDEAction* actionSaveUserDefaults; + TDEAction* actionLoadUserDefaults; - KPopupMenu* popup; - KPopupMenu* dvdPopup; + TDEPopupMenu* popup; + TDEPopupMenu* dvdPopup; TQToolButton* buttonMenu; @@ -372,31 +372,31 @@ K3bFillStatusDisplay::~K3bFillStatusDisplay() void K3bFillStatusDisplay::setupPopupMenu() { - d->actionCollection = new KActionCollection( this ); + d->actionCollection = new TDEActionCollection( this ); // we use a nother popup for the dvd sizes - d->popup = new KPopupMenu( this, "popup" ); - d->dvdPopup = new KPopupMenu( this, "dvdpopup" ); + d->popup = new TDEPopupMenu( this, "popup" ); + d->dvdPopup = new TDEPopupMenu( this, "dvdpopup" ); - d->actionShowMinutes = new KRadioAction( i18n("Minutes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showTime()), + d->actionShowMinutes = new TDERadioAction( i18n("Minutes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showTime()), d->actionCollection, "fillstatus_show_minutes" ); - d->actionShowMegs = new KRadioAction( i18n("Megabytes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showSize()), + d->actionShowMegs = new TDERadioAction( i18n("Megabytes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showSize()), d->actionCollection, "fillstatus_show_megabytes" ); d->actionShowMegs->setExclusiveGroup( "show_size_in" ); d->actionShowMinutes->setExclusiveGroup( "show_size_in" ); - d->actionAuto = new KRadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()), + d->actionAuto = new TDERadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()), d->actionCollection, "fillstatus_auto" ); - d->action74Min = new KRadioAction( i18n("%1 MB").arg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()), + d->action74Min = new TDERadioAction( i18n("%1 MB").arg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()), d->actionCollection, "fillstatus_74minutes" ); - d->action80Min = new KRadioAction( i18n("%1 MB").arg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()), + d->action80Min = new TDERadioAction( i18n("%1 MB").arg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()), d->actionCollection, "fillstatus_80minutes" ); - d->action100Min = new KRadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()), + d->action100Min = new TDERadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()), d->actionCollection, "fillstatus_100minutes" ); - d->actionDvd4_7GB = new KRadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()), + d->actionDvd4_7GB = new TDERadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()), d->actionCollection, "fillstatus_dvd_4_7gb" ); - d->actionDvdDoubleLayer = new KRadioAction( TDEIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)), + d->actionDvdDoubleLayer = new TDERadioAction( TDEIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdDoubleLayer()), d->actionCollection, "fillstatus_dvd_double_layer" ); d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()), @@ -416,14 +416,14 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionCustomSize->setExclusiveGroup( "cd_size" ); d->actionDetermineSize->setExclusiveGroup( "cd_size" ); - d->actionLoadUserDefaults = new KAction( i18n("User Defaults"), "", 0, + d->actionLoadUserDefaults = new TDEAction( i18n("User Defaults"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotLoadUserDefaults()), d->actionCollection, "load_user_defaults" ); - d->actionSaveUserDefaults = new KAction( i18n("Save User Defaults"), "", 0, + d->actionSaveUserDefaults = new TDEAction( i18n("Save User Defaults"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveUserDefaults()), d->actionCollection, "save_user_defaults" ); - KAction* dvdSizeInfoAction = new KAction( i18n("Why 4.4 instead of 4.7?"), "", 0, + TDEAction* dvdSizeInfoAction = new TDEAction( i18n("Why 4.4 instead of 4.7?"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWhy44()), d->actionCollection, "why_44_gb" ); diff --git a/src/projects/k3bfillstatusdisplay.h b/src/projects/k3bfillstatusdisplay.h index 78c22ee..95f0940 100644 --- a/src/projects/k3bfillstatusdisplay.h +++ b/src/projects/k3bfillstatusdisplay.h @@ -25,10 +25,10 @@ class TQPaintEvent; class TQMouseEvent; class K3bDoc; -class KToggleAction; -class KAction; -class KActionCollection; -class KPopupMenu; +class TDEToggleAction; +class TDEAction; +class TDEActionCollection; +class TDEPopupMenu; class TQToolButton; namespace K3bDevice { diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp index 2f3fc31..980c0f7 100644 --- a/src/projects/k3bmovixlistview.cpp +++ b/src/projects/k3bmovixlistview.cpp @@ -182,7 +182,7 @@ K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, TQWidget* parent, const ch setAllColumnsShowFocus( true ); setDragEnabled( true ); setItemsMovable( false ); - setSelectionModeExt( KListView::Extended ); + setSelectionModeExt( TDEListView::Extended ); setSorting(0); setNoItemText( i18n("Use drag'n'drop to add files to the project.") +"\n" @@ -193,8 +193,8 @@ K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, TQWidget* parent, const ch connect( m_doc, TQT_SIGNAL(newMovixFileItems()), this, TQT_SLOT(slotNewFileItems()) ); connect( m_doc, TQT_SIGNAL(movixItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotFileItemRemoved(K3bMovixFileItem*)) ); connect( m_doc, TQT_SIGNAL(subTitleItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotSubTitleItemRemoved(K3bMovixFileItem*)) ); - connect( this, TQT_SIGNAL(dropped(KListView*, TQDropEvent*, TQListViewItem*)), - this, TQT_SLOT(slotDropped(KListView*, TQDropEvent*, TQListViewItem*)) ); + connect( this, TQT_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*)), + this, TQT_SLOT(slotDropped(TDEListView*, TQDropEvent*, TQListViewItem*)) ); // let's see what the doc already has slotNewFileItems(); @@ -258,7 +258,7 @@ void K3bMovixListView::slotSubTitleItemRemoved( K3bMovixFileItem* item ) } -void K3bMovixListView::slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ) +void K3bMovixListView::slotDropped( TDEListView*, TQDropEvent* e, TQListViewItem* after ) { if( !e->isAccepted() ) return; diff --git a/src/projects/k3bmovixlistview.h b/src/projects/k3bmovixlistview.h index be5750f..c2b4005 100644 --- a/src/projects/k3bmovixlistview.h +++ b/src/projects/k3bmovixlistview.h @@ -89,7 +89,7 @@ class K3bMovixListView : public K3bListView void slotNewFileItems(); void slotFileItemRemoved( K3bMovixFileItem* ); void slotSubTitleItemRemoved( K3bMovixFileItem* ); - void slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ); + void slotDropped( TDEListView*, TQDropEvent* e, TQListViewItem* after ); void slotChanged(); private: diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp index 6e86212..58c4f3c 100644 --- a/src/projects/k3bmovixview.cpp +++ b/src/projects/k3bmovixview.cpp @@ -50,20 +50,20 @@ K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* parent, const char* name // setup actions - m_actionProperties = new KAction( i18n("Properties"), "misc", + m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(showPropertiesDialog()), actionCollection(), "movix_show_props" ); - m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", + m_actionRemove = new TDEAction( i18n( "Remove" ), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItems()), actionCollection(), "movix_remove_item" ); - m_actionRemoveSubTitle = new KAction( i18n( "Remove Subtitle File" ), "editdelete", + m_actionRemoveSubTitle = new TDEAction( i18n( "Remove Subtitle File" ), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveSubTitleItems()), actionCollection(), "movix_remove_subtitle_item" ); - m_actionAddSubTitle = new KAction( i18n("Add Subtitle File..."), "", + m_actionAddSubTitle = new TDEAction( i18n("Add Subtitle File..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSubTitleFile()), actionCollection(), "movix_add_subtitle" ); - m_popupMenu = new KPopupMenu( this ); + m_popupMenu = new TDEPopupMenu( this ); m_actionRemove->plug( m_popupMenu ); m_actionRemoveSubTitle->plug( m_popupMenu ); m_actionAddSubTitle->plug( m_popupMenu ); diff --git a/src/projects/k3bmovixview.h b/src/projects/k3bmovixview.h index b17c8c0..4f29c91 100644 --- a/src/projects/k3bmovixview.h +++ b/src/projects/k3bmovixview.h @@ -22,8 +22,8 @@ class K3bMovixDoc; class K3bMovixListView; -class KAction; -class KPopupMenu; +class TDEAction; +class TDEPopupMenu; class TQListViewItem; class TQPoint; class TQLineEdit; @@ -54,11 +54,11 @@ class K3bMovixView : public K3bView private: K3bMovixDoc* m_doc; - KAction* m_actionProperties; - KAction* m_actionRemove; - KAction* m_actionRemoveSubTitle; - KAction* m_actionAddSubTitle; - KPopupMenu* m_popupMenu; + TDEAction* m_actionProperties; + TDEAction* m_actionRemove; + TDEAction* m_actionRemoveSubTitle; + TDEAction* m_actionAddSubTitle; + TDEPopupMenu* m_popupMenu; TQLineEdit* m_volumeIDEdit; }; diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp index 19f49fb..b2c5508 100644 --- a/src/projects/k3bvcdlistview.cpp +++ b/src/projects/k3bvcdlistview.cpp @@ -46,7 +46,7 @@ K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *parent, setDropVisualizer( true ); setAllColumnsShowFocus( true ); setDragEnabled( true ); - setSelectionModeExt( KListView::Extended ); + setSelectionModeExt( TDEListView::Extended ); setItemsMovable( false ); setNoItemText( i18n( "Use drag'n'drop to add MPEG video files to the project." ) + "\n" @@ -60,10 +60,10 @@ K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *parent, setupColumns(); header() ->setClickEnabled( false ); - connect( this, TQT_SIGNAL( dropped( KListView*, TQDropEvent*, TQListViewItem* ) ), - this, TQT_SLOT( slotDropped( KListView*, TQDropEvent*, TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( showPopupMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( this, TQT_SIGNAL( dropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ), + this, TQT_SLOT( slotDropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ) ); + connect( this, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( showPopupMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQT_SLOT( showPropertiesDialog() ) ); @@ -93,9 +93,9 @@ void K3bVcdListView::setupColumns() void K3bVcdListView::setupActions() { - m_actionCollection = new KActionCollection( this ); - m_actionProperties = new KAction( i18n( "Properties" ), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT( showPropertiesDialog() ), actionCollection() ); - m_actionRemove = new KAction( i18n( "Remove" ), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTracks() ), actionCollection() ); + m_actionCollection = new TDEActionCollection( this ); + m_actionProperties = new TDEAction( i18n( "Properties" ), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT( showPropertiesDialog() ), actionCollection() ); + m_actionRemove = new TDEAction( i18n( "Remove" ), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTracks() ), actionCollection() ); // disabled by default m_actionRemove->setEnabled( false ); @@ -104,7 +104,7 @@ void K3bVcdListView::setupActions() void K3bVcdListView::setupPopupMenu() { - m_popupMenu = new KPopupMenu( this, "VcdViewPopupMenu" ); + m_popupMenu = new TDEPopupMenu( this, "VcdViewPopupMenu" ); m_actionRemove->plug( m_popupMenu ); m_popupMenu->insertSeparator(); m_actionProperties->plug( m_popupMenu ); @@ -116,7 +116,7 @@ void K3bVcdListView::setupPopupMenu() bool K3bVcdListView::acceptDrag( TQDropEvent* e ) const { // the first is for built-in item moving, the second for dropping urls - return ( KListView::acceptDrag( e ) || KURLDrag::canDecode( e ) ); + return ( TDEListView::acceptDrag( e ) || KURLDrag::canDecode( e ) ); } @@ -137,7 +137,7 @@ TQDragObject* K3bVcdListView::dragObject() } -void K3bVcdListView::slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ) +void K3bVcdListView::slotDropped( TDEListView*, TQDropEvent* e, TQListViewItem* after ) { if ( !e->isAccepted() ) return ; @@ -172,7 +172,7 @@ void K3bVcdListView::slotDropped( KListView*, TQDropEvent* e, TQListViewItem* af void K3bVcdListView::insertItem( TQListViewItem* item ) { - KListView::insertItem( item ); + TDEListView::insertItem( item ); // make sure at least one item is selected if ( selectedItems().isEmpty() ) { @@ -180,7 +180,7 @@ void K3bVcdListView::insertItem( TQListViewItem* item ) } } -void K3bVcdListView::showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& _point ) +void K3bVcdListView::showPopupMenu( TDEListView*, TQListViewItem* _item, const TQPoint& _point ) { if ( _item ) { m_actionRemove->setEnabled( true ); diff --git a/src/projects/k3bvcdlistview.h b/src/projects/k3bvcdlistview.h index d3eca48..4693a5b 100644 --- a/src/projects/k3bvcdlistview.h +++ b/src/projects/k3bvcdlistview.h @@ -25,12 +25,12 @@ class TQDragEnterEvent; class TQDragObject; class TQDropEvent; class TQTimer; -class KPopupMenu; -class KAction; +class TDEPopupMenu; +class TDEAction; class K3bVcdDoc; class K3bView; class K3bVcdTrack; -class KActionCollection; +class TDEActionCollection; class K3bVcdListViewItem; class TQPainter; @@ -45,11 +45,11 @@ class K3bVcdListView : public K3bListView ~K3bVcdListView(); /** - * reimplemented from KListView + * reimplemented from TDEListView */ void insertItem( TQListViewItem* ); - KActionCollection* actionCollection() const + TDEActionCollection* actionCollection() const { return m_actionCollection; } @@ -67,18 +67,18 @@ class K3bVcdListView : public K3bListView K3bVcdDoc* m_doc; K3bView* m_view; - KAction* m_actionProperties; - KAction* m_actionRemove; - KActionCollection* m_actionCollection; + TDEAction* m_actionProperties; + TDEAction* m_actionRemove; + TDEActionCollection* m_actionCollection; - KPopupMenu* m_popupMenu; + TDEPopupMenu* m_popupMenu; TQMap<K3bVcdTrack*, K3bVcdListViewItem*> m_itemMap; private slots: - void slotDropped( KListView*, TQDropEvent* e, TQListViewItem* after ); + void slotDropped( TDEListView*, TQDropEvent* e, TQListViewItem* after ); void slotUpdateItems(); - void showPopupMenu( KListView*, TQListViewItem* item, const TQPoint& ); + void showPopupMenu( TDEListView*, TQListViewItem* item, const TQPoint& ); void showPropertiesDialog(); void slotRemoveTracks(); void slotTrackRemoved( K3bVcdTrack* ); diff --git a/src/projects/k3bvcdlistviewitem.cpp b/src/projects/k3bvcdlistviewitem.cpp index 363068c..128d6b0 100644 --- a/src/projects/k3bvcdlistviewitem.cpp +++ b/src/projects/k3bvcdlistviewitem.cpp @@ -78,7 +78,7 @@ TQString K3bVcdListViewItem::text( int i ) const return m_track->fileName(); default: - return KListViewItem::text( i ); + return TDEListViewItem::text( i ); } } @@ -89,7 +89,7 @@ void K3bVcdListViewItem::setText( int col, const TQString& text ) m_track->setTitle( text ); } - KListViewItem::setText( col, text ); + TDEListViewItem::setText( col, text ); } diff --git a/src/projects/k3bvcdview.h b/src/projects/k3bvcdview.h index c7b151a..0dcbe87 100644 --- a/src/projects/k3bvcdview.h +++ b/src/projects/k3bvcdview.h @@ -28,7 +28,7 @@ class TQWidget; class K3bVcdDoc; class K3bVcdTrack; class TQListViewItem; -class KListView; +class TDEListView; class K3bVcdBurnDialog; class K3bProjectBurnDialog; diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp index bddc819..86e97e3 100644 --- a/src/projects/k3bview.cpp +++ b/src/projects/k3bview.cpp @@ -57,10 +57,10 @@ K3bView::K3bView( K3bDoc* pDoc, TQWidget *parent, const char* name ) grid->setSpacing( 5 ); grid->setMargin( 2 ); - KAction* burnAction = new KAction( i18n("&Burn"), "cdburn", CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotBurn()), + TDEAction* burnAction = new TDEAction( i18n("&Burn"), "cdburn", CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotBurn()), actionCollection(), "project_burn"); burnAction->setToolTip( i18n("Open the burn dialog for the current project") ); - KAction* propAction = new KAction( i18n("&Properties"), "edit", CTRL + Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + TDEAction* propAction = new TDEAction( i18n("&Properties"), "edit", CTRL + Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), actionCollection(), "project_properties"); propAction->setToolTip( i18n("Open the properties dialog") ); @@ -123,7 +123,7 @@ void K3bView::slotProperties() } -// KActionCollection* K3bView::actionCollection() const +// TDEActionCollection* K3bView::actionCollection() const // { // return m_actionCollection; // } diff --git a/src/projects/k3bview.h b/src/projects/k3bview.h index 279d7d1..7c9ab9a 100644 --- a/src/projects/k3bview.h +++ b/src/projects/k3bview.h @@ -29,7 +29,7 @@ #include <kurl.h> class K3bDoc; -class KActionCollection; +class TDEActionCollection; class K3bFillStatusDisplay; class K3bProjectBurnDialog; class K3bToolBox; |