From 940c092f32d40263ad6b24f948eaf4c48b01e99a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:13:25 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- juk/actioncollection.cpp | 12 +++--- juk/actioncollection.h | 10 ++--- juk/cache.cpp | 6 +-- juk/collectionlist.cpp | 6 +-- juk/coverdialog.cpp | 12 +++--- juk/coverdialogbase.ui | 2 +- juk/deletedialog.h | 2 +- juk/deletedialogbase.ui | 2 +- juk/directorylist.cpp | 4 +- juk/directorylistbase.ui | 2 +- juk/filerenamer.cpp | 8 ++-- juk/juk.cpp | 80 ++++++++++++++++++++-------------------- juk/juk.h | 24 ++++++------ juk/k3bexporter.cpp | 16 ++++---- juk/k3bexporter.h | 6 +-- juk/keydialog.cpp | 36 +++++++++--------- juk/keydialog.h | 10 ++--- juk/musicbrainzquery.cpp | 2 +- juk/playermanager.cpp | 22 +++++------ juk/playermanager.h | 4 +- juk/playlist.cpp | 60 +++++++++++++++--------------- juk/playlist.h | 20 +++++----- juk/playlistbox.cpp | 32 ++++++++-------- juk/playlistbox.h | 16 ++++---- juk/playlistcollection.cpp | 36 +++++++++--------- juk/playlistcollection.h | 6 +-- juk/playlistexporter.h | 10 ++--- juk/playlistitem.cpp | 18 ++++----- juk/playlistitem.h | 6 +-- juk/playlistsplitter.cpp | 14 +++---- juk/playlistsplitter.h | 2 +- juk/searchwidget.cpp | 2 +- juk/searchwidget.h | 2 +- juk/slideraction.cpp | 20 +++++----- juk/slideraction.h | 4 +- juk/systemtray.cpp | 8 ++-- juk/tageditor.cpp | 8 ++-- juk/tagguesserconfigdlg.cpp | 4 +- juk/tagguesserconfigdlgwidget.ui | 2 +- juk/trackpickerdialog.cpp | 6 +-- juk/trackpickerdialogbase.ui | 2 +- juk/tracksequenceiterator.cpp | 14 +++---- juk/tracksequencemanager.h | 8 ++-- juk/viewmode.cpp | 2 +- juk/viewmode.h | 2 +- juk/webimagefetcher.cpp | 2 +- 46 files changed, 286 insertions(+), 286 deletions(-) (limited to 'juk') diff --git a/juk/actioncollection.cpp b/juk/actioncollection.cpp index 6290d6ee..6ec753fd 100644 --- a/juk/actioncollection.cpp +++ b/juk/actioncollection.cpp @@ -20,19 +20,19 @@ namespace ActionCollection { - KActionCollection *actions() + TDEActionCollection *actions() { - static KActionCollection *a = - new KActionCollection(static_cast(0), "JuK Action Collection"); + static TDEActionCollection *a = + new TDEActionCollection(static_cast(0), "JuK Action Collection"); return a; } - KAction *action(const char *key) + TDEAction *action(const char *key) { #ifndef NO_DEBUG - KAction *a = actions()->action(key); + TDEAction *a = actions()->action(key); if(!a) - kdWarning(65432) << "KAction \"" << key << "\" is not defined yet." << endl; + kdWarning(65432) << "TDEAction \"" << key << "\" is not defined yet." << endl; return a; #else return actions()->action(key); diff --git a/juk/actioncollection.h b/juk/actioncollection.h index 22eddd54..930f12aa 100644 --- a/juk/actioncollection.h +++ b/juk/actioncollection.h @@ -16,25 +16,25 @@ #ifndef JUK_ACTIONCOLLECTION_H #define JUK_ACTIONCOLLECTION_H -class KActionCollection; -class KAction; +class TDEActionCollection; +class TDEAction; namespace ActionCollection { /** * The global action collection for JuK. */ - KActionCollection *actions(); + TDEActionCollection *actions(); /** * Returns the action for the associated key from the global action * collection. */ - KAction *action(const char *key); + TDEAction *action(const char *key); /** * Returns the action for the associated key but includes a cast to the - * type \a T. i.e. KSelectAction *a = action("chooser"); + * type \a T. i.e. TDESelectAction *a = action("chooser"); */ template T *action(const char *key) { diff --git a/juk/cache.cpp b/juk/cache.cpp index bb7c2956..4bd917f8 100644 --- a/juk/cache.cpp +++ b/juk/cache.cpp @@ -144,7 +144,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static } case History: { - action("showHistory")->setChecked(true); + action("showHistory")->setChecked(true); collection->setHistoryPlaylistEnabled(true); s >> *collection->historyPlaylist(); playlist = collection->historyPlaylist(); @@ -155,7 +155,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static /* collection->setUpcomingPlaylistEnabled(true); Playlist *p = collection->upcomingPlaylist(); - action("saveUpcomingTracks")->setChecked(true); + action("saveUpcomingTracks")->setChecked(true); s >> *p; playlist = p; */ @@ -225,7 +225,7 @@ void Cache::savePlaylists(const PlaylistList &playlists) << *static_cast(*it); } else if(dynamic_cast(*it)) { - if(!action("saveUpcomingTracks")->isChecked()) + if(!action("saveUpcomingTracks")->isChecked()) continue; s << TQ_INT32(Upcoming) << *static_cast(*it); diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp index 7b22542e..d55d80c1 100644 --- a/juk/collectionlist.cpp +++ b/juk/collectionlist.cpp @@ -228,13 +228,13 @@ CollectionList::CollectionList(PlaylistCollection *collection) : m_itemsDict(5003), m_columnTags(15, 0) { - new KAction(i18n("Show Playing"), KShortcut(), ActionCollection::actions(), "showPlaying"); + new TDEAction(i18n("Show Playing"), TDEShortcut(), ActionCollection::actions(), "showPlaying"); connect(action("showPlaying"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowPlaying())); - connect(action("back")->popupMenu(), TQT_SIGNAL(aboutToShow()), + connect(action("back")->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPopulateBackMenu())); - connect(action("back")->popupMenu(), TQT_SIGNAL(activated(int)), + connect(action("back")->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPlayFromBackMenu(int))); setSorting(-1); // Temporarily disable sorting to add items faster. diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp index 509f0695..8c2ae390 100644 --- a/juk/coverdialog.cpp +++ b/juk/coverdialog.cpp @@ -31,11 +31,11 @@ using CoverUtility::CoverIconViewItem; -class AllArtistsListViewItem : public KListViewItem +class AllArtistsListViewItem : public TDEListViewItem { public: AllArtistsListViewItem(TQListView *parent) : - KListViewItem(parent, i18n("")) + TDEListViewItem(parent, i18n("")) { } @@ -45,11 +45,11 @@ public: } }; -class CaseInsensitiveItem : public KListViewItem +class CaseInsensitiveItem : public TDEListViewItem { public: CaseInsensitiveItem(TQListView *parent, const TQString &text) : - KListViewItem(parent, text) + TDEListViewItem(parent, text) { } @@ -135,13 +135,13 @@ void CoverDialog::slotArtistClicked(TQListViewItem *item) void CoverDialog::slotContextRequested(TQIconViewItem *item, const TQPoint &pt) { - static KPopupMenu *menu = 0; + static TDEPopupMenu *menu = 0; if(!item) return; if(!menu) { - menu = new KPopupMenu(this); + menu = new TDEPopupMenu(this); menu->insertItem(i18n("Remove Cover"), this, TQT_SLOT(removeSelectedCover())); } diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui index dbdcda9c..0cad4e4f 100644 --- a/juk/coverdialogbase.ui +++ b/juk/coverdialogbase.ui @@ -19,7 +19,7 @@ unnamed - + Artist diff --git a/juk/deletedialog.h b/juk/deletedialog.h index 0e51a385..61e6255f 100644 --- a/juk/deletedialog.h +++ b/juk/deletedialog.h @@ -22,7 +22,7 @@ #include "deletedialogbase.h" class TQStringList; -class KListBox; +class TDEListBox; class TQLabel; class TQWidgetStack; diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui index 2a7837af..c1fbc200 100644 --- a/juk/deletedialogbase.ui +++ b/juk/deletedialogbase.ui @@ -80,7 +80,7 @@ - + ddFileList diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp index c368a6c3..8dfdc27e 100644 --- a/juk/directorylist.cpp +++ b/juk/directorylist.cpp @@ -46,7 +46,7 @@ DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylis TQStringList::ConstIterator it = directories.begin(); for(; it != directories.end(); ++it) - new KListViewItem(m_base->directoryListView, *it); + new TDEListViewItem(m_base->directoryListView, *it); m_base->importPlaylistsCheckBox->setChecked(importPlaylists); @@ -80,7 +80,7 @@ void DirectoryList::slotAddDirectory() TQString dir = KFileDialog::getExistingDirectory(); if(!dir.isEmpty() && m_dirList.find(dir) == m_dirList.end()) { m_dirList.append(dir); - new KListViewItem(m_base->directoryListView, dir); + new TDEListViewItem(m_base->directoryListView, dir); m_result.addedDirs.append(dir); } } diff --git a/juk/directorylistbase.ui b/juk/directorylistbase.ui index 02aae023..281aa6fd 100644 --- a/juk/directorylistbase.ui +++ b/juk/directorylistbase.ui @@ -16,7 +16,7 @@ unnamed - + Folders diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp index ca9bbce0..e9202f2e 100644 --- a/juk/filerenamer.cpp +++ b/juk/filerenamer.cpp @@ -73,7 +73,7 @@ public: "Are you sure you want to continue?"), hbox); hbox->setStretchFactor(l, 1); - KListView *lv = new KListView(vbox); + TDEListView *lv = new TDEListView(vbox); lv->addColumn(i18n("Original Name")); lv->addColumn(i18n("New Name")); @@ -82,9 +82,9 @@ public: TQMap::ConstIterator it = files.begin(); for(; it != files.end(); ++it) { - KListViewItem *i = it.key() != it.data() - ? new KListViewItem(lv, it.key(), it.data()) - : new KListViewItem(lv, it.key(), i18n("No Change")); + TDEListViewItem *i = it.key() != it.data() + ? new TDEListViewItem(lv, it.key(), it.data()) + : new TDEListViewItem(lv, it.key(), i18n("No Change")); lvHeight += i->height(); } diff --git a/juk/juk.cpp b/juk/juk.cpp index 69b65c0b..e4238416 100644 --- a/juk/juk.cpp +++ b/juk/juk.cpp @@ -44,7 +44,7 @@ using namespace ActionCollection; //////////////////////////////////////////////////////////////////////////////// JuK::JuK(TQWidget *parent, const char *name) : - KMainWindow(parent, name, WDestructiveClose), + TDEMainWindow(parent, name, WDestructiveClose), m_player(PlayerManager::instance()), m_shuttingDown(false) { @@ -82,7 +82,7 @@ JuK::~JuK() kdDebug(65432) << k_funcinfo << endl; } -KActionCollection *JuK::actionCollection() const +TDEActionCollection *JuK::actionCollection() const { return ActionCollection::actions(); } @@ -120,64 +120,64 @@ void JuK::setupActions() KStdAction::clear(TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions()); KStdAction::selectAll(TQT_TQOBJECT(kapp), TQT_SLOT(selectAll()), ActionCollection::actions()); - new KAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist"); + new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist"); - KActionMenu *actionMenu = new KActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu"); + TDEActionMenu *actionMenu = new TDEActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu"); actionMenu->setDelayed(false); - KRadioAction *ka = new KRadioAction(i18n("&Disable Random Play"), "player_playlist", 0, ActionCollection::actions(), "disableRandomPlay"); + TDERadioAction *ka = new TDERadioAction(i18n("&Disable Random Play"), "player_playlist", 0, ActionCollection::actions(), "disableRandomPlay"); ka->setExclusiveGroup("randomPlayGroup"); actionMenu->insert(ka); - m_randomPlayAction = new KRadioAction(i18n("Use &Random Play"), "roll", 0, ActionCollection::actions(), "randomPlay"); + m_randomPlayAction = new TDERadioAction(i18n("Use &Random Play"), "roll", 0, ActionCollection::actions(), "randomPlay"); m_randomPlayAction->setExclusiveGroup("randomPlayGroup"); actionMenu->insert(m_randomPlayAction); - ka = new KRadioAction(i18n("Use &Album Random Play"), "roll", 0, ActionCollection::actions(), "albumRandomPlay"); + ka = new TDERadioAction(i18n("Use &Album Random Play"), "roll", 0, ActionCollection::actions(), "albumRandomPlay"); ka->setExclusiveGroup("randomPlayGroup"); connect(ka, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckAlbumNextAction(bool))); actionMenu->insert(ka); - new KAction(i18n("&Play"), "player_play", 0, TQT_TQOBJECT(m_player), TQT_SLOT(play()), ActionCollection::actions(), "play"); - new KAction(i18n("P&ause"), "player_pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause"); - new KAction(i18n("&Stop"), "player_stop", 0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()), ActionCollection::actions(), "stop"); + new TDEAction(i18n("&Play"), "player_play", 0, TQT_TQOBJECT(m_player), TQT_SLOT(play()), ActionCollection::actions(), "play"); + new TDEAction(i18n("P&ause"), "player_pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause"); + new TDEAction(i18n("&Stop"), "player_stop", 0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()), ActionCollection::actions(), "stop"); - new KToolBarPopupAction(i18n("previous track", "Previous"), "player_start", KShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back"); - new KAction(i18n("next track", "&Next"), "player_end", KShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward"); - new KToggleAction(i18n("&Loop Playlist"), 0, KShortcut(), ActionCollection::actions(), "loopPlaylist"); - KToggleAction *resizeColumnAction = - new KToggleAction(i18n("&Resize Playlist Columns Manually"), - KShortcut(), ActionCollection::actions(), "resizeColumnsManually"); + new TDEToolBarPopupAction(i18n("previous track", "Previous"), "player_start", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back"); + new TDEAction(i18n("next track", "&Next"), "player_end", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward"); + new TDEToggleAction(i18n("&Loop Playlist"), 0, TDEShortcut(), ActionCollection::actions(), "loopPlaylist"); + TDEToggleAction *resizeColumnAction = + new TDEToggleAction(i18n("&Resize Playlist Columns Manually"), + TDEShortcut(), ActionCollection::actions(), "resizeColumnsManually"); resizeColumnAction->setCheckedState(i18n("&Resize Column Headers Automatically")); // the following are not visible by default - new KAction(i18n("Mute"), "mute", 0, TQT_TQOBJECT(m_player), TQT_SLOT(mute()), ActionCollection::actions(), "mute"); - new KAction(i18n("Volume Up"), "volumeUp", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp"); - new KAction(i18n("Volume Down"), "volumeDown", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown"); - new KAction(i18n("Play / Pause"), "playPause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(playPause()), ActionCollection::actions(), "playPause"); - new KAction(i18n("Seek Forward"), "seekForward", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward"); - new KAction(i18n("Seek Back"), "seekBack", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekBack()), ActionCollection::actions(), "seekBack"); + new TDEAction(i18n("Mute"), "mute", 0, TQT_TQOBJECT(m_player), TQT_SLOT(mute()), ActionCollection::actions(), "mute"); + new TDEAction(i18n("Volume Up"), "volumeUp", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp"); + new TDEAction(i18n("Volume Down"), "volumeDown", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown"); + new TDEAction(i18n("Play / Pause"), "playPause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(playPause()), ActionCollection::actions(), "playPause"); + new TDEAction(i18n("Seek Forward"), "seekForward", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward"); + new TDEAction(i18n("Seek Back"), "seekBack", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekBack()), ActionCollection::actions(), "seekBack"); ////////////////////////////////////////////////// // settings menu ////////////////////////////////////////////////// m_toggleSplashAction = - new KToggleAction(i18n("Show Splash Screen on Startup"), - KShortcut(), ActionCollection::actions(), "showSplashScreen"); + new TDEToggleAction(i18n("Show Splash Screen on Startup"), + TDEShortcut(), ActionCollection::actions(), "showSplashScreen"); m_toggleSplashAction->setCheckedState(i18n("Hide Splash Screen on Startup")); m_toggleSystemTrayAction = - new KToggleAction(i18n("&Dock in System Tray"), - KShortcut(), ActionCollection::actions(), "toggleSystemTray"); + new TDEToggleAction(i18n("&Dock in System Tray"), + TDEShortcut(), ActionCollection::actions(), "toggleSystemTray"); m_toggleDockOnCloseAction = - new KToggleAction(i18n("&Stay in System Tray on Close"), - KShortcut(), ActionCollection::actions(), "dockOnClose"); + new TDEToggleAction(i18n("&Stay in System Tray on Close"), + TDEShortcut(), ActionCollection::actions(), "dockOnClose"); m_togglePopupsAction = - new KToggleAction(i18n("Popup &Track Announcement"), - KShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups"); - new KToggleAction(i18n("Save &Play Queue on Exit"), - KShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks"); + new TDEToggleAction(i18n("Popup &Track Announcement"), + TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups"); + new TDEToggleAction(i18n("Save &Play Queue on Exit"), + TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks"); connect(m_toggleSystemTrayAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleSystemTray(bool))); @@ -188,10 +188,10 @@ void JuK::setupActions() if(m_outputSelectAction) m_outputSelectAction->setCurrentItem(0); - new KAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()), + new TDEAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()), ActionCollection::actions(), "tagGuesserConfig"); - new KAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()), + new TDEAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()), ActionCollection::actions(), "fileRenamerConfig"); KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), ActionCollection::actions()); @@ -269,7 +269,7 @@ void JuK::keyPressEvent(TQKeyEvent *e) { if (e->key() >= TQt::Key_Back && e->key() <= TQt::Key_MediaLast) e->accept(); - KMainWindow::keyPressEvent(e); + TDEMainWindow::keyPressEvent(e); } /** @@ -297,16 +297,16 @@ void JuK::readConfig() // Default to no random play - ActionCollection::action("disableRandomPlay")->setChecked(true); + ActionCollection::action("disableRandomPlay")->setChecked(true); TQString randomPlayMode = playerConfig.readEntry("RandomPlay", "Disabled"); if(randomPlayMode == "true" || randomPlayMode == "Normal") m_randomPlayAction->setChecked(true); else if(randomPlayMode == "AlbumRandomPlay") - ActionCollection::action("albumRandomPlay")->setChecked(true); + ActionCollection::action("albumRandomPlay")->setChecked(true); bool loopPlaylist = playerConfig.readBoolEntry("LoopPlaylist", false); - ActionCollection::action("loopPlaylist")->setChecked(loopPlaylist); + ActionCollection::action("loopPlaylist")->setChecked(loopPlaylist); // general settings @@ -340,10 +340,10 @@ void JuK::saveConfig() playerConfig.writeEntry("RandomPlay", m_randomPlayAction->isChecked()); - KToggleAction *a = ActionCollection::action("loopPlaylist"); + TDEToggleAction *a = ActionCollection::action("loopPlaylist"); playerConfig.writeEntry("LoopPlaylist", a->isChecked()); - a = ActionCollection::action("albumRandomPlay"); + a = ActionCollection::action("albumRandomPlay"); if(a->isChecked()) playerConfig.writeEntry("RandomPlay", "AlbumRandomPlay"); else if(m_randomPlayAction->isChecked()) diff --git a/juk/juk.h b/juk/juk.h index de51350f..4db7c13f 100644 --- a/juk/juk.h +++ b/juk/juk.h @@ -23,9 +23,9 @@ class TQTimer; class TQListViewItem; -class KToggleAction; -class KSelectAction; -class KToolBarPopupAction; +class TDEToggleAction; +class TDESelectAction; +class TDEToolBarPopupAction; class TDEGlobalAccel; class SliderAction; @@ -34,7 +34,7 @@ class SystemTray; class PlayerManager; class PlaylistSplitter; -class JuK : public KMainWindow +class JuK : public TDEMainWindow { Q_OBJECT @@ -42,7 +42,7 @@ class JuK : public KMainWindow public: JuK(TQWidget* parent = 0, const char *name = 0); virtual ~JuK(); - virtual KActionCollection *actionCollection() const; + virtual TDEActionCollection *actionCollection() const; private: void setupLayout(); @@ -82,13 +82,13 @@ private: SystemTray *m_systemTray; SliderAction *m_sliderAction; - KToggleAction *m_randomPlayAction; - KToggleAction *m_toggleSystemTrayAction; - KToggleAction *m_toggleDockOnCloseAction; - KToggleAction *m_togglePopupsAction; - KToggleAction *m_toggleSplashAction; - KToggleAction *m_loopPlaylistAction; - KSelectAction *m_outputSelectAction; + TDEToggleAction *m_randomPlayAction; + TDEToggleAction *m_toggleSystemTrayAction; + TDEToggleAction *m_toggleDockOnCloseAction; + TDEToggleAction *m_togglePopupsAction; + TDEToggleAction *m_toggleSplashAction; + TDEToggleAction *m_loopPlaylistAction; + TDESelectAction *m_outputSelectAction; PlayerManager *m_player; TDEGlobalAccel *m_accel; diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp index 6aec012f..aa89b005 100644 --- a/juk/k3bexporter.cpp +++ b/juk/k3bexporter.cpp @@ -41,20 +41,20 @@ using ActionCollection::actions; PlaylistAction *K3bExporter::m_action = 0; -// Special KAction subclass used to automatically call a slot when activated, +// Special TDEAction subclass used to automatically call a slot when activated, // depending on the visible playlist at the time. In other words, use *one* // instance of this action for many playlists. // // This is used to handle some actions in the Playlist context menu. -class PlaylistAction : public KAction +class PlaylistAction : public TDEAction { public: PlaylistAction(const char *name, const TQString &userText, const TQIconSet &pix, const char *slot, - const KShortcut &cut = 0) : - KAction(userText, pix, cut, 0 /* receiver */, 0 /* slot */, actions(), name), + const TDEShortcut &cut = 0) : + TDEAction(userText, pix, cut, 0 /* receiver */, 0 /* slot */, actions(), name), m_slot(slot) { } @@ -101,7 +101,7 @@ K3bExporter::K3bExporter(Playlist *parent) : PlaylistExporter(parent), m_parent( { } -KAction *K3bExporter::action() +TDEAction *K3bExporter::action() { if(!m_action && !TDEStandardDirs::findExe("k3b").isNull()) { m_action = new PlaylistAction( @@ -116,7 +116,7 @@ KAction *K3bExporter::action() // Tell the action to let us know when it is activated when // m_parent is the visible playlist. This allows us to reuse the - // action to avoid duplicate entries in KActionCollection. + // action to avoid duplicate entries in TDEActionCollection. if(m_action) m_action->addCallMapping(m_parent, this); @@ -268,10 +268,10 @@ K3bPlaylistExporter::K3bPlaylistExporter(PlaylistBox *parent) : K3bExporter(0), { } -KAction *K3bPlaylistExporter::action() +TDEAction *K3bPlaylistExporter::action() { if(!TDEStandardDirs::findExe("k3b").isNull()) { - return new KAction( + return new TDEAction( i18n("Add Playlist to Audio or Data CD"), SmallIconSet("k3b"), 0, diff --git a/juk/k3bexporter.h b/juk/k3bexporter.h index 922694a1..a6b1c27f 100644 --- a/juk/k3bexporter.h +++ b/juk/k3bexporter.h @@ -36,11 +36,11 @@ public: K3bExporter(Playlist *parent = 0); /** - * Returns a KAction that can be used to invoke the export. + * Returns a TDEAction that can be used to invoke the export. * * @return action used to start the export. */ - virtual KAction *action(); + virtual TDEAction *action(); Playlist *playlist() const { return m_parent; } void setPlaylist(Playlist *playlist) { m_parent = playlist; } @@ -82,7 +82,7 @@ class K3bPlaylistExporter : public K3bExporter public: K3bPlaylistExporter(PlaylistBox *parent = 0); - virtual KAction *action(); + virtual TDEAction *action(); private slots: void slotExport(); diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp index ea73277f..3e8d7e83 100644 --- a/juk/keydialog.cpp +++ b/juk/keydialog.cpp @@ -27,54 +27,54 @@ const KeyDialog::KeyInfo KeyDialog::keyInfo[] = { { "PlayPause", - { { KShortcut::null(), KShortcut::null() }, + { { TDEShortcut::null(), TDEShortcut::null() }, { TQt::CTRL+TQt::ALT+TQt::Key_P, KKey::QtWIN+TQt::ALT+TQt::Key_P }, { TQt::Key_MediaPlay, TQt::Key_MediaPlay } } }, { "Stop", - { { KShortcut::null(), KShortcut::null() }, + { { TDEShortcut::null(), TDEShortcut::null() }, { TQt::CTRL+TQt::ALT+TQt::Key_S, KKey::QtWIN+TQt::ALT+TQt::Key_S }, { TQt::Key_MediaStop, TQt::Key_MediaStop } } }, { "Back", - { { KShortcut::null(), KShortcut::null() }, + { { TDEShortcut::null(), TDEShortcut::null() }, { TQt::CTRL+TQt::ALT+TQt::Key_Left, KKey::QtWIN+TQt::ALT+TQt::Key_Left }, { TQt::Key_MediaPrev, TQt::Key_MediaPrev } } }, { "Forward", - { { KShortcut::null(), KShortcut::null() }, + { { TDEShortcut::null(), TDEShortcut::null() }, { TQt::CTRL+TQt::ALT+TQt::Key_Right, KKey::QtWIN+TQt::ALT+TQt::Key_Right }, { TQt::Key_MediaNext, TQt::Key_MediaNext } } }, { "ForwardAlbum", - { { KShortcut::null(), KShortcut::null() }, + { { TDEShortcut::null(), TDEShortcut::null() }, { TQt::CTRL+TQt::ALT+TQt::Key_Up, KKey::QtWIN+TQt::ALT+TQt::Key_Up }, { TQt::CTRL+TQt::Key_MediaNext, TQt::CTRL+TQt::Key_MediaNext } } }, { "SeekBack", - { { KShortcut::null(), KShortcut::null() }, + { { TDEShortcut::null(), TDEShortcut::null() }, { TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_Left, KKey::QtWIN+TQt::SHIFT+TQt::ALT+TQt::Key_Left }, { TQt::SHIFT+TQt::Key_MediaPrev, TQt::SHIFT+TQt::Key_MediaPrev } } }, { "SeekForward", - { { KShortcut::null(), KShortcut::null() }, + { { TDEShortcut::null(), TDEShortcut::null() }, { TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_Right, KKey::QtWIN+TQt::SHIFT+TQt::ALT+TQt::Key_Right }, { TQt::SHIFT+TQt::Key_MediaNext, TQt::SHIFT+TQt::Key_MediaNext } } }, { "VolumeUp", - { { KShortcut::null(), KShortcut::null() }, + { { TDEShortcut::null(), TDEShortcut::null() }, { TQt::CTRL+TQt::ALT+TQt::SHIFT+TQt::Key_Up, KKey::QtWIN+TQt::ALT+TQt::SHIFT+TQt::Key_Up }, { TQt::Key_VolumeUp, TQt::Key_VolumeUp } } }, { "VolumeDown", - { { KShortcut::null(), KShortcut::null() }, + { { TDEShortcut::null(), TDEShortcut::null() }, { TQt::CTRL+TQt::ALT+TQt::SHIFT+TQt::Key_Down, KKey::QtWIN+TQt::ALT+TQt::SHIFT+TQt::Key_Down }, { TQt::Key_VolumeDown, TQt::Key_VolumeDown } } }, { "Mute", - { { KShortcut::null(), KShortcut::null() }, + { { TDEShortcut::null(), TDEShortcut::null() }, { TQt::CTRL+TQt::ALT+TQt::Key_M, KKey::QtWIN+TQt::ALT+TQt::Key_M }, { TQt::Key_VolumeMute, TQt::Key_VolumeMute } } }, { "ShowHide", - { { KShortcut::null(), KShortcut::null() }, - { KShortcut::null(), KShortcut::null() }, - { KShortcut::null(), KShortcut::null() } } } + { { TDEShortcut::null(), TDEShortcut::null() }, + { TDEShortcut::null(), TDEShortcut::null() }, + { TDEShortcut::null(), TDEShortcut::null() } } } }; const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]); -KeyDialog::KeyDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection, +KeyDialog::KeyDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection, TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok) { @@ -114,7 +114,7 @@ KeyDialog::~KeyDialog() } -void KeyDialog::newDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection, +void KeyDialog::newDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection, int selectedButton) { m_keys = keys; @@ -171,7 +171,7 @@ void KeyDialog::slotDefault() m_pKeyChooser->allDefault(); } -int KeyDialog::configure(TDEGlobalAccel *keys, KActionCollection *actionCollection, +int KeyDialog::configure(TDEGlobalAccel *keys, TDEActionCollection *actionCollection, TQWidget *parent) { // Create and show dialog - update connections if accepted @@ -186,8 +186,8 @@ int KeyDialog::configure(TDEGlobalAccel *keys, KActionCollection *actionCollecti void KeyDialog::insert(TDEGlobalAccel *keys, const TQString &action, const TQString &label, const TQObject *objSlot, const char *methodSlot) { - KShortcut def3 = KShortcut::null(); - KShortcut def4 = KShortcut::null(); + TDEShortcut def3 = TDEShortcut::null(); + TDEShortcut def4 = TDEShortcut::null(); // Find and insert a standard key diff --git a/juk/keydialog.h b/juk/keydialog.h index 09c4853a..a974598b 100644 --- a/juk/keydialog.h +++ b/juk/keydialog.h @@ -32,7 +32,7 @@ public: /** * Constructs a KeyDialog called @p name as a child of @p parent. */ - KeyDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0, const char* name = 0); + KeyDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection, TQWidget *parent = 0, const char* name = 0); /** * Destructor. Deletes all resources used by a KeyDialog object. @@ -44,7 +44,7 @@ public: * accelerators and actions. It behaves essentially like the functions * in KKeyDialog. */ - static int configure(TDEGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0); + static int configure(TDEGlobalAccel *keys, TDEActionCollection *actionCollection, TQWidget *parent = 0); /** * This is a member function, provided to create a global accelerator with @@ -62,10 +62,10 @@ private: struct KeyInfo { TQString action; - KShortcut shortcut[3][2]; + TDEShortcut shortcut[3][2]; }; - void newDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection, int selectedButton = 0); + void newDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection, int selectedButton = 0); int configure(); private slots: @@ -73,7 +73,7 @@ private slots: void slotDefault(); private: - KActionCollection *m_actionCollection; + TDEActionCollection *m_actionCollection; TDEGlobalAccel *m_keys; KKeyChooser *m_pKeyChooser; TQHButtonGroup *m_group; diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp index c87a883c..3337ff81 100644 --- a/juk/musicbrainzquery.cpp +++ b/juk/musicbrainzquery.cpp @@ -67,7 +67,7 @@ void MusicBrainzLookup::error() void MusicBrainzLookup::message(const TQString &s) const { - KMainWindow *w = static_cast(kapp->mainWidget()); + TDEMainWindow *w = static_cast(kapp->mainWidget()); w->statusBar()->message(TQString("%1 (%2)").arg(s).arg(m_file.fileInfo().fileName()), 3000); } diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp index 0ecc9e84..26fde611 100644 --- a/juk/playermanager.cpp +++ b/juk/playermanager.cpp @@ -239,10 +239,10 @@ void PlayerManager::setStatusLabel(StatusLabel *label) m_statusLabel = label; } -KSelectAction *PlayerManager::playerSelectAction(TQObject *parent) // static +TDESelectAction *PlayerManager::playerSelectAction(TQObject *parent) // static { - KSelectAction *action = 0; - action = new KSelectAction(i18n("&Output To"), 0, parent, "outputSelect"); + TDESelectAction *action = 0; + action = new TDESelectAction(i18n("&Output To"), 0, parent, "outputSelect"); TQStringList l; #if HAVE_ARTS @@ -305,7 +305,7 @@ void PlayerManager::play(const FileHandle &file) action("pause")->setEnabled(true); action("stop")->setEnabled(true); action("forward")->setEnabled(true); - if(action("albumRandomPlay")->isChecked()) + if(action("albumRandomPlay")->isChecked()) action("forwardAlbum")->setEnabled(true); action("back")->setEnabled(true); @@ -651,10 +651,10 @@ void PlayerManager::setup() // Call this method manually to avoid warnings. - KAction *outputAction = actions()->action("outputSelect"); + TDEAction *outputAction = actions()->action("outputSelect"); if(outputAction) { - setOutput(static_cast(outputAction)->currentText()); + setOutput(static_cast(outputAction)->currentText()); connect(outputAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSetOutput(const TQString &))); } else @@ -678,9 +678,9 @@ void PlayerManager::setup() TQString PlayerManager::randomPlayMode() const { - if(action("randomPlay")->isChecked()) + if(action("randomPlay")->isChecked()) return "Random"; - if(action("albumRandomPlay")->isChecked()) + if(action("albumRandomPlay")->isChecked()) return "AlbumRandom"; return "NoRandom"; } @@ -688,11 +688,11 @@ TQString PlayerManager::randomPlayMode() const void PlayerManager::setRandomPlayMode(const TQString &randomMode) { if(randomMode.lower() == "random") - action("randomPlay")->setChecked(true); + action("randomPlay")->setChecked(true); if(randomMode.lower() == "albumrandom") - action("albumRandomPlay")->setChecked(true); + action("albumRandomPlay")->setChecked(true); if(randomMode.lower() == "norandom") - action("disableRandomPlay")->setChecked(true); + action("disableRandomPlay")->setChecked(true); } #include "playermanager.moc" diff --git a/juk/playermanager.h b/juk/playermanager.h index 62a33308..e8f6e528 100644 --- a/juk/playermanager.h +++ b/juk/playermanager.h @@ -20,7 +20,7 @@ #include "jukIface.h" class TQTimer; -class KSelectAction; +class TDESelectAction; class SliderAction; class StatusLabel; class PlaylistInterface; @@ -62,7 +62,7 @@ public: TQString randomPlayMode() const; - static KSelectAction *playerSelectAction(TQObject *parent); + static TDESelectAction *playerSelectAction(TQObject *parent); public slots: diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 1f33b4be..94d41a04 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -73,7 +73,7 @@ using namespace ActionCollection; static bool manualResize() { - return action("resizeColumnsManually")->isChecked(); + return action("resizeColumnsManually")->isChecked(); } /** @@ -238,7 +238,7 @@ Playlist::SharedSettings::SharedSettings() TDEConfigGroup config(TDEGlobal::config(), "PlaylistShared"); bool resizeColumnsManually = config.readBoolEntry("ResizeColumnsManually", false); - action("resizeColumnsManually")->setChecked(resizeColumnsManually); + action("resizeColumnsManually")->setChecked(resizeColumnsManually); // save column order m_columnOrder = config.readIntListEntry("ColumnOrder"); @@ -310,7 +310,7 @@ int Playlist::m_leftColumn = 0; Playlist::Playlist(PlaylistCollection *collection, const TQString &name, const TQString &iconName) : - KListView(collection->playlistStack(), name.latin1()), + TDEListView(collection->playlistStack(), name.latin1()), m_collection(collection), m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), m_selectedCount(0), @@ -334,7 +334,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQString &name, Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items, const TQString &name, const TQString &iconName) : - KListView(collection->playlistStack(), name.latin1()), + TDEListView(collection->playlistStack(), name.latin1()), m_collection(collection), m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), m_selectedCount(0), @@ -359,7 +359,7 @@ Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFile, const TQString &iconName) : - KListView(collection->playlistStack()), + TDEListView(collection->playlistStack()), m_collection(collection), m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), m_selectedCount(0), @@ -383,7 +383,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil } Playlist::Playlist(PlaylistCollection *collection, bool delaySetup) : - KListView(collection->playlistStack()), + TDEListView(collection->playlistStack()), m_collection(collection), m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), m_selectedCount(0), @@ -506,7 +506,7 @@ void Playlist::playPrevious() if(!playingItem()) return; - bool random = action("randomPlay") && action("randomPlay")->isChecked(); + bool random = action("randomPlay") && action("randomPlay")->isChecked(); PlaylistItem *previous = 0; @@ -644,7 +644,7 @@ PlaylistItemList Playlist::selectedItems() PlaylistItem *Playlist::firstChild() const { - return static_cast(KListView::firstChild()); + return static_cast(TDEListView::firstChild()); } void Playlist::updateLeftColumn() @@ -1033,7 +1033,7 @@ TQDragObject *Playlist::dragObject(TQWidget *parent) void Playlist::contentsDragEnterEvent(TQDragEnterEvent *e) { - KListView::contentsDragEnterEvent(e); + TDEListView::contentsDragEnterEvent(e); if(CoverDrag::canDecode(e)) { setDropHighlighter(true); @@ -1115,11 +1115,11 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e) case TQEvent::MouseMove: { if((TQT_TQMOUSEEVENT(e)->state() & Qt::LeftButton) == Qt::LeftButton && - !action("resizeColumnsManually")->isChecked()) + !action("resizeColumnsManually")->isChecked()) { m_columnWidthModeChanged = true; - action("resizeColumnsManually")->setChecked(true); + action("resizeColumnsManually")->setChecked(true); slotColumnResizeModeChanged(); } @@ -1148,7 +1148,7 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e) } } - return KListView::eventFilter(watched, e); + return TDEListView::eventFilter(watched, e); } void Playlist::keyPressEvent(TQKeyEvent *event) @@ -1166,7 +1166,7 @@ void Playlist::keyPressEvent(TQKeyEvent *event) } - KListView::keyPressEvent(event); + TDEListView::keyPressEvent(event); } void Playlist::contentsDropEvent(TQDropEvent *e) @@ -1215,7 +1215,7 @@ void Playlist::contentsDropEvent(TQDropEvent *e) setSorting(columns() + 1); - TQPtrList items = KListView::selectedItems(); + TQPtrList items = TDEListView::selectedItems(); for(TQPtrListIterator it(items); it.current(); ++it) { if(!item) { @@ -1239,7 +1239,7 @@ void Playlist::contentsDropEvent(TQDropEvent *e) dataChanged(); emit signalPlaylistItemsDropped(this); - KListView::contentsDropEvent(e); + TDEListView::contentsDropEvent(e); } void Playlist::contentsMouseDoubleClickEvent(TQMouseEvent *e) @@ -1248,7 +1248,7 @@ void Playlist::contentsMouseDoubleClickEvent(TQMouseEvent *e) // weird experience of switching songs from a double right-click. if(e->button() == Qt::LeftButton) - KListView::contentsMouseDoubleClickEvent(e); + TDEListView::contentsMouseDoubleClickEvent(e); } void Playlist::showEvent(TQShowEvent *e) @@ -1257,7 +1257,7 @@ void Playlist::showEvent(TQShowEvent *e) SharedSettings::instance()->apply(this); m_applySharedSettings = false; } - KListView::showEvent(e); + TDEListView::showEvent(e); } void Playlist::applySharedSettings() @@ -1298,7 +1298,7 @@ void Playlist::viewportPaintEvent(TQPaintEvent *pe) slotUpdateColumnWidths(); } - KListView::viewportPaintEvent(pe); + TDEListView::viewportPaintEvent(pe); } void Playlist::viewportResizeEvent(TQResizeEvent *re) @@ -1309,7 +1309,7 @@ void Playlist::viewportResizeEvent(TQResizeEvent *re) if(re->size().width() != re->oldSize().width() && !manualResize()) slotUpdateColumnWidths(); - KListView::viewportResizeEvent(re); + TDEListView::viewportResizeEvent(re); } void Playlist::insertItem(TQListViewItem *item) @@ -1320,7 +1320,7 @@ void Playlist::insertItem(TQListViewItem *item) // you need to use the PlaylistItem from here. m_addTime.append(static_cast(item)); - KListView::insertItem(item); + TDEListView::insertItem(item); } void Playlist::takeItem(TQListViewItem *item) @@ -1328,13 +1328,13 @@ void Playlist::takeItem(TQListViewItem *item) // See the warning in Playlist::insertItem. m_subtractTime.append(static_cast(item)); - KListView::takeItem(item); + TDEListView::takeItem(item); } void Playlist::addColumn(const TQString &label) { slotWeightDirty(columns()); - KListView::addColumn(label, 30); + TDEListView::addColumn(label, 30); } PlaylistItem *Playlist::createItem(const FileHandle &file, @@ -1507,7 +1507,7 @@ bool Playlist::isColumnVisible(int c) const void Playlist::polish() { - KListView::polish(); + TDEListView::polish(); if(m_polished) return; @@ -1545,7 +1545,7 @@ void Playlist::polish() // setup header RMB menu ////////////////////////////////////////////////// - m_columnVisibleAction = new KActionMenu(i18n("&Show Columns"), TQT_TQOBJECT(this), "showColumns"); + m_columnVisibleAction = new TDEActionMenu(i18n("&Show Columns"), TQT_TQOBJECT(this), "showColumns"); m_headerMenu = m_columnVisibleAction->popupMenu(); m_headerMenu->insertTitle(i18n("Show")); @@ -1579,7 +1579,7 @@ void Playlist::polish() connect(action("resizeColumnsManually"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotColumnResizeModeChanged())); - if(action("resizeColumnsManually")->isChecked()) + if(action("resizeColumnsManually")->isChecked()) setHScrollBarMode(Auto); else setHScrollBarMode(AlwaysOff); @@ -1619,7 +1619,7 @@ void Playlist::slotPopulateBackMenu() const if(!playingItem()) return; - KPopupMenu *menu = action("back")->popupMenu(); + TDEPopupMenu *menu = action("back")->popupMenu(); menu->clear(); m_backMenuItems.clear(); @@ -1733,7 +1733,7 @@ void Playlist::setPlaying(PlaylistItem *item, bool addToHistory) item->setPlaying(true); bool enableBack = !m_history.isEmpty(); - action("back")->popupMenu()->setEnabled(enableBack); + action("back")->popupMenu()->setEnabled(enableBack); } bool Playlist::playing() const @@ -2071,9 +2071,9 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c if(!m_rmbMenu) { // A bit of a hack to get a pointer to the action collection. - // Probably more of these actions should be ported over to using KActions. + // Probably more of these actions should be ported over to using TDEActions. - m_rmbMenu = new KPopupMenu(this); + m_rmbMenu = new TDEPopupMenu(this); m_rmbUpcomingID = m_rmbMenu->insertItem(SmallIcon("today"), i18n("Add to Play Queue"), this, TQT_SLOT(slotAddToUpcoming())); @@ -2108,7 +2108,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c SmallIcon("folder_new"), i18n("Create Playlist From Selected Items..."), this, TQT_SLOT(slotCreateGroup())); K3bExporter *exporter = new K3bExporter(this); - KAction *k3bAction = exporter->action(); + TDEAction *k3bAction = exporter->action(); if(k3bAction) k3bAction->plug(m_rmbMenu); } diff --git a/juk/playlist.h b/juk/playlist.h index 6016a3cb..348dda24 100644 --- a/juk/playlist.h +++ b/juk/playlist.h @@ -31,8 +31,8 @@ #include "playlistinterface.h" #include "playlistitem.h" -class KPopupMenu; -class KActionMenu; +class TDEPopupMenu; +class TDEActionMenu; class TQEvent; @@ -43,7 +43,7 @@ class UpcomingPlaylist; typedef TQValueList PlaylistItemList; -class Playlist : public KListView, public PlaylistInterface +class Playlist : public TDEListView, public PlaylistInterface { Q_OBJECT @@ -224,10 +224,10 @@ public: void setName(const TQString &n); /** - * Returns the KActionMenu that allows this to be embedded in menus outside + * Returns the TDEActionMenu that allows this to be embedded in menus outside * of the playlist. */ - KActionMenu *columnVisibleAction() const { return m_columnVisibleAction; } + TDEActionMenu *columnVisibleAction() const { return m_columnVisibleAction; } /** * Set item to be the playing item. If \a item is null then this will clear @@ -353,7 +353,7 @@ public slots: * @see clearItems() */ virtual void clear(); - virtual void selectAll() { KListView::selectAll(true); } + virtual void selectAll() { TDEListView::selectAll(true); } /** * Refreshes the tags of the selection from disk, or all of the files in the @@ -612,7 +612,7 @@ private slots: void slotColumnOrderChanged(int, int from, int to); /** - * Toggles a columns visible status. Useful for KActions. + * Toggles a columns visible status. Useful for TDEActions. * * \see hideColumn() * \see showColumn() @@ -693,9 +693,9 @@ private: TQString m_playlistName; TQString m_fileName; - KPopupMenu *m_rmbMenu; - KPopupMenu *m_headerMenu; - KActionMenu *m_columnVisibleAction; + TDEPopupMenu *m_rmbMenu; + TDEPopupMenu *m_headerMenu; + TDEActionMenu *m_columnVisibleAction; PlaylistToolTip *m_toolTip; /** diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index 94e1cd91..71329ae1 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -48,7 +48,7 @@ using namespace ActionCollection; PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack, const char *name) : - KListView(parent, name), + TDEListView(parent, name), PlaylistCollection(playlistStack), m_viewModeIndex(0), m_hasSelection(false), @@ -70,7 +70,7 @@ PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack, setAcceptDrops(true); setSelectionModeExt(Extended); - m_contextMenu = new KPopupMenu(this); + m_contextMenu = new TDEPopupMenu(this); K3bPlaylistExporter *exporter = new K3bPlaylistExporter(this); m_k3bAction = exporter->action(); @@ -90,8 +90,8 @@ PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack, // add the view modes stuff - KSelectAction *viewModeAction = - new KSelectAction(i18n("View Modes"), "view_choose", KShortcut(), ActionCollection::actions(), "viewModeMenu"); + TDESelectAction *viewModeAction = + new TDESelectAction(i18n("View Modes"), "view_choose", TDEShortcut(), ActionCollection::actions(), "viewModeMenu"); m_viewModes.append(new ViewMode(this)); m_viewModes.append(new CompactViewMode(this)); @@ -263,7 +263,7 @@ void PlaylistBox::readConfig() void PlaylistBox::saveConfig() { TDEConfigGroup config(TDEGlobal::config(), "PlaylistBox"); - config.writeEntry("ViewMode", action("viewModeMenu")->currentItem()); + config.writeEntry("ViewMode", action("viewModeMenu")->currentItem()); TDEGlobal::config()->sync(); } @@ -344,7 +344,7 @@ void PlaylistBox::remove() if(*it != upcomingPlaylist()) delete *it; else { - action("showUpcoming")->setChecked(false); + action("showUpcoming")->setChecked(false); setUpcomingPlaylistEnabled(false); } } @@ -519,14 +519,14 @@ void PlaylistBox::contentsDragLeaveEvent(TQDragLeaveEvent *e) m_dropItem = 0; old->repaint(); } - KListView::contentsDragLeaveEvent(e); + TDEListView::contentsDragLeaveEvent(e); } void PlaylistBox::contentsMousePressEvent(TQMouseEvent *e) { if(e->button() == Qt::LeftButton) m_doingMultiSelect = true; - KListView::contentsMousePressEvent(e); + TDEListView::contentsMousePressEvent(e); } void PlaylistBox::contentsMouseReleaseEvent(TQMouseEvent *e) @@ -535,14 +535,14 @@ void PlaylistBox::contentsMouseReleaseEvent(TQMouseEvent *e) m_doingMultiSelect = false; slotPlaylistChanged(); } - KListView::contentsMouseReleaseEvent(e); + TDEListView::contentsMouseReleaseEvent(e); } void PlaylistBox::keyPressEvent(TQKeyEvent *e) { if((e->key() == Key_Up || e->key() == Key_Down) && e->state() == ShiftButton) m_doingMultiSelect = true; - KListView::keyPressEvent(e); + TDEListView::keyPressEvent(e); } void PlaylistBox::keyReleaseEvent(TQKeyEvent *e) @@ -551,7 +551,7 @@ void PlaylistBox::keyReleaseEvent(TQKeyEvent *e) m_doingMultiSelect = false; slotPlaylistChanged(); } - KListView::keyReleaseEvent(e); + TDEListView::keyReleaseEvent(e); } PlaylistBox::ItemList PlaylistBox::selectedItems() const @@ -568,7 +568,7 @@ PlaylistBox::ItemList PlaylistBox::selectedItems() const void PlaylistBox::setSingleItem(TQListViewItem *item) { setSelectionModeExt(Single); - KListView::setCurrentItem(item); + TDEListView::setCurrentItem(item); setSelectionModeExt(Extended); } @@ -676,7 +676,7 @@ void PlaylistBox::setupUpcomingPlaylist() bool enable = config.readBoolEntry("showUpcoming", false); setUpcomingPlaylistEnabled(enable); - action("showUpcoming")->setChecked(enable); + action("showUpcoming")->setChecked(enable); } //////////////////////////////////////////////////////////////////////////////// @@ -686,14 +686,14 @@ void PlaylistBox::setupUpcomingPlaylist() PlaylistBox::Item *PlaylistBox::Item::m_collectionItem = 0; PlaylistBox::Item::Item(PlaylistBox *listBox, const TQString &icon, const TQString &text, Playlist *l) - : TQObject(listBox), KListViewItem(listBox, 0, text), + : TQObject(listBox), TDEListViewItem(listBox, 0, text), m_playlist(l), m_text(text), m_iconName(icon), m_sortedFirst(false) { init(); } PlaylistBox::Item::Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l) - : TQObject(parent->listView()), KListViewItem(parent, text), + : TQObject(parent->listView()), TDEListViewItem(parent, text), m_playlist(l), m_text(text), m_iconName(icon), m_sortedFirst(false) { init(); @@ -731,7 +731,7 @@ void PlaylistBox::Item::paintCell(TQPainter *painter, const TQColorGroup &colorG void PlaylistBox::Item::setText(int column, const TQString &text) { m_text = text; - KListViewItem::setText(column, text); + TDEListViewItem::setText(column, text); } void PlaylistBox::Item::setup() diff --git a/juk/playlistbox.h b/juk/playlistbox.h index bf1965d1..de06dbc8 100644 --- a/juk/playlistbox.h +++ b/juk/playlistbox.h @@ -28,8 +28,8 @@ class ViewMode; class PlaylistSearch; class SearchPlaylist; -class KPopupMenu; -class KSelectAction; +class TDEPopupMenu; +class TDESelectAction; typedef TQValueList PlaylistList; @@ -38,7 +38,7 @@ typedef TQValueList PlaylistList; * JuK's main widget (PlaylistSplitter). */ -class PlaylistBox : public KListView, public PlaylistCollection +class PlaylistBox : public TDEListView, public PlaylistCollection { Q_OBJECT @@ -121,11 +121,11 @@ private slots: void slotRemoveItem(const TQString &tag, unsigned column); private: - KPopupMenu *m_contextMenu; + TDEPopupMenu *m_contextMenu; TQPtrDict m_playlistDict; int m_viewModeIndex; TQValueList m_viewModes; - KAction *m_k3bAction; + TDEAction *m_k3bAction; bool m_hasSelection; bool m_doingMultiSelect; Item *m_dropItem; @@ -134,7 +134,7 @@ private: -class PlaylistBox::Item : public TQObject, public KListViewItem +class PlaylistBox::Item : public TQObject, public TDEListViewItem { friend class PlaylistBox; friend class ViewMode; @@ -156,7 +156,7 @@ protected: Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l = 0); Playlist *playlist() const { return m_playlist; } - PlaylistBox *listView() const { return static_cast(KListViewItem::listView()); } + PlaylistBox *listView() const { return static_cast(TDEListViewItem::listView()); } TQString iconName() const { return m_iconName; } TQString text() const { return m_text; } void setSortedFirst(bool first = true) { m_sortedFirst = first; } @@ -166,7 +166,7 @@ protected: virtual void paintFocus(TQPainter *, const TQColorGroup &, const TQRect &) {} virtual void setText(int column, const TQString &text); - virtual TQString text(int column) const { return KListViewItem::text(column); } + virtual TQString text(int column) const { return TDEListViewItem::text(column); } virtual void setup(); diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp index bff1e7c9..c2b2d80b 100644 --- a/juk/playlistcollection.cpp +++ b/juk/playlistcollection.cpp @@ -547,7 +547,7 @@ void PlaylistCollection::setHistoryPlaylistEnabled(bool enable) return; if(enable) { - action("showHistory")->setChecked(true); + action("showHistory")->setChecked(true); m_historyPlaylist = new HistoryPlaylist(this); m_historyPlaylist->setName(i18n("History")); setupPlaylist(m_historyPlaylist, "history"); @@ -569,14 +569,14 @@ void PlaylistCollection::setUpcomingPlaylistEnabled(bool enable) return; if(enable) { - action("showUpcoming")->setChecked(true); + action("showUpcoming")->setChecked(true); if(!m_upcomingPlaylist) m_upcomingPlaylist = new UpcomingPlaylist(this); setupPlaylist(m_upcomingPlaylist, "today"); } else { - action("showUpcoming")->setChecked(false); + action("showUpcoming")->setChecked(false); bool raiseCollection = m_playlistStack->visibleWidget() == m_upcomingPlaylist; delete m_upcomingPlaylist; m_upcomingPlaylist = 0; @@ -824,7 +824,7 @@ void PlaylistCollection::saveConfig() { TDEConfigGroup config(TDEGlobal::config(), "Playlists"); config.writeEntry("ImportPlaylists", m_importPlaylists); - config.writeEntry("showUpcoming", action("showUpcoming")->isChecked()); + config.writeEntry("showUpcoming", action("showUpcoming")->isChecked()); config.writePathEntry("DirectoryList", m_folderList); } @@ -836,11 +836,11 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) TQObject(0, "ActionHandler"), m_collection(collection) { - KActionMenu *menu; + TDEActionMenu *menu; // "New" menu - menu = new KActionMenu(i18n("&New"), "filenew", actions(), "file_new"); + menu = new TDEActionMenu(i18n("&New"), "filenew", actions(), "file_new"); menu->insert(createAction(i18n("&Empty Playlist..."), TQT_SLOT(slotCreatePlaylist()), "newPlaylist", "window_new", "CTRL+n")); @@ -852,7 +852,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) // Guess tag info menu #if HAVE_MUSICBRAINZ - menu = new KActionMenu(i18n("&Guess Tag Information"), TQString(), actions(), "guessTag"); + menu = new TDEActionMenu(i18n("&Guess Tag Information"), TQString(), actions(), "guessTag"); menu->setIconSet(SmallIconSet("wizard")); menu->insert(createAction(i18n("From &File Name"), TQT_SLOT(slotGuessTagFromFile()), @@ -882,7 +882,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) createAction(i18n("Refresh"), TQT_SLOT(slotRefreshItems()), "refresh", "reload"); createAction(i18n("&Rename File"), TQT_SLOT(slotRenameItems()), "renameFile", "filesaveas", "CTRL+r"); - menu = new KActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager"); + menu = new TDEActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager"); menu->setIconSet(SmallIconSet("image")); menu->insert(createAction(i18n("&View Cover"), TQT_SLOT(slotViewCovers()), "viewCover", "viewmag")); @@ -897,30 +897,30 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) menu->insert(createAction(i18n("Show Cover &Manager"), TQT_SLOT(slotShowCoverManager()), "showCoverManager")); - KToggleAction *historyAction = - new KToggleAction(i18n("Show &History"), "history", 0, actions(), "showHistory"); + TDEToggleAction *historyAction = + new TDEToggleAction(i18n("Show &History"), "history", 0, actions(), "showHistory"); historyAction->setCheckedState(i18n("Hide &History")); - KToggleAction *upcomingAction = - new KToggleAction(i18n("Show &Play Queue"), "today", 0, actions(), "showUpcoming"); + TDEToggleAction *upcomingAction = + new TDEToggleAction(i18n("Show &Play Queue"), "today", 0, actions(), "showUpcoming"); upcomingAction->setCheckedState(i18n("Hide &Play Queue")); - connect(action("showHistory"), TQT_SIGNAL(toggled(bool)), + connect(action("showHistory"), TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetHistoryPlaylistEnabled(bool))); - connect(action("showUpcoming"), TQT_SIGNAL(toggled(bool)), + connect(action("showUpcoming"), TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetUpcomingPlaylistEnabled(bool))); } -KAction *PlaylistCollection::ActionHandler::createAction(const TQString &text, +TDEAction *PlaylistCollection::ActionHandler::createAction(const TQString &text, const char *slot, const char *name, const TQString &icon, - const KShortcut &shortcut) + const TDEShortcut &shortcut) { if(icon.isNull()) - return new KAction(text, shortcut, this, slot, actions(), name); + return new TDEAction(text, shortcut, this, slot, actions(), name); else - return new KAction(text, icon, shortcut, this, slot, actions(), name); + return new TDEAction(text, icon, shortcut, this, slot, actions(), name); } #undef widget diff --git a/juk/playlistcollection.h b/juk/playlistcollection.h index 93fa71f7..2105b9cf 100644 --- a/juk/playlistcollection.h +++ b/juk/playlistcollection.h @@ -26,7 +26,7 @@ #include class TQWidgetStack; -class KAction; +class TDEAction; class Playlist; class PlaylistItem; class HistoryPlaylist; @@ -215,11 +215,11 @@ public: ActionHandler(PlaylistCollection *collection); private: - KAction *createAction(const TQString &text, + TDEAction *createAction(const TQString &text, const char *slot, const char *name, const TQString &icon = TQString(), - const KShortcut &shortcut = KShortcut()); + const TDEShortcut &shortcut = TDEShortcut()); private slots: void slotPlayFirst() { m_collection->playFirst(); } void slotPlayNextAlbum() { m_collection->playNextAlbum(); } diff --git a/juk/playlistexporter.h b/juk/playlistexporter.h index 3caae65f..39f13605 100644 --- a/juk/playlistexporter.h +++ b/juk/playlistexporter.h @@ -18,8 +18,8 @@ -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; /** * Abstract base class to define an interface for classes that export @@ -35,13 +35,13 @@ public: virtual ~PlaylistExporter() { } /** - * Returns a KAction that can be used to invoke the export. + * Returns a TDEAction that can be used to invoke the export. * Returns 0 if it is not possible. * - * @return pointer to a KAction that can invoke the export, or 0 on + * @return pointer to a TDEAction that can invoke the export, or 0 on * failure. */ - virtual KAction *action() = 0; + virtual TDEAction *action() = 0; }; #endif /* PLAYLISTEXPORTER_H */ diff --git a/juk/playlistitem.cpp b/juk/playlistitem.cpp index 2a9a2412..67ba4034 100644 --- a/juk/playlistitem.cpp +++ b/juk/playlistitem.cpp @@ -97,7 +97,7 @@ const TQPixmap *PlaylistItem::pixmap(int column) const m_playingItems.contains(const_cast(this))) return &playing; - return KListViewItem::pixmap(column); + return TDEListViewItem::pixmap(column); } TQString PlaylistItem::text(int column) const @@ -137,7 +137,7 @@ TQString PlaylistItem::text(int column) const case FullPathColumn: return d->fileHandle.fileInfo().absFilePath(); default: - return KListViewItem::text(column); + return TDEListViewItem::text(column); } } @@ -145,11 +145,11 @@ void PlaylistItem::setText(int column, const TQString &text) { int offset = playlist()->columnOffset(); if(column - offset >= 0 && column + offset <= lastColumn()) { - KListViewItem::setText(column, TQString()); + TDEListViewItem::setText(column, TQString()); return; } - KListViewItem::setText(column, text); + TDEListViewItem::setText(column, text); playlist()->slotWeightDirty(column); } @@ -178,7 +178,7 @@ void PlaylistItem::setPlaying(bool playing, bool master) void PlaylistItem::setSelected(bool selected) { playlist()->markItemSelected(this, selected); - KListViewItem::setSelected(selected); + TDEListViewItem::setSelected(selected); } void PlaylistItem::guessTagInfo(TagGuesser::Type type) @@ -240,7 +240,7 @@ void PlaylistItem::clear() //////////////////////////////////////////////////////////////////////////////// PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent) : - KListViewItem(parent), + TDEListViewItem(parent), d(0), m_watched(0) { @@ -248,7 +248,7 @@ PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent) : } PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) : - KListViewItem(parent, after), + TDEListViewItem(parent, after), d(0), m_watched(0) { @@ -259,7 +259,7 @@ PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent, TQListVie // This constructor should only be used by the CollectionList subclass. PlaylistItem::PlaylistItem(CollectionList *parent) : - KListViewItem(parent), + TDEListViewItem(parent), m_watched(0) { d = new Data; @@ -270,7 +270,7 @@ PlaylistItem::PlaylistItem(CollectionList *parent) : void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { if(!m_playingItems.contains(this)) - return KListViewItem::paintCell(p, cg, column, width, align); + return TDEListViewItem::paintCell(p, cg, column, width, align); TQColorGroup colorGroup = cg; diff --git a/juk/playlistitem.h b/juk/playlistitem.h index bcacc4e5..343a3c7c 100644 --- a/juk/playlistitem.h +++ b/juk/playlistitem.h @@ -41,7 +41,7 @@ typedef TQValueList PlaylistItemList; * Playlist::clearItem(). */ -class PlaylistItem : public KListViewItem +class PlaylistItem : public TDEListViewItem { friend class Playlist; friend class SearchPlaylist; @@ -137,12 +137,12 @@ public: /** * Returns properly casted item below this one. */ - PlaylistItem *itemBelow() { return static_cast(KListViewItem::itemBelow()); } + PlaylistItem *itemBelow() { return static_cast(TDEListViewItem::itemBelow()); } /** * Returns properly casted item above this one. */ - PlaylistItem *itemAbove() { return static_cast(KListViewItem::itemAbove()); } + PlaylistItem *itemAbove() { return static_cast(TDEListViewItem::itemAbove()); } /** * Returns a reference to the list of the currnetly playing items, with the diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp index 613ee2cc..e4042ae8 100644 --- a/juk/playlistsplitter.cpp +++ b/juk/playlistsplitter.cpp @@ -85,7 +85,7 @@ void PlaylistSplitter::slotFocusCurrentPlaylist() if(playlist) { playlist->setFocus(); - playlist->KListView::selectAll(false); + playlist->TDEListView::selectAll(false); // Select the top visible (and matching) item. @@ -117,11 +117,11 @@ Playlist *PlaylistSplitter::visiblePlaylist() const void PlaylistSplitter::setupActions() { - KToggleAction *showSearch = - new KToggleAction(i18n("Show &Search Bar"), "filefind", 0, ActionCollection::actions(), "showSearch"); + TDEToggleAction *showSearch = + new TDEToggleAction(i18n("Show &Search Bar"), "filefind", 0, ActionCollection::actions(), "showSearch"); showSearch->setCheckedState(i18n("Hide &Search Bar")); - new KAction(i18n("Edit Track Search"), "edit_clear", "F6", TQT_TQOBJECT(this), TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch"); + new TDEAction(i18n("Edit Track Search"), "edit_clear", "F6", TQT_TQOBJECT(this), TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch"); } void PlaylistSplitter::setupLayout() @@ -175,7 +175,7 @@ void PlaylistSplitter::setupLayout() m_playlistBox->object(), TQT_SLOT(slotCreateSearchPlaylist())); connect(m_searchWidget, TQT_SIGNAL(signalShown(bool)), m_playlistBox->object(), TQT_SLOT(slotSetSearchEnabled(bool))); - connect(action("showSearch"), TQT_SIGNAL(toggled(bool)), + connect(action("showSearch"), TQT_SIGNAL(toggled(bool)), m_searchWidget, TQT_SLOT(setEnabled(bool))); topLayout->addWidget(nowPlaying); @@ -198,7 +198,7 @@ void PlaylistSplitter::readConfig() setSizes(splitterSizes); bool showSearch = config.readBoolEntry("ShowSearch", true); - action("showSearch")->setChecked(showSearch); + action("showSearch")->setChecked(showSearch); m_searchWidget->setShown(showSearch); } @@ -206,7 +206,7 @@ void PlaylistSplitter::saveConfig() { TDEConfigGroup config(TDEGlobal::config(), "Splitter"); config.writeEntry("PlaylistSplitterSizes", sizes()); - config.writeEntry("ShowSearch", action("showSearch")->isChecked()); + config.writeEntry("ShowSearch", action("showSearch")->isChecked()); } void PlaylistSplitter::slotShowSearchResults() diff --git a/juk/playlistsplitter.h b/juk/playlistsplitter.h index 8e9f0e0f..8c6216ac 100644 --- a/juk/playlistsplitter.h +++ b/juk/playlistsplitter.h @@ -22,7 +22,7 @@ #include "playlistbox.h" -class KActionMenu; +class TDEActionMenu; class PlaylistItem; class SearchWidget; class HistoryPlaylist; diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp index 7f2ca315..13766ed0 100644 --- a/juk/searchwidget.cpp +++ b/juk/searchwidget.cpp @@ -188,7 +188,7 @@ void SearchLine::updateColumns() // SearchWidget public methods //////////////////////////////////////////////////////////////////////////////// -SearchWidget::SearchWidget(TQWidget *parent, const char *name) : KToolBar(parent, name) +SearchWidget::SearchWidget(TQWidget *parent, const char *name) : TDEToolBar(parent, name) { setupLayout(); updateColumns(); diff --git a/juk/searchwidget.h b/juk/searchwidget.h index cc82140b..b8990107 100644 --- a/juk/searchwidget.h +++ b/juk/searchwidget.h @@ -70,7 +70,7 @@ private: TQValueList m_columnList; }; -class SearchWidget : public KToolBar, public SearchIface +class SearchWidget : public TDEToolBar, public SearchIface { Q_OBJECT diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp index cf68043c..c62aba90 100644 --- a/juk/slideraction.cpp +++ b/juk/slideraction.cpp @@ -127,7 +127,7 @@ const int SliderAction::minPosition = 0; const int SliderAction::maxPosition = 1000; SliderAction::SliderAction(const TQString &text, TQObject *parent, const char *name) - : KAction(text, 0, parent, name), + : TDEAction(text, 0, parent, name), m_toolBar(0), m_layout(0), m_trackPositionSlider(0), @@ -153,10 +153,10 @@ int SliderAction::plug(TQWidget *parent, int index) // the check for null makes sure that there is only one toolbar that this is // "plugged" in to - if(parent->inherits("KToolBar") && !m_toolBar) { - m_toolBar = static_cast(parent); + if(parent->inherits("TDEToolBar") && !m_toolBar) { + m_toolBar = static_cast(parent); - int id = KAction::getToolButtonID(); + int id = TDEAction::getToolButtonID(); m_toolBar->insertWidget(id, w->width(), w, index); @@ -180,8 +180,8 @@ int SliderAction::plug(TQWidget *parent, int index) void SliderAction::unplug(TQWidget *parent) { - if (parent->inherits("KToolBar")) { - m_toolBar = static_cast(parent); + if (parent->inherits("TDEToolBar")) { + m_toolBar = static_cast(parent); int index = findContainer(m_toolBar); if (index != -1) { @@ -204,7 +204,7 @@ void SliderAction::slotUpdateOrientation() if(!m_toolBar) return; - if(m_toolBar->barPos() == KToolBar::Right || m_toolBar->barPos() == KToolBar::Left) { + if(m_toolBar->barPos() == TDEToolBar::Right || m_toolBar->barPos() == TDEToolBar::Left) { m_trackPositionSlider->setOrientation(Qt::Vertical); m_volumeSlider->setOrientation(Qt::Vertical); m_layout->setDirection(TQBoxLayout::TopToBottom); @@ -228,14 +228,14 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas base->setBackgroundMode(parent->backgroundMode()); base->setName("kde toolbar widget"); - KToolBar *toolBar = dynamic_cast(parent); + TDEToolBar *toolBar = dynamic_cast(parent); if(toolBar) toolBar->setStretchableWidget(base); Qt::Orientation orientation; - if(toolBar && toolBar->barPos() == KToolBar::Right || toolBar->barPos() == KToolBar::Left) + if(toolBar && toolBar->barPos() == TDEToolBar::Right || toolBar->barPos() == TDEToolBar::Left) orientation =Qt::Vertical; else orientation =Qt::Horizontal; @@ -299,7 +299,7 @@ void SliderAction::slotUpdateSize() if(!m_toolBar) return; - if(m_toolBar->barPos() == KToolBar::Right || m_toolBar->barPos() == KToolBar::Left) { + if(m_toolBar->barPos() == TDEToolBar::Right || m_toolBar->barPos() == TDEToolBar::Left) { m_volumeSlider->setMaximumWidth(m_toolBar->iconSize() - offset); m_volumeSlider->setMaximumHeight(volumeMax); diff --git a/juk/slideraction.h b/juk/slideraction.h index 0f4244da..5ce19eb3 100644 --- a/juk/slideraction.h +++ b/juk/slideraction.h @@ -46,7 +46,7 @@ private slots: void slotValueChanged(int value); }; -class SliderAction : public KAction +class SliderAction : public TDEAction { Q_OBJECT @@ -86,7 +86,7 @@ private slots: void slotToolbarDestroyed(); private: - KToolBar *m_toolBar; + TDEToolBar *m_toolBar; TQBoxLayout *m_layout; TQSlider *m_trackPositionSlider; VolumeSlider *m_volumeSlider; diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index e7c2a90e..045b00f0 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -162,10 +162,10 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, // Just create this here so that it show up in the DCOP interface and the key // bindings dialog. - new KAction(i18n("Redisplay Popup"), KShortcut(), TQT_TQOBJECT(this), + new TDEAction(i18n("Redisplay Popup"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotPlay()), ActionCollection::actions(), "showPopup"); - KPopupMenu *cm = contextMenu(); + TDEPopupMenu *cm = contextMenu(); connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotPlay())); connect(PlayerManager::instance(), TQT_SIGNAL(signalPause()), this, TQT_SLOT(slotPause())); @@ -181,7 +181,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, // Pity the actionCollection doesn't keep track of what sub-menus it has. - KActionMenu *menu = new KActionMenu(i18n("&Random Play"), TQT_TQOBJECT(this)); + TDEActionMenu *menu = new TDEActionMenu(i18n("&Random Play"), TQT_TQOBJECT(this)); menu->insert(action("disableRandomPlay")); menu->insert(action("randomPlay")); menu->insert(action("albumRandomPlay")); @@ -347,7 +347,7 @@ void SystemTray::createPopup() // If the action exists and it's checked, do our stuff - if(!action("togglePopups")->isChecked()) + if(!action("togglePopups")->isChecked()) return; delete m_popup; diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index efff323d..7ac38fcd 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -430,7 +430,7 @@ void TagEditor::readConfig() } bool show = config.readBoolEntry("Show", false); - action("showEditor")->setChecked(show); + action("showEditor")->setChecked(show); setShown(show); TagLib::StringList genres = TagLib::ID3v1::genreList(); @@ -464,16 +464,16 @@ void TagEditor::saveConfig() config.writeEntry("AlbumNameBoxMode", m_albumNameBox->completionMode()); config.writeEntry("GenreBoxMode", m_genreBox->completionMode()); } - config.writeEntry("Show", action("showEditor")->isChecked()); + config.writeEntry("Show", action("showEditor")->isChecked()); } void TagEditor::setupActions() { - KToggleAction *show = new KToggleAction(i18n("Show &Tag Editor"), "edit", 0, ActionCollection::actions(), "showEditor"); + TDEToggleAction *show = new TDEToggleAction(i18n("Show &Tag Editor"), "edit", 0, ActionCollection::actions(), "showEditor"); show->setCheckedState(i18n("Hide &Tag Editor")); connect(show, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShown(bool))); - new KAction(i18n("&Save"), "filesave", "CTRL+t", TQT_TQOBJECT(this), TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem"); + new TDEAction(i18n("&Save"), "filesave", "CTRL+t", TQT_TQOBJECT(this), TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem"); } void TagEditor::setupLayout() diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp index 5d85dcc1..5ee2b6aa 100644 --- a/juk/tagguesserconfigdlg.cpp +++ b/juk/tagguesserconfigdlg.cpp @@ -37,7 +37,7 @@ TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *parent, const char *name) TQStringList::ConstIterator it = schemes.begin(); TQStringList::ConstIterator end = schemes.end(); for (; it != end; ++it) { - KListViewItem *item = new KListViewItem(m_child->lvSchemes, *it); + TDEListViewItem *item = new TDEListViewItem(m_child->lvSchemes, *it); item->moveItem(m_child->lvSchemes->lastItem()); } @@ -105,7 +105,7 @@ void TagGuesserConfigDlg::slotMoveDownClicked() void TagGuesserConfigDlg::slotAddClicked() { - KListViewItem *item = new KListViewItem(m_child->lvSchemes); + TDEListViewItem *item = new TDEListViewItem(m_child->lvSchemes); m_child->lvSchemes->rename(item, 0); } diff --git a/juk/tagguesserconfigdlgwidget.ui b/juk/tagguesserconfigdlgwidget.ui index f3b3b2e5..1a17cffe 100644 --- a/juk/tagguesserconfigdlgwidget.ui +++ b/juk/tagguesserconfigdlgwidget.ui @@ -17,7 +17,7 @@ unnamed - + File Name Scheme diff --git a/juk/trackpickerdialog.cpp b/juk/trackpickerdialog.cpp index 91e2b012..af9c01c0 100644 --- a/juk/trackpickerdialog.cpp +++ b/juk/trackpickerdialog.cpp @@ -27,11 +27,11 @@ #define NUMBER(x) (x == 0 ? TQString() : TQString::number(x)) -class TrackPickerItem : public KListViewItem +class TrackPickerItem : public TDEListViewItem { public: - TrackPickerItem(KListView *parent, const KTRMResult &result) : - KListViewItem(parent, parent->lastChild(), + TrackPickerItem(TDEListView *parent, const KTRMResult &result) : + TDEListViewItem(parent, parent->lastChild(), result.title(), result.artist(), result.album(), NUMBER(result.track()), NUMBER(result.year())), m_result(result) {} diff --git a/juk/trackpickerdialogbase.ui b/juk/trackpickerdialogbase.ui index ddf72c2a..5b029b00 100644 --- a/juk/trackpickerdialogbase.ui +++ b/juk/trackpickerdialogbase.ui @@ -83,7 +83,7 @@ unnamed - + Track Name diff --git a/juk/tracksequenceiterator.cpp b/juk/tracksequenceiterator.cpp index b60a68d0..4f9a0313 100644 --- a/juk/tracksequenceiterator.cpp +++ b/juk/tracksequenceiterator.cpp @@ -71,9 +71,9 @@ void DefaultSequenceIterator::advance() if(!current()) return; - bool isRandom = action("randomPlay") && action("randomPlay")->isChecked(); - bool loop = action("loopPlaylist") && action("loopPlaylist")->isChecked(); - bool albumRandom = action("albumRandomPlay") && action("albumRandomPlay")->isChecked(); + bool isRandom = action("randomPlay") && action("randomPlay")->isChecked(); + bool loop = action("loopPlaylist") && action("loopPlaylist")->isChecked(); + bool albumRandom = action("albumRandomPlay") && action("albumRandomPlay")->isChecked(); if(isRandom || albumRandom) { if(m_randomItems.isEmpty() && loop) { @@ -163,8 +163,8 @@ void DefaultSequenceIterator::backup() void DefaultSequenceIterator::prepareToPlay(Playlist *playlist) { - bool random = action("randomPlay") && action("randomPlay")->isChecked(); - bool albumRandom = action("albumRandomPlay") && action("albumRandomPlay")->isChecked(); + bool random = action("randomPlay") && action("randomPlay")->isChecked(); + bool albumRandom = action("albumRandomPlay") && action("albumRandomPlay")->isChecked(); if(random || albumRandom) { PlaylistItemList items = playlist->selectedItems(); @@ -213,8 +213,8 @@ void DefaultSequenceIterator::setCurrent(PlaylistItem *current) TrackSequenceIterator::setCurrent(current); - bool random = action("randomPlay") && action("randomPlay")->isChecked(); - bool albumRandom = action("albumRandomPlay") && action("albumRandomPlay")->isChecked(); + bool random = action("randomPlay") && action("randomPlay")->isChecked(); + bool albumRandom = action("albumRandomPlay") && action("albumRandomPlay")->isChecked(); if((albumRandom || random) && current && m_randomItems.isEmpty()) { diff --git a/juk/tracksequencemanager.h b/juk/tracksequencemanager.h index c21f7d50..4e7f26a7 100644 --- a/juk/tracksequencemanager.h +++ b/juk/tracksequencemanager.h @@ -18,7 +18,7 @@ #include -class KPopupMenu; +class TDEPopupMenu; class TrackSequenceIterator; class PlaylistItem; class Playlist; @@ -110,10 +110,10 @@ public: PlaylistItem *currentItem() const; /** - * @return the current KPopupMenu used by the manager, or 0 if none is + * @return the current TDEPopupMenu used by the manager, or 0 if none is * set */ - KPopupMenu *popupMenu() const { return m_popupMenu; } + TDEPopupMenu *popupMenu() const { return m_popupMenu; } /** * @return the TrackSequenceManager's idea of the current playlist @@ -182,7 +182,7 @@ protected slots: private: Playlist *m_playlist; PlaylistItem *m_curItem, *m_playNextItem; - KPopupMenu *m_popupMenu; + TDEPopupMenu *m_popupMenu; TrackSequenceIterator *m_iterator; TrackSequenceIterator *m_defaultIterator; bool m_initialized; diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp index d1877730..efb0d06c 100644 --- a/juk/viewmode.cpp +++ b/juk/viewmode.cpp @@ -227,7 +227,7 @@ void CompactViewMode::paintCell(PlaylistBox::Item *item, const TQColorGroup &colorGroup, int column, int width, int align) { - item->KListViewItem::paintCell(painter, colorGroup, column, width, align); + item->TDEListViewItem::paintCell(painter, colorGroup, column, width, align); if(item == item->listView()->dropItem()) paintDropIndicator(painter, width, item->height()); } diff --git a/juk/viewmode.h b/juk/viewmode.h index 51c3d096..cf260204 100644 --- a/juk/viewmode.h +++ b/juk/viewmode.h @@ -109,7 +109,7 @@ public: const TQColorGroup &colorGroup, int column, int width, int align); - virtual void setupItem(PlaylistBox::Item *item) const { item->KListViewItem::setup(); } + virtual void setupItem(PlaylistBox::Item *item) const { item->TDEListViewItem::setup(); } protected: virtual void updateHeights(); }; diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp index a34309d2..7815afff 100644 --- a/juk/webimagefetcher.cpp +++ b/juk/webimagefetcher.cpp @@ -201,7 +201,7 @@ void WebImageFetcher::slotNewSearch() void WebImageFetcher::displayWaitMessage() { - KStatusBar *statusBar = static_cast(kapp->mainWidget())->statusBar(); + KStatusBar *statusBar = static_cast(kapp->mainWidget())->statusBar(); statusBar->message(i18n("Searching for Images. Please Wait...")); slotLoadImageURLs(); statusBar->clear(); -- cgit v1.2.1