aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-03-01 11:34:33 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-03-01 11:34:33 +0000
commitd44fb37b3ac7b3cbebece766fac4a421559b8dc7 (patch)
tree7df08296a11d0880015ca318ed2456311c8893c5
parent5b7ac8f9364adc4f455f7efe499c255431bb5ee8 (diff)
downloadqmmp-d44fb37b3ac7b3cbebece766fac4a421559b8dc7.tar.gz
qmmp-d44fb37b3ac7b3cbebece766fac4a421559b8dc7.tar.bz2
qmmp-d44fb37b3ac7b3cbebece766fac4a421559b8dc7.zip
changed api
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6144 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/app/builtincommandlineoption.cpp2
-rw-r--r--src/plugins/Ui/qsui/mainwindow.cpp2
-rw-r--r--src/plugins/Ui/skinned/mainwindow.cpp2
-rw-r--r--src/qmmpui/uihelper.cpp4
-rw-r--r--src/qmmpui/uihelper.h6
5 files changed, 8 insertions, 8 deletions
diff --git a/src/app/builtincommandlineoption.cpp b/src/app/builtincommandlineoption.cpp
index 5bb4da76a..4481b369b 100644
--- a/src/app/builtincommandlineoption.cpp
+++ b/src/app/builtincommandlineoption.cpp
@@ -202,7 +202,7 @@ void BuiltinCommandLineOption::executeCommand(const QString &option_string,
}
else if (option_string == "--add-file")
{
- UiHelper::instance()->addFile();
+ UiHelper::instance()->addFiles();
}
else if (option_string == "--add-dir")
{
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index ab784f1af..e458118a3 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -176,7 +176,7 @@ void MainWindow::addDir()
void MainWindow::addFiles()
{
- m_uiHelper->addFile(this);
+ m_uiHelper->addFiles(this);
}
void MainWindow::playFiles()
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index f50de5466..fca65bea4 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -220,7 +220,7 @@ void MainWindow::addDir()
void MainWindow::addFile()
{
- m_uiHelper->addFile(this);
+ m_uiHelper->addFiles(this);
}
void MainWindow::playFiles()
diff --git a/src/qmmpui/uihelper.cpp b/src/qmmpui/uihelper.cpp
index bd2cf9c5c..2e8863580 100644
--- a/src/qmmpui/uihelper.cpp
+++ b/src/qmmpui/uihelper.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2014 by Ilya Kotov *
+ * Copyright (C) 2008-2016 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -132,7 +132,7 @@ QMenu *UiHelper::createMenu(MenuType type, const QString &title, QWidget *parent
return 0;
}
-void UiHelper::addFile(QWidget *parent, PlayListModel *model)
+void UiHelper::addFiles(QWidget *parent, PlayListModel *model)
{
QStringList filters;
filters << tr("All Supported Bitstreams")+" (" +
diff --git a/src/qmmpui/uihelper.h b/src/qmmpui/uihelper.h
index bec1f4a10..309b871f3 100644
--- a/src/qmmpui/uihelper.h
+++ b/src/qmmpui/uihelper.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2014 by Ilya Kotov *
+ * Copyright (C) 2008-2016 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -88,11 +88,11 @@ public:
*/
QMenu *createMenu(MenuType type, const QString &title = QString(), QWidget *parent = 0);
/*!
- * Opens 'Add File' dialog
+ * Opens 'Add Files' dialog
* @param parent Parent widget
* @param model Destination playlist model
*/
- void addFile(QWidget *parent = qApp->activeWindow(),
+ void addFiles(QWidget *parent = qApp->activeWindow(),
PlayListModel *model = PlayListManager::instance()->selectedPlayList());
/*!
* Opens 'Play Files' dialog