diff options
| author | Bill King <bill.king@nokia.com> | 2009-11-20 04:29:51 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-11-20 04:29:51 (GMT) |
| commit | 5b1a07e9ccf0a5139273b447e2b2fda6564a506a (patch) | |
| tree | 6ad6fc7836747044713ade6e75d7230b848ba46e /examples/phonon/qmusicplayer | |
| parent | 0186faea383f3f8223bffd1844e5a47ca22770a5 (diff) | |
| parent | ea0f526ac3a7daef5d4ebff2373a01d4088e28c3 (diff) | |
| download | Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.zip Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.tar.gz Qt-5b1a07e9ccf0a5139273b447e2b2fda6564a506a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'examples/phonon/qmusicplayer')
| -rw-r--r-- | examples/phonon/qmusicplayer/mainwindow.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/phonon/qmusicplayer/mainwindow.cpp b/examples/phonon/qmusicplayer/mainwindow.cpp index 787ae53..bc1fa1b 100644 --- a/examples/phonon/qmusicplayer/mainwindow.cpp +++ b/examples/phonon/qmusicplayer/mainwindow.cpp @@ -54,12 +54,12 @@ MainWindow::MainWindow() //![0] //![2] connect(mediaObject, SIGNAL(tick(qint64)), this, SLOT(tick(qint64))); - connect(mediaObject, SIGNAL(stateChanged(Phonon::State, Phonon::State)), - this, SLOT(stateChanged(Phonon::State, Phonon::State))); + connect(mediaObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), + this, SLOT(stateChanged(Phonon::State,Phonon::State))); connect(metaInformationResolver, SIGNAL(stateChanged(Phonon::State,Phonon::State)), - this, SLOT(metaStateChanged(Phonon::State, Phonon::State))); - connect(mediaObject, SIGNAL(currentSourceChanged(const Phonon::MediaSource &)), - this, SLOT(sourceChanged(const Phonon::MediaSource &))); + this, SLOT(metaStateChanged(Phonon::State,Phonon::State))); + connect(mediaObject, SIGNAL(currentSourceChanged(Phonon::MediaSource)), + this, SLOT(sourceChanged(Phonon::MediaSource))); connect(mediaObject, SIGNAL(aboutToFinish()), this, SLOT(aboutToFinish())); //![2] @@ -328,8 +328,8 @@ void MainWindow::setupUi() musicTable->setHorizontalHeaderLabels(headers); musicTable->setSelectionMode(QAbstractItemView::SingleSelection); musicTable->setSelectionBehavior(QAbstractItemView::SelectRows); - connect(musicTable, SIGNAL(cellPressed(int, int)), - this, SLOT(tableClicked(int, int))); + connect(musicTable, SIGNAL(cellPressed(int,int)), + this, SLOT(tableClicked(int,int))); QHBoxLayout *seekerLayout = new QHBoxLayout; seekerLayout->addWidget(seekSlider); |