summaryrefslogtreecommitdiffstats
path: root/juk/juk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'juk/juk.cpp')
-rw-r--r--juk/juk.cpp90
1 files changed, 45 insertions, 45 deletions
diff --git a/juk/juk.cpp b/juk/juk.cpp
index 35c08dff..47a94692 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -43,8 +43,8 @@ using namespace ActionCollection;
// public members
////////////////////////////////////////////////////////////////////////////////
-JuK::JuK(TQWidget *parent, const char *name) :
- KMainWindow(parent, name, WDestructiveClose),
+JuK::JuK(TQWidget *tqparent, const char *name) :
+ KMainWindow(tqparent, name, WDestructiveClose),
m_player(PlayerManager::instance()),
m_shuttingDown(false)
{
@@ -72,7 +72,7 @@ JuK::JuK(TQWidget *parent, const char *name) :
SplashScreen::finishedLoading();
TQTimer::singleShot(0, CollectionList::instance(), TQT_SLOT(slotCheckCache()));
- TQTimer::singleShot(0, this, TQT_SLOT(slotProcessArgs()));
+ TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotProcessArgs()));
m_sliderAction->slotUpdateOrientation();
}
@@ -112,52 +112,52 @@ void JuK::setupActions()
{
ActionCollection::actions()->setWidget(this);
- KStdAction::quit(this, TQT_SLOT(slotQuit()), actions());
- KStdAction::undo(this, TQT_SLOT(slotUndo()), actions());
- KStdAction::cut(kapp, TQT_SLOT(cut()), actions());
- KStdAction::copy(kapp, TQT_SLOT(copy()), actions());
- KStdAction::paste(kapp, TQT_SLOT(paste()), actions());
- KStdAction::clear(kapp, TQT_SLOT(clear()), actions());
- KStdAction::selectAll(kapp, TQT_SLOT(selectAll()), actions());
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), ActionCollection::actions());
+ KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), ActionCollection::actions());
+ KStdAction::cut(TQT_TQOBJECT(kapp), TQT_SLOT(cut()), ActionCollection::actions());
+ KStdAction::copy(TQT_TQOBJECT(kapp), TQT_SLOT(copy()), ActionCollection::actions());
+ KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), ActionCollection::actions());
+ 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, kapp, TQT_SLOT(clear()), actions(), "removeFromPlaylist");
+ new KAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
- KActionMenu *actionMenu = new KActionMenu(i18n("&Random Play"), "roll", actions(), "actionMenu");
+ KActionMenu *actionMenu = new KActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu");
actionMenu->setDelayed(false);
- KRadioAction *ka = new KRadioAction(i18n("&Disable Random Play"), "player_playlist", 0, actions(), "disableRandomPlay");
+ KRadioAction *ka = new KRadioAction(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, actions(), "randomPlay");
+ m_randomPlayAction = new KRadioAction(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, actions(), "albumRandomPlay");
+ ka = new KRadioAction(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, m_player, TQT_SLOT(play()), actions(), "play");
- new KAction(i18n("P&ause"), "player_pause", 0, m_player, TQT_SLOT(pause()), actions(), "pause");
- new KAction(i18n("&Stop"), "player_stop", 0, m_player, TQT_SLOT(stop()), actions(), "stop");
+ 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 KToolBarPopupAction(i18n("previous track", "Previous"), "player_start", KShortcut(), m_player, TQT_SLOT(back()), actions(), "back");
- new KAction(i18n("next track", "&Next"), "player_end", KShortcut(), m_player, TQT_SLOT(forward()), actions(), "forward");
- new KToggleAction(i18n("&Loop Playlist"), 0, KShortcut(), actions(), "loopPlaylist");
+ 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(), actions(), "resizeColumnsManually");
+ KShortcut(), ActionCollection::actions(), "resizeColumnsManually");
resizeColumnAction->setCheckedState(i18n("&Resize Column Headers Automatically"));
// the following are not visible by default
- new KAction(i18n("Mute"), "mute", 0, m_player, TQT_SLOT(mute()), actions(), "mute");
- new KAction(i18n("Volume Up"), "volumeUp", 0, m_player, TQT_SLOT(volumeUp()), actions(), "volumeUp");
- new KAction(i18n("Volume Down"), "volumeDown", 0, m_player, TQT_SLOT(volumeDown()), actions(), "volumeDown");
- new KAction(i18n("Play / Pause"), "playPause", 0, m_player, TQT_SLOT(playPause()), actions(), "playPause");
- new KAction(i18n("Seek Forward"), "seekForward", 0, m_player, TQT_SLOT(seekForward()), actions(), "seekForward");
- new KAction(i18n("Seek Back"), "seekBack", 0, m_player, TQT_SLOT(seekBack()), actions(), "seekBack");
+ 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");
//////////////////////////////////////////////////
// settings menu
@@ -165,42 +165,42 @@ void JuK::setupActions()
m_toggleSplashAction =
new KToggleAction(i18n("Show Splash Screen on Startup"),
- KShortcut(), actions(), "showSplashScreen");
+ KShortcut(), ActionCollection::actions(), "showSplashScreen");
m_toggleSplashAction->setCheckedState(i18n("Hide Splash Screen on Startup"));
m_toggleSystemTrayAction =
new KToggleAction(i18n("&Dock in System Tray"),
- KShortcut(), actions(), "toggleSystemTray");
+ KShortcut(), ActionCollection::actions(), "toggleSystemTray");
m_toggleDockOnCloseAction =
new KToggleAction(i18n("&Stay in System Tray on Close"),
- KShortcut(), actions(), "dockOnClose");
+ KShortcut(), ActionCollection::actions(), "dockOnClose");
m_togglePopupsAction =
new KToggleAction(i18n("Popup &Track Announcement"),
- KShortcut(), this, 0, actions(), "togglePopups");
+ KShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups");
new KToggleAction(i18n("Save &Play Queue on Exit"),
- KShortcut(), this, 0, actions(), "saveUpcomingTracks");
+ KShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks");
connect(m_toggleSystemTrayAction, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(slotToggleSystemTray(bool)));
- m_outputSelectAction = PlayerManager::playerSelectAction(actions());
+ m_outputSelectAction = PlayerManager::playerSelectAction(ActionCollection::actions());
if(m_outputSelectAction)
m_outputSelectAction->setCurrentItem(0);
- new KAction(i18n("&Tag Guesser..."), 0, 0, this, TQT_SLOT(slotConfigureTagGuesser()),
- actions(), "tagGuesserConfig");
+ new KAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()),
+ ActionCollection::actions(), "tagGuesserConfig");
- new KAction(i18n("&File Renamer..."), 0, 0, this, TQT_SLOT(slotConfigureFileRenamer()),
- actions(), "fileRenamerConfig");
+ new KAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()),
+ ActionCollection::actions(), "fileRenamerConfig");
- KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actions());
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), ActionCollection::actions());
//////////////////////////////////////////////////
// just in the toolbar
//////////////////////////////////////////////////
- m_sliderAction = new SliderAction(i18n("Track Position"), actions(),
+ m_sliderAction = new SliderAction(i18n("Track Position"), ActionCollection::actions(),
"trackPositionAction");
}
@@ -213,7 +213,7 @@ void JuK::setupSystemTray()
m_toggleDockOnCloseAction->setEnabled(true);
m_togglePopupsAction->setEnabled(true);
- connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotAboutToQuit()));
+ connect(m_systemTray, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToQuit()));
}
else {
m_systemTray = 0;
@@ -224,7 +224,7 @@ void JuK::setupSystemTray()
void JuK::setupGlobalAccels()
{
- m_accel = new KGlobalAccel(this);
+ m_accel = new KGlobalAccel(TQT_TQOBJECT(this));
KeyDialog::insert(m_accel, "Play", i18n("Play"), action("play"), TQT_SLOT(activate()));
KeyDialog::insert(m_accel, "PlayPause", i18n("Play / Pause"), action("playPause"), TQT_SLOT(activate()));
@@ -236,7 +236,7 @@ void JuK::setupGlobalAccels()
KeyDialog::insert(m_accel, "VolumeUp", i18n("Volume Up"), action("volumeUp"), TQT_SLOT(activate()));
KeyDialog::insert(m_accel, "VolumeDown", i18n("Volume Down"), action("volumeDown"), TQT_SLOT(activate()));
KeyDialog::insert(m_accel, "Mute", i18n("Mute"), action("mute"), TQT_SLOT(activate()));
- KeyDialog::insert(m_accel, "ShowHide", i18n("Show / Hide"), this, TQT_SLOT(slotShowHide()));
+ KeyDialog::insert(m_accel, "ShowHide", i18n("Show / Hide"), TQT_TQOBJECT(this), TQT_SLOT(slotShowHide()));
KeyDialog::insert(m_accel, "ForwardAlbum", i18n("Play Next Album"), action("forwardAlbum"), TQT_SLOT(activate()));
m_accel->setConfigGroup("Shortcuts");
@@ -267,7 +267,7 @@ void JuK::createDirs()
void JuK::keyPressEvent(TQKeyEvent *e)
{
- if (e->key() >= Qt::Key_Back && e->key() <= Qt::Key_MediaLast)
+ if (e->key() >= TQt::Key_Back && e->key() <= TQt::Key_MediaLast)
e->accept();
KMainWindow::keyPressEvent(e);
}
@@ -446,7 +446,7 @@ void JuK::slotToggleSystemTray(bool enabled)
void JuK::slotEditKeys()
{
- KeyDialog::configure(m_accel, actions(), this);
+ KeyDialog::configure(m_accel, ActionCollection::actions(), this);
}
void JuK::slotConfigureTagGuesser()