vlc | branch: master | Marvin Scholz <[email protected]> | Wed Jul 3 16:28:02 2019 +0200| [f7205539530d5286ff7fe6cb7cca29050051803a] | committer: Jean-Baptiste Kempf
qt: Prefix uic generated headers with 'ui_' Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f7205539530d5286ff7fe6cb7cca29050051803a --- modules/gui/qt/Makefile.am | 48 +++++++++++----------- modules/gui/qt/components/extended_panels.hpp | 4 +- modules/gui/qt/components/open_panels.hpp | 8 ++-- modules/gui/qt/components/simple_preferences.hpp | 10 ++--- .../gui/qt/components/sout/profile_selector.hpp | 2 +- modules/gui/qt/dialogs/fingerprintdialog.cpp | 2 +- modules/gui/qt/dialogs/help.hpp | 4 +- modules/gui/qt/dialogs/messages.hpp | 2 +- modules/gui/qt/dialogs/open.hpp | 2 +- modules/gui/qt/dialogs/podcast_configuration.hpp | 2 +- modules/gui/qt/dialogs/sout.hpp | 2 +- modules/gui/qt/dialogs/vlm.hpp | 2 +- po/POTFILES.in | 40 +++++++++--------- 13 files changed, 64 insertions(+), 64 deletions(-) diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am index 1503a93000..50db6e4395 100644 --- a/modules/gui/qt/Makefile.am +++ b/modules/gui/qt/Makefile.am @@ -14,7 +14,7 @@ SUFFIXES += .ui .h .hpp .moc.cpp .qml libqt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ - -I$(srcdir)/gui/qt -I$(builddir)/gui/qt + -I$(srcdir)/gui/qt -I$(builddir)/gui/qt/ui libqt_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt) libqt_plugin_la_LIBADD = $(QT_LIBS) $(LIBS_qt) $(LIBM) libqt_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' @@ -306,27 +306,27 @@ nodist_libqt_plugin_la_SOURCES += gui/qt/main_interface_win32.moc.cpp endif nodist_libqt_plugin_la_SOURCES += \ - gui/qt/ui/equalizer.h \ - gui/qt/ui/video_effects.h \ - gui/qt/ui/open_file.h \ - gui/qt/ui/open_disk.h \ - gui/qt/ui/open_net.h \ - gui/qt/ui/open_capture.h \ - gui/qt/ui/open.h \ - gui/qt/ui/vlm.h \ - gui/qt/ui/podcast_configuration.h \ - gui/qt/ui/profiles.h \ - gui/qt/ui/sprefs_audio.h \ - gui/qt/ui/sprefs_input.h \ - gui/qt/ui/sprefs_interface.h \ - gui/qt/ui/sprefs_subtitles.h \ - gui/qt/ui/sprefs_video.h \ - gui/qt/ui/streampanel.h \ - gui/qt/ui/messages_panel.h \ - gui/qt/ui/about.h \ - gui/qt/ui/update.h \ - gui/qt/ui/fingerprintdialog.h \ - gui/qt/ui/sout.h + gui/qt/ui/ui_equalizer.h \ + gui/qt/ui/ui_video_effects.h \ + gui/qt/ui/ui_open_file.h \ + gui/qt/ui/ui_open_disk.h \ + gui/qt/ui/ui_open_net.h \ + gui/qt/ui/ui_open_capture.h \ + gui/qt/ui/ui_open.h \ + gui/qt/ui/ui_vlm.h \ + gui/qt/ui/ui_podcast_configuration.h \ + gui/qt/ui/ui_profiles.h \ + gui/qt/ui/ui_sprefs_audio.h \ + gui/qt/ui/ui_sprefs_input.h \ + gui/qt/ui/ui_sprefs_interface.h \ + gui/qt/ui/ui_sprefs_subtitles.h \ + gui/qt/ui/ui_sprefs_video.h \ + gui/qt/ui/ui_streampanel.h \ + gui/qt/ui/ui_messages_panel.h \ + gui/qt/ui/ui_about.h \ + gui/qt/ui/ui_update.h \ + gui/qt/ui/ui_fingerprintdialog.h \ + gui/qt/ui/ui_sout.h # User interface compilation @@ -369,8 +369,8 @@ libqt_plugin_la_UI = \ gui/qt/ui/fingerprintdialog.ui EXTRA_DIST += $(libqt_plugin_la_UI) -.ui.h: - $(AM_V_at)mkdir -p -- gui/qt/ui +ui_%.h: %.ui + $(AM_V_at)$(MKDIR_P) "gui/qt/ui" $(AM_V_at)rm -f $@ [email protected] $(AM_V_at)echo "#define Q_(a,b) QString::fromUtf8(_(a))" > [email protected] $(uic_verbose)$(UIC) -tr "Q_" $< >> [email protected] diff --git a/modules/gui/qt/components/extended_panels.hpp b/modules/gui/qt/components/extended_panels.hpp index a06704bbcb..ee2a61cf22 100644 --- a/modules/gui/qt/components/extended_panels.hpp +++ b/modules/gui/qt/components/extended_panels.hpp @@ -31,8 +31,8 @@ #include <vlc_common.h> #include "qt.hpp" -#include "ui/equalizer.h" -#include "ui/video_effects.h" +#include "ui_equalizer.h" +#include "ui_video_effects.h" #include "adapters/variables.hpp" #include <QTabWidget> diff --git a/modules/gui/qt/components/open_panels.hpp b/modules/gui/qt/components/open_panels.hpp index d9e72d8a5f..87e73c46d1 100644 --- a/modules/gui/qt/components/open_panels.hpp +++ b/modules/gui/qt/components/open_panels.hpp @@ -33,10 +33,10 @@ #include "components/preferences_widgets.hpp" -#include "ui/open_file.h" -#include "ui/open_disk.h" -#include "ui/open_net.h" -#include "ui/open_capture.h" +#include "ui_open_file.h" +#include "ui_open_disk.h" +#include "ui_open_net.h" +#include "ui_open_capture.h" #include <QFileDialog> diff --git a/modules/gui/qt/components/simple_preferences.hpp b/modules/gui/qt/components/simple_preferences.hpp index bab78fd730..e249cfadc8 100644 --- a/modules/gui/qt/components/simple_preferences.hpp +++ b/modules/gui/qt/components/simple_preferences.hpp @@ -30,11 +30,11 @@ #include <vlc_common.h> #include <vlc_interface.h> -#include "ui/sprefs_input.h" -#include "ui/sprefs_audio.h" -#include "ui/sprefs_video.h" -#include "ui/sprefs_subtitles.h" -#include "ui/sprefs_interface.h" +#include "ui_sprefs_input.h" +#include "ui_sprefs_audio.h" +#include "ui_sprefs_video.h" +#include "ui_sprefs_subtitles.h" +#include "ui_sprefs_interface.h" #ifdef _WIN32 # include "util/registry.hpp" diff --git a/modules/gui/qt/components/sout/profile_selector.hpp b/modules/gui/qt/components/sout/profile_selector.hpp index bca9e0e91e..1074c7b220 100644 --- a/modules/gui/qt/components/sout/profile_selector.hpp +++ b/modules/gui/qt/components/sout/profile_selector.hpp @@ -30,7 +30,7 @@ #include <QHash> #include "util/qvlcframe.hpp" -#include "ui/profiles.h" +#include "ui_profiles.h" class QComboBox; diff --git a/modules/gui/qt/dialogs/fingerprintdialog.cpp b/modules/gui/qt/dialogs/fingerprintdialog.cpp index a8dc7f6b1d..5703dafe80 100644 --- a/modules/gui/qt/dialogs/fingerprintdialog.cpp +++ b/modules/gui/qt/dialogs/fingerprintdialog.cpp @@ -19,7 +19,7 @@ *****************************************************************************/ #include "fingerprintdialog.hpp" -#include "ui/fingerprintdialog.h" +#include "ui_fingerprintdialog.h" #include "adapters/chromaprint.hpp" #include <vlc_url.h> diff --git a/modules/gui/qt/dialogs/help.hpp b/modules/gui/qt/dialogs/help.hpp index ad0beb4ef3..8dc4aa22da 100644 --- a/modules/gui/qt/dialogs/help.hpp +++ b/modules/gui/qt/dialogs/help.hpp @@ -31,8 +31,8 @@ #include "util/qvlcframe.hpp" #include "util/singleton.hpp" -#include "ui/about.h" -#include "ui/update.h" +#include "ui_about.h" +#include "ui_update.h" class QEvent; diff --git a/modules/gui/qt/dialogs/messages.hpp b/modules/gui/qt/dialogs/messages.hpp index 32ea0be910..9bcf7b32d6 100644 --- a/modules/gui/qt/dialogs/messages.hpp +++ b/modules/gui/qt/dialogs/messages.hpp @@ -25,7 +25,7 @@ #include "util/qvlcframe.hpp" #include "util/singleton.hpp" -#include "ui/messages_panel.h" +#include "ui_messages_panel.h" #include <stdarg.h> #include <QMutex> #include <QAtomicInt> diff --git a/modules/gui/qt/dialogs/open.hpp b/modules/gui/qt/dialogs/open.hpp index 7ac539a95c..b3607b7c44 100644 --- a/modules/gui/qt/dialogs/open.hpp +++ b/modules/gui/qt/dialogs/open.hpp @@ -31,7 +31,7 @@ #include <vlc_url.h> #include "util/qvlcframe.hpp" -#include "ui/open.h" +#include "ui_open.h" #include "components/open_panels.hpp" enum { diff --git a/modules/gui/qt/dialogs/podcast_configuration.hpp b/modules/gui/qt/dialogs/podcast_configuration.hpp index 61bd088ee2..2be8ad4e0b 100644 --- a/modules/gui/qt/dialogs/podcast_configuration.hpp +++ b/modules/gui/qt/dialogs/podcast_configuration.hpp @@ -24,7 +24,7 @@ #define QVLC_PODCAST_CONFIGURATION_DIALOG_H_ 1 #include "util/qvlcframe.hpp" -#include "ui/podcast_configuration.h" +#include "ui_podcast_configuration.h" #include "util/singleton.hpp" class PodcastConfigDialog : public QVLCDialog, public Singleton<PodcastConfigDialog> diff --git a/modules/gui/qt/dialogs/sout.hpp b/modules/gui/qt/dialogs/sout.hpp index 2e7e4d1759..909dcf80bf 100644 --- a/modules/gui/qt/dialogs/sout.hpp +++ b/modules/gui/qt/dialogs/sout.hpp @@ -29,7 +29,7 @@ #include <vlc_common.h> /* Gettext functions */ -#include "ui/sout.h" +#include "ui_sout.h" #include "util/qvlcframe.hpp" #include <QWizard> diff --git a/modules/gui/qt/dialogs/vlm.hpp b/modules/gui/qt/dialogs/vlm.hpp index 8737a4e2f4..57d8893d95 100644 --- a/modules/gui/qt/dialogs/vlm.hpp +++ b/modules/gui/qt/dialogs/vlm.hpp @@ -30,7 +30,7 @@ #include <vlc_vlm.h> -#include "ui/vlm.h" +#include "ui_vlm.h" #include "util/qvlcframe.hpp" #include "util/singleton.hpp" #include <QDateTime> diff --git a/po/POTFILES.in b/po/POTFILES.in index b461a495de..1c2a5298a8 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1269,23 +1269,23 @@ share/lua/http/mobile_view.html # qt .ui files # uncomment (and prepend $builddir} if you want to generate a proper vlc.pot -#modules/gui/qt/ui/about.h -#modules/gui/qt/ui/equalizer.h -#modules/gui/qt/ui/messages_panel.h -#modules/gui/qt/ui/open.h -#modules/gui/qt/ui/open_capture.h -#modules/gui/qt/ui/open_disk.h -#modules/gui/qt/ui/open_file.h -#modules/gui/qt/ui/open_net.h -#modules/gui/qt/ui/podcast_configuration.h -#modules/gui/qt/ui/profiles.h -#modules/gui/qt/ui/sout.h -#modules/gui/qt/ui/sprefs_audio.h -#modules/gui/qt/ui/sprefs_input.h -#modules/gui/qt/ui/sprefs_interface.h -#modules/gui/qt/ui/sprefs_subtitles.h -#modules/gui/qt/ui/sprefs_video.h -#modules/gui/qt/ui/streampanel.h -#modules/gui/qt/ui/update.h -#modules/gui/qt/ui/video_effects.h -#modules/gui/qt/ui/vlm.h +#modules/gui/qt/ui/ui_about.h +#modules/gui/qt/ui/ui_equalizer.h +#modules/gui/qt/ui/ui_messages_panel.h +#modules/gui/qt/ui/ui_open.h +#modules/gui/qt/ui/ui_open_capture.h +#modules/gui/qt/ui/ui_open_disk.h +#modules/gui/qt/ui/ui_open_file.h +#modules/gui/qt/ui/ui_open_net.h +#modules/gui/qt/ui/ui_podcast_configuration.h +#modules/gui/qt/ui/ui_profiles.h +#modules/gui/qt/ui/ui_sout.h +#modules/gui/qt/ui/ui_sprefs_audio.h +#modules/gui/qt/ui/ui_sprefs_input.h +#modules/gui/qt/ui/ui_sprefs_interface.h +#modules/gui/qt/ui/ui_sprefs_subtitles.h +#modules/gui/qt/ui/ui_sprefs_video.h +#modules/gui/qt/ui/ui_streampanel.h +#modules/gui/qt/ui/ui_update.h +#modules/gui/qt/ui/ui_video_effects.h +#modules/gui/qt/ui/ui_vlm.h _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
