diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-11 10:35:25 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-13 20:23:16 +0900 |
commit | e234565531cd8c11949cc6aecf16179e75312458 (patch) | |
tree | 90b0cb6c9f6c2a04712bbfb73b531275d4f63976 /noatun-plugins | |
parent | be3456c5d953fb877340a51b2ef699be6b3c7c02 (diff) | |
download | tdeaddons-e234565531cd8c11949cc6aecf16179e75312458.tar.gz tdeaddons-e234565531cd8c11949cc6aecf16179e75312458.zip |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 7e9d8ea45280ad6657796da9536ccf6218111f22)
Diffstat (limited to 'noatun-plugins')
26 files changed, 234 insertions, 234 deletions
diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp index b9f38d1..504ad77 100644 --- a/noatun-plugins/alarm/wakeup.cpp +++ b/noatun-plugins/alarm/wakeup.cpp @@ -60,7 +60,7 @@ Wakeup::Wakeup() : TQObject(), Plugin() update(); TQTimer *timer=new TQTimer(this); - connect (timer,TQT_SIGNAL(timeout()),TQT_SLOT(slotCheckTime())); + connect (timer,TQ_SIGNAL(timeout()),TQ_SLOT(slotCheckTime())); timer->start(60000,false); } @@ -129,7 +129,7 @@ void Wakeup::PlayerAct() // timer for volume (up/down) according to prefs :-) volTimer = new TQTimer (this); - connect (volTimer,TQT_SIGNAL(timeout()), TQT_SLOT(slotVolumeChange())); + connect (volTimer,TQ_SIGNAL(timeout()), TQ_SLOT(slotVolumeChange())); volTimer->start(1000,false); // updates volume every seconds @@ -260,8 +260,8 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) : volLayout->addWidget(volEndValue); volLayout->addStretch(); - connect (morningmode,TQT_SIGNAL(stateChanged(int)),TQT_SLOT(slotViewFrame(int))); - connect (applyall,TQT_SIGNAL(clicked()),TQT_SLOT(slotApplyAll())); + connect (morningmode,TQ_SIGNAL(stateChanged(int)),TQ_SLOT(slotViewFrame(int))); + connect (applyall,TQ_SIGNAL(clicked()),TQ_SLOT(slotApplyAll())); load(); } diff --git a/noatun-plugins/alsaplayer/seeker.cpp b/noatun-plugins/alsaplayer/seeker.cpp index b440b2b..1ddd894 100644 --- a/noatun-plugins/alsaplayer/seeker.cpp +++ b/noatun-plugins/alsaplayer/seeker.cpp @@ -29,9 +29,9 @@ Seeker::Seeker(TQWidget * parent, const char * name) : L33tSlider(0, 1000, 10, 0,TQt::Horizontal, parent, name) { - connect(this, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotValueChanged(int))); + connect(this, TQ_SIGNAL(userChanged(int)), TQ_SLOT(slotValueChanged(int))); - connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); } Seeker::~Seeker() diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp index 1a3820c..7d1e840 100644 --- a/noatun-plugins/alsaplayer/userinterface.cpp +++ b/noatun-plugins/alsaplayer/userinterface.cpp @@ -60,92 +60,92 @@ AlsaPlayer::AlsaPlayer() connect ( playlistButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(toggleListView()) + TQ_SLOT(toggleListView()) ); connect ( previousButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(back()) + TQ_SLOT(back()) ); connect ( nextButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(forward()) + TQ_SLOT(forward()) ); connect ( stopButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(stop()) + TQ_SLOT(stop()) ); connect ( playButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(playpause()) + TQ_SLOT(playpause()) ); - connect(napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide())); - connect(napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show())); + connect(napp, TQ_SIGNAL(hideYourself()), TQ_SLOT(hide())); + connect(napp, TQ_SIGNAL(showYourself()), TQ_SLOT(show())); - connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(slotPlayListShown())); - connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(slotPlayListHidden())); - connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(slotPlaying())); - connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(slotStopped())); - connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(slotPaused())); + connect(napp->player(), TQ_SIGNAL(playlistShown()), TQ_SLOT(slotPlayListShown())); + connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(slotPlayListHidden())); + connect(napp->player(), TQ_SIGNAL(playing()), TQ_SLOT(slotPlaying())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(paused()), TQ_SLOT(slotPaused())); - connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); - connect(napp->player(), TQT_SIGNAL(changed()), TQT_SLOT(slotTrackChanged())); + connect(napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); + connect(napp->player(), TQ_SIGNAL(changed()), TQ_SLOT(slotTrackChanged())); connect ( napp->player(), - TQT_SIGNAL(volumeChanged(int)), - TQT_SLOT(slotVolumeChanged(int)) + TQ_SIGNAL(volumeChanged(int)), + TQ_SLOT(slotVolumeChanged(int)) ); connect ( new AlsaPlayerConfigModule(this), - TQT_SIGNAL(saved()), - TQT_SLOT(slotConfigChanged()) + TQ_SIGNAL(saved()), + TQ_SLOT(slotConfigChanged()) ); connect ( volumeSlider, - TQT_SIGNAL(valueChanged(int)), + TQ_SIGNAL(valueChanged(int)), napp->player(), - TQT_SLOT(setVolume(int)) + TQ_SLOT(setVolume(int)) ); connect ( forwardButton, - TQT_SIGNAL(clicked()), - TQT_SLOT(slotForward()) + TQ_SIGNAL(clicked()), + TQ_SLOT(slotForward()) ); connect ( pauseButton, - TQT_SIGNAL(clicked()), - TQT_SLOT(slotPause()) + TQ_SIGNAL(clicked()), + TQ_SLOT(slotPause()) ); - connect(speedSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotSetSpeed(int))); + connect(speedSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotSetSpeed(int))); menuButton->setPopup(NoatunStdAction::ContextMenu::contextMenu()); diff --git a/noatun-plugins/charlatan/seeker.cpp b/noatun-plugins/charlatan/seeker.cpp index 8e639d8..c740c53 100644 --- a/noatun-plugins/charlatan/seeker.cpp +++ b/noatun-plugins/charlatan/seeker.cpp @@ -33,12 +33,12 @@ Seeker::Seeker(TQWidget * parent) { delayedUpdateTimer_ = new TQTimer(this); - connect(this, TQT_SIGNAL(sliderPressed()), TQT_SLOT(slotSliderPressed())); - connect(this, TQT_SIGNAL(sliderReleased()), TQT_SLOT(slotSliderReleased())); - connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); + connect(this, TQ_SIGNAL(sliderPressed()), TQ_SLOT(slotSliderPressed())); + connect(this, TQ_SIGNAL(sliderReleased()), TQ_SLOT(slotSliderReleased())); + connect(this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int))); - connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); - connect(delayedUpdateTimer_, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedUpdate())); + connect(napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); + connect(delayedUpdateTimer_, TQ_SIGNAL(timeout()), TQ_SLOT(slotDelayedUpdate())); } Seeker::~Seeker() diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp index a896cfa..c62c344 100644 --- a/noatun-plugins/charlatan/userinterface.cpp +++ b/noatun-plugins/charlatan/userinterface.cpp @@ -69,8 +69,8 @@ Charlatan::Charlatan() connect ( showingVolumeTimer_, - TQT_SIGNAL(timeout()), - TQT_SLOT(slotStopShowingVolume()) + TQ_SIGNAL(timeout()), + TQ_SLOT(slotStopShowingVolume()) ); playListToggleButton_ = new TQToolButton(this); @@ -130,68 +130,68 @@ Charlatan::Charlatan() connect ( playListToggleButton_, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(toggleListView()) + TQ_SLOT(toggleListView()) ); connect ( previousButton_, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(back()) + TQ_SLOT(back()) ); connect ( nextButton_, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(forward()) + TQ_SLOT(forward()) ); connect ( stopButton_, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(stop()) + TQ_SLOT(stop()) ); - connect(restartButton_, TQT_SIGNAL(clicked()), TQT_SLOT(slotRestart())); + connect(restartButton_, TQ_SIGNAL(clicked()), TQ_SLOT(slotRestart())); connect ( playButton_, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), napp->player(), - TQT_SLOT(playpause()) + TQ_SLOT(playpause()) ); - connect(napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide())); - connect(napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show())); + connect(napp, TQ_SIGNAL(hideYourself()), TQ_SLOT(hide())); + connect(napp, TQ_SIGNAL(showYourself()), TQ_SLOT(show())); - connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(slotPlayListShown())); - connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(slotPlayListHidden())); - connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(slotPlaying())); - connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(slotStopped())); - connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(slotPaused())); + connect(napp->player(), TQ_SIGNAL(playlistShown()), TQ_SLOT(slotPlayListShown())); + connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(slotPlayListHidden())); + connect(napp->player(), TQ_SIGNAL(playing()), TQ_SLOT(slotPlaying())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(paused()), TQ_SLOT(slotPaused())); - connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); connect ( napp->player(), - TQT_SIGNAL(volumeChanged(int)), - TQT_SLOT(slotVolumeChanged(int)) + TQ_SIGNAL(volumeChanged(int)), + TQ_SLOT(slotVolumeChanged(int)) ); connect ( new CharlatanConfigModule(this), - TQT_SIGNAL(saved()), - TQT_SLOT(slotConfigChanged()) + TQ_SIGNAL(saved()), + TQ_SLOT(slotConfigChanged()) ); setCaption(i18n("Noatun")); @@ -213,12 +213,12 @@ Charlatan::Charlatan() int accelRstt = a->insertItem(Key_Return); int accelQuit = a->insertItem(Key_Q); - a->connectItem(accelPlay, napp->player(), TQT_SLOT(playpause())); - a->connectItem(accelNext, napp->player(), TQT_SLOT(forward())); - a->connectItem(accelPrev, napp->player(), TQT_SLOT(back())); - a->connectItem(accelStop, napp->player(), TQT_SLOT(stop())); - a->connectItem(accelRstt, this, TQT_SLOT(slotRestart())); - a->connectItem(accelQuit, napp, TQT_SLOT(quit())); + a->connectItem(accelPlay, napp->player(), TQ_SLOT(playpause())); + a->connectItem(accelNext, napp->player(), TQ_SLOT(forward())); + a->connectItem(accelPrev, napp->player(), TQ_SLOT(back())); + a->connectItem(accelStop, napp->player(), TQ_SLOT(stop())); + a->connectItem(accelRstt, this, TQ_SLOT(slotRestart())); + a->connectItem(accelQuit, napp, TQ_SLOT(quit())); show(); diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp index cb67a1b..b5ff637 100644 --- a/noatun-plugins/dub/dub/dub.cpp +++ b/noatun-plugins/dub/dub/dub.cpp @@ -62,17 +62,17 @@ Dub::Dub(DubPlaylist* plist) , shuffle_recursive(this) { connect( view->dirOperator(), - TQT_SIGNAL(fileSelected(const KFileItem*)), + TQ_SIGNAL(fileSelected(const KFileItem*)), this, - TQT_SLOT(fileSelected(const KFileItem*)) ); + TQ_SLOT(fileSelected(const KFileItem*)) ); connect( dubconfig.prefs->mediaDirectory, - TQT_SIGNAL( urlSelected (const TQString &) ), + TQ_SIGNAL( urlSelected (const TQString &) ), this, - TQT_SLOT( mediaHomeSelected (const TQString &) ) ); + TQ_SLOT( mediaHomeSelected (const TQString &) ) ); connect( this, - TQT_SIGNAL(setMediaHome(KURL)), + TQ_SIGNAL(setMediaHome(KURL)), view, - TQT_SLOT(setDir(KURL)) ); + TQ_SLOT(setDir(KURL)) ); configure_sequencing(); emit setMediaHome(dubconfig.mediaDirectory); } diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp index c964979..3520fa9 100644 --- a/noatun-plugins/dub/dub/dubapp.cpp +++ b/noatun-plugins/dub/dub/dubapp.cpp @@ -54,7 +54,7 @@ DubApp::~DubApp() void DubApp::initActions() { - fileClose = KStdAction::close(this, TQT_SLOT(close()), actionCollection()); + fileClose = KStdAction::close(this, TQ_SLOT(close()), actionCollection()); setStandardToolBarMenuEnabled(true); createStandardStatusBarAction(); diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp index 4a62ecb..136a994 100644 --- a/noatun-plugins/dub/dub/fileselectorwidget.cpp +++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp @@ -86,29 +86,29 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent) // slots and signals - connect( filter, TQT_SIGNAL( activated(const TQString&) ), TQT_SLOT( slotFilterChange(const TQString&) ) ); - connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ),filter, TQT_SLOT( addToHistory(const TQString&) ) ); + connect( filter, TQ_SIGNAL( activated(const TQString&) ), TQ_SLOT( slotFilterChange(const TQString&) ) ); + connect( filter, TQ_SIGNAL( returnPressed(const TQString&) ),filter, TQ_SLOT( addToHistory(const TQString&) ) ); - connect( home, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( home() ) ); - connect( up, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( cdUp() ) ); - connect( back, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( back() ) ); - connect( forward, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( forward() ) ); + connect( home, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( home() ) ); + connect( up, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( cdUp() ) ); + connect( back, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( back() ) ); + connect( forward, TQ_SIGNAL( clicked() ), dir, TQ_SLOT( forward() ) ); - connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( cmbPathActivated( const KURL& ) )); - connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString& )), - this, TQT_SLOT( cmbPathReturnPressed( const TQString& ) )); - connect(dir, TQT_SIGNAL(urlEntered(const KURL&)), - this, TQT_SLOT(dirUrlEntered(const KURL&)) ); + connect( cmbPath, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( cmbPathActivated( const KURL& ) )); + connect( cmbPath, TQ_SIGNAL( returnPressed( const TQString& )), + this, TQ_SLOT( cmbPathReturnPressed( const TQString& ) )); + connect(dir, TQ_SIGNAL(urlEntered(const KURL&)), + this, TQ_SLOT(dirUrlEntered(const KURL&)) ); - connect(dir, TQT_SIGNAL(finishedLoading()), - this, TQT_SLOT(dirFinishedLoading()) ); + connect(dir, TQ_SIGNAL(finishedLoading()), + this, TQ_SLOT(dirFinishedLoading()) ); - connect(dir, TQT_SIGNAL(fileHighlighted(const KFileItem *)), - TQT_SLOT(fileHighlighted(const KFileItem *))); - connect(dir, TQT_SIGNAL(fileSelected(const KFileItem *)), - TQT_SLOT(fileSelected(const KFileItem *))); + connect(dir, TQ_SIGNAL(fileHighlighted(const KFileItem *)), + TQ_SLOT(fileHighlighted(const KFileItem *))); + connect(dir, TQ_SIGNAL(fileSelected(const KFileItem *)), + TQ_SLOT(fileSelected(const KFileItem *))); kdDebug(90010) << "connected stuff!" << endl; } diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp index ae2a243..065069a 100644 --- a/noatun-plugins/ffrs/ffrs.cpp +++ b/noatun-plugins/ffrs/ffrs.cpp @@ -138,7 +138,7 @@ FFRS::FFRS() : TQObject(), Plugin() dpyleft = dpyright = 0; changed(); prefs = new FFRSPrefs(this); - connect(prefs, TQT_SIGNAL(changed()), TQT_SLOT(changed())); + connect(prefs, TQ_SIGNAL(changed()), TQ_SLOT(changed())); setSamples(256); diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp index 56f64a6..6ebe81f 100644 --- a/noatun-plugins/lyrics/cmodule.cpp +++ b/noatun-plugins/lyrics/cmodule.cpp @@ -58,10 +58,10 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n(" boxlayout->addWidget(providersBox); boxButtons = new KButtonBox( this,TQt::Vertical ); - boxButtons->addButton( i18n( "New Search Provider" ), this, TQT_SLOT( newSearch() ) ); - boxButtons->addButton( i18n( "Delete Search Provider" ), this, TQT_SLOT( delSearch() ) ); - boxButtons->addButton( i18n( "Move Up" ), this, TQT_SLOT( moveUpSearch() ) ); - boxButtons->addButton( i18n( "Move Down" ), this, TQT_SLOT( moveDownSearch() ) ); + boxButtons->addButton( i18n( "New Search Provider" ), this, TQ_SLOT( newSearch() ) ); + boxButtons->addButton( i18n( "Delete Search Provider" ), this, TQ_SLOT( delSearch() ) ); + boxButtons->addButton( i18n( "Move Up" ), this, TQ_SLOT( moveUpSearch() ) ); + boxButtons->addButton( i18n( "Move Down" ), this, TQ_SLOT( moveDownSearch() ) ); boxButtons->layout(); boxlayout->addWidget( boxButtons ); @@ -82,9 +82,9 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n(" /* Signal/slots */ nameEdit->setEnabled( false ); queryEdit->setEnabled( false ); - connect( providersBox, TQT_SIGNAL( highlighted( TQListBoxItem * ) ), this, TQT_SLOT( selected( TQListBoxItem * ) ) ); - connect( nameEdit, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( nameChanged( const TQString & ) ) ); - connect( queryEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( queryChanged( const TQString & ) ) ); + connect( providersBox, TQ_SIGNAL( highlighted( TQListBoxItem * ) ), this, TQ_SLOT( selected( TQListBoxItem * ) ) ); + connect( nameEdit, TQ_SIGNAL( textChanged( const TQString &) ), this, TQ_SLOT( nameChanged( const TQString & ) ) ); + connect( queryEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( queryChanged( const TQString & ) ) ); diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index 4a552eb..353bef4 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -27,25 +27,25 @@ Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false) { lyrics = this; /* Create default actions */ - (void)KStdAction::close(this, TQT_SLOT(close()), actionCollection()); - ( void )KStdAction::goTo( this, TQT_SLOT( goTo() ), actionCollection(), "go_web_goTo" ); - //(void)KStdAction::print(this, TQT_SLOT(print()), actionCollection()); - //(void)KStdAction::printPreview(this, TQT_SLOT(printPreview()), actionCollection()); - //(void)KStdAction::mail(this, TQT_SLOT(mail()), actionCollection()); - //(void)KStdAction::find(this, TQT_SLOT(find()), actionCollection()); + (void)KStdAction::close(this, TQ_SLOT(close()), actionCollection()); + ( void )KStdAction::goTo( this, TQ_SLOT( goTo() ), actionCollection(), "go_web_goTo" ); + //(void)KStdAction::print(this, TQ_SLOT(print()), actionCollection()); + //(void)KStdAction::printPreview(this, TQ_SLOT(printPreview()), actionCollection()); + //(void)KStdAction::mail(this, TQ_SLOT(mail()), actionCollection()); + //(void)KStdAction::find(this, TQ_SLOT(find()), actionCollection()); follow_act = new TDEToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow"); - KStdAction::redisplay(this, TQT_SLOT(viewLyrics()), actionCollection()); + KStdAction::redisplay(this, TQ_SLOT(viewLyrics()), actionCollection()); attach_act = new TDEToggleAction(i18n("&Link URL to File"), "attach", TDEShortcut("CTRL+ALT+A"), actionCollection(), "attach_url"); - connect(attach_act, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(attach(bool))); - back_act = KStdAction::back(this, TQT_SLOT(back()), actionCollection()); + connect(attach_act, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(attach(bool))); + back_act = KStdAction::back(this, TQ_SLOT(back()), actionCollection()); back_act->setEnabled(false); - forward_act = KStdAction::forward(this, TQT_SLOT(forward()), actionCollection()); + forward_act = KStdAction::forward(this, TQ_SLOT(forward()), actionCollection()); forward_act->setEnabled(false); new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "tde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label"); - site_act = new TDESelectAction(i18n("&Search Provider"), 0, this, TQT_SLOT(viewLyrics()), actionCollection(), "search_provider"); + site_act = new TDESelectAction(i18n("&Search Provider"), 0, this, TQ_SLOT(viewLyrics()), actionCollection(), "search_provider"); /* Add entry to menu */ - menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, TQT_SLOT(viewLyrics())); + menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, TQ_SLOT(viewLyrics())); /* Create history manager and htmlpart */ history = new HistoryManager(this); @@ -53,11 +53,11 @@ Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false) //htmlpart->view()->setMinimumSize(350, 420); /* Connect signals/slots */ - connect( htmlpart->browserExtension(), TQT_SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs & ))); - connect( htmlpart, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(loadingURL(TDEIO::Job *)) ); - connect( htmlpart, TQT_SIGNAL(completed()), this, TQT_SLOT(loadedURL()) ); - connect( history, TQT_SIGNAL(uiChanged(int, bool)), this, TQT_SLOT(changeUI(int, bool)) ); - connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()) ); + connect( htmlpart->browserExtension(), TQ_SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs & ))); + connect( htmlpart, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(loadingURL(TDEIO::Job *)) ); + connect( htmlpart, TQ_SIGNAL(completed()), this, TQ_SLOT(loadedURL()) ); + connect( history, TQ_SIGNAL(uiChanged(int, bool)), this, TQ_SLOT(changeUI(int, bool)) ); + connect( napp->player(), TQ_SIGNAL(newSong()), this, TQ_SLOT(newSong()) ); /* Status bar */ statusBar()->insertItem(i18n("Ready"), 0, 1); diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp index ca371a6..b71cf03 100644 --- a/noatun-plugins/nexscope/gui.cpp +++ b/noatun-plugins/nexscope/gui.cpp @@ -72,9 +72,9 @@ Control::Control() : mConfigurator(0) { { TDEToolBar *tools=toolBar(); - KStdAction::save(this, TQT_SLOT(save()), actionCollection())->plug(tools); - KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection())->plug(tools); - KStdAction::open(this, TQT_SLOT(open()), actionCollection())->plug(tools); + KStdAction::save(this, TQ_SLOT(save()), actionCollection())->plug(tools); + KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection())->plug(tools); + KStdAction::open(this, TQ_SLOT(open()), actionCollection())->plug(tools); } @@ -88,11 +88,11 @@ Control::Control() : mConfigurator(0) mTree->setSorting(-1); mTree->setRootIsDecorated(true); - connect(mTree, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), - TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*, TQListViewItem*))); + connect(mTree, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + TQ_SLOT(dropEvent(TQDropEvent*, TQListViewItem*, TQListViewItem*))); - connect(mTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(currentChanged(TQListViewItem*))); + connect(mTree, TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(currentChanged(TQListViewItem*))); mCreatorsList=new RendererListView(left); mCreatorsList->addColumn(i18n("Name")); diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp index b8ba470..87f4cc9 100644 --- a/noatun-plugins/nexscope/nex.cpp +++ b/noatun-plugins/nexscope/nex.cpp @@ -62,7 +62,7 @@ NexCheckBox::NexCheckBox(TQWidget *parent, { value=v; setChecked(*v); - connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(change(bool))); + connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(change(bool))); } void NexCheckBox::change(bool b) { @@ -77,7 +77,7 @@ NexColorButton::NexColorButton(TQWidget *parent, Pixel *color) c=color; TQColor temp( (*c >> 16) & 0xFF, (*c >> 8) & 0xFF, *c & 0xFF); setColor(temp); - connect(this, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(change(const TQColor&))); + connect(this, TQ_SIGNAL(changed(const TQColor&)), TQ_SLOT(change(const TQColor&))); } void NexColorButton::change(const TQColor &co) @@ -411,13 +411,13 @@ RendererListConfigurator::RendererListConfigurator(RendererList *l, TQWidget *pa { (new TQVBoxLayout(this))->setAutoAdd(true); mErase=new TQCheckBox(i18n("&Erase between frames"), this); - connect(mErase, TQT_SIGNAL(toggled(bool)), TQT_SLOT(eraseOn(bool))); + connect(mErase, TQ_SIGNAL(toggled(bool)), TQ_SLOT(eraseOn(bool))); mErase->setChecked(mList->mClearAfter); if (nex->rendererList()==l) { TQCheckBox *mConvolve=new TQCheckBox(i18n("&Convolve audio"), this); - connect(mConvolve, TQT_SIGNAL(toggled(bool)), TQT_SLOT(convolve(bool))); + connect(mConvolve, TQ_SIGNAL(toggled(bool)), TQ_SLOT(convolve(bool))); mConvolve->setChecked(nex->input()->convolve()); } diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp index cb5f9c6..fe4d569 100644 --- a/noatun-plugins/nexscope/noatunplugin.cpp +++ b/noatun-plugins/nexscope/noatunplugin.cpp @@ -18,7 +18,7 @@ extern "C" NexPlugin::NexPlugin() { - connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); + connect(&process, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(processExited(TDEProcess *))); } NexPlugin::~NexPlugin() diff --git a/noatun-plugins/noatunmadness/madness.cpp b/noatun-plugins/noatunmadness/madness.cpp index 07a3581..99780bd 100644 --- a/noatun-plugins/noatunmadness/madness.cpp +++ b/noatun-plugins/noatunmadness/madness.cpp @@ -30,10 +30,10 @@ extern "C" Madness::Madness() : MonoFFTScope(100), Plugin(), mWm(this) { - connect(&mWm, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(update())); - connect(&mWm, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(update())); - connect(&mWm, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(update())); - connect(&mWm, TQT_SIGNAL(strutChanged()), TQT_SLOT(update())); + connect(&mWm, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(update())); + connect(&mWm, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(update())); + connect(&mWm, TQ_SIGNAL(windowRemoved(WId)), TQ_SLOT(update())); + connect(&mWm, TQ_SIGNAL(strutChanged()), TQ_SLOT(update())); } diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index f7f8448..3a9d05a 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -47,24 +47,24 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) box->setSpacing(7); mSchemaList = new TQComboBox(box); connect( - mSchemaList, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(selectSchema(const TQString&)) + mSchemaList, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(selectSchema(const TQString&)) ); mAdd = new TQPushButton(BarIconSet("document-new"), 0, box); mAdd->setFixedWidth(mAdd->height()); TQToolTip::add(mAdd, i18n("Create new schema")); - connect(mAdd, TQT_SIGNAL(clicked()), TQT_SLOT(newSchema())); + connect(mAdd, TQ_SIGNAL(clicked()), TQ_SLOT(newSchema())); mRemove = new TQPushButton(BarIconSet("edit-delete"), 0, box); mRemove->setFixedWidth(mRemove->height()); TQToolTip::add(mRemove, i18n("Remove this schema")); - connect(mRemove, TQT_SIGNAL(clicked()), TQT_SLOT(removeSchema())); + connect(mRemove, TQ_SIGNAL(clicked()), TQ_SLOT(removeSchema())); mCopy = new TQPushButton(BarIconSet("edit-copy"), 0, box); mCopy->setFixedWidth(mCopy->height()); TQToolTip::add(mCopy, i18n("Copy this schema")); - connect(mCopy, TQT_SIGNAL(clicked()), TQT_SLOT(copySchema())); + connect(mCopy, TQ_SIGNAL(clicked()), TQ_SLOT(copySchema())); } @@ -74,12 +74,12 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) mSchemaTree = new TDEListView(middle); connect( - mSchemaTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(setCurrent(TQListViewItem*)) + mSchemaTree, TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(setCurrent(TQListViewItem*)) ); connect( - mSchemaTree, TQT_SIGNAL(moved(TQListViewItem *, TQListViewItem *, TQListViewItem *)), - TQT_SLOT(move(TQListViewItem *, TQListViewItem *, TQListViewItem *)) + mSchemaTree, TQ_SIGNAL(moved(TQListViewItem *, TQListViewItem *, TQListViewItem *)), + TQ_SLOT(move(TQListViewItem *, TQListViewItem *, TQListViewItem *)) ); mSchemaTree->setAcceptDrops(true); @@ -96,17 +96,17 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) mAddSibling = new TQPushButton(BarIconSet("1rightarrow", TDEIcon::SizeSmall), "",buttons); mAddSibling->setFixedWidth(mAddSibling->height()); - connect(mAddSibling, TQT_SIGNAL(clicked()), TQT_SLOT(addSibling())); + connect(mAddSibling, TQ_SIGNAL(clicked()), TQ_SLOT(addSibling())); TQToolTip::add(mAddSibling, i18n("Create a new item after the selected one")); mAddChild = new TQPushButton(BarIconSet("2rightarrow", TDEIcon::SizeSmall), "", buttons); mAddChild->setFixedWidth(mAddChild->height()); - connect(mAddChild, TQT_SIGNAL(clicked()), TQT_SLOT(addChild())); + connect(mAddChild, TQ_SIGNAL(clicked()), TQ_SLOT(addChild())); TQToolTip::add(mAddChild, i18n("Create a new child item under the selected one")); mRemoveSelf = new TQPushButton(BarIconSet("document-new", TDEIcon::SizeSmall), "", buttons); mRemoveSelf->setFixedWidth(mRemoveSelf->height()); - connect(mRemoveSelf, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelf())); + connect(mRemoveSelf, TQ_SIGNAL(clicked()), TQ_SLOT(removeSelf())); TQToolTip::add(mRemoveSelf, i18n("Remove the selected item")); new TQWidget(buttons); @@ -128,25 +128,25 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) label->setBuddy(mPropertyEdit); grid->addWidget(label, 0, 0); grid->addMultiCellWidget(mPropertyEdit, 0, 0, 1, 2); - connect(mPropertyEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCurrent())); + connect(mPropertyEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(updateCurrent())); label = new TQLabel(i18n("&Value:"), topSide); mValueEdit = new KLineEdit(topSide); label->setBuddy(mPropertyEdit); grid->addWidget(label, 1, 0); grid->addMultiCellWidget(mValueEdit, 1, 1, 1, 1); - connect(mValueEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCurrent())); + connect(mValueEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(updateCurrent())); TQPushButton *editRe = new TQPushButton(i18n("&Edit..."), topSide); grid->addWidget(editRe, 1, 2); - connect(editRe, TQT_SIGNAL(clicked()), TQT_SLOT(editValueRegexp())); + connect(editRe, TQ_SIGNAL(clicked()), TQ_SLOT(editValueRegexp())); label = new TQLabel(i18n("Pre&sentation:"), topSide); mPresentationEdit = new KLineEdit(topSide); label->setBuddy(mPropertyEdit); grid->addWidget(label, 2, 0); grid->addMultiCellWidget(mPresentationEdit, 2, 2, 1, 2); - connect(mPresentationEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCurrent())); + connect(mPresentationEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(updateCurrent())); } { @@ -156,15 +156,15 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) mOptionPlayable = new TQCheckBox(i18n("Play&able"), groupbox); TQWhatsThis::add(mOptionPlayable, i18n("This branch represents an individual file. If two items' presentation match, two items are created.")); - connect(mOptionPlayable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); + connect(mOptionPlayable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCurrent())); mOptionChildrenVisible = new TQCheckBox(i18n("&Children visible"), groupbox); TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes children become direct children of this node's parent")); - connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); + connect(mOptionChildrenVisible, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCurrent())); mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox); TQWhatsThis::add(mOptionAutoOpen, i18n("This branch is marked as open immediately.")); - connect(mOptionAutoOpen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); + connect(mOptionAutoOpen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCurrent())); } } @@ -522,12 +522,12 @@ SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique) mAdd = new TQPushButton(BarIconSet("1rightarrow", TDEIcon::SizeSmall), "",buttons); mAdd->setFixedWidth(mAdd->height()); - connect(mAdd, TQT_SIGNAL(clicked()), TQT_SLOT(addSibling())); + connect(mAdd, TQ_SIGNAL(clicked()), TQ_SLOT(addSibling())); TQToolTip::add(mAdd, i18n("Create a new item")); mRemove = new TQPushButton(BarIconSet("document-new", TDEIcon::SizeSmall), "", buttons); mRemove->setFixedWidth(mRemove->height()); - connect(mRemove, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelf())); + connect(mRemove, TQ_SIGNAL(clicked()), TQ_SLOT(removeSelf())); TQToolTip::add(mRemove, i18n("Remove the selected item")); new TQWidget(buttons); diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp index cbf67c3..8dfd965 100644 --- a/noatun-plugins/oblique/menu.cpp +++ b/noatun-plugins/oblique/menu.cpp @@ -14,13 +14,13 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file) mFiles.append(file); insertItem( BarIconSet("delete"), i18n("&Remove From Playlist"), - this, TQT_SLOT(removeFromList()) + this, TQ_SLOT(removeFromList()) ); - insertItem(i18n("&Properties"), this, TQT_SLOT(properties())); + insertItem(i18n("&Properties"), this, TQ_SLOT(properties())); (new SliceListAction( i18n("&Slices"), oblique, - this, TQT_SLOT(toggleInSlice(Slice *)), + this, TQ_SLOT(toggleInSlice(Slice *)), mFiles, this ))->plug(this); } @@ -46,13 +46,13 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items) insertItem( BarIconSet("delete"), i18n("&Remove From Playlist"), - this, TQT_SLOT(removeFromList()) + this, TQ_SLOT(removeFromList()) ); - insertItem(i18n("&Properties"), this, TQT_SLOT(properties())); + insertItem(i18n("&Properties"), this, TQ_SLOT(properties())); (new SliceListAction( i18n("&Slices"), oblique, - this, TQT_SLOT(toggleInSlice(Slice *)), + this, TQ_SLOT(toggleInSlice(Slice *)), mFiles,this ))->plug(this); } @@ -99,9 +99,9 @@ SliceListAction::SliceListAction( mOblique = oblique; slicesModified(); if (reciever) - connect(this, TQT_SIGNAL(activated(Slice*)), reciever, slot); - connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(hit(int))); - connect(oblique->base(), TQT_SIGNAL(slicesModified()), TQT_SLOT(slicesModified())); + connect(this, TQ_SIGNAL(activated(Slice*)), reciever, slot); + connect(popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(hit(int))); + connect(oblique->base(), TQ_SIGNAL(slicesModified()), TQ_SLOT(slicesModified())); } void SliceListAction::slicesModified() @@ -158,9 +158,9 @@ SchemaListAction::SchemaListAction( { mTree = 0; if (reciever) - connect(this, TQT_SIGNAL(activated(const TQString&)), reciever, slot); - connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(prepare())); - connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(hit(int))); + connect(this, TQ_SIGNAL(activated(const TQString&)), reciever, slot); + connect(popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(prepare())); + connect(popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(hit(int))); } void SchemaListAction::prepare() @@ -200,8 +200,8 @@ void SchemaListAction::hit(int index) ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent) : KPropertiesDialog(makeItems(files), parent), mFiles(files) { - connect(this, TQT_SIGNAL(propertiesClosed()), TQT_SLOT(deleteLater())); - connect(this, TQT_SIGNAL(applied()), TQT_SLOT(modified())); + connect(this, TQ_SIGNAL(propertiesClosed()), TQ_SLOT(deleteLater())); + connect(this, TQ_SIGNAL(applied()), TQ_SLOT(modified())); show(); } diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp index a74ce3b..8365468 100644 --- a/noatun-plugins/oblique/oblique.cpp +++ b/noatun-plugins/oblique/oblique.cpp @@ -37,15 +37,15 @@ Oblique::Oblique() mBase = new Base(::locate("data", "noatun/")+"/oblique-list"); mView = new View(this); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), TQT_SLOT(loopTypeChange(int))); + connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), TQ_SLOT(loopTypeChange(int))); mSelector = new SequentialSelector(mView->tree()); new Configure(this); // psst, window's gone, pass it on! - connect(mView, TQT_SIGNAL(listHidden()), TQT_SIGNAL(listHidden())); - connect(mView, TQT_SIGNAL(listShown()), TQT_SIGNAL(listShown())); + connect(mView, TQ_SIGNAL(listHidden()), TQ_SIGNAL(listHidden())); + connect(mView, TQ_SIGNAL(listShown()), TQ_SIGNAL(listShown())); loopTypeChange(napp->player()->loopStyle()); } @@ -187,7 +187,7 @@ void Oblique::beginDirectoryAdd(const KURL &url) else { mAdder = new DirectoryAdder(url, this); - connect(mAdder, TQT_SIGNAL(done()), TQT_SLOT(adderDone())); + connect(mAdder, TQ_SIGNAL(done()), TQ_SLOT(adderDone())); } } @@ -201,7 +201,7 @@ Loader::Loader(Tree *tree) mDeferredLoaderAt=1; - TQTimer::singleShot(0, this, TQT_SLOT(loadItemsDeferred())); + TQTimer::singleShot(0, this, TQ_SLOT(loadItemsDeferred())); } void Loader::loadItemsDeferred() @@ -230,7 +230,7 @@ void Loader::loadItemsDeferred() mDeferredLoaderAt++; } - TQTimer::singleShot(0, this, TQT_SLOT(loadItemsDeferred())); + TQTimer::singleShot(0, this, TQ_SLOT(loadItemsDeferred())); } @@ -267,16 +267,16 @@ void DirectoryAdder::addNextPending() currentJobURL= *pendingIt; listJob = TDEIO::listDir(currentJobURL, false, false); connect( - listJob, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&)) + listJob, TQ_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&)) ); connect( - listJob, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotResult(TDEIO::Job *)) + listJob, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotResult(TDEIO::Job *)) ); connect( - listJob, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)), - TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &)) + listJob, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL &)), + TQ_SLOT(slotRedirection(TDEIO::Job *, const KURL &)) ); pendingAddDirectories.remove(pendingIt); lastAddedSubDirectory = pendingAddDirectories.begin(); diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index f86f624..af8feec 100644 --- a/noatun-plugins/oblique/tree.cpp +++ b/noatun-plugins/oblique/tree.cpp @@ -453,28 +453,28 @@ Tree::Tree(Oblique *oblique, TQWidget *parent) connect( - this, TQT_SIGNAL(moved(TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&)), - TQT_SLOT(dropped(TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&)) + this, TQ_SIGNAL(moved(TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&)), + TQ_SLOT(dropped(TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&, TQPtrList<TQListViewItem>&)) ); connect( - this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) + this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); connect( - this, TQT_SIGNAL(executed(TQListViewItem*)), - TQT_SLOT(play(TQListViewItem*)) + this, TQ_SIGNAL(executed(TQListViewItem*)), + TQ_SLOT(play(TQListViewItem*)) ); Base *base = oblique->base(); - connect(base, TQT_SIGNAL(added(File)), TQT_SLOT(insert(File))); - connect(base, TQT_SIGNAL(removed(File)), TQT_SLOT(remove(File))); - connect(base, TQT_SIGNAL(modified(File)), TQT_SLOT(update(File))); + connect(base, TQ_SIGNAL(added(File)), TQ_SLOT(insert(File))); + connect(base, TQ_SIGNAL(removed(File)), TQ_SLOT(remove(File))); + connect(base, TQ_SIGNAL(modified(File)), TQ_SLOT(update(File))); - connect(base, TQT_SIGNAL(addedTo(Slice*, File)), TQT_SLOT(checkInsert(Slice*, File))); - connect(base, TQT_SIGNAL(removedFrom(Slice*, File)), TQT_SLOT(checkRemove(Slice*, File))); + connect(base, TQ_SIGNAL(addedTo(Slice*, File)), TQ_SLOT(checkInsert(Slice*, File))); + connect(base, TQ_SIGNAL(removedFrom(Slice*, File)), TQ_SLOT(checkRemove(Slice*, File))); - connect(this, TQT_SIGNAL(selected(TreeItem*)), oblique, TQT_SLOT(selected(TreeItem*))); + connect(this, TQ_SIGNAL(selected(TreeItem*)), oblique, TQ_SLOT(selected(TreeItem*))); mSlice = oblique->base()->defaultSlice(); @@ -660,7 +660,7 @@ void Tree::reload() delete mLoader; clear(); mLoader = new Loader(this); - connect(mLoader, TQT_SIGNAL(finished()), TQT_SLOT(destroyLoader())); + connect(mLoader, TQ_SIGNAL(finished()), TQ_SLOT(destroyLoader())); } void Tree::setSlice(Slice *slice) diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp index 32210cd..53be59e 100644 --- a/noatun-plugins/oblique/view.cpp +++ b/noatun-plugins/oblique/view.cpp @@ -37,37 +37,37 @@ View::View(Oblique *oblique) mTabs = new TabWidget(this); mTabs->tabBar()->hide(); - connect(mTabs, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(currentTabChanged(TQWidget*))); + connect(mTabs, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(currentTabChanged(TQWidget*))); setCentralWidget(mTabs); TDEAction *ac; - ac = new TDEAction(i18n("Add &Files..."), "queue", 0, this, TQT_SLOT(addFiles()), actionCollection(), "add_files"); + ac = new TDEAction(i18n("Add &Files..."), "queue", 0, this, TQ_SLOT(addFiles()), actionCollection(), "add_files"); ac->setWhatsThis(i18n("Add a reference to a media file on disk to this collection.")); - ac = new TDEAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); + ac = new TDEAction(i18n("Add Fol&ders..."), "folder", 0, this, TQ_SLOT(addDirectory()), actionCollection(), "add_dir"); -// ac = new TDEAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload"); +// ac = new TDEAction(i18n("&Reload"), "reload", 0, oblique, TQ_SLOT(reload()), actionCollection(), "reload"); // ac->setWhatsThis(i18n("Reread the collection and meta-information from its files.")); ac = new SliceListAction( i18n("&Slices"), oblique, - this, TQT_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices" + this, TQ_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices" ); ac->setWhatsThis(i18n("Select a sub-collection to display")); mSchemaListAction = new SchemaListAction( - i18n("&Schemas"), this, TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas" + i18n("&Schemas"), this, TQ_SLOT(setSchema(const TQString&)), actionCollection(), "schemas" ); mSchemaListAction->setWhatsThis(i18n("Select a schema to use to collate the tree.")); ac = new TDEAction( - i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT(addTab()), + i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQ_SLOT(addTab()), actionCollection(), "newtab" ); mRemoveTabAction = new TDEAction( - i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, TQT_SLOT(removeTab()), + i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, TQ_SLOT(removeTab()), actionCollection(), "removecurrenttab" ); @@ -84,10 +84,10 @@ View::View(Oblique *oblique) LineEditAction *jumpAction = new LineEditAction(i18n("Jump Bar"), 0, 0, actionCollection(), "jump_text"); jumpAction->setWhatsThis(i18n("Only display items which contain this string")); l->setBuddy(jumpAction->lineEdit()); - connect(jumpAction->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(jumpTextChanged(const TQString&))); + connect(jumpAction->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(jumpTextChanged(const TQString&))); } - KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(configureToolBars()), actionCollection()); applyMainWindowSettings(TDEGlobal::config(), "Oblique View"); createGUI("obliqueui.rc"); @@ -151,7 +151,7 @@ void View::configureToolBars() { saveMainWindowSettings(TDEGlobal::config(), "Oblique View"); KEditToolbar dlg(actionCollection(), "obliqueui.rc"); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(newToolBarConfig())); dlg.exec(); } diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp index 3b67678..2135d8e 100644 --- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp +++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp @@ -46,10 +46,10 @@ PitchableSpeed::PitchableSpeed() : Plugin(), offsetInput->setRange(-5,15,1,false); offsetInput->setValue(offset); setupSliderRange(); - connect(napp->player(), TQT_SIGNAL(changed()), - this, TQT_SLOT(newSong())); - connect(preserveFrequencies, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(preserveFrequenciesChanged(bool))); + connect(napp->player(), TQ_SIGNAL(changed()), + this, TQ_SLOT(newSong())); + connect(preserveFrequencies, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(preserveFrequenciesChanged(bool))); //show(); } @@ -149,7 +149,7 @@ void PitchableSpeed::preserveFrequenciesChanged(bool preserveNow) void PitchableSpeed::init() { pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Speed Slider"), - this, TQT_SLOT(toggle(void))); + this, TQ_SLOT(toggle(void))); } void PitchableSpeed::toggle(void) diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp index d32bb17..bf6209b 100644 --- a/noatun-plugins/synaescope/cmodule.cpp +++ b/noatun-plugins/synaescope/cmodule.cpp @@ -52,8 +52,8 @@ SynaePrefs::SynaePrefs(TQObject *parent) layout->addStretch(); changed=false; - connect(xRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges())); - connect(yRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges())); + connect(xRes, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanges())); + connect(yRes, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanges())); } void SynaePrefs::save() diff --git a/noatun-plugins/synaescope/synaescope.cpp b/noatun-plugins/synaescope/synaescope.cpp index 1249953..3d143dd 100644 --- a/noatun-plugins/synaescope/synaescope.cpp +++ b/noatun-plugins/synaescope/synaescope.cpp @@ -26,12 +26,12 @@ SynaeScope::SynaeScope() : Plugin(), scopeExePath(0) { kdDebug(66666) << k_funcinfo << endl; restarting=false; - connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(processExited(TDEProcess *))); - connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), - this, TQT_SLOT(receivedStdout(TDEProcess *,char *,int))); - connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)), - this, TQT_SLOT(receivedStderr(TDEProcess *,char *,int))); + connect(&process, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(processExited(TDEProcess *))); + connect(&process, TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)), + this, TQ_SLOT(receivedStdout(TDEProcess *,char *,int))); + connect(&process, TQ_SIGNAL(receivedStderr(TDEProcess *,char *,int)), + this, TQ_SLOT(receivedStderr(TDEProcess *,char *,int))); } SynaeScope::~SynaeScope() @@ -46,7 +46,7 @@ void SynaeScope::init() mPrefs = new SynaePrefs(this); mPrefs->reopen(); mPrefs->save(); - connect(mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig())); + connect(mPrefs, TQ_SIGNAL(configChanged()), this, TQ_SLOT(readConfig())); scopeExePath = TDEStandardDirs::findExe("noatunsynaescope.bin"); if (scopeExePath.isEmpty()) diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp index aadc8c8..5e20dd6 100644 --- a/noatun-plugins/tippercanoe/synaescope.cpp +++ b/noatun-plugins/tippercanoe/synaescope.cpp @@ -48,14 +48,14 @@ SynaeScope::SynaeScope() SynaeScope::~SynaeScope() { - connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); + connect(&process, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(processExited(TDEProcess *))); napp->pluginMenuRemove(pluginMenuItem); } void SynaeScope::init() { - connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(read(TDEProcess *, char *, int))); - pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), this, TQT_SLOT(toggle(void))); + connect(&process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(read(TDEProcess *, char *, int))); + pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), this, TQ_SLOT(toggle(void))); process << TDEStandardDirs::findExe("noatuntippecanoe.bin"); diff --git a/noatun-plugins/tyler/tyler.cpp b/noatun-plugins/tyler/tyler.cpp index d7690bb..5eb7073 100644 --- a/noatun-plugins/tyler/tyler.cpp +++ b/noatun-plugins/tyler/tyler.cpp @@ -40,7 +40,7 @@ Tyler::~Tyler() void Tyler::init() { process << TDEStandardDirs::findExe("noatuntyler.bin"); - connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); + connect(&process, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(processExited(TDEProcess *))); // Note that process.start() will fail if findExe fails, so there's no real need // for two separate checks. diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp index 8178ba1..41118ec 100644 --- a/noatun-plugins/wavecapture/wavecapture.cpp +++ b/noatun-plugins/wavecapture/wavecapture.cpp @@ -68,12 +68,12 @@ WaveCapture::WaveCapture() : TQObject(0,0), Plugin(), newSong(); - connect( _timer, TQT_SIGNAL( timeout() ), TQT_SLOT( saveAs() ) ); + connect( _timer, TQ_SIGNAL( timeout() ), TQ_SLOT( saveAs() ) ); - connect(napp->player(), TQT_SIGNAL(changed()), TQT_SLOT(newSong())); - connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(stopped())); - connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing())); - connect(napp->player(), TQT_SIGNAL( paused()), TQT_SLOT( paused())); + connect(napp->player(), TQ_SIGNAL(changed()), TQ_SLOT(newSong())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(stopped())); + connect(napp->player(), TQ_SIGNAL(playing()), TQ_SLOT(playing())); + connect(napp->player(), TQ_SIGNAL( paused()), TQ_SLOT( paused())); } WaveCapture::~WaveCapture() @@ -91,7 +91,7 @@ WaveCapture::~WaveCapture() void WaveCapture::init() { - pluginMenuItem = napp->pluginMenuAdd( i18n( "Wave Capture" ), this, TQT_SLOT( toggle() ) ); + pluginMenuItem = napp->pluginMenuAdd( i18n( "Wave Capture" ), this, TQ_SLOT( toggle() ) ); napp->pluginMenu()->setCheckable( true ); } @@ -142,7 +142,7 @@ void WaveCapture::saveAs() TDERecentDocument::add( url ); m_job = TDEIO::file_move( KURL( filename2 ), url, -1, true ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( copyFinished( TDEIO::Job* ) ) ); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( copyFinished( TDEIO::Job* ) ) ); } else { |