From 39a4235db1ca9b470a13686c534c2f10cf6be1b1 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 13 Jan 2024 12:45:22 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 286a061a4cd8a904a0b16b5be4c274a20935d5df) --- juk/advancedsearchdialog.cpp | 6 ++-- juk/artsplayer.cpp | 4 +-- juk/collectionlist.cpp | 10 +++--- juk/coverdialog.cpp | 4 +-- juk/deletedialog.cpp | 2 +- juk/directorylist.cpp | 8 ++--- juk/dynamicplaylist.cpp | 4 +-- juk/exampleoptions.cpp | 12 +++---- juk/filerenamer.cpp | 34 +++++++++--------- juk/folderplaylist.cpp | 4 +-- juk/gstreamerplayer.cpp | 2 +- juk/historyplaylist.cpp | 4 +-- juk/juk.cpp | 84 +++++++++++++++++++++---------------------- juk/k3bexporter.cpp | 10 +++--- juk/keydialog.cpp | 4 +-- juk/nowplaying.cpp | 12 +++---- juk/playermanager.cpp | 16 ++++----- juk/playlist.cpp | 44 +++++++++++------------ juk/playlistbox.cpp | 48 ++++++++++++------------- juk/playlistcollection.cpp | 74 +++++++++++++++++++------------------- juk/playlistsplitter.cpp | 36 +++++++++---------- juk/searchwidget.cpp | 24 ++++++------- juk/slideraction.cpp | 24 ++++++------- juk/statuslabel.cpp | 2 +- juk/systemtray.cpp | 28 +++++++-------- juk/tageditor.cpp | 52 +++++++++++++-------------- juk/tagguesserconfigdlg.cpp | 18 +++++----- juk/trackpickerdialog.cpp | 4 +-- juk/tracksequencemanager.cpp | 8 ++--- juk/webimagefetcher.cpp | 6 ++-- juk/webimagefetcherdialog.cpp | 14 ++++---- 31 files changed, 301 insertions(+), 301 deletions(-) (limited to 'juk') diff --git a/juk/advancedsearchdialog.cpp b/juk/advancedsearchdialog.cpp index 8fc4c037..386e12e3 100644 --- a/juk/advancedsearchdialog.cpp +++ b/juk/advancedsearchdialog.cpp @@ -82,17 +82,17 @@ AdvancedSearchDialog::AdvancedSearchDialog(const TQString &defaultName, TQBoxLayout *l = new TQHBoxLayout(buttons, 0, 5); KPushButton *clearButton = new KPushButton(KStdGuiItem::clear(), buttons); - connect(clearButton, TQT_SIGNAL(clicked()), TQT_SLOT(clear())); + connect(clearButton, TQ_SIGNAL(clicked()), TQ_SLOT(clear())); l->addWidget(clearButton); l->addStretch(1); m_moreButton = new KPushButton(i18n("More"), buttons); - connect(m_moreButton, TQT_SIGNAL(clicked()), TQT_SLOT(more())); + connect(m_moreButton, TQ_SIGNAL(clicked()), TQ_SLOT(more())); l->addWidget(m_moreButton); m_fewerButton = new KPushButton(i18n("Fewer"), buttons); - connect(m_fewerButton, TQT_SIGNAL(clicked()), TQT_SLOT(fewer())); + connect(m_fewerButton, TQ_SIGNAL(clicked()), TQ_SLOT(fewer())); l->addWidget(m_fewerButton); m_playlistNameLineEdit->setFocus(); diff --git a/juk/artsplayer.cpp b/juk/artsplayer.cpp index 2bcf43ca..f3b27616 100644 --- a/juk/artsplayer.cpp +++ b/juk/artsplayer.cpp @@ -84,7 +84,7 @@ void ArtsPlayer::play(const FileHandle &file) m_playobject = m_factory->createPlayObject(m_currentURL, false); if(m_playobject->object().isNull()) - connect(m_playobject, TQT_SIGNAL(playObjectCreated()), TQT_SLOT(playObjectCreated())); + connect(m_playobject, TQ_SIGNAL(playObjectCreated()), TQ_SLOT(playObjectCreated())); else playObjectCreated(); } @@ -251,7 +251,7 @@ void ArtsPlayer::setupPlayer() m_dispatcher = new KArtsDispatcher; m_server = new KArtsServer; setupArtsObjects(); - connect(m_server, TQT_SIGNAL(restartedServer()), TQT_SLOT(setupArtsObjects())); + connect(m_server, TQ_SIGNAL(restartedServer()), TQ_SLOT(setupArtsObjects())); } void ArtsPlayer::setupVolumeControl() diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp index 770ed92f..3cc0eb6a 100644 --- a/juk/collectionlist.cpp +++ b/juk/collectionlist.cpp @@ -230,12 +230,12 @@ CollectionList::CollectionList(PlaylistCollection *collection) : { new TDEAction(i18n("Show Playing"), TDEShortcut(), ActionCollection::actions(), "showPlaying"); - connect(action("showPlaying"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowPlaying())); + connect(action("showPlaying"), TQ_SIGNAL(activated()), this, TQ_SLOT(slotShowPlaying())); - connect(action("back")->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotPopulateBackMenu())); - connect(action("back")->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPlayFromBackMenu(int))); + connect(action("back")->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotPopulateBackMenu())); + connect(action("back")->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPlayFromBackMenu(int))); setSorting(-1); // Temporarily disable sorting to add items faster. m_columnTags[PlaylistItem::ArtistColumn] = new TagCountDict(5001, false); diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp index 9c81126b..fc4fa7ed 100644 --- a/juk/coverdialog.cpp +++ b/juk/coverdialog.cpp @@ -89,7 +89,7 @@ void CoverDialog::show() m_artists->setSorting(0); - TQTimer::singleShot(0, this, TQT_SLOT(loadCovers())); + TQTimer::singleShot(0, this, TQ_SLOT(loadCovers())); CoverDialogBase::show(); } @@ -142,7 +142,7 @@ void CoverDialog::slotContextRequested(TQIconViewItem *item, const TQPoint &pt) if(!menu) { menu = new TDEPopupMenu(this); - menu->insertItem(i18n("Remove Cover"), this, TQT_SLOT(removeSelectedCover())); + menu->insertItem(i18n("Remove Cover"), this, TQ_SLOT(removeSelectedCover())); } menu->popup(pt); diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp index f3d81680..daed8164 100644 --- a/juk/deletedialog.cpp +++ b/juk/deletedialog.cpp @@ -84,7 +84,7 @@ DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) : slotShouldDelete(shouldDelete()); - connect(m_widget->ddShouldDelete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShouldDelete(bool))); + connect(m_widget->ddShouldDelete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotShouldDelete(bool))); } bool DeleteDialog::confirmDeleteList(const TQStringList &condemnedFiles) diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp index 8a9e2a56..f8af3b85 100644 --- a/juk/directorylist.cpp +++ b/juk/directorylist.cpp @@ -39,10 +39,10 @@ DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylis m_base->directoryListView->setFullWidth(true); - connect(m_base->addDirectoryButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotAddDirectory())); - connect(m_base->removeDirectoryButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRemoveDirectory())); + connect(m_base->addDirectoryButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAddDirectory())); + connect(m_base->removeDirectoryButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRemoveDirectory())); TQStringList::ConstIterator it = directories.begin(); for(; it != directories.end(); ++it) diff --git a/juk/dynamicplaylist.cpp b/juk/dynamicplaylist.cpp index 336d1e3e..c6f155da 100644 --- a/juk/dynamicplaylist.cpp +++ b/juk/dynamicplaylist.cpp @@ -60,7 +60,7 @@ DynamicPlaylist::DynamicPlaylist(const PlaylistList &playlists, for(PlaylistList::ConstIterator it = playlists.begin(); it != playlists.end(); ++it) m_observers.append(new PlaylistDirtyObserver(this, *it)); - connect(CollectionList::instance(), TQT_SIGNAL(signalCollectionChanged()), this, TQT_SLOT(slotSetDirty())); + connect(CollectionList::instance(), TQ_SIGNAL(signalCollectionChanged()), this, TQ_SLOT(slotSetDirty())); } DynamicPlaylist::~DynamicPlaylist() @@ -153,7 +153,7 @@ void DynamicPlaylist::updateItems() PlaylistItemList newSiblings = siblings; if(m_siblings != newSiblings) { m_siblings = newSiblings; - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateItems())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateItems())); } } diff --git a/juk/exampleoptions.cpp b/juk/exampleoptions.cpp index dc95baa1..bc2b4f01 100644 --- a/juk/exampleoptions.cpp +++ b/juk/exampleoptions.cpp @@ -55,12 +55,12 @@ ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *parent) : // Forward signals - connect(m_options, TQT_SIGNAL(fileChanged()), TQT_SLOT(fileModeSelected())); - connect(m_options, TQT_SIGNAL(dataChanged()), TQT_SIGNAL(dataChanged())); - connect(m_options->m_exampleFile, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SIGNAL(fileChanged(const TQString &))); - connect(m_options->m_exampleFile, TQT_SIGNAL(returnPressed(const TQString &)), - this, TQT_SIGNAL(fileChanged(const TQString &))); + connect(m_options, TQ_SIGNAL(fileChanged()), TQ_SLOT(fileModeSelected())); + connect(m_options, TQ_SIGNAL(dataChanged()), TQ_SIGNAL(dataChanged())); + connect(m_options->m_exampleFile, TQ_SIGNAL(urlSelected(const TQString &)), + this, TQ_SIGNAL(fileChanged(const TQString &))); + connect(m_options->m_exampleFile, TQ_SIGNAL(returnPressed(const TQString &)), + this, TQ_SIGNAL(fileChanged(const TQString &))); } void ExampleOptionsDialog::hideEvent(TQHideEvent *) diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp index 9476ea29..e5398fdf 100644 --- a/juk/filerenamer.cpp +++ b/juk/filerenamer.cpp @@ -248,11 +248,11 @@ FileRenamerWidget::FileRenamerWidget(TQWidget *parent) : m_category->insertItem(category); } - connect(m_exampleDialog, TQT_SIGNAL(signalShown()), TQT_SLOT(exampleDialogShown())); - connect(m_exampleDialog, TQT_SIGNAL(signalHidden()), TQT_SLOT(exampleDialogHidden())); - connect(m_exampleDialog, TQT_SIGNAL(dataChanged()), TQT_SLOT(dataSelected())); - connect(m_exampleDialog, TQT_SIGNAL(fileChanged(const TQString &)), - this, TQT_SLOT(fileSelected(const TQString &))); + connect(m_exampleDialog, TQ_SIGNAL(signalShown()), TQ_SLOT(exampleDialogShown())); + connect(m_exampleDialog, TQ_SIGNAL(signalHidden()), TQ_SLOT(exampleDialogHidden())); + connect(m_exampleDialog, TQ_SIGNAL(dataChanged()), TQ_SLOT(dataSelected())); + connect(m_exampleDialog, TQ_SIGNAL(fileChanged(const TQString &)), + this, TQ_SLOT(fileSelected(const TQString &))); exampleTextChanged(); } @@ -347,9 +347,9 @@ unsigned FileRenamerWidget::addRowCategory(TagType category) row.upButton->setFlat(true); row.downButton->setFlat(true); - upMapper->connect(row.upButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); + upMapper->connect(row.upButton, TQ_SIGNAL(clicked()), TQ_SLOT(map())); upMapper->setMapping(row.upButton, id); - downMapper->connect(row.downButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); + downMapper->connect(row.downButton, TQ_SIGNAL(clicked()), TQ_SLOT(map())); downMapper->setMapping(row.downButton, id); TQString labelText = TQString("%1").arg(TagRenamerOptions::tagTypeText(category)); @@ -359,11 +359,11 @@ unsigned FileRenamerWidget::addRowCategory(TagType category) TQVBox *options = new TQVBox(frame); row.enableButton = new KPushButton(i18n("Remove"), options); - toggleMapper->connect(row.enableButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); + toggleMapper->connect(row.enableButton, TQ_SIGNAL(clicked()), TQ_SLOT(map())); toggleMapper->setMapping(row.enableButton, id); row.optionsButton = new KPushButton(i18n("Options"), options); - mapper->connect(row.optionsButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); + mapper->connect(row.optionsButton, TQ_SIGNAL(clicked()), TQ_SLOT(map())); mapper->setMapping(row.optionsButton, id); row.widget->show(); @@ -448,7 +448,7 @@ bool FileRenamerWidget::removeRow(unsigned id) // We can insert another row now, make sure GUI is updated to match. m_insertCategory->setEnabled(true); - TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(exampleTextChanged())); return true; } @@ -462,8 +462,8 @@ void FileRenamerWidget::addFolderSeparatorCheckbox() l->addWidget(cb, 0, AlignCenter); cb->setChecked(false); - connect(cb, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(exampleTextChanged())); + connect(cb, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(exampleTextChanged())); temp->show(); } @@ -485,10 +485,10 @@ void FileRenamerWidget::createTagRows() upMapper = new TQSignalMapper(this, "up button mapper"); downMapper = new TQSignalMapper(this, "down button mapper"); - connect(mapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(showCategoryOption(int))); - connect(toggleMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(slotRemoveRow(int))); - connect(upMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(moveItemUp(int))); - connect(downMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(moveItemDown(int))); + connect(mapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(showCategoryOption(int))); + connect(toggleMapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(slotRemoveRow(int))); + connect(upMapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(moveItemUp(int))); + connect(downMapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(moveItemDown(int))); m_mainFrame = new TQVBox(m_mainView->viewport()); m_mainFrame->setMargin(10); @@ -687,7 +687,7 @@ void FileRenamerWidget::moveItem(unsigned id, MovementDirection direction) layout->insertWidget(2 * pos, w); layout->invalidate(); - TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(exampleTextChanged())); } unsigned FileRenamerWidget::idOfPosition(unsigned position) const diff --git a/juk/folderplaylist.cpp b/juk/folderplaylist.cpp index 71934359..e12e0746 100644 --- a/juk/folderplaylist.cpp +++ b/juk/folderplaylist.cpp @@ -26,7 +26,7 @@ FolderPlaylist::FolderPlaylist(PlaylistCollection *collection, const TQString &f Playlist(collection, name, "folder"), m_folder(folder) { - TQTimer::singleShot(0, this, TQT_SLOT(slotReload())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReload())); } FolderPlaylist::~FolderPlaylist() @@ -42,7 +42,7 @@ TQString FolderPlaylist::folder() const void FolderPlaylist::setFolder(const TQString &s) { m_folder = s; - TQTimer::singleShot(0, this, TQT_SLOT(slotReload())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReload())); } //////////////////////////////////////////////////////////////////////////////// diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp index 26bd8aef..464e7486 100644 --- a/juk/gstreamerplayer.cpp +++ b/juk/gstreamerplayer.cpp @@ -193,7 +193,7 @@ static GstBusSyncReply messageHandler(GstBus *, GstMessage *message, gpointer da { if(GST_MESSAGE_TYPE(message) == GST_MESSAGE_EOS) { GStreamerPlayer *player = static_cast(data); - TQTimer::singleShot(0, player, TQT_SLOT(stop())); + TQTimer::singleShot(0, player, TQ_SLOT(stop())); } gst_message_unref(message); diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp index 47e6fddb..85d01c0c 100644 --- a/juk/historyplaylist.cpp +++ b/juk/historyplaylist.cpp @@ -31,8 +31,8 @@ HistoryPlaylist::HistoryPlaylist(PlaylistCollection *collection) : setAllowDuplicates(true); m_timer = new TQTimer(this); - connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotAddPlaying())); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCreateNewItem())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalPlay()), this, TQ_SLOT(slotAddPlaying())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCreateNewItem())); } HistoryPlaylist::~HistoryPlaylist() diff --git a/juk/juk.cpp b/juk/juk.cpp index 734d39b7..ad35266c 100644 --- a/juk/juk.cpp +++ b/juk/juk.cpp @@ -71,8 +71,8 @@ JuK::JuK(TQWidget *parent, const char *name) : createDirs(); SplashScreen::finishedLoading(); - TQTimer::singleShot(0, CollectionList::instance(), TQT_SLOT(slotCheckCache())); - TQTimer::singleShot(0, this, TQT_SLOT(slotProcessArgs())); + TQTimer::singleShot(0, CollectionList::instance(), TQ_SLOT(slotCheckCache())); + TQTimer::singleShot(0, this, TQ_SLOT(slotProcessArgs())); m_sliderAction->slotUpdateOrientation(); } @@ -99,8 +99,8 @@ void JuK::setupLayout() setCentralWidget(m_splitter); m_statusLabel = new StatusLabel(m_splitter->playlist(), statusBar()); - connect(CollectionList::instance(), TQT_SIGNAL(signalCollectionChanged()), - m_statusLabel, TQT_SLOT(updateData())); + connect(CollectionList::instance(), TQ_SIGNAL(signalCollectionChanged()), + m_statusLabel, TQ_SLOT(updateData())); statusBar()->addWidget(m_statusLabel, 1); PlayerManager::instance()->setStatusLabel(m_statusLabel); @@ -112,15 +112,15 @@ void JuK::setupActions() { ActionCollection::actions()->setWidget(this); - KStdAction::quit(this, TQT_SLOT(slotQuit()), ActionCollection::actions()); - KStdAction::undo(this, TQT_SLOT(slotUndo()), ActionCollection::actions()); - KStdAction::cut(kapp, TQT_SLOT(cut()), ActionCollection::actions()); - KStdAction::copy(kapp, TQT_SLOT(copy()), ActionCollection::actions()); - KStdAction::paste(kapp, TQT_SLOT(paste()), ActionCollection::actions()); - KStdAction::clear(kapp, TQT_SLOT(clear()), ActionCollection::actions()); - KStdAction::selectAll(kapp, TQT_SLOT(selectAll()), ActionCollection::actions()); + KStdAction::quit(this, TQ_SLOT(slotQuit()), ActionCollection::actions()); + KStdAction::undo(this, TQ_SLOT(slotUndo()), ActionCollection::actions()); + KStdAction::cut(kapp, TQ_SLOT(cut()), ActionCollection::actions()); + KStdAction::copy(kapp, TQ_SLOT(copy()), ActionCollection::actions()); + KStdAction::paste(kapp, TQ_SLOT(paste()), ActionCollection::actions()); + KStdAction::clear(kapp, TQ_SLOT(clear()), ActionCollection::actions()); + KStdAction::selectAll(kapp, TQ_SLOT(selectAll()), ActionCollection::actions()); - new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, kapp, TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist"); + new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, kapp, TQ_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist"); TDEActionMenu *actionMenu = new TDEActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu"); actionMenu->setDelayed(false); @@ -135,15 +135,15 @@ void JuK::setupActions() 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))); + connect(ka, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCheckAlbumNextAction(bool))); actionMenu->insert(ka); - new TDEAction(i18n("&Play"), "media-playback-start", 0, m_player, TQT_SLOT(play()), ActionCollection::actions(), "play"); - new TDEAction(i18n("P&ause"), "media-playback-pause", 0, m_player, TQT_SLOT(pause()), ActionCollection::actions(), "pause"); - new TDEAction(i18n("&Stop"), "media-playback-stop", 0, m_player, TQT_SLOT(stop()), ActionCollection::actions(), "stop"); + new TDEAction(i18n("&Play"), "media-playback-start", 0, m_player, TQ_SLOT(play()), ActionCollection::actions(), "play"); + new TDEAction(i18n("P&ause"), "media-playback-pause", 0, m_player, TQ_SLOT(pause()), ActionCollection::actions(), "pause"); + new TDEAction(i18n("&Stop"), "media-playback-stop", 0, m_player, TQ_SLOT(stop()), ActionCollection::actions(), "stop"); - new TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), m_player, TQT_SLOT(back()), ActionCollection::actions(), "back"); - new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), m_player, TQT_SLOT(forward()), ActionCollection::actions(), "forward"); + new TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), m_player, TQ_SLOT(back()), ActionCollection::actions(), "back"); + new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), m_player, TQ_SLOT(forward()), ActionCollection::actions(), "forward"); new TDEToggleAction(i18n("&Loop Playlist"), 0, TDEShortcut(), ActionCollection::actions(), "loopPlaylist"); TDEToggleAction *resizeColumnAction = new TDEToggleAction(i18n("&Resize Playlist Columns Manually"), @@ -152,12 +152,12 @@ void JuK::setupActions() // the following are not visible by default - new TDEAction(i18n("Mute"), "mute", 0, m_player, TQT_SLOT(mute()), ActionCollection::actions(), "mute"); - new TDEAction(i18n("Volume Up"), "volumeUp", 0, m_player, TQT_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp"); - new TDEAction(i18n("Volume Down"), "volumeDown", 0, m_player, TQT_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown"); - new TDEAction(i18n("Play / Pause"), "playPause", 0, m_player, TQT_SLOT(playPause()), ActionCollection::actions(), "playPause"); - new TDEAction(i18n("Seek Forward"), "seekForward", 0, m_player, TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward"); - new TDEAction(i18n("Seek Back"), "seekBack", 0, m_player, TQT_SLOT(seekBack()), ActionCollection::actions(), "seekBack"); + new TDEAction(i18n("Mute"), "mute", 0, m_player, TQ_SLOT(mute()), ActionCollection::actions(), "mute"); + new TDEAction(i18n("Volume Up"), "volumeUp", 0, m_player, TQ_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp"); + new TDEAction(i18n("Volume Down"), "volumeDown", 0, m_player, TQ_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown"); + new TDEAction(i18n("Play / Pause"), "playPause", 0, m_player, TQ_SLOT(playPause()), ActionCollection::actions(), "playPause"); + new TDEAction(i18n("Seek Forward"), "seekForward", 0, m_player, TQ_SLOT(seekForward()), ActionCollection::actions(), "seekForward"); + new TDEAction(i18n("Seek Back"), "seekBack", 0, m_player, TQ_SLOT(seekBack()), ActionCollection::actions(), "seekBack"); ////////////////////////////////////////////////// // settings menu @@ -179,8 +179,8 @@ void JuK::setupActions() new TDEToggleAction(i18n("Save &Play Queue on Exit"), TDEShortcut(), this, 0, ActionCollection::actions(), "saveUpcomingTracks"); - connect(m_toggleSystemTrayAction, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleSystemTray(bool))); + connect(m_toggleSystemTrayAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleSystemTray(bool))); m_outputSelectAction = PlayerManager::playerSelectAction(ActionCollection::actions()); @@ -188,13 +188,13 @@ void JuK::setupActions() if(m_outputSelectAction) m_outputSelectAction->setCurrentItem(0); - new TDEAction(i18n("&Tag Guesser..."), 0, 0, this, TQT_SLOT(slotConfigureTagGuesser()), + new TDEAction(i18n("&Tag Guesser..."), 0, 0, this, TQ_SLOT(slotConfigureTagGuesser()), ActionCollection::actions(), "tagGuesserConfig"); - new TDEAction(i18n("&File Renamer..."), 0, 0, this, TQT_SLOT(slotConfigureFileRenamer()), + new TDEAction(i18n("&File Renamer..."), 0, 0, this, TQ_SLOT(slotConfigureFileRenamer()), ActionCollection::actions(), "fileRenamerConfig"); - KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), ActionCollection::actions()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), ActionCollection::actions()); ////////////////////////////////////////////////// // just in the toolbar @@ -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, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotAboutToQuit())); } else { m_systemTray = 0; @@ -226,18 +226,18 @@ void JuK::setupGlobalAccels() { m_accel = new TDEGlobalAccel(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())); - KeyDialog::insert(m_accel, "Stop", i18n("Stop Playing"), action("stop"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "Back", i18n("Back"), action("back"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "Forward", i18n("Forward"), action("forward"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "SeekBack", i18n("Seek Back"), action("seekBack"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "SeekForward", i18n("Seek Forward"), action("seekForward"), TQT_SLOT(activate())); - 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, "ForwardAlbum", i18n("Play Next Album"), action("forwardAlbum"), TQT_SLOT(activate())); + KeyDialog::insert(m_accel, "Play", i18n("Play"), action("play"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "PlayPause", i18n("Play / Pause"), action("playPause"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "Stop", i18n("Stop Playing"), action("stop"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "Back", i18n("Back"), action("back"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "Forward", i18n("Forward"), action("forward"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "SeekBack", i18n("Seek Back"), action("seekBack"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "SeekForward", i18n("Seek Forward"), action("seekForward"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "VolumeUp", i18n("Volume Up"), action("volumeUp"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "VolumeDown", i18n("Volume Down"), action("volumeDown"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "Mute", i18n("Mute"), action("mute"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "ShowHide", i18n("Show / Hide"), this, TQ_SLOT(slotShowHide())); + KeyDialog::insert(m_accel, "ForwardAlbum", i18n("Play Next Album"), action("forwardAlbum"), TQ_SLOT(activate())); m_accel->setConfigGroup("Shortcuts"); m_accel->readSettings(); diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp index 91ad104a..36f7eadb 100644 --- a/juk/k3bexporter.cpp +++ b/juk/k3bexporter.cpp @@ -62,7 +62,7 @@ class PlaylistAction : public TDEAction typedef TQMap PlaylistRecipientMap; /** - * Defines a TQObject to call (using the m_slot SLOT) when an action is + * Defines a TQObject to call (using the m_slot TQ_SLOT) when an action is * emitted from a Playlist. */ void addCallMapping(const Playlist *p, TQObject *obj) @@ -87,9 +87,9 @@ class PlaylistAction : public TDEAction // Invoke the slot using some trickery. // XXX: Use the TQMetaObject to do this in TQt 4. - connect(this, TQT_SIGNAL(activated()), recipient, m_slot); + connect(this, TQ_SIGNAL(activated()), recipient, m_slot); emit(activated()); - disconnect(this, TQT_SIGNAL(activated()), recipient, m_slot); + disconnect(this, TQ_SIGNAL(activated()), recipient, m_slot); } private: @@ -108,7 +108,7 @@ TDEAction *K3bExporter::action() "export_to_k3b", i18n("Add Selected Items to Audio or Data CD"), SmallIconSet("k3b"), - TQT_SLOT(slotExport()) + TQ_SLOT(slotExport()) ); m_action->setShortcutConfigurable(false); @@ -276,7 +276,7 @@ TDEAction *K3bPlaylistExporter::action() SmallIconSet("k3b"), 0, this, - TQT_SLOT(slotExport()), + TQ_SLOT(slotExport()), actions(), "export_playlist_to_k3b" ); diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp index bc1d13a9..07584657 100644 --- a/juk/keydialog.cpp +++ b/juk/keydialog.cpp @@ -99,7 +99,7 @@ KeyDialog::KeyDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection new TQRadioButton(i18n("&No keys"), m_group); new TQRadioButton(i18n("&Standard keys"), m_group); new TQRadioButton(i18n("&Multimedia keys"), m_group); - connect(m_group, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotKeys(int))); + connect(m_group, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotKeys(int))); TQWhatsThis::add(m_group, i18n("Here you can select the keys used as global shortcuts to control the player")); @@ -127,7 +127,7 @@ void KeyDialog::newDialog(TDEGlobalAccel *keys, TDEActionCollection *actionColle m_widgetStack->raiseWidget(m_pKeyChooser); m_group->setButton(selectedButton); - connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotDefault())); + connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotDefault())); } int KeyDialog::configure() diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp index 838aadd2..6c3110fa 100644 --- a/juk/nowplaying.cpp +++ b/juk/nowplaying.cpp @@ -67,8 +67,8 @@ NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const c setStretchFactor(new Line(this), 0); setStretchFactor(new HistoryItem(this), 1); - connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotUpdate())); - connect(PlayerManager::instance(), TQT_SIGNAL(signalStop()), this, TQT_SLOT(slotUpdate())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalPlay()), this, TQ_SLOT(slotUpdate())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalStop()), this, TQ_SLOT(slotUpdate())); hide(); } @@ -230,14 +230,14 @@ TrackItem::TrackItem(NowPlaying *parent) : layout->addWidget(m_label); layout->addStretch(); - connect(m_label, TQT_SIGNAL(linkClicked(const TQString &)), this, - TQT_SLOT(slotOpenLink(const TQString &))); + connect(m_label, TQ_SIGNAL(linkClicked(const TQString &)), this, + TQ_SLOT(slotOpenLink(const TQString &))); } void TrackItem::update(const FileHandle &file) { m_file = file; - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdate())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdate())); } void TrackItem::slotOpenLink(const TQString &link) @@ -297,7 +297,7 @@ HistoryItem::HistoryItem(NowPlaying *parent) : setText(TQString("%1").arg(i18n("History"))); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAddPlaying())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAddPlaying())); } void HistoryItem::update(const FileHandle &file) diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp index 044198c3..8fe33f72 100644 --- a/juk/playermanager.cpp +++ b/juk/playermanager.cpp @@ -642,12 +642,12 @@ void PlayerManager::setup() m_sliderAction = action("trackPositionAction"); - connect(m_sliderAction, TQT_SIGNAL(signalPositionChanged(int)), - this, TQT_SLOT(seekPosition(int))); - connect(m_sliderAction->trackPositionSlider(), TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotUpdateTime(int))); - connect(m_sliderAction, TQT_SIGNAL(signalVolumeChanged(int)), - this, TQT_SLOT(slotSetVolume(int))); + connect(m_sliderAction, TQ_SIGNAL(signalPositionChanged(int)), + this, TQ_SLOT(seekPosition(int))); + connect(m_sliderAction->trackPositionSlider(), TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotUpdateTime(int))); + connect(m_sliderAction, TQ_SIGNAL(signalVolumeChanged(int)), + this, TQ_SLOT(slotSetVolume(int))); // Call this method manually to avoid warnings. @@ -655,7 +655,7 @@ void PlayerManager::setup() if(outputAction) { setOutput(static_cast(outputAction)->currentText()); - connect(outputAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSetOutput(const TQString &))); + connect(outputAction, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotSetOutput(const TQString &))); } else m_player = createPlayer(); @@ -673,7 +673,7 @@ void PlayerManager::setup() m_player->setVolume(volume); m_timer = new TQTimer(this, "play timer"); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPollPlay())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPollPlay())); } TQString PlayerManager::randomPlayMode() const diff --git a/juk/playlist.cpp b/juk/playlist.cpp index cf20a415..2895542d 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -1142,7 +1142,7 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e) } if(!manualResize() && m_widthsDirty) - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateColumnWidths())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateColumnWidths())); break; } default: @@ -1561,25 +1561,25 @@ void Playlist::polish() adjustColumn(i); } - connect(m_headerMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleColumnVisible(int))); + connect(m_headerMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotToggleColumnVisible(int))); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotShowRMBMenu(TQListViewItem *, const TQPoint &, int))); - connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)), - this, TQT_SLOT(slotInlineEditDone(TQListViewItem *, const TQString &, int))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - this, TQT_SLOT(slotPlayCurrent())); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(slotPlayCurrent())); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotShowRMBMenu(TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)), + this, TQ_SLOT(slotInlineEditDone(TQListViewItem *, const TQString &, int))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(slotPlayCurrent())); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(slotPlayCurrent())); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(slotColumnSizeChanged(int, int, int))); - connect(renameLineEdit(), TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - this, TQT_SLOT(slotInlineCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(renameLineEdit(), TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + this, TQ_SLOT(slotInlineCompletionModeChanged(TDEGlobalSettings::Completion))); - connect(action("resizeColumnsManually"), TQT_SIGNAL(activated()), - this, TQT_SLOT(slotColumnResizeModeChanged())); + connect(action("resizeColumnsManually"), TQ_SIGNAL(activated()), + this, TQ_SLOT(slotColumnResizeModeChanged())); if(action("resizeColumnsManually")->isChecked()) setHScrollBarMode(Auto); @@ -1653,13 +1653,13 @@ void Playlist::setup() { setItemMargin(3); - connect(header(), TQT_SIGNAL(indexChange(int, int, int)), this, TQT_SLOT(slotColumnOrderChanged(int, int, int))); + connect(header(), TQ_SIGNAL(indexChange(int, int, int)), this, TQ_SLOT(slotColumnOrderChanged(int, int, int))); - connect(m_fetcher, TQT_SIGNAL(signalCoverChanged(int)), this, TQT_SLOT(slotCoverChanged(int))); + connect(m_fetcher, TQ_SIGNAL(signalCoverChanged(int)), this, TQ_SLOT(slotCoverChanged(int))); // Prevent list of selected items from changing while internet search is in // progress. - connect(this, TQT_SIGNAL(selectionChanged()), m_fetcher, TQT_SLOT(abortSearch())); + connect(this, TQ_SIGNAL(selectionChanged()), m_fetcher, TQ_SLOT(abortSearch())); setSorting(1); } @@ -2078,7 +2078,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c m_rmbMenu = new TDEPopupMenu(this); m_rmbUpcomingID = m_rmbMenu->insertItem(SmallIcon("today"), - i18n("Add to Play Queue"), this, TQT_SLOT(slotAddToUpcoming())); + i18n("Add to Play Queue"), this, TQ_SLOT(slotAddToUpcoming())); m_rmbMenu->insertSeparator(); if(!readOnly()) { @@ -2092,7 +2092,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c action("edit_copy")->plug(m_rmbMenu); m_rmbEditID = m_rmbMenu->insertItem( - i18n("Edit"), this, TQT_SLOT(slotRenameTag())); + i18n("Edit"), this, TQ_SLOT(slotRenameTag())); action("refresh")->plug(m_rmbMenu); action("removeItem")->plug(m_rmbMenu); @@ -2107,7 +2107,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c m_rmbMenu->insertSeparator(); m_rmbMenu->insertItem( - SmallIcon("folder-new"), i18n("Create Playlist From Selected Items..."), this, TQT_SLOT(slotCreateGroup())); + SmallIcon("folder-new"), i18n("Create Playlist From Selected Items..."), this, TQ_SLOT(slotCreateGroup())); K3bExporter *exporter = new K3bExporter(this); TDEAction *k3bAction = exporter->action(); diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index f0450166..a8a09018 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -120,36 +120,36 @@ PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack, raise(CollectionList::instance()); viewModeAction->plug(m_contextMenu); - connect(viewModeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetViewMode(int))); + connect(viewModeAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetViewMode(int))); - connect(this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotPlaylistChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotPlaylistChanged())); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - this, TQT_SLOT(slotDoubleClicked())); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(slotDoubleClicked())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotShowContextMenu(TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotShowContextMenu(TQListViewItem *, const TQPoint &, int))); TagTransactionManager *tagManager = TagTransactionManager::instance(); - connect(tagManager, TQT_SIGNAL(signalAboutToModifyTags()), TQT_SLOT(slotFreezePlaylists())); - connect(tagManager, TQT_SIGNAL(signalDoneModifyingTags()), TQT_SLOT(slotUnfreezePlaylists())); + connect(tagManager, TQ_SIGNAL(signalAboutToModifyTags()), TQ_SLOT(slotFreezePlaylists())); + connect(tagManager, TQ_SIGNAL(signalDoneModifyingTags()), TQ_SLOT(slotUnfreezePlaylists())); setupUpcomingPlaylist(); - connect(CollectionList::instance(), TQT_SIGNAL(signalNewTag(const TQString &, unsigned)), - this, TQT_SLOT(slotAddItem(const TQString &, unsigned))); - connect(CollectionList::instance(), TQT_SIGNAL(signalRemovedTag(const TQString &, unsigned)), - this, TQT_SLOT(slotRemoveItem(const TQString &, unsigned))); + connect(CollectionList::instance(), TQ_SIGNAL(signalNewTag(const TQString &, unsigned)), + this, TQ_SLOT(slotAddItem(const TQString &, unsigned))); + connect(CollectionList::instance(), TQ_SIGNAL(signalRemovedTag(const TQString &, unsigned)), + this, TQ_SLOT(slotRemoveItem(const TQString &, unsigned))); - TQTimer::singleShot(0, object(), TQT_SLOT(slotScanFolders())); + TQTimer::singleShot(0, object(), TQ_SLOT(slotScanFolders())); enableDirWatch(true); // Auto-save playlists after 10 minutes - TQTimer::singleShot(600000, this, TQT_SLOT(slotSavePlaylists())); + TQTimer::singleShot(600000, this, TQ_SLOT(slotSavePlaylists())); m_showTimer = new TQTimer(this); - connect(m_showTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotShowDropTarget())); + connect(m_showTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotShowDropTarget())); } PlaylistBox::~PlaylistBox() @@ -232,8 +232,8 @@ void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName) void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName, Item *parentItem) { - connect(playlist, TQT_SIGNAL(signalPlaylistItemsDropped(Playlist *)), - TQT_SLOT(slotPlaylistItemsDropped(Playlist *))); + connect(playlist, TQ_SIGNAL(signalPlaylistItemsDropped(Playlist *)), + TQ_SLOT(slotPlaylistItemsDropped(Playlist *))); PlaylistCollection::setupPlaylist(playlist, iconName); @@ -375,7 +375,7 @@ void PlaylistBox::slotSavePlaylists() Cache::savePlaylists(l); CoverManager::saveCovers(); - TQTimer::singleShot(600000, this, TQT_SLOT(slotSavePlaylists())); + TQTimer::singleShot(600000, this, TQ_SLOT(slotSavePlaylists())); } void PlaylistBox::slotShowDropTarget() @@ -770,11 +770,11 @@ void PlaylistBox::Item::init() list->addNameToDict(m_text); if(m_playlist) { - connect(m_playlist, TQT_SIGNAL(signalNameChanged(const TQString &)), - this, TQT_SLOT(slotSetName(const TQString &))); - connect(m_playlist, TQT_SIGNAL(destroyed()), this, TQT_SLOT(deleteLater())); - connect(m_playlist, TQT_SIGNAL(signalEnableDirWatch(bool)), - list->object(), TQT_SLOT(slotEnableDirWatch(bool))); + connect(m_playlist, TQ_SIGNAL(signalNameChanged(const TQString &)), + this, TQ_SLOT(slotSetName(const TQString &))); + connect(m_playlist, TQ_SIGNAL(destroyed()), this, TQ_SLOT(deleteLater())); + connect(m_playlist, TQ_SIGNAL(signalEnableDirWatch(bool)), + list->object(), TQ_SLOT(slotEnableDirWatch(bool))); } if(m_playlist == CollectionList::instance()) { diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp index c1aca5aa..1d96e025 100644 --- a/juk/playlistcollection.cpp +++ b/juk/playlistcollection.cpp @@ -670,8 +670,8 @@ void PlaylistCollection::setupPlaylist(Playlist *playlist, const TQString &) if(!playlist->name().isNull()) m_playlistNames.insert(playlist->name()); - TQObject::connect(playlist, TQT_SIGNAL(selectionChanged()), - object(), TQT_SIGNAL(signalSelectedItemsChanged())); + TQObject::connect(playlist, TQ_SIGNAL(selectionChanged()), + object(), TQ_SIGNAL(signalSelectedItemsChanged())); } bool PlaylistCollection::importPlaylists() const @@ -710,12 +710,12 @@ void PlaylistCollection::enableDirWatch(bool enable) m_dirLister.disconnect(object()); if(enable) { - TQObject::connect(&m_dirLister, TQT_SIGNAL(newItems(const KFileItemList &)), - object(), TQT_SLOT(slotNewItems(const KFileItemList &))); - TQObject::connect(&m_dirLister, TQT_SIGNAL(refreshItems(const KFileItemList &)), - collection, TQT_SLOT(slotRefreshItems(const KFileItemList &))); - TQObject::connect(&m_dirLister, TQT_SIGNAL(deleteItem(KFileItem *)), - collection, TQT_SLOT(slotDeleteItem(KFileItem *))); + TQObject::connect(&m_dirLister, TQ_SIGNAL(newItems(const KFileItemList &)), + object(), TQ_SLOT(slotNewItems(const KFileItemList &))); + TQObject::connect(&m_dirLister, TQ_SIGNAL(refreshItems(const KFileItemList &)), + collection, TQ_SLOT(slotRefreshItems(const KFileItemList &))); + TQObject::connect(&m_dirLister, TQ_SIGNAL(deleteItem(KFileItem *)), + collection, TQ_SLOT(slotDeleteItem(KFileItem *))); } } @@ -842,11 +842,11 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) menu = new TDEActionMenu(i18n("&New"), "document-new", actions(), "file_new"); - menu->insert(createAction(i18n("&Empty Playlist..."), TQT_SLOT(slotCreatePlaylist()), + menu->insert(createAction(i18n("&Empty Playlist..."), TQ_SLOT(slotCreatePlaylist()), "newPlaylist", "window-new", "CTRL+n")); - menu->insert(createAction(i18n("&Search Playlist..."), TQT_SLOT(slotCreateSearchPlaylist()), + menu->insert(createAction(i18n("&Search Playlist..."), TQ_SLOT(slotCreateSearchPlaylist()), "newSearchPlaylist", "edit-find", "CTRL+f")); - menu->insert(createAction(i18n("Playlist From &Folder..."), TQT_SLOT(slotCreateFolderPlaylist()), + menu->insert(createAction(i18n("Playlist From &Folder..."), TQ_SLOT(slotCreateFolderPlaylist()), "newDirectoryPlaylist", "document-open", "CTRL+d")); // Guess tag info menu @@ -855,47 +855,47 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) menu = new TDEActionMenu(i18n("&Guess Tag Information"), TQString(), actions(), "guessTag"); menu->setIconSet(SmallIconSet("wizard")); - menu->insert(createAction(i18n("From &File Name"), TQT_SLOT(slotGuessTagFromFile()), + menu->insert(createAction(i18n("From &File Name"), TQ_SLOT(slotGuessTagFromFile()), "guessTagFile", "fileimport", "CTRL+g")); - menu->insert(createAction(i18n("From &Internet"), TQT_SLOT(slotGuessTagFromInternet()), + menu->insert(createAction(i18n("From &Internet"), TQ_SLOT(slotGuessTagFromInternet()), "guessTagInternet", "connect_established", "CTRL+i")); #else - createAction(i18n("Guess Tag Information From &File Name"), TQT_SLOT(slotGuessTagFromFile()), + createAction(i18n("Guess Tag Information From &File Name"), TQ_SLOT(slotGuessTagFromFile()), "guessTag", "fileimport", "CTRL+f"); #endif - createAction(i18n("Play First Track"),TQT_SLOT(slotPlayFirst()), "playFirst"); - createAction(i18n("Play Next Album"), TQT_SLOT(slotPlayNextAlbum()), "forwardAlbum", "next"); + createAction(i18n("Play First Track"),TQ_SLOT(slotPlayFirst()), "playFirst"); + createAction(i18n("Play Next Album"), TQ_SLOT(slotPlayNextAlbum()), "forwardAlbum", "next"); - createAction(i18n("Open..."), TQT_SLOT(slotOpen()), "file_open", "document-open", "CTRL+o"); - createAction(i18n("Add &Folder..."), TQT_SLOT(slotAddFolder()), "openDirectory", "document-open"); - createAction(i18n("&Rename..."), TQT_SLOT(slotRename()), "renamePlaylist", "lineedit"); - createAction(i18n("D&uplicate..."), TQT_SLOT(slotDuplicate()), "duplicatePlaylist", "edit-copy"); - createAction(i18n("Save"), TQT_SLOT(slotSave()), "file_save", "document-save", "CTRL+s"); - createAction(i18n("Save As..."), TQT_SLOT(slotSaveAs()), "file_save_as", "document-save-as"); - createAction(i18n("R&emove"), TQT_SLOT(slotRemove()), "deleteItemPlaylist", "edittrash"); - createAction(i18n("Reload"), TQT_SLOT(slotReload()), "reloadPlaylist", "reload"); - createAction(i18n("Edit Search..."), TQT_SLOT(slotEditSearch()), "editSearch", "edit-clear"); + createAction(i18n("Open..."), TQ_SLOT(slotOpen()), "file_open", "document-open", "CTRL+o"); + createAction(i18n("Add &Folder..."), TQ_SLOT(slotAddFolder()), "openDirectory", "document-open"); + createAction(i18n("&Rename..."), TQ_SLOT(slotRename()), "renamePlaylist", "lineedit"); + createAction(i18n("D&uplicate..."), TQ_SLOT(slotDuplicate()), "duplicatePlaylist", "edit-copy"); + createAction(i18n("Save"), TQ_SLOT(slotSave()), "file_save", "document-save", "CTRL+s"); + createAction(i18n("Save As..."), TQ_SLOT(slotSaveAs()), "file_save_as", "document-save-as"); + createAction(i18n("R&emove"), TQ_SLOT(slotRemove()), "deleteItemPlaylist", "edittrash"); + createAction(i18n("Reload"), TQ_SLOT(slotReload()), "reloadPlaylist", "reload"); + createAction(i18n("Edit Search..."), TQ_SLOT(slotEditSearch()), "editSearch", "edit-clear"); - createAction(i18n("&Delete"), TQT_SLOT(slotRemoveItems()), "removeItem", "edit-delete"); - createAction(i18n("Refresh"), TQT_SLOT(slotRefreshItems()), "refresh", "reload"); - createAction(i18n("&Rename File"), TQT_SLOT(slotRenameItems()), "renameFile", "document-save-as", "CTRL+r"); + createAction(i18n("&Delete"), TQ_SLOT(slotRemoveItems()), "removeItem", "edit-delete"); + createAction(i18n("Refresh"), TQ_SLOT(slotRefreshItems()), "refresh", "reload"); + createAction(i18n("&Rename File"), TQ_SLOT(slotRenameItems()), "renameFile", "document-save-as", "CTRL+r"); menu = new TDEActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager"); menu->setIconSet(SmallIconSet("image-x-generic")); menu->insert(createAction(i18n("&View Cover"), - TQT_SLOT(slotViewCovers()), "viewCover", "viewmag")); + TQ_SLOT(slotViewCovers()), "viewCover", "viewmag")); menu->insert(createAction(i18n("Get Cover From &File..."), - TQT_SLOT(slotAddLocalCover()), "addCover", "fileimport", "CTRL+SHIFT+f")); + TQ_SLOT(slotAddLocalCover()), "addCover", "fileimport", "CTRL+SHIFT+f")); // Do not rename googleCover for backward compatibility menu->insert(createAction(i18n("Get Cover From &Internet..."), - TQT_SLOT(slotAddInternetCover()), "googleCover", "connect_established", "CTRL+SHIFT+g")); + TQ_SLOT(slotAddInternetCover()), "googleCover", "connect_established", "CTRL+SHIFT+g")); menu->insert(createAction(i18n("&Delete Cover"), - TQT_SLOT(slotRemoveCovers()), "removeCover", "edit-delete")); + TQ_SLOT(slotRemoveCovers()), "removeCover", "edit-delete")); menu->insert(createAction(i18n("Show Cover &Manager"), - TQT_SLOT(slotShowCoverManager()), "showCoverManager")); + TQ_SLOT(slotShowCoverManager()), "showCoverManager")); TDEToggleAction *historyAction = new TDEToggleAction(i18n("Show &History"), "history", 0, actions(), "showHistory"); @@ -905,10 +905,10 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) new TDEToggleAction(i18n("Show &Play Queue"), "today", 0, actions(), "showUpcoming"); upcomingAction->setCheckedState(i18n("Hide &Play Queue")); - connect(action("showHistory"), TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSetHistoryPlaylistEnabled(bool))); - connect(action("showUpcoming"), TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSetUpcomingPlaylistEnabled(bool))); + connect(action("showHistory"), TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSetHistoryPlaylistEnabled(bool))); + connect(action("showUpcoming"), TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSetUpcomingPlaylistEnabled(bool))); } TDEAction *PlaylistCollection::ActionHandler::createAction(const TQString &text, diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp index a55e4747..d1eff928 100644 --- a/juk/playlistsplitter.cpp +++ b/juk/playlistsplitter.cpp @@ -121,7 +121,7 @@ void PlaylistSplitter::setupActions() new TDEToggleAction(i18n("Show &Search Bar"), "filefind", 0, ActionCollection::actions(), "showSearch"); showSearch->setCheckedState(i18n("Hide &Search Bar")); - new TDEAction(i18n("Edit Track Search"), "edit_clear", "F6", this, TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch"); + new TDEAction(i18n("Edit Track Search"), "edit_clear", "F6", this, TQ_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch"); } void PlaylistSplitter::setupLayout() @@ -140,7 +140,7 @@ void PlaylistSplitter::setupLayout() m_playlistStack = new TQWidgetStack(top, "playlistStack"); m_playlistStack->installEventFilter(this); - connect(m_playlistStack, TQT_SIGNAL(aboutToShow(TQWidget *)), this, TQT_SLOT(slotPlaylistChanged(TQWidget *))); + connect(m_playlistStack, TQ_SIGNAL(aboutToShow(TQWidget *)), this, TQ_SLOT(slotPlaylistChanged(TQWidget *))); m_editor = new TagEditor(editorSplitter, "tagEditor"); @@ -152,31 +152,31 @@ void PlaylistSplitter::setupLayout() m_playlistBox = new PlaylistBox(this, m_playlistStack, "playlistBox"); - connect(m_playlistBox->object(), TQT_SIGNAL(signalSelectedItemsChanged()), - this, TQT_SLOT(slotPlaylistSelectionChanged())); - connect(m_playlistBox, TQT_SIGNAL(signalPlaylistDestroyed(Playlist *)), - m_editor, TQT_SLOT(slotPlaylistDestroyed(Playlist *))); + connect(m_playlistBox->object(), TQ_SIGNAL(signalSelectedItemsChanged()), + this, TQ_SLOT(slotPlaylistSelectionChanged())); + connect(m_playlistBox, TQ_SIGNAL(signalPlaylistDestroyed(Playlist *)), + m_editor, TQ_SLOT(slotPlaylistDestroyed(Playlist *))); moveToFirst(m_playlistBox); - connect(CollectionList::instance(), TQT_SIGNAL(signalCollectionChanged()), - m_editor, TQT_SLOT(slotUpdateCollection())); + connect(CollectionList::instance(), TQ_SIGNAL(signalCollectionChanged()), + m_editor, TQ_SLOT(slotUpdateCollection())); NowPlaying *nowPlaying = new NowPlaying(top, m_playlistBox); // Create the search widget -- this must be done after the CollectionList is created. m_searchWidget = new SearchWidget(top, "searchWidget"); - connect(m_searchWidget, TQT_SIGNAL(signalQueryChanged()), - this, TQT_SLOT(slotShowSearchResults())); - connect(m_searchWidget, TQT_SIGNAL(signalDownPressed()), - this, TQT_SLOT(slotFocusCurrentPlaylist())); - connect(m_searchWidget, TQT_SIGNAL(signalAdvancedSearchClicked()), - 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)), - m_searchWidget, TQT_SLOT(setEnabled(bool))); + connect(m_searchWidget, TQ_SIGNAL(signalQueryChanged()), + this, TQ_SLOT(slotShowSearchResults())); + connect(m_searchWidget, TQ_SIGNAL(signalDownPressed()), + this, TQ_SLOT(slotFocusCurrentPlaylist())); + connect(m_searchWidget, TQ_SIGNAL(signalAdvancedSearchClicked()), + m_playlistBox->object(), TQ_SLOT(slotCreateSearchPlaylist())); + connect(m_searchWidget, TQ_SIGNAL(signalShown(bool)), + m_playlistBox->object(), TQ_SLOT(slotSetSearchEnabled(bool))); + connect(action("showSearch"), TQ_SIGNAL(toggled(bool)), + m_searchWidget, TQ_SLOT(setEnabled(bool))); topLayout->addWidget(nowPlaying); topLayout->addWidget(m_searchWidget); diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp index 19e98c33..de6a1aa8 100644 --- a/juk/searchwidget.cpp +++ b/juk/searchwidget.cpp @@ -48,24 +48,24 @@ SearchLine::SearchLine(TQWidget *parent, bool simple, const char *name) : if(!m_simple) { m_searchFieldsBox = new KComboBox(this, "searchFields"); - connect(m_searchFieldsBox, TQT_SIGNAL(activated(int)), - this, TQT_SIGNAL(signalQueryChanged())); + connect(m_searchFieldsBox, TQ_SIGNAL(activated(int)), + this, TQ_SIGNAL(signalQueryChanged())); } m_lineEdit = new KLineEdit(this, "searchLineEdit"); m_lineEdit->installEventFilter(this); - connect(m_lineEdit, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SIGNAL(signalQueryChanged())); - connect(m_lineEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotActivate())); + connect(m_lineEdit, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SIGNAL(signalQueryChanged())); + connect(m_lineEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotActivate())); if(!m_simple) { m_caseSensitive = new KComboBox(this); m_caseSensitive->insertItem(i18n("Normal Matching"), 0); m_caseSensitive->insertItem(i18n("Case Sensitive"), 1); m_caseSensitive->insertItem(i18n("Pattern Matching"), 2); - connect(m_caseSensitive, TQT_SIGNAL(activated(int)), - this, TQT_SIGNAL(signalQueryChanged())); + connect(m_caseSensitive, TQ_SIGNAL(activated(int)), + this, TQ_SIGNAL(signalQueryChanged())); } else m_caseSensitive = 0; @@ -273,9 +273,9 @@ void SearchWidget::setupLayout() label->setBuddy(m_searchLine); - connect(m_searchLine, TQT_SIGNAL(signalQueryChanged()), this, TQT_SIGNAL(signalQueryChanged())); - connect(m_searchLine, TQT_SIGNAL(signalDownPressed()), this, TQT_SIGNAL(signalDownPressed())); - connect(clearSearchButton, TQT_SIGNAL(pressed()), m_searchLine, TQT_SLOT(clear())); + connect(m_searchLine, TQ_SIGNAL(signalQueryChanged()), this, TQ_SIGNAL(signalQueryChanged())); + connect(m_searchLine, TQ_SIGNAL(signalDownPressed()), this, TQ_SIGNAL(signalDownPressed())); + connect(clearSearchButton, TQ_SIGNAL(pressed()), m_searchLine, TQ_SLOT(clear())); setStretchableWidget(m_searchLine); // I've decided that I think this is ugly, for now. @@ -285,7 +285,7 @@ void SearchWidget::setupLayout() b->setTextLabel(i18n("Advanced Search"), true); b->setIconSet(SmallIconSet("wizard")); - connect(b, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(signalAdvancedSearchClicked())); + connect(b, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(signalAdvancedSearchClicked())); */ } diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp index b632282e..f16b21eb 100644 --- a/juk/slideraction.cpp +++ b/juk/slideraction.cpp @@ -66,7 +66,7 @@ protected: VolumeSlider::VolumeSlider(TQt::Orientation o, TQWidget *parent, const char *name) : TQSlider(o, parent, name) { - connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int))); + connect(this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged(int))); } void VolumeSlider::wheelEvent(TQWheelEvent *e) @@ -162,11 +162,11 @@ int SliderAction::plug(TQWidget *parent, int index) addContainer(m_toolBar, id); - connect(m_toolBar, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotToolbarDestroyed())); - connect(m_toolBar, TQT_SIGNAL(orientationChanged(TQt::Orientation)), - this, TQT_SLOT(slotUpdateOrientation())); - connect(m_toolBar, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), - this, TQT_SLOT(slotUpdateOrientation())); + connect(m_toolBar, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotToolbarDestroyed())); + connect(m_toolBar, TQ_SIGNAL(orientationChanged(TQt::Orientation)), + this, TQ_SLOT(slotUpdateOrientation())); + connect(m_toolBar, TQ_SIGNAL(placeChanged(TQDockWindow::Place)), + this, TQ_SLOT(slotUpdateOrientation())); slotUpdateOrientation(); return (containerCount() - 1); @@ -254,8 +254,8 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas m_trackPositionSlider->setMaxValue(maxPosition); TQToolTip::add(m_trackPositionSlider, i18n("Track position")); m_layout->addWidget(m_trackPositionSlider); - connect(m_trackPositionSlider, TQT_SIGNAL(sliderPressed()), this, TQT_SLOT(slotSliderPressed())); - connect(m_trackPositionSlider, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(slotSliderReleased())); + connect(m_trackPositionSlider, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(slotSliderPressed())); + connect(m_trackPositionSlider, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(slotSliderReleased())); m_layout->addItem(new TQSpacerItem(10, 1)); @@ -269,9 +269,9 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas m_volumeSlider->setMaxValue(100); TQToolTip::add(m_volumeSlider, i18n("Volume")); m_layout->addWidget(m_volumeSlider); - connect(m_volumeSlider, TQT_SIGNAL(signalVolumeChanged(int)), TQT_SIGNAL(signalVolumeChanged(int))); - connect(m_volumeSlider, TQT_SIGNAL(sliderPressed()), this, TQT_SLOT(slotVolumeSliderPressed())); - connect(m_volumeSlider, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(slotVolumeSliderReleased())); + connect(m_volumeSlider, TQ_SIGNAL(signalVolumeChanged(int)), TQ_SIGNAL(signalVolumeChanged(int))); + connect(m_volumeSlider, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(slotVolumeSliderPressed())); + connect(m_volumeSlider, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(slotVolumeSliderReleased())); m_volumeSlider->setName("tde toolbar widget"); m_trackPositionSlider->setName("tde toolbar widget"); @@ -279,7 +279,7 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas m_layout->setStretchFactor(m_trackPositionSlider, 4); m_layout->setStretchFactor(m_volumeSlider, 1); - connect(parent, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotUpdateSize())); + connect(parent, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotUpdateSize())); return base; } diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp index a590362c..1aea48b5 100644 --- a/juk/statuslabel.cpp +++ b/juk/statuslabel.cpp @@ -85,7 +85,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch jumpButton->setFlat(true); TQToolTip::add(jumpButton, i18n("Jump to the currently playing item")); - connect(jumpButton, TQT_SIGNAL(clicked()), action("showPlaying"), TQT_SLOT(activate())); + connect(jumpButton, TQ_SIGNAL(clicked()), action("showPlaying"), TQ_SLOT(activate())); installEventFilter(this); diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index 29c5c436..2e46272e 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -97,7 +97,7 @@ PassiveInfo::PassiveInfo(TQWidget *parent, const char *name) : // that I'll just handle the timeout myself, thank you very much. KPassivePopup::setTimeout(0); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerExpired())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(timerExpired())); } void PassiveInfo::setTimeout(int delay) @@ -163,13 +163,13 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, // bindings dialog. new TDEAction(i18n("Redisplay Popup"), TDEShortcut(), this, - TQT_SLOT(slotPlay()), ActionCollection::actions(), "showPopup"); + TQ_SLOT(slotPlay()), ActionCollection::actions(), "showPopup"); TDEPopupMenu *cm = contextMenu(); - connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotPlay())); - connect(PlayerManager::instance(), TQT_SIGNAL(signalPause()), this, TQT_SLOT(slotPause())); - connect(PlayerManager::instance(), TQT_SIGNAL(signalStop()), this, TQT_SLOT(slotStop())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalPlay()), this, TQ_SLOT(slotPlay())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalPause()), this, TQ_SLOT(slotPause())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalStop()), this, TQ_SLOT(slotStop())); action("play")->plug(cm); action("pause")->plug(cm); @@ -190,7 +190,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, action("togglePopups")->plug(cm); m_fadeTimer = new TQTimer(this, "systrayFadeTimer"); - connect(m_fadeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNextStep())); + connect(m_fadeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotNextStep())); if(PlayerManager::instance()->playing()) slotPlay(); @@ -278,8 +278,8 @@ void SystemTray::slotFadeOut() m_startColor = m_labels[0]->textColor(); m_endColor = m_labels[0]->backgroundColor(); - connect(this, TQT_SIGNAL(fadeDone()), m_popup, TQT_SLOT(hide())); - connect(m_popup, TQT_SIGNAL(mouseEntered()), this, TQT_SLOT(slotMouseInPopup())); + connect(this, TQ_SIGNAL(fadeDone()), m_popup, TQ_SLOT(hide())); + connect(m_popup, TQ_SIGNAL(mouseEntered()), this, TQ_SLOT(slotMouseInPopup())); m_fadeTimer->start(1500 / STEPS); } @@ -289,7 +289,7 @@ void SystemTray::slotFadeOut() void SystemTray::slotMouseInPopup() { m_endColor = m_labels[0]->textColor(); - disconnect(TQT_SIGNAL(fadeDone())); + disconnect(TQ_SIGNAL(fadeDone())); m_step = STEPS - 1; // Simulate end of fade to solid text slotNextStep(); @@ -360,8 +360,8 @@ void SystemTray::createPopup() m_step = 0; m_popup = new PassiveInfo(this); - connect(m_popup, TQT_SIGNAL(destroyed()), TQT_SLOT(slotPopupDestroyed())); - connect(m_popup, TQT_SIGNAL(timeExpired()), TQT_SLOT(slotFadeOut())); + connect(m_popup, TQ_SIGNAL(destroyed()), TQ_SLOT(slotPopupDestroyed())); + connect(m_popup, TQ_SIGNAL(timeExpired()), TQ_SLOT(slotFadeOut())); TQHBox *box = new TQHBox(m_popup, "popupMainLayout"); box->setSpacing(15); // Add space between text and buttons @@ -448,11 +448,11 @@ void SystemTray::createButtonBox(TQWidget *parent) TQPushButton *forwardButton = new TQPushButton(m_forwardPix, 0, buttonBox, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotForward())); + connect(forwardButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotForward())); TQPushButton *backButton = new TQPushButton(m_backPix, 0, buttonBox, "popup_back"); backButton->setFlat(true); - connect(backButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotBack())); + connect(backButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotBack())); } /** @@ -491,7 +491,7 @@ void SystemTray::addCoverButton(TQWidget *parent, const TQPixmap &cover) coverButton->setFixedSize(cover.size()); coverButton->setFlat(true); - connect(coverButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPopupLargeCover())); + connect(coverButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPopupLargeCover())); } TQColor SystemTray::interpolateColor(int step, int steps) diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index 0129680f..ed1cdca8 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -174,8 +174,8 @@ void TagEditor::slotSetItems(const PlaylistItemList &list) saveChangesPrompt(); if(m_currentPlaylist) { - disconnect(m_currentPlaylist, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)), - this, TQT_SLOT(slotItemRemoved(PlaylistItem *))); + disconnect(m_currentPlaylist, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)), + this, TQ_SLOT(slotItemRemoved(PlaylistItem *))); } if(hadPlaylist && !m_currentPlaylist || !itemPlaylist) { @@ -191,9 +191,9 @@ void TagEditor::slotSetItems(const PlaylistItemList &list) } if(m_currentPlaylist) { - connect(m_currentPlaylist, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)), - this, TQT_SLOT(slotItemRemoved(PlaylistItem *))); - connect(m_currentPlaylist, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotPlaylistRemoved())); + connect(m_currentPlaylist, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)), + this, TQ_SLOT(slotItemRemoved(PlaylistItem *))); + connect(m_currentPlaylist, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotPlaylistRemoved())); } if(isVisible()) @@ -473,9 +473,9 @@ void TagEditor::setupActions() { 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))); + connect(show, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShown(bool))); - new TDEAction(i18n("&Save"), "document-save", "CTRL+t", this, TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem"); + new TDEAction(i18n("&Save"), "document-save", "CTRL+t", this, TQ_SLOT(slotSave()), ActionCollection::actions(), "saveItem"); } void TagEditor::setupLayout() @@ -588,32 +588,32 @@ void TagEditor::setupLayout() } - connect(m_artistNameBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_artistNameBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_trackNameBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_trackNameBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_albumNameBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_albumNameBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_genreBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotDataChanged())); + connect(m_genreBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotDataChanged())); - connect(m_genreBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_genreBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_fileNameBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_fileNameBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_yearSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotDataChanged())); + connect(m_yearSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotDataChanged())); - connect(m_trackSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotDataChanged())); + connect(m_trackSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotDataChanged())); - connect(m_commentBox, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(slotDataChanged())); + connect(m_commentBox, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(slotDataChanged())); } void TagEditor::save(const PlaylistItemList &list) @@ -752,7 +752,7 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layou enableBox->hide(); - connect(enableBox, TQT_SIGNAL(toggled(bool)), item, TQT_SLOT(setEnabled(bool))); + connect(enableBox, TQ_SIGNAL(toggled(bool)), item, TQ_SLOT(setEnabled(bool))); m_enableBoxes.insert(item, enableBox); } diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp index b5ceaac9..201e2215 100644 --- a/juk/tagguesserconfigdlg.cpp +++ b/juk/tagguesserconfigdlg.cpp @@ -41,15 +41,15 @@ TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *parent, const char *name) item->moveItem(m_child->lvSchemes->lastItem()); } - connect(m_child->lvSchemes, TQT_SIGNAL(currentChanged(TQListViewItem *)), - this, TQT_SLOT(slotCurrentChanged(TQListViewItem *))); - connect(m_child->lvSchemes, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotRenameItem(TQListViewItem *, const TQPoint &, int))); - connect(m_child->bMoveUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveUpClicked())); - connect(m_child->bMoveDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDownClicked())); - connect(m_child->bAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddClicked())); - connect(m_child->bModify, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotModifyClicked())); - connect(m_child->bRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveClicked())); + connect(m_child->lvSchemes, TQ_SIGNAL(currentChanged(TQListViewItem *)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem *))); + connect(m_child->lvSchemes, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotRenameItem(TQListViewItem *, const TQPoint &, int))); + connect(m_child->bMoveUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveUpClicked())); + connect(m_child->bMoveDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveDownClicked())); + connect(m_child->bAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddClicked())); + connect(m_child->bModify, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotModifyClicked())); + connect(m_child->bRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveClicked())); m_child->lvSchemes->setSelected(m_child->lvSchemes->firstChild(), true); slotCurrentChanged(m_child->lvSchemes->currentItem()); diff --git a/juk/trackpickerdialog.cpp b/juk/trackpickerdialog.cpp index 892b2156..f02d43fd 100644 --- a/juk/trackpickerdialog.cpp +++ b/juk/trackpickerdialog.cpp @@ -61,8 +61,8 @@ TrackPickerDialog::TrackPickerDialog(const TQString &name, m_base->trackList->setSelected(m_base->trackList->firstChild(), true); - connect(m_base->trackList, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(accept())); + connect(m_base->trackList, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(accept())); setMinimumWidth(kMax(400, width())); } diff --git a/juk/tracksequencemanager.cpp b/juk/tracksequencemanager.cpp index 86f88f96..34076bf7 100644 --- a/juk/tracksequencemanager.cpp +++ b/juk/tracksequencemanager.cpp @@ -121,8 +121,8 @@ void TrackSequenceManager::setCurrentPlaylist(Playlist *list) m_playlist->disconnect(this); m_playlist = list; - connect(m_playlist, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)), - this, TQT_SLOT(slotItemAboutToDie(PlaylistItem *))); + connect(m_playlist, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)), + this, TQ_SLOT(slotItemAboutToDie(PlaylistItem *))); } void TrackSequenceManager::setCurrent(PlaylistItem *item) @@ -148,8 +148,8 @@ void TrackSequenceManager::initialize() return; // Make sure we don't use m_playNextItem if it's invalid. - connect(collection, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)), - this, TQT_SLOT(slotItemAboutToDie(PlaylistItem *))); + connect(collection, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)), + this, TQ_SLOT(slotItemAboutToDie(PlaylistItem *))); m_initialized = true; } diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp index 142b1eb9..368832d1 100644 --- a/juk/webimagefetcher.cpp +++ b/juk/webimagefetcher.cpp @@ -48,7 +48,7 @@ WebImageFetcher::WebImageFetcher(TQObject *parent) m_connectionId(-1), m_dialog(0) { - connect(m_connection, TQT_SIGNAL(requestFinished(int,bool)), TQT_SLOT(slotWebRequestFinished(int,bool))); + connect(m_connection, TQ_SIGNAL(requestFinished(int,bool)), TQ_SLOT(slotWebRequestFinished(int,bool))); } WebImageFetcher::~WebImageFetcher() @@ -173,8 +173,8 @@ void WebImageFetcher::slotWebRequestFinished(int id, bool error) m_dialog = new WebImageFetcherDialog(m_imageList, m_file, 0); m_dialog->setModal(true); - connect(m_dialog, TQT_SIGNAL(coverSelected()), TQT_SLOT(slotCoverChosen())); - connect(m_dialog, TQT_SIGNAL(newSearchRequested()), TQT_SLOT(slotNewSearch())); + connect(m_dialog, TQ_SIGNAL(coverSelected()), TQ_SLOT(slotCoverChosen())); + connect(m_dialog, TQ_SIGNAL(newSearchRequested()), TQ_SLOT(slotNewSearch())); } m_dialog->refreshScreen(m_imageList); diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp index 9f6c9744..c7abdf1a 100644 --- a/juk/webimagefetcherdialog.cpp +++ b/juk/webimagefetcherdialog.cpp @@ -55,8 +55,8 @@ WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList, m_iconWidget->arrangeItemsInGrid(); m_iconWidget->setItemsMovable(false); mainLayout->addWidget(m_iconWidget); - connect(m_iconWidget, TQT_SIGNAL(executed(TQIconViewItem *)), - this, TQT_SLOT(slotOk())); + connect(m_iconWidget, TQ_SIGNAL(executed(TQIconViewItem *)), + this, TQ_SLOT(slotOk())); // Before changing the code below be sure to check the attribution terms // of the Yahoo Image Search API. @@ -66,8 +66,8 @@ WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList, logoLabel->setPixmap(UserIcon("yahoo_credit")); logoLabel->setMargin(15); // Allow large margin per attribution terms. logoLabel->setUseTips(true); // Show URL in tooltip. - connect(logoLabel, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(showCreditURL(const TQString &))); + connect(logoLabel, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(showCreditURL(const TQString &))); TQBoxLayout *creditLayout = new TQHBoxLayout(mainLayout); creditLayout->addStretch(); // Left spacer @@ -197,9 +197,9 @@ CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const WebImage &image) // Start downloading the image. m_job = TDEIO::get(image.thumbURL(), false, false); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(imageResult(TDEIO::Job *))); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(imageData(TDEIO::Job *, const TQByteArray &))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(imageResult(TDEIO::Job *))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(imageData(TDEIO::Job *, const TQByteArray &))); } CoverIconViewItem::~CoverIconViewItem() -- cgit v1.2.1