aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/winextras/musicplayer/main.cpp5
-rw-r--r--examples/winextras/musicplayer/musicplayer.cpp11
2 files changed, 9 insertions, 7 deletions
diff --git a/examples/winextras/musicplayer/main.cpp b/examples/winextras/musicplayer/main.cpp
index cc3771a..c868978 100644
--- a/examples/winextras/musicplayer/main.cpp
+++ b/examples/winextras/musicplayer/main.cpp
@@ -81,8 +81,9 @@ int main(int argc, char *argv[])
associateFileTypes(QStringList(".mp3"));
MusicPlayer player;
- if (argc > 1)
- player.playFile(app.arguments().value(1));
+ const QStringList arguments = QCoreApplication::arguments();
+ if (arguments.size() > 1)
+ player.playFile(arguments.at(1));
player.resize(300, 60);
player.show();
diff --git a/examples/winextras/musicplayer/musicplayer.cpp b/examples/winextras/musicplayer/musicplayer.cpp
index 4384de8..c44d387 100644
--- a/examples/winextras/musicplayer/musicplayer.cpp
+++ b/examples/winextras/musicplayer/musicplayer.cpp
@@ -68,12 +68,13 @@ MusicPlayer::MusicPlayer(QWidget *parent) : QWidget(parent),
void MusicPlayer::openFile()
{
- static QString path = QDir::homePath();
- QString filePath = QFileDialog::getOpenFileName(this, tr("Open File"), path, tr("MP3 files (*.mp3);;All files (*.*)"));
- if (!filePath.isEmpty()) {
- path = filePath;
+ const QStringList musicPaths = QStandardPaths::standardLocations(QStandardPaths::MusicLocation);
+ const QString filePath =
+ QFileDialog::getOpenFileName(this, tr("Open File"),
+ musicPaths.isEmpty() ? QDir::homePath() : musicPaths.first(),
+ tr("MP3 files (*.mp3);;All files (*.*)"));
+ if (!filePath.isEmpty())
playFile(filePath);
- }
}
void MusicPlayer::playFile(const QString &filePath)