Commit cab40a4a authored by Laurent Montel's avatar Laurent Montel

normalize signals/slots

svn path=/trunk/KDE/kdemultimedia/juk/; revision=1244197
parent d37943eb
......@@ -247,12 +247,12 @@ CollectionList::CollectionList(PlaylistCollection *collection) :
{
QAction *spaction = ActionCollection::actions()->addAction("showPlaying");
spaction->setText(i18n("Show Playing"));
connect(spaction, SIGNAL(triggered(bool) ), SLOT(slotShowPlaying()));
connect(spaction, SIGNAL(triggered(bool)), SLOT(slotShowPlaying()));
connect(action<KToolBarPopupAction>("back")->menu(), SIGNAL(aboutToShow()),
this, SLOT(slotPopulateBackMenu()));
connect(action<KToolBarPopupAction>("back")->menu(), SIGNAL(triggered(QAction *)),
this, SLOT(slotPlayFromBackMenu(QAction *)));
connect(action<KToolBarPopupAction>("back")->menu(), SIGNAL(triggered(QAction*)),
this, SLOT(slotPlayFromBackMenu(QAction*)));
setSorting(-1); // Temporarily disable sorting to add items faster.
m_columnTags[PlaylistItem::ArtistColumn] = new TagCountDict;
......
......@@ -63,10 +63,10 @@ ExampleOptionsDialog::ExampleOptionsDialog(QWidget *parent) :
connect(m_options, SIGNAL(fileChanged()), SLOT(fileModeSelected()));
connect(m_options, SIGNAL(dataChanged()), SIGNAL(dataChanged()));
connect(m_options->m_exampleFile, SIGNAL(urlSelected(const KUrl &)),
this, SLOT(fileChanged(const KUrl &)));
connect(m_options->m_exampleFile, SIGNAL(returnPressed(const QString &)),
this, SIGNAL(fileChanged(const QString &)));
connect(m_options->m_exampleFile, SIGNAL(urlSelected(KUrl)),
this, SLOT(fileChanged(KUrl)));
connect(m_options->m_exampleFile, SIGNAL(returnPressed(QString)),
this, SIGNAL(fileChanged(QString)));
}
void ExampleOptionsDialog::fileChanged(const KUrl &url)
......
......@@ -252,8 +252,8 @@ FileRenamerWidget::FileRenamerWidget(QWidget *parent) :
connect(m_exampleDialog, SIGNAL(signalShown()), SLOT(exampleDialogShown()));
connect(m_exampleDialog, SIGNAL(signalHidden()), SLOT(exampleDialogHidden()));
connect(m_exampleDialog, SIGNAL(dataChanged()), SLOT(dataSelected()));
connect(m_exampleDialog, SIGNAL(fileChanged(const QString &)),
this, SLOT(fileSelected(const QString &)));
connect(m_exampleDialog, SIGNAL(fileChanged(QString)),
this, SLOT(fileSelected(QString)));
exampleTextChanged();
}
......
......@@ -629,7 +629,7 @@ void KTRMLookup::puidGenerated()
d->results.clear();
KIO::Job *job = KIO::storedGet( QString( "http://musicbrainz.org/ws/1/track/?type=xml&puid=%1" ).arg( puid ) , KIO::NoReload, KIO::HideProgressInfo );
connect( job, SIGNAL( result( KJob* ) ), SLOT( lookupResult( KJob* ) ) );
connect( job, SIGNAL(result(KJob*)), SLOT(lookupResult(KJob*)) );
#endif
}
......
......@@ -254,8 +254,8 @@ TrackItem::TrackItem(NowPlaying *parent) :
layout->addWidget(m_label);
layout->addStretch();
connect(m_label, SIGNAL(linkActivated(const QString &)), this,
SLOT(slotOpenLink(const QString &)));
connect(m_label, SIGNAL(linkActivated(QString)), this,
SLOT(slotOpenLink(QString)));
// Ensure that if we're filtering results, that the filtering is cleared if we
// hide the now playing bar so that the user can select tracks normally.
......
......@@ -566,7 +566,7 @@ void PlayerManager::setup()
m_audioPath[i].insertEffect(m_fader[i]);
m_fader[i]->setVolume(1.0f);
connect(m_media[i], SIGNAL(stateChanged(Phonon::State, Phonon::State)), SLOT(slotStateChanged(Phonon::State, Phonon::State)));
connect(m_media[i], SIGNAL(stateChanged(Phonon::State,Phonon::State)), SLOT(slotStateChanged(Phonon::State,Phonon::State)));
connect(m_media[i], SIGNAL(prefinishMarkReached(qint32)), SLOT(slotNeedNextUrl()));
connect(m_media[i], SIGNAL(totalTimeChanged(qint64)), SLOT(slotLength(qint64)));
connect(m_media[i], SIGNAL(tick(qint64)), SLOT(slotTick(qint64)));
......
......@@ -1564,19 +1564,19 @@ void Playlist::slotInitialize()
adjustColumn(i);
}
connect(m_headerMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotToggleColumnVisible(QAction *)));
connect(m_headerMenu, SIGNAL(triggered(QAction*)), this, SLOT(slotToggleColumnVisible(QAction*)));
connect(this, SIGNAL(contextMenuRequested(Q3ListViewItem *, const QPoint &, int)),
this, SLOT(slotShowRMBMenu(Q3ListViewItem *, const QPoint &, int)));
connect(this, SIGNAL(itemRenamed(Q3ListViewItem *, const QString &, int)),
this, SLOT(slotInlineEditDone(Q3ListViewItem *, const QString &, int)));
connect(this, SIGNAL(doubleClicked(Q3ListViewItem *)),
connect(this, SIGNAL(contextMenuRequested(Q3ListViewItem*,QPoint,int)),
this, SLOT(slotShowRMBMenu(Q3ListViewItem*,QPoint,int)));
connect(this, SIGNAL(itemRenamed(Q3ListViewItem*,QString,int)),
this, SLOT(slotInlineEditDone(Q3ListViewItem*,QString,int)));
connect(this, SIGNAL(doubleClicked(Q3ListViewItem*)),
this, SLOT(slotPlayCurrent()));
connect(this, SIGNAL(returnPressed(Q3ListViewItem *)),
connect(this, SIGNAL(returnPressed(Q3ListViewItem*)),
this, SLOT(slotPlayCurrent()));
connect(header(), SIGNAL(sizeChange(int, int, int)),
this, SLOT(slotColumnSizeChanged(int, int, int)));
connect(header(), SIGNAL(sizeChange(int,int,int)),
this, SLOT(slotColumnSizeChanged(int,int,int)));
connect(renameLineEdit(), SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
this, SLOT(slotInlineCompletionModeChanged(KGlobalSettings::Completion)));
......@@ -1678,7 +1678,7 @@ void Playlist::setup()
{
setItemMargin(3);
connect(header(), SIGNAL(indexChange(int, int, int)), this, SLOT(slotColumnOrderChanged(int, int, int)));
connect(header(), SIGNAL(indexChange(int,int,int)), this, SLOT(slotColumnOrderChanged(int,int,int)));
connect(m_fetcher, SIGNAL(signalCoverChanged(int)), this, SLOT(slotCoverChanged(int)));
......
......@@ -135,11 +135,11 @@ PlaylistBox::PlaylistBox(PlayerManager *player, QWidget *parent, QStackedWidget
connect(this, SIGNAL(selectionChanged()),
this, SLOT(slotPlaylistChanged()));
connect(this, SIGNAL(doubleClicked(Q3ListViewItem *)),
this, SLOT(slotDoubleClicked(Q3ListViewItem *)));
connect(this, SIGNAL(doubleClicked(Q3ListViewItem*)),
this, SLOT(slotDoubleClicked(Q3ListViewItem*)));
connect(this, SIGNAL(contextMenuRequested(Q3ListViewItem *, const QPoint &, int)),
this, SLOT(slotShowContextMenu(Q3ListViewItem *, const QPoint &, int)));
connect(this, SIGNAL(contextMenuRequested(Q3ListViewItem*,QPoint,int)),
this, SLOT(slotShowContextMenu(Q3ListViewItem*,QPoint,int)));
TagTransactionManager *tagManager = TagTransactionManager::instance();
connect(tagManager, SIGNAL(signalAboutToModifyTags()), SLOT(slotFreezePlaylists()));
......@@ -147,10 +147,10 @@ PlaylistBox::PlaylistBox(PlayerManager *player, QWidget *parent, QStackedWidget
setupUpcomingPlaylist();
connect(CollectionList::instance(), SIGNAL(signalNewTag(const QString &, unsigned)),
this, SLOT(slotAddItem(const QString &, unsigned)));
connect(CollectionList::instance(), SIGNAL(signalRemovedTag(const QString &, unsigned)),
this, SLOT(slotRemoveItem(const QString &, unsigned)));
connect(CollectionList::instance(), SIGNAL(signalNewTag(QString,uint)),
this, SLOT(slotAddItem(QString,uint)));
connect(CollectionList::instance(), SIGNAL(signalRemovedTag(QString,uint)),
this, SLOT(slotRemoveItem(QString,uint)));
QTimer::singleShot(0, this, SLOT(slotLoadCachedPlaylists()));
QTimer::singleShot(0, object(), SLOT(slotScanFolders()));
......@@ -262,8 +262,8 @@ void PlaylistBox::setupPlaylist(Playlist *playlist, const QString &iconName)
void PlaylistBox::setupPlaylist(Playlist *playlist, const QString &iconName, Item *parentItem)
{
connect(playlist, SIGNAL(signalPlaylistItemsDropped(Playlist *)),
SLOT(slotPlaylistItemsDropped(Playlist *)));
connect(playlist, SIGNAL(signalPlaylistItemsDropped(Playlist*)),
SLOT(slotPlaylistItemsDropped(Playlist*)));
PlaylistCollection::setupPlaylist(playlist, iconName);
......@@ -845,8 +845,8 @@ void PlaylistBox::Item::init()
list->addNameToDict(m_text);
if(m_playlist) {
connect(m_playlist, SIGNAL(signalNameChanged(const QString &)),
this, SLOT(slotSetName(const QString &)));
connect(m_playlist, SIGNAL(signalNameChanged(QString)),
this, SLOT(slotSetName(QString)));
connect(m_playlist, SIGNAL(signalEnableDirWatch(bool)),
list->object(), SLOT(slotEnableDirWatch(bool)));
}
......
......@@ -722,12 +722,12 @@ void PlaylistCollection::enableDirWatch(bool enable)
m_dirLister.disconnect(object());
if(enable) {
QObject::connect(&m_dirLister, SIGNAL(newItems(const KFileItemList &)),
object(), SLOT(slotNewItems(const KFileItemList &)));
QObject::connect(&m_dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem, KFileItem> > &)),
collection, SLOT(slotRefreshItems(const QList<QPair<KFileItem, KFileItem> > &)));
QObject::connect(&m_dirLister, SIGNAL(deleteItem(const KFileItem &)),
collection, SLOT(slotDeleteItem(const KFileItem &)));
QObject::connect(&m_dirLister, SIGNAL(newItems(KFileItemList)),
object(), SLOT(slotNewItems(KFileItemList)));
QObject::connect(&m_dirLister, SIGNAL(refreshItems(QList<QPair<KFileItem,KFileItem> >)),
collection, SLOT(slotRefreshItems(QList<QPair<KFileItem,KFileItem> >)));
QObject::connect(&m_dirLister, SIGNAL(deleteItem(KFileItem)),
collection, SLOT(slotDeleteItem(KFileItem)));
}
}
......
......@@ -197,8 +197,8 @@ void PlaylistSplitter::setupLayout()
connect(m_playlistBox->object(), SIGNAL(signalSelectedItemsChanged()),
this, SLOT(slotPlaylistSelectionChanged()));
connect(m_playlistBox, SIGNAL(signalPlaylistDestroyed(Playlist *)),
m_editor, SLOT(slotPlaylistDestroyed(Playlist *)));
connect(m_playlistBox, SIGNAL(signalPlaylistDestroyed(Playlist*)),
m_editor, SLOT(slotPlaylistDestroyed(Playlist*)));
connect(m_playlistBox, SIGNAL(startupComplete()), SLOT(slotEnable()));
connect(m_playlistBox, SIGNAL(startFilePlayback(FileHandle)),
m_player, SLOT(play(FileHandle)));
......
......@@ -62,7 +62,7 @@ SearchLine::SearchLine(QWidget *parent, bool simple)
layout->addWidget(m_lineEdit);
m_lineEdit->setClearButtonShown(true);
m_lineEdit->installEventFilter(this);
connect(m_lineEdit, SIGNAL(textChanged(const QString &)),
connect(m_lineEdit, SIGNAL(textChanged(QString)),
this, SIGNAL(signalQueryChanged()));
connect(m_lineEdit, SIGNAL(returnPressed()),
this, SLOT(slotActivate()));
......
......@@ -210,11 +210,11 @@ VolumeSlider::VolumeSlider( uint max, QWidget *parent, bool customStyle )
setFocusPolicy( Qt::NoFocus );
setInvertedAppearance( false );
setInvertedControls( false );
connect( this, SIGNAL( sliderMoved( int ) ),
this, SLOT( emitVolumeChanged( int ) ) );
connect( this, SIGNAL(sliderMoved(int)),
this, SLOT(emitVolumeChanged(int)) );
connect( this, SIGNAL( sliderReleased( int ) ),
this, SLOT( emitVolumeChanged( int ) ) );
connect( this, SIGNAL(sliderReleased(int)),
this, SLOT(emitVolumeChanged(int)) );
}
void
......
......@@ -206,10 +206,10 @@ SystemTray::SystemTray(PlayerManager *player, QWidget *parent) :
connect(m_fadeTimer, SIGNAL(timeout()), SLOT(slotNextStep()));
// Handle wheel events
connect(this, SIGNAL(scrollRequested(int, Qt::Orientation)), SLOT(scrollEvent(int, Qt::Orientation)));
connect(this, SIGNAL(scrollRequested(int,Qt::Orientation)), SLOT(scrollEvent(int,Qt::Orientation)));
// Add a quick hook for play/pause toggle
connect(this, SIGNAL(secondaryActivateRequested(const QPoint &)),
connect(this, SIGNAL(secondaryActivateRequested(QPoint)),
action("playPause"), SLOT(trigger()));
if(m_player->playing())
......
......@@ -178,8 +178,8 @@ void TagEditor::slotSetItems(const PlaylistItemList &list)
saveChangesPrompt();
if(m_currentPlaylist) {
disconnect(m_currentPlaylist, SIGNAL(signalAboutToRemove(PlaylistItem *)),
this, SLOT(slotItemRemoved(PlaylistItem *)));
disconnect(m_currentPlaylist, SIGNAL(signalAboutToRemove(PlaylistItem*)),
this, SLOT(slotItemRemoved(PlaylistItem*)));
}
if((hadPlaylist && !m_currentPlaylist) || !itemPlaylist) {
......@@ -195,8 +195,8 @@ void TagEditor::slotSetItems(const PlaylistItemList &list)
}
if(m_currentPlaylist) {
connect(m_currentPlaylist, SIGNAL(signalAboutToRemove(PlaylistItem *)),
this, SLOT(slotItemRemoved(PlaylistItem *)));
connect(m_currentPlaylist, SIGNAL(signalAboutToRemove(PlaylistItem*)),
this, SLOT(slotItemRemoved(PlaylistItem*)));
connect(m_currentPlaylist, SIGNAL(destroyed()), this, SLOT(slotPlaylistRemoved()));
}
......@@ -498,7 +498,7 @@ void TagEditor::setupLayout()
foreach(QWidget *input, findChildren<QWidget *>()) {
if(input->inherits("QLineEdit") || input->inherits("QComboBox"))
connect(input, SIGNAL(textChanged(const QString &)), this, SLOT(slotDataChanged()));
connect(input, SIGNAL(textChanged(QString)), this, SLOT(slotDataChanged()));
if(input->inherits("QComboxBox"))
connect(input, SIGNAL(activated(int)), this, SLOT(slotDataChanged()));
if(input->inherits("QSpinBox"))
......
......@@ -64,7 +64,7 @@ TrackPickerDialog::TrackPickerDialog(const QString &name,
m_base->trackList->setSelected(m_base->trackList->firstChild(), true);
connect(m_base->trackList, SIGNAL(doubleClicked(Q3ListViewItem *, const QPoint &, int)),
connect(m_base->trackList, SIGNAL(doubleClicked(Q3ListViewItem*,QPoint,int)),
this, SLOT(accept()));
setMinimumWidth(qMax(400, width()));
......
......@@ -122,8 +122,8 @@ void TrackSequenceManager::setCurrentPlaylist(Playlist *list)
m_playlist->disconnect(this);
m_playlist = list;
connect(m_playlist, SIGNAL(signalAboutToRemove(PlaylistItem *)),
this, SLOT(slotItemAboutToDie(PlaylistItem *)));
connect(m_playlist, SIGNAL(signalAboutToRemove(PlaylistItem*)),
this, SLOT(slotItemAboutToDie(PlaylistItem*)));
}
void TrackSequenceManager::setCurrent(PlaylistItem *item)
......@@ -149,8 +149,8 @@ void TrackSequenceManager::initialize()
return;
// Make sure we don't use m_playNextItem if it's invalid.
connect(collection, SIGNAL(signalAboutToRemove(PlaylistItem *)),
this, SLOT(slotItemAboutToDie(PlaylistItem *)));
connect(collection, SIGNAL(signalAboutToRemove(PlaylistItem*)),
this, SLOT(slotItemAboutToDie(PlaylistItem*)));
m_initialized = true;
}
......
......@@ -58,8 +58,8 @@ VolumePopupButton::VolumePopupButton( QWidget * parent )
QWidgetAction * sliderActionWidget = new QWidgetAction( this );
sliderActionWidget->setDefaultWidget( mainBox );
connect( m_volumeSlider, SIGNAL( volumeChanged( float ) ), player, SLOT( setVolume( float ) ) );
connect( m_volumeSlider, SIGNAL( volumeChanged( float ) ), player, SLOT( setVolume( float ) ) );
connect( m_volumeSlider, SIGNAL(volumeChanged(float)), player, SLOT(setVolume(float)) );
connect( m_volumeSlider, SIGNAL(volumeChanged(float)), player, SLOT(setVolume(float)) );
QToolBar *muteBar = new QToolBar( QString(), mainBox );
muteBar->setContentsMargins( 0, 0, 0, 0 );
......@@ -68,8 +68,8 @@ VolumePopupButton::VolumePopupButton( QWidget * parent )
m_muteAction->setCheckable ( true );
m_muteAction->setChecked( player->muted() );
connect( m_muteAction, SIGNAL( toggled( bool ) ), player, SLOT( setMuted( bool ) ) );
connect( m_muteAction, SIGNAL( toggled( bool ) ), this, SLOT( muteStateChanged( bool ) ) );
connect( m_muteAction, SIGNAL(toggled(bool)), player, SLOT(setMuted(bool)) );
connect( m_muteAction, SIGNAL(toggled(bool)), this, SLOT(muteStateChanged(bool)) );
m_volumeMenu->addAction( sliderActionWidget );
muteBar->addAction( m_muteAction );
......@@ -77,8 +77,8 @@ VolumePopupButton::VolumePopupButton( QWidget * parent )
// set correct icon and label initially
volumeChanged( player->volume() );
connect( m_volumeSlider, SIGNAL( volumeChanged( float ) ),
this, SLOT( volumeChanged( float ) ) );
connect( m_volumeSlider, SIGNAL(volumeChanged(float)),
this, SLOT(volumeChanged(float)) );
}
void
......
......@@ -106,7 +106,7 @@ void WebImageFetcher::slotLoadImageURLs()
kDebug() << "Using request " << url.encodedPathAndQuery();
d->connection = KIO::storedGet(url, KIO::Reload /* reload always */, KIO::HideProgressInfo);
connect(d->connection, SIGNAL(result(KJob *)), SLOT(slotWebRequestFinished(KJob *)));
connect(d->connection, SIGNAL(result(KJob*)), SLOT(slotWebRequestFinished(KJob*)));
// Wait for the results...
}
......@@ -201,7 +201,7 @@ void WebImageFetcher::slotWebRequestFinished(KJob *job)
d->dialog = new WebImageFetcherDialog(d->imageList, d->file, 0);
d->dialog->setModal(true);
connect(d->dialog, SIGNAL(coverSelected(const KUrl &)), SLOT(slotCoverChosen(const KUrl &)));
connect(d->dialog, SIGNAL(coverSelected(KUrl)), SLOT(slotCoverChosen(KUrl)));
connect(d->dialog, SIGNAL(newSearchRequested()), SLOT(slotNewSearch()));
}
......
......@@ -63,8 +63,8 @@ WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList,
m_iconWidget->setIconSize(QSize(80, 80));
mainLayout->addWidget(m_iconWidget);
connect(m_iconWidget, SIGNAL(activated(const QModelIndex &)),
this, SLOT(slotActivated(const QModelIndex &)));
connect(m_iconWidget, SIGNAL(activated(QModelIndex)),
this, SLOT(slotActivated(QModelIndex)));
// Before changing the code below be sure to check the attribution terms
// of the Yahoo Image Search API.
......@@ -74,8 +74,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, SIGNAL(leftClickedUrl(const QString &)),
SLOT(showCreditURL(const QString &)));
connect(logoLabel, SIGNAL(leftClickedUrl(QString)),
SLOT(showCreditURL(QString)));
QBoxLayout *creditLayout = new QHBoxLayout;
mainLayout->addLayout(creditLayout);
......@@ -194,7 +194,7 @@ WebCoverIconViewItem::WebCoverIconViewItem(QWidget *parent, const WebImage &imag
// Start downloading the image.
m_job = KIO::storedGet(image.thumbURL(), KIO::NoReload, KIO::HideProgressInfo);
connect(m_job, SIGNAL(result(KJob *)), this, SLOT(imageResult(KJob *)));
connect(m_job, SIGNAL(result(KJob*)), this, SLOT(imageResult(KJob*)));
}
WebCoverIconViewItem::~WebCoverIconViewItem()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment