[vlc-commits] qt: move adapters to util
Pierre Lamot
git at videolan.org
Tue Dec 17 15:37:39 CET 2019
vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Thu Dec 5 16:17:08 2019 +0100| [1cc85f66269c97daa557b6fa95ded9c48c1ca711] | committer: Jean-Baptiste Kempf
qt: move adapters to util
no functionnal changes
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1cc85f66269c97daa557b6fa95ded9c48c1ca711
---
modules/gui/qt/Makefile.am | 10 +++++-----
modules/gui/qt/dialogs/extended/extended_panels.hpp | 2 +-
modules/gui/qt/menus.cpp | 2 +-
modules/gui/qt/player/player_controller.hpp | 2 +-
modules/gui/qt/player/player_controller_p.hpp | 4 ++--
.../{adapters/var_choice_model.cpp => util/varchoicemodel.cpp} | 2 +-
.../{adapters/var_choice_model.hpp => util/varchoicemodel.hpp} | 2 +-
.../gui/qt/{adapters/var_common_p.hpp => util/varcommon_p.hpp} | 0
modules/gui/qt/{adapters => util}/variables.cpp | 0
modules/gui/qt/{adapters => util}/variables.hpp | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 58e11eea2a..708b82f62a 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -51,9 +51,9 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/dialogs_provider.cpp gui/qt/dialogs/dialogs_provider.hpp \
gui/qt/managers/renderer_manager.cpp gui/qt/managers/renderer_manager.hpp \
gui/qt/recents.cpp gui/qt/recents.hpp \
- gui/qt/adapters/var_common_p.hpp \
- gui/qt/adapters/variables.cpp gui/qt/adapters/variables.hpp \
- gui/qt/adapters/var_choice_model.cpp gui/qt/adapters/var_choice_model.hpp \
+ gui/qt/util/var_common_p.hpp \
+ gui/qt/util/variables.cpp gui/qt/util/variables.hpp \
+ gui/qt/util/varchoicemodel.cpp gui/qt/util/varchoicemodel.hpp \
gui/qt/dialogs/bookmarks/bookmarks.cpp gui/qt/dialogs/bookmarks/bookmarks.hpp \
gui/qt/dialogs/mediainfo/mediainfo.cpp gui/qt/dialogs/mediainfo/mediainfo.hpp \
gui/qt/dialogs/mediainfo/info_panels.cpp gui/qt/dialogs/mediainfo/info_panels.hpp \
@@ -234,8 +234,8 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/dialogs_provider.moc.cpp \
gui/qt/managers/renderer_manager.moc.cpp \
gui/qt/recents.moc.cpp \
- gui/qt/adapters/variables.moc.cpp \
- gui/qt/adapters/var_choice_model.moc.cpp \
+ gui/qt/util/variables.moc.cpp \
+ gui/qt/util/varchoicemodel.moc.cpp \
gui/qt/dialogs/bookmarks/bookmarks.moc.cpp \
gui/qt/dialogs/mediainfo/mediainfo.moc.cpp \
gui/qt/dialogs/mediainfo/info_panels.moc.cpp \
diff --git a/modules/gui/qt/dialogs/extended/extended_panels.hpp b/modules/gui/qt/dialogs/extended/extended_panels.hpp
index bf0f545741..98f0d84376 100644
--- a/modules/gui/qt/dialogs/extended/extended_panels.hpp
+++ b/modules/gui/qt/dialogs/extended/extended_panels.hpp
@@ -33,7 +33,7 @@
#include "qt.hpp"
#include "dialogs/extended/ui_equalizer.h"
#include "dialogs/extended/ui_video_effects.h"
-#include "adapters/variables.hpp"
+#include "util/variables.hpp"
#include <QTabWidget>
diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp
index f3095ee28f..546430b6cf 100644
--- a/modules/gui/qt/menus.cpp
+++ b/modules/gui/qt/menus.cpp
@@ -44,7 +44,7 @@
#include "recents.hpp" /* Recent Items */
#include "dialogs/extensions/extensions_manager.hpp" /* Extensions menu */
#include "dialogs/extended/extended_panels.hpp"
-#include "adapters/var_choice_model.hpp"
+#include "util/varchoicemodel.hpp"
#include <QMenu>
#include <QMenuBar>
diff --git a/modules/gui/qt/player/player_controller.hpp b/modules/gui/qt/player/player_controller.hpp
index 81ed34035b..7d987cd7b5 100644
--- a/modules/gui/qt/player/player_controller.hpp
+++ b/modules/gui/qt/player/player_controller.hpp
@@ -31,7 +31,7 @@
#include <vlc_cxx_helpers.hpp>
#include "player/input_models.hpp"
#include "components/audio_device_model.hpp"
-#include "adapters/var_choice_model.hpp"
+#include "util/varchoicemodel.hpp"
#include "util/vlctick.hpp"
class QSignalMapper;
diff --git a/modules/gui/qt/player/player_controller_p.hpp b/modules/gui/qt/player/player_controller_p.hpp
index f7ebdc3489..8a7bcc790b 100644
--- a/modules/gui/qt/player/player_controller_p.hpp
+++ b/modules/gui/qt/player/player_controller_p.hpp
@@ -20,9 +20,9 @@
#define QVLC_INPUT_MANAGER_P_H_
#include "player_controller.hpp"
-#include "adapters/variables.hpp"
+#include "util/variables.hpp"
#include "input_models.hpp"
-#include "adapters/var_choice_model.hpp"
+#include "util/varchoicemodel.hpp"
#include <QTimer>
diff --git a/modules/gui/qt/adapters/var_choice_model.cpp b/modules/gui/qt/util/varchoicemodel.cpp
similarity index 99%
rename from modules/gui/qt/adapters/var_choice_model.cpp
rename to modules/gui/qt/util/varchoicemodel.cpp
index d5da2f0b58..88b719c8d1 100644
--- a/modules/gui/qt/adapters/var_choice_model.cpp
+++ b/modules/gui/qt/util/varchoicemodel.cpp
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "var_choice_model.hpp"
+#include "varchoicemodel.hpp"
int VLCVarChoiceModel::on_variable_callback( vlc_object_t * object, char const * , vlc_value_t oldvalue, vlc_value_t newvalue, void * data)
{
diff --git a/modules/gui/qt/adapters/var_choice_model.hpp b/modules/gui/qt/util/varchoicemodel.hpp
similarity index 99%
rename from modules/gui/qt/adapters/var_choice_model.hpp
rename to modules/gui/qt/util/varchoicemodel.hpp
index 3eb2b91e5b..9f5b20729a 100644
--- a/modules/gui/qt/adapters/var_choice_model.hpp
+++ b/modules/gui/qt/util/varchoicemodel.hpp
@@ -27,7 +27,7 @@
#include <QAbstractListModel>
#include <QMutex>
#include <vlc_cxx_helpers.hpp>
-#include "var_common_p.hpp"
+#include "varcommon_p.hpp"
extern "C" {
int VLCVarChoiceModel_on_variable_callback( vlc_object_t * object, char const * , vlc_value_t oldvalue, vlc_value_t newvalue, void * data);
diff --git a/modules/gui/qt/adapters/var_common_p.hpp b/modules/gui/qt/util/varcommon_p.hpp
similarity index 100%
rename from modules/gui/qt/adapters/var_common_p.hpp
rename to modules/gui/qt/util/varcommon_p.hpp
diff --git a/modules/gui/qt/adapters/variables.cpp b/modules/gui/qt/util/variables.cpp
similarity index 100%
rename from modules/gui/qt/adapters/variables.cpp
rename to modules/gui/qt/util/variables.cpp
diff --git a/modules/gui/qt/adapters/variables.hpp b/modules/gui/qt/util/variables.hpp
similarity index 99%
rename from modules/gui/qt/adapters/variables.hpp
rename to modules/gui/qt/util/variables.hpp
index 69c5f6f2d9..dff7e84bcb 100644
--- a/modules/gui/qt/adapters/variables.hpp
+++ b/modules/gui/qt/util/variables.hpp
@@ -30,7 +30,7 @@
#include <QObject>
#include "qt.hpp"
-#include "var_common_p.hpp"
+#include "varcommon_p.hpp"
/*
* type traits to convert VLC_VAR to C++types
More information about the vlc-commits
mailing list