diff options
author | Lars Knoll <lars.knoll@qt.io> | 2016-10-31 10:14:14 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-11-14 17:04:32 +0000 |
commit | a7c23d86362efad27b8dbfd1bc570299dd606fbb (patch) | |
tree | 1db6f27ff768ca15303d216cd84a3bdc4575cd7f /examples/multimediawidgets/player/player.cpp | |
parent | f0ea26416a73e9ed60e0e0440275e73081f601a2 (diff) |
Cleanup all maemo/meego specific code
Change-Id: I6c6f28084c6b030928eebc53c5d0009b168ede6a
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'examples/multimediawidgets/player/player.cpp')
-rw-r--r-- | examples/multimediawidgets/player/player.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp index e787aa269..ab048838a 100644 --- a/examples/multimediawidgets/player/player.cpp +++ b/examples/multimediawidgets/player/player.cpp @@ -55,9 +55,7 @@ Player::Player(QWidget *parent) , videoWidget(0) , coverLabel(0) , slider(0) -#ifndef PLAYER_NO_COLOROPTIONS , colorDialog(0) -#endif { //! [create-objs] player = new QMediaPlayer(this); @@ -135,11 +133,9 @@ Player::Player(QWidget *parent) fullScreenButton = new QPushButton(tr("FullScreen"), this); fullScreenButton->setCheckable(true); -#ifndef PLAYER_NO_COLOROPTIONS colorButton = new QPushButton(tr("Color Options..."), this); colorButton->setEnabled(false); connect(colorButton, SIGNAL(clicked()), this, SLOT(showColorDialog())); -#endif QBoxLayout *displayLayout = new QHBoxLayout; displayLayout->addWidget(videoWidget, 2); @@ -152,9 +148,7 @@ Player::Player(QWidget *parent) controlLayout->addWidget(controls); controlLayout->addStretch(1); controlLayout->addWidget(fullScreenButton); -#ifndef PLAYER_NO_COLOROPTIONS controlLayout->addWidget(colorButton); -#endif QBoxLayout *layout = new QVBoxLayout; layout->addLayout(displayLayout); @@ -175,9 +169,7 @@ Player::Player(QWidget *parent) controls->setEnabled(false); playlistView->setEnabled(false); openButton->setEnabled(false); -#ifndef PLAYER_NO_COLOROPTIONS colorButton->setEnabled(false); -#endif fullScreenButton->setEnabled(false); } @@ -347,9 +339,7 @@ void Player::videoAvailableChanged(bool available) if (fullScreenButton->isChecked()) videoWidget->setFullScreen(true); } -#ifndef PLAYER_NO_COLOROPTIONS colorButton->setEnabled(available); -#endif } void Player::setTrackInfo(const QString &info) @@ -389,7 +379,6 @@ void Player::updateDurationInfo(qint64 currentInfo) labelDuration->setText(tStr); } -#ifndef PLAYER_NO_COLOROPTIONS void Player::showColorDialog() { if (!colorDialog) { @@ -434,4 +423,3 @@ void Player::showColorDialog() } colorDialog->show(); } -#endif |