Commit f7205539 authored by Marvin Scholz's avatar Marvin Scholz Committed by Jean-Baptiste Kempf

qt: Prefix uic generated headers with 'ui_'

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 993d6fd1
......@@ -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 $@ $@.tmp
$(AM_V_at)echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
$(uic_verbose)$(UIC) -tr "Q_" $< >> $@.tmp
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"
......
......@@ -30,7 +30,7 @@
#include <QHash>
#include "util/qvlcframe.hpp"
#include "ui/profiles.h"
#include "ui_profiles.h"
class QComboBox;
......
......@@ -19,7 +19,7 @@
*****************************************************************************/
#include "fingerprintdialog.hpp"
#include "ui/fingerprintdialog.h"
#include "ui_fingerprintdialog.h"
#include "adapters/chromaprint.hpp"
#include <vlc_url.h>
......
......@@ -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;
......
......@@ -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>
......
......@@ -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 {
......
......@@ -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>
......
......@@ -29,7 +29,7 @@
#include <vlc_common.h> /* Gettext functions */
#include "ui/sout.h"
#include "ui_sout.h"
#include "util/qvlcframe.hpp"
#include <QWizard>
......
......@@ -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>
......
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment