summaryrefslogtreecommitdiffstats
path: root/kscd
diff options
context:
space:
mode:
Diffstat (limited to 'kscd')
-rw-r--r--kscd/cddbdlg.cpp12
-rw-r--r--kscd/docking.cpp14
-rw-r--r--kscd/kcompactdisc.cpp2
-rw-r--r--kscd/kscd.cpp128
4 files changed, 78 insertions, 78 deletions
diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp
index 40a17cbf..9fc6cbac 100644
--- a/kscd/cddbdlg.cpp
+++ b/kscd/cddbdlg.cpp
@@ -46,15 +46,15 @@ CDDBDlg::CDDBDlg( TQWidget* parent, const char* name )
setButtonText( User1, i18n( "Upload" ) );
setButtonText( User2, i18n( "Fetch Info" ) );
- connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( save() ) );
- connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( upload() ) );
- connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SIGNAL( cddbQuery() ) );
- connect( m_dlgBase, TQT_SIGNAL( play( int ) ), TQT_SIGNAL( play( int ) ) );
+ connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( save() ) );
+ connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( upload() ) );
+ connect( this, TQ_SIGNAL( user2Clicked() ), TQ_SIGNAL( cddbQuery() ) );
+ connect( m_dlgBase, TQ_SIGNAL( play( int ) ), TQ_SIGNAL( play( int ) ) );
cddbClient = new KCDDB::Client();
cddbClient->setBlockingMode(false);
- connect (cddbClient, TQT_SIGNAL(finished(CDDB::Result)),
- TQT_SLOT(submitFinished(CDDB::Result)));
+ connect (cddbClient, TQ_SIGNAL(finished(CDDB::Result)),
+ TQ_SLOT(submitFinished(CDDB::Result)));
}
diff --git a/kscd/docking.cpp b/kscd/docking.cpp
index 0241b803..3a45e71a 100644
--- a/kscd/docking.cpp
+++ b/kscd/docking.cpp
@@ -53,11 +53,11 @@ DockWidget::DockWidget( KSCD* parent, const char *name)
// popup menu for right mouse button
TQPopupMenu* popup = contextMenu();
- popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-start", TDEIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked()));
- popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-stop", TDEIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked()));
- popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-forward", TDEIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked()));
- popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-backward", TDEIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked()));
- popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", TDEIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked()));
+ popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-start", TDEIcon::Small), i18n("Play/Pause"), parent, TQ_SLOT(playClicked()));
+ popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-stop", TDEIcon::Small), i18n("Stop"), parent, TQ_SLOT(stopClicked()));
+ popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-forward", TDEIcon::Small), i18n("Next"), parent, TQ_SLOT(nextClicked()));
+ popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-backward", TDEIcon::Small), i18n("Previous"), parent, TQ_SLOT(prevClicked()));
+ popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", TDEIcon::Small), i18n("Eject"), parent, TQ_SLOT(ejectClicked()));
TQToolTip::add(this, kapp->aboutData()->programName());
}
@@ -80,7 +80,7 @@ void DockWidget::createPopup(const TQString &songName, bool addButtons)
{
TQPushButton* backButton = new TQPushButton(m_backPix, 0, box, "popup_back");
backButton->setFlat(true);
- connect(backButton, TQT_SIGNAL(clicked()), m_backAction, TQT_SLOT(activate()));
+ connect(backButton, TQ_SIGNAL(clicked()), m_backAction, TQ_SLOT(activate()));
}
TQLabel* l = new TQLabel(songName, box);
@@ -90,7 +90,7 @@ void DockWidget::createPopup(const TQString &songName, bool addButtons)
{
TQPushButton* forwardButton = new TQPushButton(m_forwardPix, 0, box, "popup_forward");
forwardButton->setFlat(true);
- connect(forwardButton, TQT_SIGNAL(clicked()), m_forwardAction, TQT_SLOT(activate()));
+ connect(forwardButton, TQ_SIGNAL(clicked()), m_forwardAction, TQ_SLOT(activate()));
}
m_popup->setView(box);
diff --git a/kscd/kcompactdisc.cpp b/kscd/kcompactdisc.cpp
index e17fdaa7..5ae482d2 100644
--- a/kscd/kcompactdisc.cpp
+++ b/kscd/kcompactdisc.cpp
@@ -109,7 +109,7 @@ TDECompactDisc::TDECompactDisc(InformationMode infoMode) :
m_trackArtists.clear();
m_trackTitles.clear();
m_trackStartFrames.clear();
- connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerExpired()));
+ connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timerExpired()));
}
TDECompactDisc::~TDECompactDisc()
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 34e7c360..3a8599c4 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -103,7 +103,7 @@ KSCD::KSCD( TQWidget *parent, const char *name )
random_current = random_list.begin();
cddb = new KCDDB::Client();
- connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), this, TQT_SLOT(lookupCDDBDone(CDDB::Result)));
+ connect(cddb, TQ_SIGNAL(finished(CDDB::Result)), this, TQ_SLOT(lookupCDDBDone(CDDB::Result)));
#if defined(BUILD_CDDA)
audio_systems_list
@@ -124,10 +124,10 @@ KSCD::KSCD( TQWidget *parent, const char *name )
// the time slider
timeIcon->setPixmap(SmallIcon("player_time"));
- connect(timeSlider, TQT_SIGNAL(sliderPressed()), TQT_SLOT(timeSliderPressed()));
- connect(timeSlider, TQT_SIGNAL(sliderReleased()), TQT_SLOT(timeSliderReleased()));
- connect(timeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(timeSliderMoved(int)));
- connect(timeSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(jumpToTime(int)));
+ connect(timeSlider, TQ_SIGNAL(sliderPressed()), TQ_SLOT(timeSliderPressed()));
+ connect(timeSlider, TQ_SIGNAL(sliderReleased()), TQ_SLOT(timeSliderReleased()));
+ connect(timeSlider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(timeSliderMoved(int)));
+ connect(timeSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(jumpToTime(int)));
// the volume slider
volumeIcon->setPixmap(SmallIcon("player_volume"));
@@ -135,33 +135,33 @@ KSCD::KSCD( TQWidget *parent, const char *name )
TQString str;
str = TQString::fromUtf8( TQCString().sprintf(i18n("Vol: %02d%%").utf8(), Prefs::volume()) );
volumelabel->setText(str);
- connect(volumeSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volChanged(int)));
+ connect(volumeSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(volChanged(int)));
/* FIXME check for return value */
setDevicePaths(/*Prefs::cdDevice(), Prefs::audioSystem(), Prefs::audioDevice()*/);
- connect(m_cd, TQT_SIGNAL(trackPlaying(unsigned, unsigned)), this, TQT_SLOT(trackUpdate(unsigned, unsigned)));
- connect(m_cd, TQT_SIGNAL(trackPaused(unsigned, unsigned)), this, TQT_SLOT(trackUpdate(unsigned, unsigned)));
- connect(m_cd, TQT_SIGNAL(trackChanged(unsigned, unsigned)), this, TQT_SLOT(trackChanged(unsigned, unsigned)));
- connect(m_cd, TQT_SIGNAL(discStopped()), this, TQT_SLOT(discStopped()));
- connect(m_cd, TQT_SIGNAL(discChanged(unsigned)), this, TQT_SLOT(discChanged(unsigned)));
- connect( &queryledtimer, TQT_SIGNAL(timeout()), TQT_SLOT(togglequeryled()) );
- connect( &titlelabeltimer, TQT_SIGNAL(timeout()), TQT_SLOT(titlelabeltimeout()) );
- connect( &cycletimer, TQT_SIGNAL(timeout()), TQT_SLOT(cycletimeout()) );
- connect( &jumpTrackTimer, TQT_SIGNAL(timeout()), TQT_SLOT(jumpTracks()) );
+ connect(m_cd, TQ_SIGNAL(trackPlaying(unsigned, unsigned)), this, TQ_SLOT(trackUpdate(unsigned, unsigned)));
+ connect(m_cd, TQ_SIGNAL(trackPaused(unsigned, unsigned)), this, TQ_SLOT(trackUpdate(unsigned, unsigned)));
+ connect(m_cd, TQ_SIGNAL(trackChanged(unsigned, unsigned)), this, TQ_SLOT(trackChanged(unsigned, unsigned)));
+ connect(m_cd, TQ_SIGNAL(discStopped()), this, TQ_SLOT(discStopped()));
+ connect(m_cd, TQ_SIGNAL(discChanged(unsigned)), this, TQ_SLOT(discChanged(unsigned)));
+ connect( &queryledtimer, TQ_SIGNAL(timeout()), TQ_SLOT(togglequeryled()) );
+ connect( &titlelabeltimer, TQ_SIGNAL(timeout()), TQ_SLOT(titlelabeltimeout()) );
+ connect( &cycletimer, TQ_SIGNAL(timeout()), TQ_SLOT(cycletimeout()) );
+ connect( &jumpTrackTimer, TQ_SIGNAL(timeout()), TQ_SLOT(jumpTracks()) );
/*
these are always connected in base class
- connect( playPB, TQT_SIGNAL(clicked()), TQT_SLOT(playClicked()) );
- connect( nextPB, TQT_SIGNAL(clicked()), TQT_SLOT(nextClicked()) );
- connect( prevPB, TQT_SIGNAL(clicked()), TQT_SLOT(prevClicked()) );
- connect( stopPB, TQT_SIGNAL(clicked()), TQT_SLOT(stopClicked()) );
- connect( ejectPB, TQT_SIGNAL(clicked()), TQT_SLOT(ejectClicked()) );
+ connect( playPB, TQ_SIGNAL(clicked()), TQ_SLOT(playClicked()) );
+ connect( nextPB, TQ_SIGNAL(clicked()), TQ_SLOT(nextClicked()) );
+ connect( prevPB, TQ_SIGNAL(clicked()), TQ_SLOT(prevClicked()) );
+ connect( stopPB, TQ_SIGNAL(clicked()), TQ_SLOT(stopClicked()) );
+ connect( ejectPB, TQ_SIGNAL(clicked()), TQ_SLOT(ejectClicked()) );
*/
- connect( repeatPB, TQT_SIGNAL(clicked()), TQT_SLOT(loopClicked()) );
- connect( songListCB, TQT_SIGNAL(activated(int)), TQT_SLOT(trackSelected(int)));
- connect( shufflePB, TQT_SIGNAL(clicked()), TQT_SLOT(randomSelected()));
- connect( cddbPB, TQT_SIGNAL(clicked()), TQT_SLOT(CDDialogSelected()));
- connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(setColors()));
- connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(setIcons()));
+ connect( repeatPB, TQ_SIGNAL(clicked()), TQ_SLOT(loopClicked()) );
+ connect( songListCB, TQ_SIGNAL(activated(int)), TQ_SLOT(trackSelected(int)));
+ connect( shufflePB, TQ_SIGNAL(clicked()), TQ_SLOT(randomSelected()));
+ connect( cddbPB, TQ_SIGNAL(clicked()), TQ_SLOT(CDDialogSelected()));
+ connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(setColors()));
+ connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(setIcons()));
TQToolTip::remove(songListCB);
TQToolTip::add(songListCB, i18n("Track list"));
@@ -170,24 +170,24 @@ KSCD::KSCD( TQWidget *parent, const char *name )
m_actions = new TDEActionCollection(this);
TDEAction* action;
- action = new TDEAction(i18n("Play/Pause"), Key_P, this, TQT_SLOT(playClicked()), m_actions, "Play/Pause");
- action = new TDEAction(i18n("Stop"), Key_S, this, TQT_SLOT(stopClicked()), m_actions, "Stop");
- action = new TDEAction(i18n("Previous"), Key_B, this, TQT_SLOT(prevClicked()), m_actions, "Previous");
- action = new TDEAction(i18n("Next"), Key_N, this, TQT_SLOT(nextClicked()), m_actions, "Next");
- action = KStdAction::quit(this, TQT_SLOT(quitClicked()), m_actions);
- action = KStdAction::keyBindings(this, TQT_SLOT(configureKeys()), m_actions, "options_configure_shortcuts");
- action = KStdAction::keyBindings(this, TQT_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals");
- action = KStdAction::preferences(this, TQT_SLOT(showConfig()), m_actions);
- action = new TDEAction(i18n("Loop"), Key_L, this, TQT_SLOT(loopClicked()), m_actions, "Loop");
- action = new TDEAction(i18n("Eject"), CTRL + Key_E, this, TQT_SLOT(ejectClicked()), m_actions, "Eject");
- action = new TDEAction(i18n("Increase Volume"), Key_Plus, this, TQT_SLOT(incVolume()), m_actions, "IncVolume");
+ action = new TDEAction(i18n("Play/Pause"), Key_P, this, TQ_SLOT(playClicked()), m_actions, "Play/Pause");
+ action = new TDEAction(i18n("Stop"), Key_S, this, TQ_SLOT(stopClicked()), m_actions, "Stop");
+ action = new TDEAction(i18n("Previous"), Key_B, this, TQ_SLOT(prevClicked()), m_actions, "Previous");
+ action = new TDEAction(i18n("Next"), Key_N, this, TQ_SLOT(nextClicked()), m_actions, "Next");
+ action = KStdAction::quit(this, TQ_SLOT(quitClicked()), m_actions);
+ action = KStdAction::keyBindings(this, TQ_SLOT(configureKeys()), m_actions, "options_configure_shortcuts");
+ action = KStdAction::keyBindings(this, TQ_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals");
+ action = KStdAction::preferences(this, TQ_SLOT(showConfig()), m_actions);
+ action = new TDEAction(i18n("Loop"), Key_L, this, TQ_SLOT(loopClicked()), m_actions, "Loop");
+ action = new TDEAction(i18n("Eject"), CTRL + Key_E, this, TQ_SLOT(ejectClicked()), m_actions, "Eject");
+ action = new TDEAction(i18n("Increase Volume"), Key_Plus, this, TQ_SLOT(incVolume()), m_actions, "IncVolume");
TDEShortcut increaseVolume = action->shortcut();
increaseVolume.append( KKey( Key_Equal ) );
action->setShortcut( increaseVolume );
- action = new TDEAction(i18n("Decrease Volume"), Key_Minus, this, TQT_SLOT(decVolume()), m_actions, "DecVolume");
- action = new TDEAction(i18n("Options"), CTRL + Key_T, this, TQT_SLOT(showConfig()), m_actions, "Options");
- action = new TDEAction(i18n("Shuffle"), Key_R, this, TQT_SLOT(randomSelected()), m_actions, "Shuffle");
- action = new TDEAction(i18n("CDDB"), CTRL + Key_D, this, TQT_SLOT(CDDialogSelected()), m_actions, "CDDB");
+ action = new TDEAction(i18n("Decrease Volume"), Key_Minus, this, TQ_SLOT(decVolume()), m_actions, "DecVolume");
+ action = new TDEAction(i18n("Options"), CTRL + Key_T, this, TQ_SLOT(showConfig()), m_actions, "Options");
+ action = new TDEAction(i18n("Shuffle"), Key_R, this, TQ_SLOT(randomSelected()), m_actions, "Shuffle");
+ action = new TDEAction(i18n("CDDB"), CTRL + Key_D, this, TQ_SLOT(CDDialogSelected()), m_actions, "CDDB");
m_actions->readShortcutSettings("Shortcuts");
@@ -232,20 +232,20 @@ void KSCD::initGlobalShortcuts() {
//Definition of global shortcuts is based on 'local' shortcuts which follow
//the WIN key.
m_globalAccel->insert("Next", i18n("Next"), 0, KKey("WIN+N"), KKey("WIN+Right"),
- this, TQT_SLOT(nextClicked()));
+ this, TQ_SLOT(nextClicked()));
//NOTE: WIN+B collidates with amarok's default global shortcut.
m_globalAccel->insert("Previous", i18n("Previous"), 0, KKey("WIN+B"), KKey("WIN+Left"),
- this, TQT_SLOT(prevClicked()));
+ this, TQ_SLOT(prevClicked()));
m_globalAccel->insert("Play/Pause", i18n("Play/Pause"), 0, KKey("WIN+P"), 0,
- this, TQT_SLOT(playClicked()));
+ this, TQ_SLOT(playClicked()));
m_globalAccel->insert("Stop", i18n("Stop"), 0, KKey("WIN+S"), 0,
- this, TQT_SLOT(stopClicked()));
+ this, TQ_SLOT(stopClicked()));
m_globalAccel->insert("IncVolume", i18n("Increase Volume"), 0, KKey("WIN+Plus"), KKey("WIN+Up"),
- this, TQT_SLOT(incVolume()));
+ this, TQ_SLOT(incVolume()));
m_globalAccel->insert("DecVolume", i18n("Decrease Volume"), 0, KKey("WIN+Minus"), KKey("WIN+Down"),
- this, TQT_SLOT(decVolume()));
+ this, TQ_SLOT(decVolume()));
m_globalAccel->insert("Shuffle", i18n("Shuffle"), 0, KKey("WIN+R"), 0,
- this, TQT_SLOT(incVolume()));
+ this, TQ_SLOT(incVolume()));
m_globalAccel->setConfigGroup( "GlobalShortcuts" );
m_globalAccel->readSettings( kapp->config() );
@@ -312,7 +312,7 @@ void KSCD::drawPanel()
trackTimeLED[u]->setLEDoffColor(Prefs::backColor());
trackTimeLED[u]->setLEDColor(Prefs::ledColor(), Prefs::backColor());
trackTimeLED[u]->setGeometry(2 + u * 18, D, 23, 30);
- connect(trackTimeLED[u], TQT_SIGNAL(clicked()), this, TQT_SLOT(cycleplaytimemode()));
+ connect(trackTimeLED[u], TQ_SIGNAL(clicked()), this, TQ_SLOT(cycleplaytimemode()));
}
setLEDs(-1);
@@ -369,7 +369,7 @@ void KSCD::setupPopups()
mainPopup->insertItem(i18n("Artist Information"), infoPopup);
- connect( infoPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(information(int)) );
+ connect( infoPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(information(int)) );
KHelpMenu* helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false);
mainPopup->insertItem(SmallIcon("help"),i18n("&Help"), helpMenu->menu());
@@ -756,16 +756,16 @@ void KSCD::showConfig()
cfg->readConfig();
configDialog -> addPage(m, cfg, TQString("CDDB"), "application-x-cda", i18n("Configure Fetching Items"));
- connect(configDialog, TQT_SIGNAL(okClicked()), m, TQT_SLOT(save()));
- connect(configDialog, TQT_SIGNAL(applyClicked()), m, TQT_SLOT(save()));
- connect(configDialog, TQT_SIGNAL(defaultClicked()), m, TQT_SLOT(defaults()));
+ connect(configDialog, TQ_SIGNAL(okClicked()), m, TQ_SLOT(save()));
+ connect(configDialog, TQ_SIGNAL(applyClicked()), m, TQ_SLOT(save()));
+ connect(configDialog, TQ_SIGNAL(defaultClicked()), m, TQ_SLOT(defaults()));
}
}
}
updateConfigDialog(confWidget);
- connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(configDone()));
+ connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(configDone()));
configDialog -> show();
} // showConfig()
@@ -814,14 +814,14 @@ void KSCD::setDocking(bool dock)
if (!m_dockWidget)
{
m_dockWidget = new DockWidget(this, "dockw");
- connect(m_dockWidget, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitClicked()));
+ connect(m_dockWidget, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitClicked()));
}
m_dockWidget->show();
- connect(this, TQT_SIGNAL(trackChanged(const TQString&)),
- m_dockWidget, TQT_SLOT(setToolTip(const TQString&)));
- connect(this, TQT_SIGNAL(trackChanged(const TQString&)),
- m_dockWidget, TQT_SLOT(createPopup(const TQString&)));
+ connect(this, TQ_SIGNAL(trackChanged(const TQString&)),
+ m_dockWidget, TQ_SLOT(setToolTip(const TQString&)));
+ connect(this, TQ_SIGNAL(trackChanged(const TQString&)),
+ m_dockWidget, TQ_SLOT(createPopup(const TQString&)));
}
else
{
@@ -1155,11 +1155,11 @@ void KSCD::CDDialogSelected()
cddialog = new CDDBDlg(this);
cddialog->setData(cddbInfo, m_cd->discSignature(), playlist);
- connect(cddialog,TQT_SIGNAL(cddbQuery()),TQT_SLOT(lookupCDDB()));
- connect(cddialog,TQT_SIGNAL(newCDInfoStored(KCDDB::CDInfo)),
- TQT_SLOT(setCDInfo(KCDDB::CDInfo)));
- connect(cddialog,TQT_SIGNAL(finished()),TQT_SLOT(CDDialogDone()));
- connect(cddialog,TQT_SIGNAL(play(int)),TQT_SLOT(trackSelected(int)));
+ connect(cddialog,TQ_SIGNAL(cddbQuery()),TQ_SLOT(lookupCDDB()));
+ connect(cddialog,TQ_SIGNAL(newCDInfoStored(KCDDB::CDInfo)),
+ TQ_SLOT(setCDInfo(KCDDB::CDInfo)));
+ connect(cddialog,TQ_SIGNAL(finished()),TQ_SLOT(CDDialogDone()));
+ connect(cddialog,TQ_SIGNAL(play(int)),TQ_SLOT(trackSelected(int)));
}
cddialog->show();