vlc | branch: master | Francois Cartegnie <[email protected]> | Sat Apr 6 21:14:50 2013 +0200| [0f82e115c9c147a745d6d821f58620ba5b42c518] | committer: Francois Cartegnie
Qt: move variables.*pp. Almost unused, and clearly can't belong to root. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0f82e115c9c147a745d6d821f58620ba5b42c518 --- modules/gui/qt4/Modules.am | 6 +++--- modules/gui/qt4/{ => adapters}/variables.cpp | 0 modules/gui/qt4/{ => adapters}/variables.hpp | 0 modules/gui/qt4/dialogs/external.hpp | 2 +- modules/gui/qt4/input_manager.hpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am index 940aa12..e926986 100644 --- a/modules/gui/qt4/Modules.am +++ b/modules/gui/qt4/Modules.am @@ -24,7 +24,7 @@ nodist_SOURCES_qt4 = \ recents.moc.cpp \ adapters/seekpoints.moc.cpp \ adapters/chromaprint.moc.cpp \ - variables.moc.cpp \ + adapters/variables.moc.cpp \ dialogs/playlist.moc.cpp \ dialogs/bookmarks.moc.cpp \ dialogs/mediainfo.moc.cpp \ @@ -286,7 +286,7 @@ SOURCES_qt4 = qt4.cpp \ recents.cpp \ adapters/seekpoints.cpp \ adapters/chromaprint.cpp \ - variables.cpp \ + adapters/variables.cpp \ dialogs/playlist.cpp \ dialogs/bookmarks.cpp \ dialogs/preferences.cpp \ @@ -365,7 +365,7 @@ noinst_HEADERS = \ recents.hpp \ adapters/seekpoints.hpp \ adapters/chromaprint.hpp \ - variables.hpp \ + adapters/variables.hpp \ dialogs/playlist.hpp \ dialogs/bookmarks.hpp \ dialogs/mediainfo.hpp \ diff --git a/modules/gui/qt4/variables.cpp b/modules/gui/qt4/adapters/variables.cpp similarity index 100% rename from modules/gui/qt4/variables.cpp rename to modules/gui/qt4/adapters/variables.cpp diff --git a/modules/gui/qt4/variables.hpp b/modules/gui/qt4/adapters/variables.hpp similarity index 100% rename from modules/gui/qt4/variables.hpp rename to modules/gui/qt4/adapters/variables.hpp diff --git a/modules/gui/qt4/dialogs/external.hpp b/modules/gui/qt4/dialogs/external.hpp index 84a19b1..60c08f1 100644 --- a/modules/gui/qt4/dialogs/external.hpp +++ b/modules/gui/qt4/dialogs/external.hpp @@ -27,7 +27,7 @@ #include <QObject> #include <vlc_common.h> -#include "variables.hpp" +#include "adapters/variables.hpp" struct intf_thread_t; class QProgressDialog; diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp index 7126cf1..dcf23ee 100644 --- a/modules/gui/qt4/input_manager.hpp +++ b/modules/gui/qt4/input_manager.hpp @@ -33,7 +33,7 @@ #include "qt4.hpp" #include "util/singleton.hpp" -#include "variables.hpp" +#include "adapters/variables.hpp" #include <QObject> #include <QEvent> _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
