aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/qmmpui/CMakeLists.txt14
-rw-r--r--src/qmmpui/abstractplaylist.cpp32
-rw-r--r--src/qmmpui/abstractplaylist.h38
-rw-r--r--src/qmmpui/fileloader.cpp (renamed from src/ui/fileloader.cpp)0
-rw-r--r--src/qmmpui/fileloader.h (renamed from src/ui/fileloader.h)0
-rw-r--r--src/qmmpui/playlistitem.cpp (renamed from src/ui/playlistitem.cpp)0
-rw-r--r--src/qmmpui/playlistitem.h (renamed from src/ui/playlistitem.h)0
-rw-r--r--src/qmmpui/playlistmodel.cpp (renamed from src/ui/playlistmodel.cpp)0
-rw-r--r--src/qmmpui/playlistmodel.h (renamed from src/ui/playlistmodel.h)0
-rw-r--r--src/qmmpui/playstate.cpp (renamed from src/ui/playstate.cpp)0
-rw-r--r--src/qmmpui/playstate.h (renamed from src/ui/playstate.h)0
-rw-r--r--src/qmmpui/qmmpui.pro14
-rw-r--r--src/ui/CMakeLists.txt8
-rw-r--r--src/ui/addurldialog.cpp2
-rw-r--r--src/ui/jumptotrackdialog.cpp2
-rw-r--r--src/ui/keyboardmanager.cpp3
-rw-r--r--src/ui/listwidget.cpp5
-rw-r--r--src/ui/mainwindow.cpp6
-rw-r--r--src/ui/mainwindow.h2
-rw-r--r--src/ui/playlist.cpp7
-rw-r--r--src/ui/playlisttitlebar.cpp3
-rw-r--r--src/ui/ui.pro7
22 files changed, 38 insertions, 105 deletions
diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt
index 96517cf0f..08b7a5c94 100644
--- a/src/qmmpui/CMakeLists.txt
+++ b/src/qmmpui/CMakeLists.txt
@@ -35,8 +35,11 @@ SET(libqmmpui_SRCS
commandlinemanager.cpp
filedialog.cpp
qtfiledialog.cpp
- abstractplaylist.cpp
abstractplaylistitem.cpp
+ fileloader.cpp
+ playstate.cpp
+ playlistmodel.cpp
+ playlistitem.cpp
)
SET(libqmmpui_MOC_HDRS
@@ -50,8 +53,11 @@ SET(libqmmpui_MOC_HDRS
filedialog.h
filedialogfactory.h
qtfiledialog.h
- abstractplaylist.h
abstractplaylistitem.h
+ fileloader.h
+ playstate.h
+ playlistmodel.h
+ playlistitem.h
)
SET(libqmmpui_DEVEL_HDRS
@@ -64,8 +70,10 @@ SET(libqmmpui_DEVEL_HDRS
commandlineoption.h
filedialog.h
filedialogfactory.h
- abstractplaylist.h
+ qtfiledialog.h
abstractplaylistitem.h
+ playlistmodel.h
+ playlistitem.h
)
diff --git a/src/qmmpui/abstractplaylist.cpp b/src/qmmpui/abstractplaylist.cpp
deleted file mode 100644
index 607165426..000000000
--- a/src/qmmpui/abstractplaylist.cpp
+++ /dev/null
@@ -1,32 +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 "abstractplaylist.h"
-
-AbstractPlaylist::AbstractPlaylist(QObject *parent)
- : QObject(parent)
-{
-}
-
-
-AbstractPlaylist::~AbstractPlaylist()
-{
-}
-
-
diff --git a/src/qmmpui/abstractplaylist.h b/src/qmmpui/abstractplaylist.h
deleted file mode 100644
index 6190cd8b4..000000000
--- a/src/qmmpui/abstractplaylist.h
+++ /dev/null
@@ -1,38 +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. *
- ***************************************************************************/
-#ifndef ABSTRACTPLAYLIST_H
-#define ABSTRACTPLAYLIST_H
-
-#include <QObject>
-
-/**
- @author Ilya Kotov <forkotov02@hotmail.ru>
-*/
-class AbstractPlaylist : public QObject
-{
-Q_OBJECT
-public:
- AbstractPlaylist(QObject *parent = 0);
-
- ~AbstractPlaylist();
-
-};
-
-#endif
diff --git a/src/ui/fileloader.cpp b/src/qmmpui/fileloader.cpp
index ce5ccb56c..ce5ccb56c 100644
--- a/src/ui/fileloader.cpp
+++ b/src/qmmpui/fileloader.cpp
diff --git a/src/ui/fileloader.h b/src/qmmpui/fileloader.h
index d2dcc0748..d2dcc0748 100644
--- a/src/ui/fileloader.h
+++ b/src/qmmpui/fileloader.h
diff --git a/src/ui/playlistitem.cpp b/src/qmmpui/playlistitem.cpp
index bfbaa354c..bfbaa354c 100644
--- a/src/ui/playlistitem.cpp
+++ b/src/qmmpui/playlistitem.cpp
diff --git a/src/ui/playlistitem.h b/src/qmmpui/playlistitem.h
index ce26ca2f5..ce26ca2f5 100644
--- a/src/ui/playlistitem.h
+++ b/src/qmmpui/playlistitem.h
diff --git a/src/ui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index ffde91ac8..ffde91ac8 100644
--- a/src/ui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
diff --git a/src/ui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index a5231b44f..a5231b44f 100644
--- a/src/ui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
diff --git a/src/ui/playstate.cpp b/src/qmmpui/playstate.cpp
index 373619574..373619574 100644
--- a/src/ui/playstate.cpp
+++ b/src/qmmpui/playstate.cpp
diff --git a/src/ui/playstate.h b/src/qmmpui/playstate.h
index e4af7fa6f..e4af7fa6f 100644
--- a/src/ui/playstate.h
+++ b/src/qmmpui/playstate.h
diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro
index 3d60de0c8..08182560f 100644
--- a/src/qmmpui/qmmpui.pro
+++ b/src/qmmpui/qmmpui.pro
@@ -40,16 +40,22 @@ HEADERS += general.h \
filedialog.h \
filedialogfactory.h \
qtfiledialog.h \
- abstractplaylist.h \
- abstractplaylistitem.h
+ abstractplaylistitem.h \
+ playlistitem.h \
+ playlistmodel.h \
+ playstate.h \
+ fileloader.h
SOURCES += general.cpp \
generalhandler.cpp \
playlistparser.cpp \
commandlinemanager.cpp \
filedialog.cpp \
qtfiledialog.cpp \
- abstractplaylist.cpp \
- abstractplaylistitem.cpp
+ abstractplaylistitem.cpp \
+ playlistmodel.cpp \
+ playstate.cpp \
+ playlistitem.cpp \
+ fileloader.cpp
DESTDIR = .
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 292237903..45b7b1c83 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -49,24 +49,20 @@ SET(ui_SRCS
eqslider.cpp
eqtitlebar.cpp
eqwidget.cpp
- fileloader.cpp
jumptotrackdialog.cpp
keyboardmanager.cpp
listwidget.cpp
logscale.cpp
mainvisual.cpp
mainwindow.cpp
- playlistitem.cpp
monostereo.cpp
mp3player.cpp
number.cpp
pixmapwidget.cpp
playlistcontrol.cpp
playlist.cpp
- playlistmodel.cpp
playlistslider.cpp
playlisttitlebar.cpp
- playstate.cpp
playstatus.cpp
pluginitem.cpp
positionbar.cpp
@@ -102,7 +98,6 @@ SET(ui_MOC_HDRS
eqtitlebar.h
eqwidget.h
fft.h
- fileloader.h
inlines.h
jumptotrackdialog.h
keyboardmanager.h
@@ -110,16 +105,13 @@ SET(ui_MOC_HDRS
logscale.h
mainvisual.h
mainwindow.h
- playlistitem.h
monostereo.h
number.h
pixmapwidget.h
playlistcontrol.h
playlist.h
- playlistmodel.h
playlistslider.h
playlisttitlebar.h
- playstate.h
playstatus.h
pluginitem.h
positionbar.h
diff --git a/src/ui/addurldialog.cpp b/src/ui/addurldialog.cpp
index 78a9a6969..581aa9cac 100644
--- a/src/ui/addurldialog.cpp
+++ b/src/ui/addurldialog.cpp
@@ -26,7 +26,7 @@
#include "addurldialog.h"
#include <qmmpui/playlistparser.h>
#include <qmmpui/playlistformat.h>
-#include "playlistmodel.h"
+#include <qmmpui/playlistmodel.h>
#define HISTORY_SIZE 10
diff --git a/src/ui/jumptotrackdialog.cpp b/src/ui/jumptotrackdialog.cpp
index 37848e34f..6c9343170 100644
--- a/src/ui/jumptotrackdialog.cpp
+++ b/src/ui/jumptotrackdialog.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "jumptotrackdialog.h"
-#include "playlistmodel.h"
+#include <qmmpui/playlistmodel.h>
#include <QStringListModel>
#include <QSortFilterProxyModel>
diff --git a/src/ui/keyboardmanager.cpp b/src/ui/keyboardmanager.cpp
index 5ad32fee7..7e76625cd 100644
--- a/src/ui/keyboardmanager.cpp
+++ b/src/ui/keyboardmanager.cpp
@@ -21,8 +21,9 @@
#include <QKeyEvent>
+#include <qmmpui/playlistmodel.h>
+
#include "playlist.h"
-#include "playlistmodel.h"
#include "listwidget.h"
#include "keyboardmanager.h"
#include "mainwindow.h"
diff --git a/src/ui/listwidget.cpp b/src/ui/listwidget.cpp
index a81a6098c..3219611f1 100644
--- a/src/ui/listwidget.cpp
+++ b/src/ui/listwidget.cpp
@@ -27,11 +27,12 @@
#include <QUrl>
#include <QApplication>
-#include "playlistitem.h"
+#include <qmmpui/playlistitem.h>
+#include <qmmpui/playlistmodel.h>
+
#include "textscroller.h"
#include "listwidget.h"
#include "skin.h"
-#include "playlistmodel.h"
#include "playlist.h"
#define INVALID_ROW -1
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 89761a7f0..4f38ec160 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -33,13 +33,13 @@
#include <qmmpui/playlistformat.h>
#include <qmmpui/commandlinemanager.h>
#include <qmmpui/filedialog.h>
+#include <qmmpui/fileloader.h>
+#include <qmmpui/playlistmodel.h>
#include "textscroller.h"
#include "mainwindow.h"
-#include "fileloader.h"
#include "skin.h"
#include "playlist.h"
-#include "playlistmodel.h"
#include "configdialog.h"
#include "dock.h"
#include "eqwidget.h"
@@ -350,7 +350,7 @@ void MainWindow::showMetaData()
}
}
-void MainWindow::closeEvent ( QCloseEvent *)
+void MainWindow::closeEvent (QCloseEvent *)
{
writeSettings();
m_playlist->close();
diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 674b8ad06..4add7ccb3 100644
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -25,9 +25,9 @@
#include <qmmp/output.h>
#include <qmmp/decoder.h>
#include <qmmp/decoderfactory.h>
+#include <qmmpui/playlistitem.h>
#include "display.h"
-#include "playlistitem.h"
#include "titlebar.h"
/**
diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp
index 42d560b2d..a6718ab74 100644
--- a/src/ui/playlist.cpp
+++ b/src/ui/playlist.cpp
@@ -27,13 +27,11 @@
#include <QCloseEvent>
#include "dock.h"
-#include "fileloader.h"
#include "playlist.h"
#include "skin.h"
#include "listwidget.h"
#include "button.h"
-#include "playlistitem.h"
-#include "playlistmodel.h"
+
#include "playlisttitlebar.h"
#include "playlistslider.h"
#include "pixmapwidget.h"
@@ -41,6 +39,9 @@
#include "playlistcontrol.h"
#include "keyboardmanager.h"
+#include <qmmpui/playlistitem.h>
+#include <qmmpui/playlistmodel.h>
+#include <qmmpui/fileloader.h>
#include <qmmp/soundcore.h>
PlayList::PlayList (QWidget *parent)
diff --git a/src/ui/playlisttitlebar.cpp b/src/ui/playlisttitlebar.cpp
index f218504d5..73e66f881 100644
--- a/src/ui/playlisttitlebar.cpp
+++ b/src/ui/playlisttitlebar.cpp
@@ -22,9 +22,10 @@
#include <QMenu>
#include <QSettings>
+#include <qmmpui/playlistmodel.h>
+
#include "dock.h"
#include "button.h"
-#include "playlistmodel.h"
#include "playlisttitlebar.h"
#include "skin.h"
diff --git a/src/ui/ui.pro b/src/ui/ui.pro
index 5bda93a6f..a9391b9a1 100644
--- a/src/ui/ui.pro
+++ b/src/ui/ui.pro
@@ -12,7 +12,6 @@ FORMS += ./forms/configdialog.ui \
./forms/addurldialog.ui
HEADERS += mainwindow.h \
- fileloader.h \
button.h \
display.h \
skin.h \
@@ -21,7 +20,6 @@ HEADERS += mainwindow.h \
number.h \
playlist.h \
listwidget.h \
- playlistmodel.h \
pixmapwidget.h \
playlisttitlebar.h \
configdialog.h \
@@ -60,12 +58,10 @@ HEADERS += mainwindow.h \
titlebarcontrol.h \
shadedvisual.h \
shadedbar.h \
- playlistitem.h \
builtincommandlineoption.h
SOURCES += mainwindow.cpp \
mp3player.cpp \
- fileloader.cpp \
button.cpp \
display.cpp \
skin.cpp \
@@ -74,7 +70,6 @@ SOURCES += mainwindow.cpp \
number.cpp \
playlist.cpp \
listwidget.cpp \
- playlistmodel.cpp \
pixmapwidget.cpp \
playlisttitlebar.cpp \
configdialog.cpp \
@@ -94,7 +89,6 @@ SOURCES += mainwindow.cpp \
pluginitem.cpp \
volumebar.cpp \
balancebar.cpp \
- playstate.cpp \
symboldisplay.cpp \
playlistcontrol.cpp \
qmmpstarter.cpp \
@@ -111,7 +105,6 @@ SOURCES += mainwindow.cpp \
titlebarcontrol.cpp \
shadedvisual.cpp \
shadedbar.cpp \
- playlistitem.cpp \
builtincommandlineoption.cpp
#Some conf to redirect intermediate stuff in separate dirs
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 12:34:45 +0000