Browse Source

qt: move vlm dialog to its own folder

no functionnal changes

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
pull/101/head
Pierre Lamot 7 years ago
committed by Jean-Baptiste Kempf
parent
commit
df4258badf
  1. 10
      modules/gui/qt/Makefile.am
  2. 2
      modules/gui/qt/dialogs/vlm/vlm.cpp
  3. 2
      modules/gui/qt/dialogs/vlm/vlm.hpp
  4. 0
      modules/gui/qt/dialogs/vlm/vlm.ui
  5. 2
      modules/gui/qt/dialogs_provider.cpp
  6. 6
      po/POTFILES.in

10
modules/gui/qt/Makefile.am

@ -69,7 +69,7 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/toolbareditor.cpp gui/qt/dialogs/toolbareditor.hpp \
gui/qt/dialogs/open/open.cpp gui/qt/dialogs/open/open.hpp \
gui/qt/dialogs/open/openurl.cpp gui/qt/dialogs/open/openurl.hpp \
gui/qt/dialogs/vlm.cpp gui/qt/dialogs/vlm.hpp \
gui/qt/dialogs/vlm/vlm.cpp gui/qt/dialogs/vlm/vlm.hpp \
gui/qt/dialogs/firstrun/firstrun.cpp gui/qt/dialogs/firstrun/firstrun.hpp \
gui/qt/dialogs/podcast/podcast_configuration.cpp \
gui/qt/dialogs/podcast/podcast_configuration.hpp \
@ -226,7 +226,7 @@ moc_verbose__0 = $(moc_verbose_0)
$(moc_verbose)$(MOC) $(MOC_CPPFLAGS) -o $@ $<
# These MOC files depend on the configure settings:
dialogs_provider.moc.cpp dialogs/vlm.moc.cpp: $(top_builddir)/config.h
dialogs_provider.moc.cpp dialogs/vlm/vlm.moc.cpp: $(top_builddir)/config.h
nodist_libqt_plugin_la_SOURCES = \
gui/qt/main_interface.moc.cpp \
@ -339,7 +339,7 @@ nodist_libqt_plugin_la_SOURCES += \
gui/qt/dialogs/open/ui_open_net.h \
gui/qt/dialogs/open/ui_open_capture.h \
gui/qt/dialogs/open/ui_open.h \
gui/qt/ui/ui_vlm.h \
gui/qt/dialogs/vlm/ui_vlm.h \
gui/qt/dialogs/podcast/ui_podcast_configuration.h \
gui/qt/dialogs/sout/ui_profiles.h \
gui/qt/dialogs/preferences/ui_sprefs_audio.h \
@ -391,7 +391,7 @@ libqt_plugin_la_UI = \
gui/qt/dialogs/help/about.ui \
gui/qt/dialogs/help/update.ui \
gui/qt/dialogs/sout/sout.ui \
gui/qt/ui/vlm.ui \
gui/qt/dialogs/vlm/vlm.ui \
gui/qt/dialogs/fingerprint/fingerprintdialog.ui
EXTRA_DIST += $(libqt_plugin_la_UI)
@ -666,7 +666,7 @@ EXTRA_DIST += gui/qt/vlc.qrc $(libqt_plugin_la_RES)
nodist_libqt_plugin_la_SOURCES += gui/qt/resources.cpp
if ENABLE_VLM
nodist_libqt_plugin_la_SOURCES += gui/qt/dialogs/vlm.moc.cpp
nodist_libqt_plugin_la_SOURCES += gui/qt/dialogs/vlm/vlm.moc.cpp
endif
if HAVE_QMLCACHE

2
modules/gui/qt/dialogs/vlm.cpp → modules/gui/qt/dialogs/vlm/vlm.cpp

@ -27,7 +27,7 @@
#endif
#ifdef ENABLE_VLM
#include "dialogs/vlm.hpp"
#include "dialogs/vlm/vlm.hpp"
#include "dialogs/open/open.hpp"
#include "dialogs/sout/sout.hpp"
#include "util/qt_dirs.hpp"

2
modules/gui/qt/dialogs/vlm.hpp → modules/gui/qt/dialogs/vlm/vlm.hpp

@ -30,7 +30,7 @@
#include <vlc_vlm.h>
#include "ui_vlm.h"
#include "dialogs/vlm/ui_vlm.h"
#include "util/qvlcframe.hpp"
#include "util/singleton.hpp"
#include <QDateTime>

0
modules/gui/qt/ui/vlm.ui → modules/gui/qt/dialogs/vlm/vlm.ui

2
modules/gui/qt/dialogs_provider.cpp

@ -43,7 +43,7 @@
#include "dialogs/mediainfo/mediainfo.hpp"
#include "dialogs/messages/messages.hpp"
#include "dialogs/extended/extended.hpp"
#include "dialogs/vlm.hpp"
#include "dialogs/vlm/vlm.hpp"
#include "dialogs/sout/sout.hpp"
#include "dialogs/sout/convert.hpp"
#include "dialogs/open/open.hpp"

6
po/POTFILES.in

@ -749,8 +749,8 @@ modules/gui/qt/dialogs/sout/sout.cpp
modules/gui/qt/dialogs/sout/sout.hpp
modules/gui/qt/dialogs/toolbar.cpp
modules/gui/qt/dialogs/toolbar.hpp
modules/gui/qt/dialogs/vlm.cpp
modules/gui/qt/dialogs/vlm.hpp
modules/gui/qt/dialogs/vlm/vlm.cpp
modules/gui/qt/dialogs/vlm/vlm.hpp
modules/gui/qt/dialogs_provider.cpp
modules/gui/qt/dialogs_provider.hpp
modules/gui/qt/dialogs/extensions/extensions_manager.cpp
@ -1294,4 +1294,4 @@ share/lua/http/mobile_view.html
#modules/gui/qt/ui/ui_streampanel.h
#modules/gui/qt/dialogs/help/ui_update.h
#modules/gui/qt/dialogs/extended/ui_video_effects.h
#modules/gui/qt/ui/ui_vlm.h
#modules/gui/qt/dialogs/vlm/ui_vlm.h

Loading…
Cancel
Save