renamed private headers

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2240 90c681e8-e032-0410-971d-27865f9a5e38

40 files changed, 46 insertions, 281 deletions

diff --git a/src/qmmp/abstractengine.cpp b/src/qmmp/abstractengine.cpp
index 702bf66aa..bf452756e 100644
--- a/src/qmmp/abstractengine.cpp
+++ b/src/qmmp/abstractengine.cpp
@@ -23,7 +23,7 @@
 #include <QPluginLoader>
 #include <QApplication>
 #include "enginefactory.h"
-#include "qmmpaudioengine.h"
+#include "qmmpaudioengine_p.h"
 #include "qmmp.h"
 #include "abstractengine.h"
 
diff --git a/src/qmmp/audioconverter.cpp b/src/qmmp/audioconverter.cpp
index dbe9706e7..e6718d47e 100644
--- a/src/qmmp/audioconverter.cpp
+++ b/src/qmmp/audioconverter.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "audioconverter.h"
+#include "audioconverter_p.h"
 
 //static functions
 static inline void s8_to_s16(qint8 *in, qint16 *out, qint64 samples)
diff --git a/src/qmmp/audioconverter.h b/src/qmmp/audioconverter_p.h
index 5fdaa1caa..5fdaa1caa 100644
--- a/src/qmmp/audioconverter.h
+++ b/src/qmmp/audioconverter_p.h
diff --git a/src/qmmp/effect.cpp b/src/qmmp/effect.cpp
index 51490f098..a172cd97b 100644
--- a/src/qmmp/effect.cpp
+++ b/src/qmmp/effect.cpp
@@ -22,7 +22,7 @@
 #include <QDir>
 #include <QApplication>
 #include <QHash>
-#include "qmmpaudioengine.h"
+#include "qmmpaudioengine_p.h"
 #include "qmmp.h"
 #include "effectfactory.h"
 #include "effect.h"
diff --git a/src/qmmp/emptyinputsource.cpp b/src/qmmp/emptyinputsource.cpp
index 1b1c13748..d841e3d3c 100644
--- a/src/qmmp/emptyinputsource.cpp
+++ b/src/qmmp/emptyinputsource.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "emptyinputsource.h"
+#include "emptyinputsource_p.h"
 
 EmptyInputSource::EmptyInputSource(const QString &url, QObject *parent) : InputSource(url,parent)
 {
diff --git a/src/qmmp/emptyinputsource.h b/src/qmmp/emptyinputsource_p.h
index 09798791b..09798791b 100644
--- a/src/qmmp/emptyinputsource.h
+++ b/src/qmmp/emptyinputsource_p.h
diff --git a/src/qmmp/fileinputsource.cpp b/src/qmmp/fileinputsource.cpp
index 60e91f450..99d4453e8 100644
--- a/src/qmmp/fileinputsource.cpp
+++ b/src/qmmp/fileinputsource.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QFile>
-#include "fileinputsource.h"
+#include "fileinputsource_p.h"
 
 FileInputSource::FileInputSource(const QString &url, QObject *parent) : InputSource(url,parent)
 {
diff --git a/src/qmmp/fileinputsource.h b/src/qmmp/fileinputsource_p.h
index 084a412ab..084a412ab 100644
--- a/src/qmmp/fileinputsource.h
+++ b/src/qmmp/fileinputsource_p.h
diff --git a/src/qmmp/inputsource.cpp b/src/qmmp/inputsource.cpp
index 43451f356..8d1a93a08 100644
--- a/src/qmmp/inputsource.cpp
+++ b/src/qmmp/inputsource.cpp
@@ -23,8 +23,8 @@
 #include <QApplication>
 #include <QPluginLoader>
 #include "qmmp.h"
-#include "fileinputsource.h"
-#include "emptyinputsource.h"
+#include "fileinputsource_p.h"
+#include "emptyinputsource_p.h"
 #include "inputsource.h"
 
 InputSource::InputSource(const QString &source, QObject *parent) : QObject(parent)
diff --git a/src/qmmp/metadatachangedevent.cpp b/src/qmmp/metadatachangedevent.cpp
index 210f03f50..891666349 100644
--- a/src/qmmp/metadatachangedevent.cpp
+++ b/src/qmmp/metadatachangedevent.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "metadatachangedevent.h"
+#include "metadatachangedevent_p.h"
 
 MetaDataChangedEvent::MetaDataChangedEvent(const QMap<Qmmp::MetaData, QString> &metaData)
     : QEvent (QEvent::Type(Qmmp::MetaDataChanged))
diff --git a/src/qmmp/metadatachangedevent.h b/src/qmmp/metadatachangedevent_p.h
index f49c87f33..f49c87f33 100644
--- a/src/qmmp/metadatachangedevent.h
+++ b/src/qmmp/metadatachangedevent_p.h
diff --git a/src/qmmp/qmmp.pro b/src/qmmp/qmmp.pro
index 2160de85e..cece5d73d 100644
--- a/src/qmmp/qmmp.pro
+++ b/src/qmmp/qmmp.pro
@@ -21,16 +21,16 @@ HEADERS += recycler.h \
     metadatamodel.h \
     tagmodel.h \
     abstractengine.h \
-    qmmpaudioengine.h \
+    qmmpaudioengine_p.h \
     audioparameters.h \
     inputsource.h \
-    fileinputsource.h \
-    emptyinputsource.h \
+    fileinputsource_p.h \
+    emptyinputsource_p.h \
     inputsourcefactory.h \
     enginefactory.h \
     metadatamanager.h \
     replaygain.h \
-    audioconverter.h \
+    audioconverter_p.h \
     qmmpsettings.h \
     eqsettings.h \
     statechangedevent.h \
@@ -63,7 +63,7 @@ SOURCES += recycler.cpp \
     eqsettings.cpp \
     statechangedevent.cpp \
     metadatachangedevent.cpp
-FORMS += 
+FORMS +=
 unix:TARGET = ../../lib/qmmp
 win32:TARGET = ../../../bin/qmmp
 CONFIG += release \
@@ -77,11 +77,11 @@ unix:isEmpty(LIB_DIR):LIB_DIR = /lib
 unix:DEFINES += LIB_DIR=\\\"$$LIB_DIR\\\"
 DEFINES += QMMP_VERSION=$$QMMP_VERSION
 DEFINES += QMMP_STR_VERSION=\\\"$$QMMP_VERSION\\\"
-contains(CONFIG, SVN_VERSION) { 
+contains(CONFIG, SVN_VERSION) {
     unix:DEFINES += SVN_REVISION=\\\"$$system(./svn_revision.sh)\\\"
     win32:DEFINES += SVN_REVISION=\\\"svn\\\"
 }
-unix { 
+unix {
     target.path = $$LIB_DIR
     devel.files += recycler.h \
         buffer.h \
diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp
index 0ba012e9c..275663637 100644
--- a/src/qmmp/qmmpaudioengine.cpp
+++ b/src/qmmp/qmmpaudioengine.cpp
@@ -21,7 +21,7 @@
 #include <QMetaType>
 #include <QIODevice>
 #include <QFile>
-#include "replaygain.h"
+#include "replaygain_p.h"
 #include "effect.h"
 #include "buffer.h"
 #include "decoder.h"
@@ -29,8 +29,8 @@
 #include "decoderfactory.h"
 #include "effectfactory.h"
 #include "inputsource.h"
-#include "audioconverter.h"
-#include "qmmpaudioengine.h"
+#include "audioconverter_p.h"
+#include "qmmpaudioengine_p.h"
 #include "metadatamanager.h"
 
 
diff --git a/src/qmmp/qmmpaudioengine.h b/src/qmmp/qmmpaudioengine_p.h
index aaef326da..aaef326da 100644
--- a/src/qmmp/qmmpaudioengine.h
+++ b/src/qmmp/qmmpaudioengine_p.h
diff --git a/src/qmmp/replaygain.cpp b/src/qmmp/replaygain.cpp
index ccd3bf28e..b9e143ad6 100644
--- a/src/qmmp/replaygain.cpp
+++ b/src/qmmp/replaygain.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <math.h>
-#include "replaygain.h"
+#include "replaygain_p.h"
 
 ReplayGain::ReplayGain()
 {
diff --git a/src/qmmp/replaygain.h b/src/qmmp/replaygain_p.h
index 50b3a373a..50b3a373a 100644
--- a/src/qmmp/replaygain.h
+++ b/src/qmmp/replaygain_p.h
diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp
index b81508b42..505829a12 100644
--- a/src/qmmp/soundcore.cpp
+++ b/src/qmmp/soundcore.cpp
@@ -23,9 +23,9 @@
 #include <QApplication>
 #include <QSettings>
 #include <QDir>
-#include "statechangedevent.h"
-#include "metadatachangedevent.h"
-#include "qmmpaudioengine.h"
+#include "statechangedevent_p.h"
+#include "metadatachangedevent_p.h"
+#include "qmmpaudioengine_p.h"
 #include "decoderfactory.h"
 #include "effect.h"
 #include "statehandler.h"
diff --git a/src/qmmp/statechangedevent.cpp b/src/qmmp/statechangedevent.cpp
index 24483ce61..3dc53dfd5 100644
--- a/src/qmmp/statechangedevent.cpp
+++ b/src/qmmp/statechangedevent.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "statechangedevent.h"
+#include "statechangedevent_p.h"
 
 StateChangedEvent::StateChangedEvent(Qmmp::State currentState, Qmmp::State previousState)
     : QEvent((QEvent::Type)Qmmp::StateChanged)
diff --git a/src/qmmp/statechangedevent.h b/src/qmmp/statechangedevent_p.h
index 96841e6a7..96841e6a7 100644
--- a/src/qmmp/statechangedevent.h
+++ b/src/qmmp/statechangedevent_p.h
diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp
index b8625aae5..7f6a9c7ca 100644
--- a/src/qmmp/statehandler.cpp
+++ b/src/qmmp/statehandler.cpp
@@ -21,8 +21,8 @@
 #include <QStringList>
 #include <QApplication>
 #include "soundcore.h"
-#include "statechangedevent.h"
-#include "metadatachangedevent.h"
+#include "statechangedevent_p.h"
+#include "metadatachangedevent_p.h"
 #include "statehandler.h"
 
 #define TICK_INTERVAL 250
diff --git a/src/qmmpui/abstractplaylistitem.cpp b/src/qmmpui/abstractplaylistitem.cpp
deleted file mode 100644
index bbae56bd3..000000000
--- a/src/qmmpui/abstractplaylistitem.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2008 by Ilya Kotov                                      *
- *   forkotov02@hotmail.ru                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-#include "abstractplaylistitem.h"
-
-AbstractPlaylistItem::AbstractPlaylistItem()
-{
-    m_length = 0;
-}
-
-
-AbstractPlaylistItem::~AbstractPlaylistItem()
-{
-}
-
-const QString AbstractPlaylistItem::title () const
-{
-    return m_metaData.value(Qmmp::TITLE);
-}
-
-const QString AbstractPlaylistItem::artist () const
-{
-    return m_metaData.value(Qmmp::ARTIST);
-}
-
-const QString AbstractPlaylistItem::album () const
-{
-    return m_metaData.value(Qmmp::ALBUM);
-}
-
-const QString AbstractPlaylistItem::comment () const
-{
-    return m_metaData.value(Qmmp::COMMENT);
-}
-
-const QString AbstractPlaylistItem::genre () const
-{
-    return m_metaData.value(Qmmp::GENRE);
-}
-
-const QString AbstractPlaylistItem::composer() const
-{
-    return m_metaData.value(Qmmp::COMPOSER);
-}
-
-const QString AbstractPlaylistItem::track () const
-{
-    return m_metaData.value(Qmmp::TRACK);
-}
-
-const QString AbstractPlaylistItem::year () const
-{
-    return m_metaData.value(Qmmp::YEAR);
-}
-
-const QString AbstractPlaylistItem::discNumber () const
-{
-    return m_metaData.value(Qmmp::DISCNUMBER);
-}
-
-const QString AbstractPlaylistItem::url () const
-{
-    return m_metaData.value(Qmmp::URL);
-}
-
-qint64 AbstractPlaylistItem::length ()
-{
-    return m_length;
-}
-
-bool AbstractPlaylistItem::isEmpty()
-{
-    return m_metaData.isEmpty();
-}
-
-void AbstractPlaylistItem::clear()
-{
-    m_metaData.clear();
-    m_length = 0;
-}
-
-void AbstractPlaylistItem::setMetaData(const QMap <Qmmp::MetaData, QString> &metaData)
-{
-    m_metaData = metaData;
-}
-
-void AbstractPlaylistItem::setMetaData(Qmmp::MetaData key, const QString &value)
-{
-    m_metaData.insert(key, value);
-}
-
-void AbstractPlaylistItem::setLength(qint64 length)
-{
-    m_length = length;
-}
-
-const QMap <Qmmp::MetaData, QString> AbstractPlaylistItem::metaData()
-{
-    return m_metaData;
-}
diff --git a/src/qmmpui/abstractplaylistitem.h b/src/qmmpui/abstractplaylistitem.h
deleted file mode 100644
index c3f962a42..000000000
--- a/src/qmmpui/abstractplaylistitem.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2008-2010 by Ilya Kotov                                 *
- *   forkotov02@hotmail.ru                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-#ifndef ABSTRACTPLAYLISTITEM_H
-#define ABSTRACTPLAYLISTITEM_H
-
-#include <QMap>
-#include <QString>
-#include <qmmp/qmmp.h>
-
-/** @brief The AbstractPlaylistItem class provides the basic functionality for the playlist items.
- * @author Ilya Kotov <forkotov02@hotmail.ru>
- */
-class AbstractPlaylistItem
-{
-public:
-    /*!
-     * Constructs empty AbstractPlaylistItem object.
-     */
-    AbstractPlaylistItem();
-    /*!
-     * Object destructor
-     */
-    ~AbstractPlaylistItem();
-    /*!
-     * Returns song title.
-     */
-    const QString title () const;
-    /*!
-     * Returns song artist.
-     */
-    const QString artist () const;
-    /*!
-     * Returns song album.
-     */
-    const QString album () const;
-    /*!
-     * Returns comment.
-     */
-    const QString comment () const;
-    /*!
-     * Returns genre.
-     */
-    const QString genre () const;
-    /*!
-     * Returns composer.
-     */
-    const QString composer() const;
-    /*!
-     * Returns track number.
-     */
-    const QString track () const;
-    /*!
-     * Returns year.
-     */
-    const QString year () const;
-    /*!
-     * Returns disc number.
-     */
-    const QString discNumber () const;
-    /*!
-     * Returns stream url or local file path.
-     */
-    const QString url () const;
-    /*!
-     * Returns song length in seconds.
-     */
-    qint64 length ();
-    /*!
-     * Returns \b true if item has no metadata.
-     */
-    bool isEmpty();
-    /*!
-    * Removes all metadata from item.
-    */
-    void clear();
-    /*!
-     * Loads metadata.
-     * @param metaData A map with metadata.
-     */
-    virtual void setMetaData(const QMap <Qmmp::MetaData, QString> &metaData);
-    /*!
-     * Loads one metadata value.
-     * @param key Metadata key.
-     * @param value Metadata value.
-     */
-    virtual void setMetaData(Qmmp::MetaData key, const QString &value);
-    /*!
-     * Sets length in seconds.
-     */
-    virtual void setLength(qint64 length);
-    /*!
-     * Returns all meta data in map.
-     */
-    const QMap <Qmmp::MetaData, QString> metaData();
-
-private:
-    QMap <Qmmp::MetaData, QString> m_metaData;
-    qint64 m_length;
-};
-
-#endif
diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp
index 10cba244b..d072f51ea 100644
--- a/src/qmmpui/detailsdialog.cpp
+++ b/src/qmmpui/detailsdialog.cpp
@@ -29,7 +29,7 @@
 #include <qmmp/tagmodel.h>
 #include "ui_detailsdialog.h"
 #include "playlistitem.h"
-#include "tageditor.h"
+#include "tageditor_p.h"
 #include "detailsdialog.h"
 
 DetailsDialog::DetailsDialog(PlayListItem *item, QWidget *parent)
diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp
index 55e297dcb..cd1b1e713 100644
--- a/src/qmmpui/filedialog.cpp
+++ b/src/qmmpui/filedialog.cpp
@@ -27,7 +27,7 @@
 #include <QLibrary>
 #include <qmmp/qmmp.h>
 #include "filedialog.h"
-#include "qtfiledialog.h"
+#include "qtfiledialog_p.h"
 
 
 FileDialog* FileDialog::_instance = 0;
diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp
index 203d147fe..b37a795e3 100644
--- a/src/qmmpui/fileloader.cpp
+++ b/src/qmmpui/fileloader.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 
 #include <qmmp/metadatamanager.h>
-#include "fileloader.h"
-#include "playlistsettings.h"
+#include "fileloader_p.h"
+#include "playlistsettings_p.h"
 #include "playlistitem.h"
 
 FileLoader::FileLoader(QObject *parent) : QThread(parent)
diff --git a/src/qmmpui/fileloader.h b/src/qmmpui/fileloader_p.h
index f3c89b490..f3c89b490 100644
--- a/src/qmmpui/fileloader.h
+++ b/src/qmmpui/fileloader_p.h
diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp
index c4dc178e0..ef70f5cdb 100644
--- a/src/qmmpui/mediaplayer.cpp
+++ b/src/qmmpui/mediaplayer.cpp
@@ -22,8 +22,8 @@
 #include <QString>
 #include <QTranslator>
 #include <QLocale>
-#include <qmmp/statechangedevent.h>
-#include <qmmp/metadatachangedevent.h>
+#include <qmmp/statechangedevent_p.h>
+#include <qmmp/metadatachangedevent_p.h>
 #include "playlistitem.h"
 #include "mediaplayer.h"
 
diff --git a/src/qmmpui/playlistitem.cpp b/src/qmmpui/playlistitem.cpp
index 49f3bcce8..084bb3ffa 100644
--- a/src/qmmpui/playlistitem.cpp
+++ b/src/qmmpui/playlistitem.cpp
@@ -21,7 +21,7 @@
 #include <QDir>
 #include <qmmp/metadatamanager.h>
 #include "metadataformatter.h"
-#include "playlistsettings.h"
+#include "playlistsettings_p.h"
 #include "playlistitem.h"
 
 PlayListItem::PlayListItem() : QMap<Qmmp::MetaData, QString>(), m_flag(FREE)
diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index 6960b1068..85ec93855 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -24,7 +24,7 @@
 #include <QSettings>
 #include <QDir>
 #include <qmmp/fileinfo.h>
-#include "playlistsettings.h"
+#include "playlistsettings_p.h"
 #include "playlistmanager.h"
 
 PlayListManager::PlayListManager(QObject *parent) : QObject(parent)
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index b015e54bb..5c46694f9 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -33,11 +33,11 @@
 #include <qmmp/metadatamanager.h>
 #include "playlistparser.h"
 #include "playlistformat.h"
-#include "fileloader.h"
+#include "fileloader_p.h"
 #include "playlistitem.h"
-#include "playstate.h"
+#include "playstate_p.h"
 #include "detailsdialog.h"
-#include "playlistsettings.h"
+#include "playlistsettings_p.h"
 #include "playlistmodel.h"
 
 
diff --git a/src/qmmpui/playlistsettings.cpp b/src/qmmpui/playlistsettings.cpp
index 5fec65c19..c1fa58174 100644
--- a/src/qmmpui/playlistsettings.cpp
+++ b/src/qmmpui/playlistsettings.cpp
@@ -20,7 +20,7 @@
 
 #include <QSettings>
 #include <qmmp/qmmp.h>
-#include "playlistsettings.h"
+#include "playlistsettings_p.h"
 
 PlaylistSettings *PlaylistSettings::m_instance = 0;
 
diff --git a/src/qmmpui/playlistsettings.h b/src/qmmpui/playlistsettings_p.h
index cce4f35e1..cce4f35e1 100644
--- a/src/qmmpui/playlistsettings.h
+++ b/src/qmmpui/playlistsettings_p.h
diff --git a/src/qmmpui/playstate.cpp b/src/qmmpui/playstate.cpp
index 50db86459..b615a0dfe 100644
--- a/src/qmmpui/playstate.cpp
+++ b/src/qmmpui/playstate.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "playstate.h"
+#include "playstate_p.h"
 
 ShufflePlayState::ShufflePlayState(PlayListModel * model) : PlayState(model)
 {
diff --git a/src/qmmpui/playstate.h b/src/qmmpui/playstate_p.h
index 011a02848..011a02848 100644
--- a/src/qmmpui/playstate.h
+++ b/src/qmmpui/playstate_p.h
diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro
index c69af5341..1696ea003 100644
--- a/src/qmmpui/qmmpui.pro
+++ b/src/qmmpui/qmmpui.pro
@@ -27,15 +27,15 @@ HEADERS += general.h \
     commandlineoption.h \
     filedialog.h \
     filedialogfactory.h \
-    qtfiledialog.h \
+    qtfiledialog_p.h \
     playlistitem.h \
     playlistmodel.h \
-    playstate.h \
-    fileloader.h \
+    playstate_p.h \
+    fileloader_p.h \
     mediaplayer.h \
-    playlistsettings.h \
+    playlistsettings_p.h \
     detailsdialog.h \
-    tageditor.h \
+    tageditor_p.h \
     playlistmanager.h \
     metadataformatter.h \
     templateeditor.h
@@ -75,7 +75,7 @@ TRANSLATIONS = translations/libqmmpui_ru.ts \
     translations/libqmmpui_nl.ts \
     translations/libqmmpui_ja.ts \
     translations/libqmmpui_es.ts
-unix { 
+unix {
     devel.files += general.h \
                    generalfactory.h \
                    generalhandler.h \
diff --git a/src/qmmpui/qtfiledialog.cpp b/src/qmmpui/qtfiledialog.cpp
index 1b9d7bb05..7af812189 100644
--- a/src/qmmpui/qtfiledialog.cpp
+++ b/src/qmmpui/qtfiledialog.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QFileDialog>
-#include "qtfiledialog.h"
+#include "qtfiledialog_p.h"
 
 
 FileDialog* QtFileDialogFactory::create()
diff --git a/src/qmmpui/qtfiledialog.h b/src/qmmpui/qtfiledialog_p.h
index 1cff174c9..1cff174c9 100644
--- a/src/qmmpui/qtfiledialog.h
+++ b/src/qmmpui/qtfiledialog_p.h
diff --git a/src/qmmpui/tageditor.cpp b/src/qmmpui/tageditor.cpp
index 7e4927213..b94dcbb6d 100644
--- a/src/qmmpui/tageditor.cpp
+++ b/src/qmmpui/tageditor.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <qmmp/tagmodel.h>
-#include "tageditor.h"
+#include "tageditor_p.h"
 #include "ui_tageditor.h"
 
 TagEditor::TagEditor(TagModel *tagModel, QWidget *parent) : QWidget(parent), m_ui(new Ui::TagEditor)
diff --git a/src/qmmpui/tageditor.h b/src/qmmpui/tageditor_p.h
index 7ed6c9033..7ed6c9033 100644
--- a/src/qmmpui/tageditor.h
+++ b/src/qmmpui/tageditor_p.h
diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp
index 9ecec594c..75a6110ea 100644
--- a/src/ui/playlist.cpp
+++ b/src/ui/playlist.cpp
@@ -28,7 +28,6 @@
 #include <qmmpui/playlistitem.h>
 #include <qmmpui/playlistmodel.h>
 #include <qmmpui/playlistmanager.h>
-#include <qmmpui/fileloader.h>
 #include <qmmpui/generalhandler.h>
 #include <qmmp/soundcore.h>
 #include "dock.h"