aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/app/qmmpstarter.cpp2
-rw-r--r--src/plugins/PlaylistFormats/m3u/m3uplaylistformat.h4
-rw-r--r--src/plugins/PlaylistFormats/pls/plsplaylistformat.h4
-rw-r--r--src/plugins/PlaylistFormats/xspf/xspfplaylistformat.h4
-rw-r--r--src/plugins/Ui/skinned/addurldialog.cpp4
-rw-r--r--src/qmmpui/playlistformat.h6
-rw-r--r--src/qmmpui/playlistmodel.cpp4
-rw-r--r--src/qmmpui/playlistmodel.h2
-rw-r--r--src/qmmpui/playlistparser.cpp26
-rw-r--r--src/qmmpui/playlistparser.h16
-rw-r--r--src/qmmpui/uihelper.cpp12
11 files changed, 42 insertions, 42 deletions
diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp
index 5c8b73463..6ea21be5a 100644
--- a/src/app/qmmpstarter.cpp
+++ b/src/app/qmmpstarter.cpp
@@ -165,7 +165,7 @@ void QMMPStarter::startPlayer()
m_core = SoundCore::instance();
//additional featuries
- new PlaylistParser(this);
+ new PlayListParser(this);
new UiHelper(this);
//interface
diff --git a/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.h b/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.h
index 55da7f159..4a5414894 100644
--- a/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.h
+++ b/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.h
@@ -30,10 +30,10 @@
* Class for M3U playlist format parsing
* @author Vladimir Kuznetsov <vovanec@gmail.com>
*/
-class M3UPlaylistFormat : public QObject, public PlaylistFormat
+class M3UPlaylistFormat : public QObject, public PlayListFormat
{
Q_OBJECT
- Q_INTERFACES(PlaylistFormat)
+ Q_INTERFACES(PlayListFormat)
public:
M3UPlaylistFormat();
virtual QStringList getExtensions()const;
diff --git a/src/plugins/PlaylistFormats/pls/plsplaylistformat.h b/src/plugins/PlaylistFormats/pls/plsplaylistformat.h
index da73caf1e..4d770ee74 100644
--- a/src/plugins/PlaylistFormats/pls/plsplaylistformat.h
+++ b/src/plugins/PlaylistFormats/pls/plsplaylistformat.h
@@ -30,10 +30,10 @@
* Class for PLS playlist format parsing
* @author Vladimir Kuznetsov <vovanec@gmail.com>
*/
-class PLSPlaylistFormat : public QObject, public PlaylistFormat
+class PLSPlaylistFormat : public QObject, public PlayListFormat
{
Q_OBJECT
- Q_INTERFACES(PlaylistFormat)
+ Q_INTERFACES(PlayListFormat)
public:
PLSPlaylistFormat();
virtual QStringList getExtensions()const;
diff --git a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.h b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.h
index 484bd0d08..2b72c8613 100644
--- a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.h
+++ b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.h
@@ -30,10 +30,10 @@
* Class for XSPF playlist format parsing
* @author Vladimir Kuznetsov <vovanec@gmail.com>
*/
-class XSPFPlaylistFormat : public QObject, public PlaylistFormat
+class XSPFPlaylistFormat : public QObject, public PlayListFormat
{
Q_OBJECT
- Q_INTERFACES(PlaylistFormat)
+ Q_INTERFACES(PlayListFormat)
public:
XSPFPlaylistFormat();
virtual QStringList getExtensions()const;
diff --git a/src/plugins/Ui/skinned/addurldialog.cpp b/src/plugins/Ui/skinned/addurldialog.cpp
index 1ad37b36a..6b4f13c9f 100644
--- a/src/plugins/Ui/skinned/addurldialog.cpp
+++ b/src/plugins/Ui/skinned/addurldialog.cpp
@@ -99,7 +99,7 @@ void AddUrlDialog::accept( )
if (s.startsWith("http://"))
{
//try to download playlist
- PlaylistFormat* prs = PlaylistParser::instance()->findByPath(s);
+ PlayListFormat* prs = PlayListParser::instance()->findByPath(s);
if (prs)
{
connect(m_http, SIGNAL(finished (QNetworkReply *)), SLOT(readResponse(QNetworkReply *)));
@@ -138,7 +138,7 @@ void AddUrlDialog::readResponse(QNetworkReply *reply)
m_redirect_url.clear();
QString s = urlComboBox->currentText();
- PlaylistFormat* prs = PlaylistParser::instance()->findByPath(s);
+ PlayListFormat* prs = PlayListParser::instance()->findByPath(s);
if (prs)
{
m_model->add(prs->decode(reply->readAll()));
diff --git a/src/qmmpui/playlistformat.h b/src/qmmpui/playlistformat.h
index 2f9b79819..4c152d786 100644
--- a/src/qmmpui/playlistformat.h
+++ b/src/qmmpui/playlistformat.h
@@ -27,13 +27,13 @@ class PlayListItem;
/*! @brief Abstract interface for playlist formats.
* @author Vladimir Kuznetsov <vovanec@gmail.com>
*/
-class PlaylistFormat
+class PlayListFormat
{
public:
/*!
* Object destructor
*/
- virtual ~PlaylistFormat()
+ virtual ~PlayListFormat()
{
;
}
@@ -61,6 +61,6 @@ public:
virtual QString name() const = 0;
};
-Q_DECLARE_INTERFACE(PlaylistFormat,"PlaylistFormatInterface/1.0")
+Q_DECLARE_INTERFACE(PlayListFormat,"PlayListFormatInterface/1.0")
#endif
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 263e6c836..30f7cfe3c 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -840,7 +840,7 @@ void PlayListModel::doCurrentVisibleRequest()
void PlayListModel::loadPlaylist(const QString &f_name)
{
- PlaylistFormat* prs = PlaylistParser::instance()->findByPath(f_name);
+ PlayListFormat* prs = PlayListParser::instance()->findByPath(f_name);
if(!prs)
{
//qWarning("PlayListModel: unsupported playlist format");
@@ -874,7 +874,7 @@ void PlayListModel::loadPlaylist(const QString &f_name)
void PlayListModel::savePlaylist(const QString & f_name)
{
- PlaylistFormat* prs = PlaylistParser::instance()->findByPath(f_name);
+ PlayListFormat* prs = PlayListParser::instance()->findByPath(f_name);
if (prs)
{
QFile file(f_name);
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index 4a6a9a3f2..18d751894 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -32,7 +32,7 @@
class FileLoader;
class PlayListItem;
class PlayState;
-class PlaylistFormat;
+class PlayListFormat;
class PlayListModel;
/*! @brief Helper class that keeps track of a view's selected items.
diff --git a/src/qmmpui/playlistparser.cpp b/src/qmmpui/playlistparser.cpp
index 62f77695e..aca6fe970 100644
--- a/src/qmmpui/playlistparser.cpp
+++ b/src/qmmpui/playlistparser.cpp
@@ -26,39 +26,39 @@
#include "playlistformat.h"
#include "playlistparser.h"
-PlaylistParser *PlaylistParser::m_instance = 0;
+PlayListParser *PlayListParser::m_instance = 0;
-PlaylistParser::PlaylistParser(QObject *parent) : QObject (parent)
+PlayListParser::PlayListParser(QObject *parent) : QObject (parent)
{
m_instance = this;
}
-PlaylistParser::~PlaylistParser()
+PlayListParser::~PlayListParser()
{
m_instance = 0;
}
-QStringList PlaylistParser::getExtensions()
+QStringList PlayListParser::getExtensions()
{
loadExternalPlaylistFormats();
QStringList extensions;
- foreach(PlaylistFormat *format, m_formats)
+ foreach(PlayListFormat *format, m_formats)
extensions << format->getExtensions();
return extensions;
}
-bool PlaylistParser::supports(const QString &filePath)
+bool PlayListParser::supports(const QString &filePath)
{
return findByPath(filePath) != 0;
}
-QList<PlaylistFormat*> PlaylistParser::formats()
+QList<PlayListFormat*> PlayListParser::formats()
{
loadExternalPlaylistFormats();
return m_formats;
}
-PlaylistFormat *PlaylistParser::findByPath(const QString &filePath)
+PlayListFormat *PlayListParser::findByPath(const QString &filePath)
{
loadExternalPlaylistFormats();
QString ext;
@@ -70,7 +70,7 @@ PlaylistFormat *PlaylistParser::findByPath(const QString &filePath)
else
ext = QFileInfo(filePath).suffix().toLower();
- foreach(PlaylistFormat* format, m_formats)
+ foreach(PlayListFormat* format, m_formats)
{
if (format->hasFormat(ext))
return format;
@@ -78,14 +78,14 @@ PlaylistFormat *PlaylistParser::findByPath(const QString &filePath)
return 0;
}
-PlaylistParser* PlaylistParser::instance()
+PlayListParser* PlayListParser::instance()
{
if(!m_instance)
qFatal("PlaylistParser: object is not created");
return m_instance;
}
-void PlaylistParser::loadExternalPlaylistFormats()
+void PlayListParser::loadExternalPlaylistFormats()
{
if (!m_formats.isEmpty())
return;
@@ -100,9 +100,9 @@ void PlaylistParser::loadExternalPlaylistFormats()
else
qWarning("PlaylistParser: %s", qPrintable(loader.errorString ()));
- PlaylistFormat *fmt = 0;
+ PlayListFormat *fmt = 0;
if (plugin)
- fmt = qobject_cast<PlaylistFormat *>(plugin);
+ fmt = qobject_cast<PlayListFormat *>(plugin);
if (fmt)
m_formats << fmt;
diff --git a/src/qmmpui/playlistparser.h b/src/qmmpui/playlistparser.h
index fbe15996c..6381eaefc 100644
--- a/src/qmmpui/playlistparser.h
+++ b/src/qmmpui/playlistparser.h
@@ -26,7 +26,7 @@
/*! @brief The PlaylistParser class provides a simple api to access playlist format plugins.
* @author Ilya Kotov <forkotov02@hotmail.ru>
*/
-class PlaylistParser : public QObject
+class PlayListParser : public QObject
{
Q_OBJECT
public:
@@ -34,11 +34,11 @@ public:
* Object constructor,
* @param parent Parent object
*/
- PlaylistParser(QObject *parent);
+ PlayListParser(QObject *parent);
/*!
* Destructor
*/
- ~PlaylistParser();
+ ~PlayListParser();
/*!
* Returns a list of supported file extensions.
*/
@@ -50,21 +50,21 @@ public:
/*!
* Returns a list of the installed playlist formats.
*/
- QList<PlaylistFormat*> formats();
+ QList<PlayListFormat*> formats();
/*!
* Returns a pointer to the object's instance.
*/
- static PlaylistParser* instance();
+ static PlayListParser* instance();
/*!
* Finds playlist format by file path \b filePath
* Returns \b 0 if file \b filePath is unsupported.
*/
- PlaylistFormat *findByPath(const QString &filePath);
+ PlayListFormat *findByPath(const QString &filePath);
private:
void loadExternalPlaylistFormats();
- QList<PlaylistFormat*> m_formats;
- static PlaylistParser* m_instance;
+ QList<PlayListFormat*> m_formats;
+ static PlayListParser* m_instance;
};
diff --git a/src/qmmpui/uihelper.cpp b/src/qmmpui/uihelper.cpp
index e01b6eb80..77d4a81a9 100644
--- a/src/qmmpui/uihelper.cpp
+++ b/src/qmmpui/uihelper.cpp
@@ -45,8 +45,8 @@ UiHelper::UiHelper(QObject *parent)
General::create(parent);
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
m_lastDir = settings.value("General/last_dir", QDir::homePath()).toString(); //last directory
- if(!PlaylistParser::instance())
- new PlaylistParser(parent);
+ if(!PlayListParser::instance())
+ new PlayListParser(parent);
}
UiHelper::~UiHelper()
@@ -150,10 +150,10 @@ void UiHelper::addDirectory(QWidget *parent, PlayListModel *model)
void UiHelper::loadPlayList(QWidget *parent, PlayListModel *model)
{
QStringList l;
- QList<PlaylistFormat*> p_list = PlaylistParser::instance()->formats();
+ QList<PlayListFormat*> p_list = PlayListParser::instance()->formats();
if (!p_list.isEmpty())
{
- foreach(PlaylistFormat* fmt,p_list)
+ foreach(PlayListFormat* fmt,p_list)
l << fmt->getExtensions();
QString mask = tr("Playlist Files")+" (" + l.join(" *.").prepend("*.") + ")";
@@ -176,10 +176,10 @@ void UiHelper::loadPlayList(QWidget *parent, PlayListModel *model)
void UiHelper::savePlayList(QWidget *parent, PlayListModel *model)
{
QStringList l;
- QList<PlaylistFormat*> p_list = PlaylistParser::instance()->formats();
+ QList<PlayListFormat*> p_list = PlayListParser::instance()->formats();
if (!p_list.isEmpty())
{
- foreach(PlaylistFormat* fmt,p_list)
+ foreach(PlayListFormat* fmt,p_list)
l << fmt->getExtensions();
QString mask = tr("Playlist Files")+" (" + l.join(" *.").prepend("*.") + ")";
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 22:22:07 +0000