Rename to aniplayer

diff --git a/aniplayer.pro b/aniplayer.pro
index 83c1f96d423ead9f97824e90657df45975e79f5d..7bff57308e730e5a796e9700222d3dd03a7caf78 100644 (file)
--- a/aniplayer.pro
+++ b/aniplayer.pro
@@ -3,6 +3,6 @@ CONFIG += ordered
 
 include(config.pri)
 
-SUBDIRS += aniplayer2
-win32: SUBDIRS += aniplayer2_dshow
+SUBDIRS += aniplayer
+win32: SUBDIRS += aniplayer_dshow
 SUBDIRS += player

diff --git a/aniplayer/aniplayer.h b/aniplayer/aniplayer.h
index 3ba45e249057bc944c53d2df0dc37198ecb2fa6b..31d467646b3fd2f827bab296dc930b08f645f5d2 100644 (file)
--- a/aniplayer/aniplayer.h
+++ b/aniplayer/aniplayer.h
@@ -1,7 +1,7 @@
 #ifndef ANIPLAYER_H
 #define ANIPLAYER_H
 
-#include "aniplayer2_global.h"
+#include "aniplayer_global.h"
 
 #include <QObject>
 #include <QString>
@@ -11,7 +11,7 @@
 class VideoWidget;
 class QTimerEvent;
 
-struct ANIPLAYER2SHARED_EXPORT Chapter
+struct ANIPLAYERSHARED_EXPORT Chapter
 {
        QString name;
        qint64 time;
@@ -26,7 +26,7 @@ enum StreamType
        OtherStream
 };
 
-struct ANIPLAYER2SHARED_EXPORT Stream
+struct ANIPLAYERSHARED_EXPORT Stream
 {
        QString name;
        StreamType type;
@@ -34,7 +34,7 @@ struct ANIPLAYER2SHARED_EXPORT Stream
 };
 typedef QList<Stream *> StreamList;
 
-class ANIPLAYER2SHARED_EXPORT AniPlayer : public QObject
+class ANIPLAYERSHARED_EXPORT AniPlayer : public QObject
 {
        Q_OBJECT
        Q_PROPERTY(State state READ state NOTIFY stateChanged)

diff --git a/aniplayer/aniplayer.pro b/aniplayer/aniplayer.pro
index 9caf30083f70726bdd0885f7215034bc984353dd..73438e1099d2113a7a9ce36638b7acdde3ba88c3 100644 (file)
--- a/aniplayer/aniplayer.pro
+++ b/aniplayer/aniplayer.pro
@@ -2,14 +2,14 @@ QT += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = aniplayer2
+TARGET = aniplayer
 DESTDIR = ../build
 
 TEMPLATE = lib
 
-DEFINES += ANIPLAYER2_LIBRARY
+DEFINES += ANIPLAYER_LIBRARY
 
-HEADERS += aniplayer2_global.h \
+HEADERS += aniplayer_global.h \
        constants.h \
        aniplayerapplication.h \
        aniplayer.h \

diff --git a/aniplayer/aniplayer_global.h b/aniplayer/aniplayer_global.h
index c26d14ce17b8dc2e1e99d456b3b16b18de34a8f6..fbf72376968eb508ad5218aede1899eba9ee01ac 100644 (file)
--- a/aniplayer/aniplayer_global.h
+++ b/aniplayer/aniplayer_global.h
@@ -1,12 +1,12 @@
-#ifndef ANIPLAYER2_GLOBAL_H
-#define ANIPLAYER2_GLOBAL_H
+#ifndef ANIPLAYER_GLOBAL_H
+#define ANIPLAYER_GLOBAL_H
 
 #include <QtCore/qglobal.h>
 
-#if defined(ANIPLAYER2_LIBRARY)
-#  define ANIPLAYER2SHARED_EXPORT Q_DECL_EXPORT
+#if defined(ANIPLAYER_LIBRARY)
+#  define ANIPLAYERSHARED_EXPORT Q_DECL_EXPORT
 #else
-#  define ANIPLAYER2SHARED_EXPORT Q_DECL_IMPORT
+#  define ANIPLAYERSHARED_EXPORT Q_DECL_IMPORT
 #endif
 
 #endif // LIBANIPLAYER2_GLOBAL_H

diff --git a/aniplayer/aniplayerapplication.h b/aniplayer/aniplayerapplication.h
index 6682941c15b6a3400fb8f5420147e314b48f15d8..e49a6e690f6b0ded572db9357ee8d81ce4fd194d 100644 (file)
--- a/aniplayer/aniplayerapplication.h
+++ b/aniplayer/aniplayerapplication.h
@@ -1,7 +1,7 @@
 #ifndef ANIPLAYERAPPLICATION_H
 #define ANIPLAYERAPPLICATION_H
 
-#include "aniplayer2_global.h"
+#include "aniplayer_global.h"
 #include <QtSingleApplication>
 
 class AniPlayer;
@@ -11,7 +11,7 @@ class AniPlayer;
 #endif
 #define qApp (AniPlayerApplication::instance())
 
-class ANIPLAYER2SHARED_EXPORT AniPlayerApplication : public QtSingleApplication
+class ANIPLAYERSHARED_EXPORT AniPlayerApplication : public QtSingleApplication
 {
        Q_OBJECT
 public:

diff --git a/aniplayer/videowidget.h b/aniplayer/videowidget.h
index 64b007579f3fcfbab7fe314294a381e7d3d77077..cd9b70273714f829b6105d8578e5375af41eb870 100644 (file)
--- a/aniplayer/videowidget.h
+++ b/aniplayer/videowidget.h
@@ -1,12 +1,12 @@
 #ifndef VIDEOWIDGET_H
 #define VIDEOWIDGET_H
 
-#include "aniplayer2_global.h"
+#include "aniplayer_global.h"
 #include <QWidget>
 
 class AniPlayer;
 
-class ANIPLAYER2SHARED_EXPORT VideoWidget : public QWidget
+class ANIPLAYERSHARED_EXPORT VideoWidget : public QWidget
 {
        Q_OBJECT
        Q_PROPERTY(bool fullScreen READ isFullScreen WRITE setFullScreen NOTIFY fullScreenChanged)

diff --git a/aniplayer/volumeslider.h b/aniplayer/volumeslider.h
index 25e8fc53d158febf1b8e4fab94b05229b3c16e1e..cc3b53256cf473401df74ef4c631be6aa541c84a 100644 (file)
--- a/aniplayer/volumeslider.h
+++ b/aniplayer/volumeslider.h
@@ -1,13 +1,13 @@
 #ifndef VOLUMESLIDER_H
 #define VOLUMESLIDER_H
 
-#include "aniplayer2_global.h"
+#include "aniplayer_global.h"
 #include <QWidget>
 
 class QSlider;
 class QPushButton;
 
-class ANIPLAYER2SHARED_EXPORT VolumeSlider : public QWidget
+class ANIPLAYERSHARED_EXPORT VolumeSlider : public QWidget
 {
        Q_OBJECT
        Q_PROPERTY(double volume READ volume WRITE setVolume NOTIFY volumeChanged USER true)

diff --git a/aniplayer_dshow/aniplayer_dshow.pri b/aniplayer_dshow/aniplayer_dshow.pri
index 6a0e8e59b40cdaf118000ea31ddec339675c3e22..a5f86dac5870e6ee8dbfe79267ea59431cd7f2de 100644 (file)
--- a/aniplayer_dshow/aniplayer_dshow.pri
+++ b/aniplayer_dshow/aniplayer_dshow.pri
@@ -1,5 +1,5 @@
 INCLUDEPATH += $$PWD
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
-LIBS += -laniplayer2_dshow
+LIBS += -laniplayer_dshow
 LIBS += -L$$PWD/../build

diff --git a/aniplayer_dshow/aniplayer_dshow.pro b/aniplayer_dshow/aniplayer_dshow.pro
index 43f10473f9d37282465caf967fb5a3e432c786f9..9c19b1b35e7d4817573ac9d36624f7287c849cee 100644 (file)
--- a/aniplayer_dshow/aniplayer_dshow.pro
+++ b/aniplayer_dshow/aniplayer_dshow.pro
@@ -2,15 +2,15 @@ QT += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = aniplayer2_dshow
+TARGET = aniplayer_dshow
 DESTDIR = ../build
 
 TEMPLATE = lib
 
-DEFINES += ANIPLAYER2_DSHOW_LIBRARY
+DEFINES += ANIPLAYER_DSHOW_LIBRARY
 
 
-HEADERS += aniplayer2_dshow_global.h
+HEADERS += aniplayer_dshow_global.h
 
 HEADERS += \
        aniplayerdshow.h \
@@ -24,6 +24,6 @@ SOURCES += \
        videowidgetdshow.cpp
 
 include(../config.pri)
-include(../aniplayer2/aniplayer2.pri)
+include(../aniplayer/aniplayer.pri)
 
 LIBS += -lstrmiids -lole32 -lOleAut32 -lUser32

diff --git a/aniplayer_dshow/aniplayer_dshow_global.h b/aniplayer_dshow/aniplayer_dshow_global.h
index b5d8367065482f2d43bef5964d68bcbea8fb3ae7..14ccc793ea2965db7ae9f5398b8f4b79af740145 100644 (file)
--- a/aniplayer_dshow/aniplayer_dshow_global.h
+++ b/aniplayer_dshow/aniplayer_dshow_global.h
@@ -1,12 +1,12 @@
-#ifndef ANIPLAYER2_DSHOW_GLOBAL_H
-#define ANIPLAYER2_DSHOW_GLOBAL_H
+#ifndef ANIPLAYER_DSHOW_GLOBAL_H
+#define ANIPLAYER_DSHOW_GLOBAL_H
 
 #include <QtCore/qglobal.h>
 
-#if defined(ANIPLAYER2_DSHOW_LIBRARY)
-#  define ANIPLAYER2_DSHOWSHARED_EXPORT Q_DECL_EXPORT
+#if defined(ANIPLAYER_DSHOW_LIBRARY)
+#  define ANIPLAYER_DSHOWSHARED_EXPORT Q_DECL_EXPORT
 #else
-#  define ANIPLAYER2_DSHOWSHARED_EXPORT Q_DECL_IMPORT
+#  define ANIPLAYER_DSHOWSHARED_EXPORT Q_DECL_IMPORT
 #endif
 
-#endif // ANIPLAYER2_DSHOW_GLOBAL_H
+#endif // ANIPLAYER_DSHOW_GLOBAL_H

diff --git a/aniplayer_dshow/aniplayerdshow.h b/aniplayer_dshow/aniplayerdshow.h
index 603dbabb1787d59d0c83f5828c64bb573ca6f43c..6d558371103c2bde3beb85363cd7d626ec202a80 100644 (file)
--- a/aniplayer_dshow/aniplayerdshow.h
+++ b/aniplayer_dshow/aniplayerdshow.h
@@ -1,14 +1,14 @@
 #ifndef ANIPLAYERDSHOW_H
 #define ANIPLAYERDSHOW_H
 
-#include "aniplayer2_dshow_global.h"
+#include "aniplayer_dshow_global.h"
 #include <aniplayer.h>
 
 class VideoWidgetDShow;
 
 struct AniPlayerDShowInternal;
 
-class ANIPLAYER2_DSHOWSHARED_EXPORT AniPlayerDShow : public AniPlayer
+class ANIPLAYER_DSHOWSHARED_EXPORT AniPlayerDShow : public AniPlayer
 {
        friend struct AniPlayerDShowInternal;
        Q_OBJECT

diff --git a/aniplayer_dshow/videowidgetdshow.h b/aniplayer_dshow/videowidgetdshow.h
index 399349a33355a0d7b1a7fbec1a4ce51cc2bd4da1..afa7724c903d9500d2f8d9a94f10ef948b6b306d 100644 (file)
--- a/aniplayer_dshow/videowidgetdshow.h
+++ b/aniplayer_dshow/videowidgetdshow.h
@@ -1,12 +1,12 @@
 #ifndef VIDEOWIDGETDSHOW_H
 #define VIDEOWIDGETDSHOW_H
 
-#include "aniplayer2_dshow_global.h"
+#include "aniplayer_dshow_global.h"
 #include <videowidget.h>
 
 class AniPlayerDShow;
 
-class ANIPLAYER2_DSHOWSHARED_EXPORT VideoWidgetDShow : public VideoWidget
+class ANIPLAYER_DSHOWSHARED_EXPORT VideoWidgetDShow : public VideoWidget
 {
        Q_OBJECT
 public:

diff --git a/player/player.pro b/player/player.pro
index b62b11908c996c7e57fe2e37559bf74b0eb8e972..dbbcc5aabb537e5676fa0170bcd3380e826f9a87 100644 (file)
--- a/player/player.pro
+++ b/player/player.pro
@@ -22,8 +22,8 @@ FORMS    += mainwindow.ui \
        menu.ui
 
 include(../config.pri)
-include(../aniplayer2/aniplayer2.pri)
-win32:include(../aniplayer2_dshow/aniplayer2_dshow.pri)
+include(../aniplayer/aniplayer.pri)
+win32:include(../aniplayer_dshow/aniplayer_dshow.pri)
 
 win32 {
        CONFIG -= embed_manifest_exe