diff --git a/KittehPlayer.pro b/KittehPlayer.pro index ffc7aa7..45b5cf6 100644 --- a/KittehPlayer.pro +++ b/KittehPlayer.pro @@ -29,7 +29,7 @@ unix { INSTALLS += target -HEADERS += src/mpvobject.h src/config.h src/filesavedialog.h src/fileopendialog.h +HEADERS += src/mpvobject.h src/filesavedialog.h src/fileopendialog.h DISTFILES += KittehPlayer.desktop KittehPlayer.png README.md LICENSE.txt diff --git a/src/config.h b/src/config.h deleted file mode 100644 index 8b6ca76..0000000 --- a/src/config.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef CONFIG_H -#define CONFIG_H - -#include - -#if MPV_CLIENT_API_VERSION >= MPV_MAKE_VERSION(1, 28) -// good -#else -#error "Old MPV versions without render API are not supported." -#endif - -#endif // CONFIG_H diff --git a/src/main.cpp b/src/main.cpp index 373b92e..b5cd47b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,30 +1,13 @@ -#include -#include -#include -#include -#include - -#include "config.h" -#include "mpvobject.h" #ifdef QRC_SOURCE_PATH #include "runtimeqml/runtimeqml.h" #endif +#include +#include +#include #include "fileopendialog.h" #include "filesavedialog.h" - -#include - -#include -#include - -#include -#include -#include -#include -#include -#include - +#include "mpvobject.h" int main( int argc, char *argv[] ) { diff --git a/src/mpvobject.cpp b/src/mpvobject.cpp index 8397e68..9f27b17 100644 --- a/src/mpvobject.cpp +++ b/src/mpvobject.cpp @@ -3,26 +3,12 @@ #include #include "mpvobject.h" -#include "config.h" - -#include -#include -#include #include - +#include #include +#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include namespace { diff --git a/src/mpvobject.h b/src/mpvobject.h index 3ceca71..b20bea4 100644 --- a/src/mpvobject.h +++ b/src/mpvobject.h @@ -1,23 +1,14 @@ #ifndef MPVOBJECT_H #define MPVOBJECT_H -#include - #include - #include - #include #include -#include #include -#include - #include -#include -#include class MpvRenderer; diff --git a/src/qml/CustomComboBox.qml b/src/qml/CustomComboBox.qml index 507ecda..8d7d225 100644 --- a/src/qml/CustomComboBox.qml +++ b/src/qml/CustomComboBox.qml @@ -1,8 +1,5 @@ import QtQuick 2.11 import QtQuick.Controls 2.4 -import QtQuick.Dialogs 1.3 -import QtQuick.Layouts 1.11 -import QtQuick.Window 2.11 ComboBox { id: control diff --git a/src/qml/CustomMenuItem.qml b/src/qml/CustomMenuItem.qml index 4b8e5e2..87c2c89 100644 --- a/src/qml/CustomMenuItem.qml +++ b/src/qml/CustomMenuItem.qml @@ -1,8 +1,5 @@ import QtQuick 2.11 import QtQuick.Controls 2.4 -import QtQuick.Dialogs 1.3 -import QtQuick.Layouts 1.11 -import QtQuick.Window 2.11 MenuItem { FontLoader { diff --git a/src/qml/main.qml b/src/qml/main.qml index 983bd11..9e8decf 100644 --- a/src/qml/main.qml +++ b/src/qml/main.qml @@ -5,7 +5,6 @@ import QtQuick.Layouts 1.11 import QtQuick.Window 2.11 import Qt.labs.settings 1.0 import player 1.0 -//import QtGraphicalEffects 1.0 import "codes.js" as LanguageCodes