[vlc-commits] qt: move native widgets to their own folder
Pierre Lamot
git at videolan.org
Tue Dec 17 15:37:45 CET 2019
vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Dec 6 15:39:22 2019 +0100| [f955f1fef38088bbfbba9797b3cded1a4986d8a9] | committer: Jean-Baptiste Kempf
qt: move native widgets to their own folder
no functionnal changes
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f955f1fef38088bbfbba9797b3cded1a4986d8a9
---
modules/gui/qt/Makefile.am | 22 +++++++++++-----------
.../gui/qt/components/voutwindow/qvoutwindow.cpp | 2 +-
modules/gui/qt/dialogs/bookmarks/bookmarks.hpp | 2 +-
modules/gui/qt/dialogs/dialogs_provider.cpp | 2 +-
modules/gui/qt/dialogs/epg/epg.hpp | 2 +-
modules/gui/qt/dialogs/errors/errors.hpp | 2 +-
modules/gui/qt/dialogs/extended/extended.hpp | 2 +-
.../gui/qt/dialogs/extended/extended_panels.cpp | 2 +-
modules/gui/qt/dialogs/extended/video_effects.ui | 2 +-
modules/gui/qt/dialogs/extensions/extensions.cpp | 2 +-
modules/gui/qt/dialogs/gototime/gototime.hpp | 2 +-
modules/gui/qt/dialogs/help/help.hpp | 2 +-
modules/gui/qt/dialogs/mediainfo/info_panels.cpp | 2 +-
modules/gui/qt/dialogs/mediainfo/mediainfo.hpp | 2 +-
modules/gui/qt/dialogs/messages/messages.hpp | 2 +-
modules/gui/qt/dialogs/messages/messages_panel.ui | 2 +-
modules/gui/qt/dialogs/open/open.hpp | 2 +-
modules/gui/qt/dialogs/open/openurl.cpp | 2 +-
modules/gui/qt/dialogs/open/openurl.hpp | 2 +-
modules/gui/qt/dialogs/plugins/plugins.cpp | 4 ++--
modules/gui/qt/dialogs/plugins/plugins.hpp | 2 +-
.../qt/dialogs/podcast/podcast_configuration.hpp | 2 +-
modules/gui/qt/dialogs/preferences/preferences.cpp | 6 +++---
modules/gui/qt/dialogs/preferences/preferences.hpp | 2 +-
.../qt/dialogs/preferences/preferences_widgets.cpp | 4 ++--
modules/gui/qt/dialogs/sout/convert.hpp | 2 +-
modules/gui/qt/dialogs/sout/profile_selector.hpp | 2 +-
modules/gui/qt/dialogs/sout/profiles.ui | 2 +-
modules/gui/qt/dialogs/sout/sout.hpp | 2 +-
modules/gui/qt/dialogs/toolbar/toolbareditor.hpp | 2 +-
modules/gui/qt/dialogs/vlm/vlm.hpp | 2 +-
modules/gui/qt/main_interface.cpp | 4 ++--
modules/gui/qt/main_interface.hpp | 2 +-
.../gui/qt/{util => widgets/native}/animators.cpp | 0
.../gui/qt/{util => widgets/native}/animators.hpp | 0
.../qt/{util => widgets/native}/customwidgets.cpp | 0
.../qt/{util => widgets/native}/customwidgets.hpp | 0
.../native}/interface_widgets.cpp | 4 ++--
.../native}/interface_widgets.hpp | 0
.../gui/qt/{util => widgets/native}/qvlcframe.cpp | 0
.../gui/qt/{util => widgets/native}/qvlcframe.hpp | 0
.../qt/{util => widgets/native}/searchlineedit.cpp | 0
.../qt/{util => widgets/native}/searchlineedit.hpp | 0
po/POTFILES.in | 18 +++++++++---------
44 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 8baccd60cb..68656a6e49 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -99,8 +99,8 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/preferences/simple_preferences.cpp \
gui/qt/dialogs/preferences/simple_preferences.hpp \
gui/qt/dialogs/open/open_panels.cpp gui/qt/dialogs/open/open_panels.hpp \
- gui/qt/components/interface_widgets.cpp \
- gui/qt/components/interface_widgets.hpp \
+ gui/qt/widgets/native/interface_widgets.cpp \
+ gui/qt/widgets/native/interface_widgets.hpp \
gui/qt/components/recent_media_model.cpp \
gui/qt/components/recent_media_model.hpp \
gui/qt/components/settings.cpp \
@@ -180,16 +180,16 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/sout/sout_widgets.cpp \
gui/qt/dialogs/sout/sout_widgets.hpp \
gui/qt/dialogs/sout/profiles.hpp \
- gui/qt/util/animators.cpp gui/qt/util/animators.hpp \
+ gui/qt/widgets/native/animators.cpp gui/qt/widgets/animators.hpp \
gui/qt/player/input_models.cpp gui/qt/player/input_models.hpp \
- gui/qt/util/customwidgets.cpp gui/qt/util/customwidgets.hpp \
- gui/qt/util/searchlineedit.cpp gui/qt/util/searchlineedit.hpp \
+ gui/qt/widgets/native/customwidgets.cpp gui/qt/widgets/native/customwidgets.hpp \
+ gui/qt/widgets/native/searchlineedit.cpp gui/qt/widgets/native/searchlineedit.hpp \
gui/qt/util/registry.cpp gui/qt/util/registry.hpp \
gui/qt/util/soutchain.cpp gui/qt/util/soutchain.hpp \
gui/qt/util/qt_dirs.cpp gui/qt/util/qt_dirs.hpp \
gui/qt/util/validators.cpp gui/qt/util/validators.hpp \
- gui/qt/util/qvlcframe.cpp \
- gui/qt/util/qvlcframe.hpp \
+ gui/qt/widgets/native/qvlcframe.cpp \
+ gui/qt/widgets/native/qvlcframe.hpp \
gui/qt/util/qvlcapp.hpp \
gui/qt/util/qmleventfilter.cpp \
gui/qt/util/qmleventfilter.hpp \
@@ -254,7 +254,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/preferences/complete_preferences.moc.cpp \
gui/qt/dialogs/preferences/simple_preferences.moc.cpp \
gui/qt/dialogs/open/open_panels.moc.cpp \
- gui/qt/components/interface_widgets.moc.cpp \
+ gui/qt/widgets/native/interface_widgets.moc.cpp \
gui/qt/components/navigation_history.moc.cpp \
gui/qt/menus/custom_menus.moc.cpp \
gui/qt/components/recent_media_model.moc.cpp \
@@ -296,11 +296,11 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/sout/sout.moc.cpp \
gui/qt/dialogs/sout/profile_selector.moc.cpp \
gui/qt/dialogs/sout/sout_widgets.moc.cpp \
- gui/qt/util/animators.moc.cpp \
+ gui/qt/widgets/native/animators.moc.cpp \
gui/qt/player/input_models.moc.cpp \
- gui/qt/util/customwidgets.moc.cpp \
+ gui/qt/widgets/native/customwidgets.moc.cpp \
gui/qt/util/qmleventfilter.moc.cpp \
- gui/qt/util/searchlineedit.moc.cpp \
+ gui/qt/widgets/native/searchlineedit.moc.cpp \
gui/qt/util/qvlcapp.moc.cpp \
gui/qt/util/vlctick.moc.cpp \
gui/qt/util/validators.moc.cpp
diff --git a/modules/gui/qt/components/voutwindow/qvoutwindow.cpp b/modules/gui/qt/components/voutwindow/qvoutwindow.cpp
index b102a42706..4b93508f61 100644
--- a/modules/gui/qt/components/voutwindow/qvoutwindow.cpp
+++ b/modules/gui/qt/components/voutwindow/qvoutwindow.cpp
@@ -1,5 +1,5 @@
#include "qvoutwindow.hpp"
-#include "util/customwidgets.hpp" //for qtEventToVLCKey
+#include "widgets/native/customwidgets.hpp" //for qtEventToVLCKey
QVoutWindow::QVoutWindow(QObject* parent)
: QObject(parent)
diff --git a/modules/gui/qt/dialogs/bookmarks/bookmarks.hpp b/modules/gui/qt/dialogs/bookmarks/bookmarks.hpp
index 2551dd65ad..52b0e9f402 100644
--- a/modules/gui/qt/dialogs/bookmarks/bookmarks.hpp
+++ b/modules/gui/qt/dialogs/bookmarks/bookmarks.hpp
@@ -24,7 +24,7 @@
#ifndef QVLC_BOOKMARKS_H_
#define QVLC_BOOKMARKS_H_ 1
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include <QStandardItemModel>
#include <QTreeView>
#include <QTreeWidget>
diff --git a/modules/gui/qt/dialogs/dialogs_provider.cpp b/modules/gui/qt/dialogs/dialogs_provider.cpp
index 289f2be127..7fbc2870ef 100644
--- a/modules/gui/qt/dialogs/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs/dialogs_provider.cpp
@@ -34,7 +34,7 @@
#include "menus/menus.hpp"
#include "recents.hpp"
#include "util/qt_dirs.hpp"
-#include "util/customwidgets.hpp" /* VLCKeyToString() */
+#include "widgets/native/customwidgets.hpp" /* VLCKeyToString() */
#include "main_interface.hpp"
/* The dialogs */
diff --git a/modules/gui/qt/dialogs/epg/epg.hpp b/modules/gui/qt/dialogs/epg/epg.hpp
index 1afc3c14a7..bfdb837222 100644
--- a/modules/gui/qt/dialogs/epg/epg.hpp
+++ b/modules/gui/qt/dialogs/epg/epg.hpp
@@ -23,7 +23,7 @@
#ifndef QVLC_EPG_DIALOG_H_
#define QVLC_EPG_DIALOG_H_ 1
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "util/singleton.hpp"
diff --git a/modules/gui/qt/dialogs/errors/errors.hpp b/modules/gui/qt/dialogs/errors/errors.hpp
index 939dc9bdf6..17f7104c96 100644
--- a/modules/gui/qt/dialogs/errors/errors.hpp
+++ b/modules/gui/qt/dialogs/errors/errors.hpp
@@ -23,7 +23,7 @@
#ifndef QVLC_ERRORS_DIALOG_H_
#define QVLC_ERRORS_DIALOG_H_ 1
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "util/singleton.hpp"
class QCheckBox;
diff --git a/modules/gui/qt/dialogs/extended/extended.hpp b/modules/gui/qt/dialogs/extended/extended.hpp
index ad179c8dbd..903570bfca 100644
--- a/modules/gui/qt/dialogs/extended/extended.hpp
+++ b/modules/gui/qt/dialogs/extended/extended.hpp
@@ -23,7 +23,7 @@
#ifndef QVLC_EXTENDED_DIALOG_H_
#define QVLC_EXTENDED_DIALOG_H_ 1
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "extended_panels.hpp"
#include "util/singleton.hpp"
diff --git a/modules/gui/qt/dialogs/extended/extended_panels.cpp b/modules/gui/qt/dialogs/extended/extended_panels.cpp
index 9c524f589e..099921cdee 100644
--- a/modules/gui/qt/dialogs/extended/extended_panels.cpp
+++ b/modules/gui/qt/dialogs/extended/extended_panels.cpp
@@ -49,7 +49,7 @@
#include "qt.hpp"
#include "player/player_controller.hpp"
#include "util/qt_dirs.hpp"
-#include "util/customwidgets.hpp"
+#include "widgets/native/customwidgets.hpp"
#include "dialogs/dialogs_provider.hpp"
#include "../../../../audio_filter/equalizer_presets.h"
diff --git a/modules/gui/qt/dialogs/extended/video_effects.ui b/modules/gui/qt/dialogs/extended/video_effects.ui
index e3144c663f..ea40e5afd4 100644
--- a/modules/gui/qt/dialogs/extended/video_effects.ui
+++ b/modules/gui/qt/dialogs/extended/video_effects.ui
@@ -1665,7 +1665,7 @@
<customwidget>
<class>VLCQDial</class>
<extends>QDial</extends>
- <header>util/customwidgets.hpp</header>
+ <header>widgets/native/customwidgets.hpp</header>
</customwidget>
</customwidgets>
<tabstops>
diff --git a/modules/gui/qt/dialogs/extensions/extensions.cpp b/modules/gui/qt/dialogs/extensions/extensions.cpp
index 725cb8bbcf..a7c215817e 100644
--- a/modules/gui/qt/dialogs/extensions/extensions.cpp
+++ b/modules/gui/qt/dialogs/extensions/extensions.cpp
@@ -38,7 +38,7 @@
#include <QCloseEvent>
#include <QCoreApplication>
#include <QKeyEvent>
-#include "util/customwidgets.hpp"
+#include "widgets/native/customwidgets.hpp"
ExtensionsDialogProvider *ExtensionsDialogProvider::instance = NULL;
diff --git a/modules/gui/qt/dialogs/gototime/gototime.hpp b/modules/gui/qt/dialogs/gototime/gototime.hpp
index ab7c3d8c28..2365dd2ead 100644
--- a/modules/gui/qt/dialogs/gototime/gototime.hpp
+++ b/modules/gui/qt/dialogs/gototime/gototime.hpp
@@ -23,7 +23,7 @@
#ifndef QVLC_GOTOTIME_DIALOG_H_
#define QVLC_GOTOTIME_DIALOG_H_ 1
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "util/singleton.hpp"
class QTimeEdit;
diff --git a/modules/gui/qt/dialogs/help/help.hpp b/modules/gui/qt/dialogs/help/help.hpp
index 7638eee0ff..5754e06b9a 100644
--- a/modules/gui/qt/dialogs/help/help.hpp
+++ b/modules/gui/qt/dialogs/help/help.hpp
@@ -29,7 +29,7 @@
#include "qt.hpp"
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "util/singleton.hpp"
#include "dialogs/help/ui_about.h"
#include "dialogs/help/ui_update.h"
diff --git a/modules/gui/qt/dialogs/mediainfo/info_panels.cpp b/modules/gui/qt/dialogs/mediainfo/info_panels.cpp
index 354f473725..f5250362dd 100644
--- a/modules/gui/qt/dialogs/mediainfo/info_panels.cpp
+++ b/modules/gui/qt/dialogs/mediainfo/info_panels.cpp
@@ -28,7 +28,7 @@
#include "qt.hpp"
#include "info_panels.hpp"
-#include "components/interface_widgets.hpp"
+#include "widgets/native/interface_widgets.hpp"
#include "info_widgets.hpp"
#include "dialogs/fingerprint/fingerprintdialog.hpp"
#include "dialogs/fingerprint/chromaprint.hpp"
diff --git a/modules/gui/qt/dialogs/mediainfo/mediainfo.hpp b/modules/gui/qt/dialogs/mediainfo/mediainfo.hpp
index 52e119b96e..869b8cc0fb 100644
--- a/modules/gui/qt/dialogs/mediainfo/mediainfo.hpp
+++ b/modules/gui/qt/dialogs/mediainfo/mediainfo.hpp
@@ -24,7 +24,7 @@
#ifndef QVLC_MEDIAINFO_DIALOG_H_
#define QVLC_MEDIAINFO_DIALOG_H_ 1
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "info_panels.hpp"
#include "util/singleton.hpp"
diff --git a/modules/gui/qt/dialogs/messages/messages.hpp b/modules/gui/qt/dialogs/messages/messages.hpp
index c63678a7d1..c2fd2850d1 100644
--- a/modules/gui/qt/dialogs/messages/messages.hpp
+++ b/modules/gui/qt/dialogs/messages/messages.hpp
@@ -23,7 +23,7 @@
#ifndef QVLC_MESSAGES_DIALOG_H_
#define QVLC_MESSAGES_DIALOG_H_ 1
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "util/singleton.hpp"
#include "dialogs/messages/ui_messages_panel.h"
#include <stdarg.h>
diff --git a/modules/gui/qt/dialogs/messages/messages_panel.ui b/modules/gui/qt/dialogs/messages/messages_panel.ui
index 53f7bfbc4e..9b961a08db 100644
--- a/modules/gui/qt/dialogs/messages/messages_panel.ui
+++ b/modules/gui/qt/dialogs/messages/messages_panel.ui
@@ -120,7 +120,7 @@
<customwidget>
<class>QVLCDebugLevelSpinBox</class>
<extends>QSpinBox</extends>
- <header>util/customwidgets.hpp</header>
+ <header>widgets/native/customwidgets.hpp</header>
</customwidget>
</customwidgets>
<resources/>
diff --git a/modules/gui/qt/dialogs/open/open.hpp b/modules/gui/qt/dialogs/open/open.hpp
index 790406868c..0ae45ecc95 100644
--- a/modules/gui/qt/dialogs/open/open.hpp
+++ b/modules/gui/qt/dialogs/open/open.hpp
@@ -30,7 +30,7 @@
#include <vlc_common.h>
#include <vlc_url.h>
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "dialogs/open/ui_open.h"
#include "dialogs/open/open_panels.hpp"
diff --git a/modules/gui/qt/dialogs/open/openurl.cpp b/modules/gui/qt/dialogs/open/openurl.cpp
index 281ba5409d..146b4bde6a 100644
--- a/modules/gui/qt/dialogs/open/openurl.cpp
+++ b/modules/gui/qt/dialogs/open/openurl.cpp
@@ -25,7 +25,7 @@
#endif
#include "dialogs/open/openurl.hpp"
-#include "util/searchlineedit.hpp"
+#include "widgets/native/searchlineedit.hpp"
#include "util/validators.hpp"
#include <QPushButton>
diff --git a/modules/gui/qt/dialogs/open/openurl.hpp b/modules/gui/qt/dialogs/open/openurl.hpp
index 45be5cf992..76c3479cc3 100644
--- a/modules/gui/qt/dialogs/open/openurl.hpp
+++ b/modules/gui/qt/dialogs/open/openurl.hpp
@@ -28,7 +28,7 @@
#endif
#include <vlc_common.h>
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "util/singleton.hpp"
class ClickLineEdit;
diff --git a/modules/gui/qt/dialogs/plugins/plugins.cpp b/modules/gui/qt/dialogs/plugins/plugins.cpp
index aacc65b03a..b9385e41ae 100644
--- a/modules/gui/qt/dialogs/plugins/plugins.cpp
+++ b/modules/gui/qt/dialogs/plugins/plugins.cpp
@@ -27,10 +27,10 @@
#include "plugins.hpp"
-#include "util/searchlineedit.hpp"
+#include "widgets/native/searchlineedit.hpp"
#include "dialogs/extensions/extensions_manager.hpp"
#include "addons_manager.hpp"
-#include "util/animators.hpp"
+#include "widgets/native/animators.hpp"
#include "util/imagehelper.hpp"
#include <assert.h>
diff --git a/modules/gui/qt/dialogs/plugins/plugins.hpp b/modules/gui/qt/dialogs/plugins/plugins.hpp
index 12705a91d2..092306510c 100644
--- a/modules/gui/qt/dialogs/plugins/plugins.hpp
+++ b/modules/gui/qt/dialogs/plugins/plugins.hpp
@@ -23,7 +23,7 @@
#ifndef QVLC_PLUGIN_DIALOG_H_
#define QVLC_PLUGIN_DIALOG_H_ 1
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "util/singleton.hpp"
#include <vlc_extensions.h>
diff --git a/modules/gui/qt/dialogs/podcast/podcast_configuration.hpp b/modules/gui/qt/dialogs/podcast/podcast_configuration.hpp
index 331ce1eb55..65308b9440 100644
--- a/modules/gui/qt/dialogs/podcast/podcast_configuration.hpp
+++ b/modules/gui/qt/dialogs/podcast/podcast_configuration.hpp
@@ -23,7 +23,7 @@
#ifndef QVLC_PODCAST_CONFIGURATION_DIALOG_H_
#define QVLC_PODCAST_CONFIGURATION_DIALOG_H_ 1
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "dialogs/podcast/ui_podcast_configuration.h"
#include "util/singleton.hpp"
diff --git a/modules/gui/qt/dialogs/preferences/preferences.cpp b/modules/gui/qt/dialogs/preferences/preferences.cpp
index ffcfbb3758..8eb54920a6 100644
--- a/modules/gui/qt/dialogs/preferences/preferences.cpp
+++ b/modules/gui/qt/dialogs/preferences/preferences.cpp
@@ -26,13 +26,13 @@
#endif
#include "dialogs/preferences/preferences.hpp"
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "dialogs/errors/errors.hpp"
#include "dialogs/preferences/complete_preferences.hpp"
#include "dialogs/preferences/simple_preferences.hpp"
-#include "util/searchlineedit.hpp"
-#include "util/qvlcframe.hpp"
+#include "widgets/native/searchlineedit.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "main_interface.hpp"
#include <QHBoxLayout>
diff --git a/modules/gui/qt/dialogs/preferences/preferences.hpp b/modules/gui/qt/dialogs/preferences/preferences.hpp
index 4462113967..495bc20f5a 100644
--- a/modules/gui/qt/dialogs/preferences/preferences.hpp
+++ b/modules/gui/qt/dialogs/preferences/preferences.hpp
@@ -23,7 +23,7 @@
#ifndef QVLC_PREFS_DIALOG_H_
#define QVLC_PREFS_DIALOG_H_ 1
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "dialogs/preferences/simple_preferences.hpp"
class PrefsTree;
diff --git a/modules/gui/qt/dialogs/preferences/preferences_widgets.cpp b/modules/gui/qt/dialogs/preferences/preferences_widgets.cpp
index 41df1845ba..b1649ac6fa 100644
--- a/modules/gui/qt/dialogs/preferences/preferences_widgets.cpp
+++ b/modules/gui/qt/dialogs/preferences/preferences_widgets.cpp
@@ -31,8 +31,8 @@
#endif
#include "dialogs/preferences/preferences_widgets.hpp"
-#include "util/customwidgets.hpp"
-#include "util/searchlineedit.hpp"
+#include "widgets/native/customwidgets.hpp"
+#include "widgets/native/searchlineedit.hpp"
#include "util/qt_dirs.hpp"
#include <vlc_actions.h>
#include <vlc_intf_strings.h>
diff --git a/modules/gui/qt/dialogs/sout/convert.hpp b/modules/gui/qt/dialogs/sout/convert.hpp
index 3d6ca1f53d..34fd39a156 100644
--- a/modules/gui/qt/dialogs/sout/convert.hpp
+++ b/modules/gui/qt/dialogs/sout/convert.hpp
@@ -23,7 +23,7 @@
#ifndef QVLC_CONVERT_DIALOG_H_
#define QVLC_CONVERT_DIALOG_H_ 1
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
class QLineEdit;
class QCheckBox;
diff --git a/modules/gui/qt/dialogs/sout/profile_selector.hpp b/modules/gui/qt/dialogs/sout/profile_selector.hpp
index d9953656b9..c1c37a50f8 100644
--- a/modules/gui/qt/dialogs/sout/profile_selector.hpp
+++ b/modules/gui/qt/dialogs/sout/profile_selector.hpp
@@ -29,7 +29,7 @@
#include <QSet>
#include <QHash>
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "util/soutchain.hpp"
#include "dialogs/sout/ui_profiles.h"
diff --git a/modules/gui/qt/dialogs/sout/profiles.ui b/modules/gui/qt/dialogs/sout/profiles.ui
index 79d5285d2e..98588bfc6b 100644
--- a/modules/gui/qt/dialogs/sout/profiles.ui
+++ b/modules/gui/qt/dialogs/sout/profiles.ui
@@ -829,7 +829,7 @@
<customwidget>
<class>YesNoCheckBox</class>
<extends>QCheckBox</extends>
- <header>util/customwidgets.hpp</header>
+ <header>widgets/native/customwidgets.hpp</header>
</customwidget>
</customwidgets>
<tabstops>
diff --git a/modules/gui/qt/dialogs/sout/sout.hpp b/modules/gui/qt/dialogs/sout/sout.hpp
index 128ce10f29..ca8c5aa5b3 100644
--- a/modules/gui/qt/dialogs/sout/sout.hpp
+++ b/modules/gui/qt/dialogs/sout/sout.hpp
@@ -30,7 +30,7 @@
#include <vlc_common.h> /* Gettext functions */
#include "dialogs/sout/ui_sout.h"
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "util/soutchain.hpp"
#include <QWizard>
diff --git a/modules/gui/qt/dialogs/toolbar/toolbareditor.hpp b/modules/gui/qt/dialogs/toolbar/toolbareditor.hpp
index ae81e61851..069a943578 100644
--- a/modules/gui/qt/dialogs/toolbar/toolbareditor.hpp
+++ b/modules/gui/qt/dialogs/toolbar/toolbareditor.hpp
@@ -19,7 +19,7 @@
#ifndef QVLC_TOOLBAREDITOR_DIALOG_H_
#define QVLC_TOOLBAREDITOR_DIALOG_H_ 1
-#include "util/qvlcframe.hpp" /* QVLCDialog */
+#include "widgets/native/qvlcframe.hpp" /* QVLCDialog */
#include "components/qml_main_context.hpp"
#include "dialogs/sout/profile_selector.hpp"
diff --git a/modules/gui/qt/dialogs/vlm/vlm.hpp b/modules/gui/qt/dialogs/vlm/vlm.hpp
index 8202c2d6d1..930efe43d5 100644
--- a/modules/gui/qt/dialogs/vlm/vlm.hpp
+++ b/modules/gui/qt/dialogs/vlm/vlm.hpp
@@ -31,7 +31,7 @@
#include <vlc_vlm.h>
#include "dialogs/vlm/ui_vlm.h"
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "util/singleton.hpp"
#include <QDateTime>
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index 4ab07b6945..08dd6176e7 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -32,11 +32,11 @@
#include "player/player_controller.hpp" // Creation
#include "managers/renderer_manager.hpp"
-#include "util/customwidgets.hpp" // qtEventToVLCKey, QVLCStackedWidget
+#include "widgets/native/customwidgets.hpp" // qtEventToVLCKey, QVLCStackedWidget
#include "util/qt_dirs.hpp" // toNativeSeparators
#include "util/imagehelper.hpp"
-#include "components/interface_widgets.hpp" // bgWidget, videoWidget
+#include "widgets/native/interface_widgets.hpp" // bgWidget, videoWidget
#include "dialogs/firstrun/firstrun.hpp" // First Run
#include "playlist/playlist_model.hpp"
diff --git a/modules/gui/qt/main_interface.hpp b/modules/gui/qt/main_interface.hpp
index 4cb7dd2360..2362603e5b 100644
--- a/modules/gui/qt/main_interface.hpp
+++ b/modules/gui/qt/main_interface.hpp
@@ -26,7 +26,7 @@
#include "qt.hpp"
-#include "util/qvlcframe.hpp"
+#include "widgets/native/qvlcframe.hpp"
#include "player/player_controller.hpp"
#include "components/voutwindow/qvoutwindow.hpp"
diff --git a/modules/gui/qt/util/animators.cpp b/modules/gui/qt/widgets/native/animators.cpp
similarity index 100%
rename from modules/gui/qt/util/animators.cpp
rename to modules/gui/qt/widgets/native/animators.cpp
diff --git a/modules/gui/qt/util/animators.hpp b/modules/gui/qt/widgets/native/animators.hpp
similarity index 100%
rename from modules/gui/qt/util/animators.hpp
rename to modules/gui/qt/widgets/native/animators.hpp
diff --git a/modules/gui/qt/util/customwidgets.cpp b/modules/gui/qt/widgets/native/customwidgets.cpp
similarity index 100%
rename from modules/gui/qt/util/customwidgets.cpp
rename to modules/gui/qt/widgets/native/customwidgets.cpp
diff --git a/modules/gui/qt/util/customwidgets.hpp b/modules/gui/qt/widgets/native/customwidgets.hpp
similarity index 100%
rename from modules/gui/qt/util/customwidgets.hpp
rename to modules/gui/qt/widgets/native/customwidgets.hpp
diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/widgets/native/interface_widgets.cpp
similarity index 99%
rename from modules/gui/qt/components/interface_widgets.cpp
rename to modules/gui/qt/widgets/native/interface_widgets.cpp
index a3799e7be7..f509760d88 100644
--- a/modules/gui/qt/components/interface_widgets.cpp
+++ b/modules/gui/qt/widgets/native/interface_widgets.cpp
@@ -28,9 +28,9 @@
#endif
#include "qt.hpp"
-#include "components/interface_widgets.hpp"
+#include "interface_widgets.hpp"
#include "dialogs/dialogs_provider.hpp"
-#include "util/customwidgets.hpp" // qtEventToVLCKey, QVLCStackedWidget
+#include "widgets/native/customwidgets.hpp" // qtEventToVLCKey, QVLCStackedWidget
#include <QLabel>
#include <QToolButton>
diff --git a/modules/gui/qt/components/interface_widgets.hpp b/modules/gui/qt/widgets/native/interface_widgets.hpp
similarity index 100%
rename from modules/gui/qt/components/interface_widgets.hpp
rename to modules/gui/qt/widgets/native/interface_widgets.hpp
diff --git a/modules/gui/qt/util/qvlcframe.cpp b/modules/gui/qt/widgets/native/qvlcframe.cpp
similarity index 100%
rename from modules/gui/qt/util/qvlcframe.cpp
rename to modules/gui/qt/widgets/native/qvlcframe.cpp
diff --git a/modules/gui/qt/util/qvlcframe.hpp b/modules/gui/qt/widgets/native/qvlcframe.hpp
similarity index 100%
rename from modules/gui/qt/util/qvlcframe.hpp
rename to modules/gui/qt/widgets/native/qvlcframe.hpp
diff --git a/modules/gui/qt/util/searchlineedit.cpp b/modules/gui/qt/widgets/native/searchlineedit.cpp
similarity index 100%
rename from modules/gui/qt/util/searchlineedit.cpp
rename to modules/gui/qt/widgets/native/searchlineedit.cpp
diff --git a/modules/gui/qt/util/searchlineedit.hpp b/modules/gui/qt/widgets/native/searchlineedit.hpp
similarity index 100%
rename from modules/gui/qt/util/searchlineedit.hpp
rename to modules/gui/qt/widgets/native/searchlineedit.hpp
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ebe17f7c5b..8d4611518b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -694,8 +694,8 @@ modules/gui/qt/dialogs/mediainfo/info_panels.cpp
modules/gui/qt/dialogs/mediainfo/info_panels.hpp
modules/gui/qt/dialogs/mediainfo/info_widgets.cpp
modules/gui/qt/dialogs/mediainfo/info_widgets.hpp
-modules/gui/qt/components/interface_widgets.cpp
-modules/gui/qt/components/interface_widgets.hpp
+modules/gui/qt/widgets/native/interface_widgets.cpp
+modules/gui/qt/widgets/native/interface_widgets.hpp
modules/gui/qt/dialogs/open/open_panels.cpp
modules/gui/qt/dialogs/open/open_panels.hpp
modules/gui/qt/dialogs/preferences/preferences_widgets.cpp
@@ -761,20 +761,20 @@ modules/gui/qt/qt.cpp
modules/gui/qt/qt.hpp
modules/gui/qt/recents.cpp
modules/gui/qt/recents.hpp
-modules/gui/qt/util/animators.cpp
-modules/gui/qt/util/animators.hpp
-modules/gui/qt/util/customwidgets.cpp
-modules/gui/qt/util/customwidgets.hpp
+modules/gui/qt/widgets/native/animators.cpp
+modules/gui/qt/widgets/native/animators.hpp
+modules/gui/qt/widgets/native/customwidgets.cpp
+modules/gui/qt/widgets/native/customwidgets.hpp
modules/gui/qt/util/imagehelper.cpp
modules/gui/qt/util/imagehelper.hpp
modules/gui/qt/util/qt_dirs.cpp
modules/gui/qt/util/qt_dirs.hpp
modules/gui/qt/util/qvlcapp.hpp
-modules/gui/qt/util/qvlcframe.hpp
+modules/gui/qt/widgets/native/qvlcframe.hpp
modules/gui/qt/util/registry.cpp
modules/gui/qt/util/registry.hpp
-modules/gui/qt/util/searchlineedit.cpp
-modules/gui/qt/util/searchlineedit.hpp
+modules/gui/qt/widgets/native/searchlineedit.cpp
+modules/gui/qt/widgets/native/searchlineedit.hpp
modules/gui/qt/util/singleton.hpp
modules/gui/qt/util/validators.cpp
modules/gui/qt/util/validators.hpp
More information about the vlc-commits
mailing list