From bb91cf4caf0d823d73d91f8ebecb7dfcfe2ea9ea Mon Sep 17 00:00:00 2001 From: "craig.p.drummond" Date: Sat, 18 May 2013 10:21:43 +0000 Subject: [PATCH] Move lyrics files into context folder --- CMakeLists.txt | 8 ++++---- cantata.qrc | 2 +- {lyrics => context}/lyricsdialog.cpp | 0 {lyrics => context}/lyricsdialog.h | 0 {lyrics => context}/lyricsettings.cpp | 0 {lyrics => context}/lyricsettings.h | 0 {lyrics => context}/lyricsettings.ui | 0 {lyrics => context}/ultimate_providers.xml | 0 {lyrics => context}/ultimatelyrics.cpp | 0 {lyrics => context}/ultimatelyrics.h | 0 {lyrics => context}/ultimatelyricsprovider.cpp | 0 {lyrics => context}/ultimatelyricsprovider.h | 0 12 files changed, 5 insertions(+), 5 deletions(-) rename {lyrics => context}/lyricsdialog.cpp (100%) rename {lyrics => context}/lyricsdialog.h (100%) rename {lyrics => context}/lyricsettings.cpp (100%) rename {lyrics => context}/lyricsettings.h (100%) rename {lyrics => context}/lyricsettings.ui (100%) rename {lyrics => context}/ultimate_providers.xml (100%) rename {lyrics => context}/ultimatelyrics.cpp (100%) rename {lyrics => context}/ultimatelyrics.h (100%) rename {lyrics => context}/ultimatelyricsprovider.cpp (100%) rename {lyrics => context}/ultimatelyricsprovider.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b448f3bf4..9a19ee617 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,9 +100,9 @@ SET( CANTATA_SRCS gui/application.cpp gui/main.cpp gui/initialsettingswizard.cpp widgets/actionlabel.cpp widgets/playqueueview.cpp widgets/groupedview.cpp widgets/actionitemdelegate.cpp widgets/textbrowser.cpp widgets/coverwidget.cpp widgets/volumecontrol.cpp widgets/icons.cpp widgets/genrecombo.cpp widgets/toolbar.cpp widgets/menubutton.cpp widgets/toolbutton.cpp widgets/wizardpage.cpp widgets/headerlabel.cpp widgets/statuslabel.cpp - lyrics/lyricsettings.cpp lyrics/ultimatelyricsprovider.cpp lyrics/ultimatelyrics.cpp lyrics/lyricsdialog.cpp network/networkaccessmanager.cpp devices/deviceoptions.cpp + context/lyricsettings.cpp context/ultimatelyricsprovider.cpp context/ultimatelyrics.cpp context/lyricsdialog.cpp context/contextpage.cpp context/view.cpp context/artistview.cpp context/albumview.cpp context/songview.cpp) SET( CANTATA_MOC_HDRS gui/initialsettingswizard.h gui/mainwindow.h gui/settings.h gui/covers.h gui/folderpage.h gui/librarypage.h gui/albumspage.h @@ -117,8 +117,8 @@ SET( CANTATA_MOC_HDRS widgets/treeview.h widgets/listview.h widgets/itemview.h widgets/autohidingsplitter.h widgets/timeslider.h widgets/actionlabel.h widgets/playqueueview.h widgets/groupedview.h widgets/actionitemdelegate.h widgets/coverwidget.h widgets/volumecontrol.h widgets/genrecombo.h widgets/toolbar.h - lyrics/lyricsettings.h lyrics/ultimatelyrics.h lyrics/ultimatelyricsprovider.h lyrics/lyricsdialog.h network/networkaccessmanager.h + context/lyricsettings.h context/ultimatelyrics.h context/ultimatelyricsprovider.h context/lyricsdialog.h context/contextpage.h context/artistview.h context/albumview.h context/songview.h) SET( CANTATA_UIS gui/initialsettingswizard.ui gui/mainwindow.ui gui/folderpage.ui gui/librarypage.ui gui/albumspage.ui gui/playlistspage.ui @@ -126,7 +126,7 @@ SET( CANTATA_UIS gui/coverdialog.ui streams/streamspage.ui dynamic/dynamicpage.ui dynamic/dynamicrule.ui dynamic/dynamicrules.ui - lyrics/lyricsettings.ui + context/lyricsettings.ui widgets/itemview.ui) if (ENABLE_ONLINE_SERVICES) @@ -183,7 +183,7 @@ endif(NOT WIN32) SET( CANTATA_RCS cantata.qrc ) include_directories( ${CMAKE_SOURCE_DIR}/gui ${CMAKE_SOURCE_DIR}/mpd ${CMAKE_SOURCE_DIR}/models ${CMAKE_SOURCE_DIR}/widgets - ${CMAKE_SOURCE_DIR}/lyrics ${CMAKE_SOURCE_DIR}/network ${CMAKE_SOURCE_DIR}/dbus ${CMAKE_SOURCE_DIR}/http + ${CMAKE_SOURCE_DIR}/network ${CMAKE_SOURCE_DIR}/dbus ${CMAKE_SOURCE_DIR}/http ${CMAKE_SOURCE_DIR}/devices ${CMAKE_SOURCE_DIR}/dynamic ${CMAKE_SOURCE_DIR}/support ${CMAKE_SOURCE_DIR}/streams ${CMAKE_SOURCE_DIR}/tags ${CMAKE_SOURCE_DIR}/online ${CMAKE_SOURCE_DIR}/context ${CMAKE_SOURCE_DIR}/3rdparty ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/support) diff --git a/cantata.qrc b/cantata.qrc index c0ab01a00..854843082 100644 --- a/cantata.qrc +++ b/cantata.qrc @@ -1,6 +1,6 @@ -lyrics/ultimate_providers.xml +context/ultimate_providers.xml streams/providers.xml gui/weblinks.xml icons/view-media-repeat16.png diff --git a/lyrics/lyricsdialog.cpp b/context/lyricsdialog.cpp similarity index 100% rename from lyrics/lyricsdialog.cpp rename to context/lyricsdialog.cpp diff --git a/lyrics/lyricsdialog.h b/context/lyricsdialog.h similarity index 100% rename from lyrics/lyricsdialog.h rename to context/lyricsdialog.h diff --git a/lyrics/lyricsettings.cpp b/context/lyricsettings.cpp similarity index 100% rename from lyrics/lyricsettings.cpp rename to context/lyricsettings.cpp diff --git a/lyrics/lyricsettings.h b/context/lyricsettings.h similarity index 100% rename from lyrics/lyricsettings.h rename to context/lyricsettings.h diff --git a/lyrics/lyricsettings.ui b/context/lyricsettings.ui similarity index 100% rename from lyrics/lyricsettings.ui rename to context/lyricsettings.ui diff --git a/lyrics/ultimate_providers.xml b/context/ultimate_providers.xml similarity index 100% rename from lyrics/ultimate_providers.xml rename to context/ultimate_providers.xml diff --git a/lyrics/ultimatelyrics.cpp b/context/ultimatelyrics.cpp similarity index 100% rename from lyrics/ultimatelyrics.cpp rename to context/ultimatelyrics.cpp diff --git a/lyrics/ultimatelyrics.h b/context/ultimatelyrics.h similarity index 100% rename from lyrics/ultimatelyrics.h rename to context/ultimatelyrics.h diff --git a/lyrics/ultimatelyricsprovider.cpp b/context/ultimatelyricsprovider.cpp similarity index 100% rename from lyrics/ultimatelyricsprovider.cpp rename to context/ultimatelyricsprovider.cpp diff --git a/lyrics/ultimatelyricsprovider.h b/context/ultimatelyricsprovider.h similarity index 100% rename from lyrics/ultimatelyricsprovider.h rename to context/ultimatelyricsprovider.h