Moved util functions into utils

src/ui/LmsApplication.cpp

@@ -28,7 +28,7 @@
 #include <Wt/Auth/Identity>
 
 #include "config/config.h"
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
 
 #include "settings/Settings.hpp"

src/ui/audio/AudioPlayer.cpp

@@ -17,7 +17,6 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <Wt/WText>
 #include <Wt/WAudio>
 #include <Wt/WImage>
@@ -25,7 +24,8 @@
 #include <Wt/WPushButton>
 
 #include "common/InputRange.hpp"
-#include "logger/Logger.hpp"
+
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
 
 #include "LmsApplication.hpp"

src/ui/audio/desktop/DesktopAudio.cpp

@@ -31,7 +31,8 @@
 #include <Wt/WLineEdit>
 #include <Wt/WLabel>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "TableFilter.hpp"

src/ui/audio/desktop/PlayQueue.cpp

@@ -27,7 +27,7 @@
 #include <Wt/WFileResource>
 #include <Wt/WTheme>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "LmsApplication.hpp"
 #include "PlayQueue.hpp"

src/ui/audio/desktop/TableFilter.cpp

@@ -20,7 +20,8 @@
 #include <Wt/WItemDelegate>
 
 #include "database/Types.hpp"
-#include "logger/Logger.hpp"
+
+#include "utils/Logger.hpp"
 
 #include "LmsApplication.hpp"
 #include "TableFilter.hpp"

src/ui/audio/desktop/TrackView.cpp

@@ -22,7 +22,7 @@
 #include <Wt/WItemDelegate>
 #include <Wt/WBreak>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
 
 #include "LmsApplication.hpp"

src/ui/audio/mobile/ArtistSearchView.cpp

@@ -20,7 +20,8 @@
 #include <Wt/WApplication>
 #include <Wt/WText>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "SearchUtils.hpp"
 
 #include "ArtistSearch.hpp"

src/ui/audio/mobile/MobileAudio.cpp

@@ -23,10 +23,8 @@
 #include <Wt/WTemplate>
 #include <Wt/WText>
 
-#include "logger/Logger.hpp"
-#include "utils/Utils.hpp"
-
 #include "audio/AudioPlayer.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "PreviewSearchView.hpp"
@@ -39,6 +37,9 @@
 
 #include "MobilePlayQueue.hpp"
 
+#include "utils/Logger.hpp"
+#include "utils/Utils.hpp"
+
 #include "MobileAudio.hpp"
 
 

src/ui/audio/mobile/MobilePlayQueue.cpp

@@ -22,7 +22,7 @@
 #include <Wt/WText>
 #include <Wt/WPushButton>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "LmsApplication.hpp"
 

src/ui/audio/mobile/PreviewSearchView.cpp

@@ -20,7 +20,8 @@
 #include <Wt/WApplication>
 #include <Wt/WText>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "SearchUtils.hpp"
 
 #include "ArtistSearch.hpp"

src/ui/audio/mobile/ReleaseSearch.cpp

@@ -22,7 +22,8 @@
 #include <Wt/WPushButton>
 #include <Wt/WTemplate>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "ReleaseSearch.hpp"

src/ui/audio/mobile/ReleaseView.cpp

@@ -22,8 +22,9 @@
 #include <Wt/WPushButton>
 #include <Wt/WTemplate>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "ReleaseView.hpp"

src/ui/audio/mobile/TrackSearch.cpp

@@ -22,8 +22,9 @@
 #include <Wt/WPushButton>
 #include <Wt/WTemplate>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "TrackSearch.hpp"

src/ui/audio/mobile/TrackSearchView.cpp

@@ -20,7 +20,8 @@
 #include <Wt/WApplication>
 #include <Wt/WText>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "SearchUtils.hpp"
 
 #include "TrackSearch.hpp"

src/ui/resource/AvConvTranscodeStreamResource.cpp

@@ -21,7 +21,7 @@
 #include <Wt/Http/Request>
 #include <Wt/Http/Response>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "AvConvTranscodeStreamResource.hpp"
 

src/ui/resource/ImageResource.cpp

@@ -20,8 +20,9 @@
 #include <Wt/WApplication>
 #include <Wt/Http/Response>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "cover/CoverArtGrabber.hpp"

src/ui/resource/TranscodeResource.cpp

@@ -19,7 +19,8 @@
 
 #include <Wt/Http/Response>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "TranscodeResource.hpp"

src/ui/settings/Settings.cpp

@@ -29,7 +29,8 @@
 #include "SettingsMediaDirectories.hpp"
 #include "SettingsUsers.hpp"
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "database/Setting.hpp"
 #include "database/updater/DatabaseUpdater.hpp"
 

src/ui/settings/SettingsAccountFormView.cpp

@@ -26,7 +26,7 @@
 #include <Wt/WPushButton>
 #include <Wt/Auth/Identity>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"

src/ui/settings/SettingsAudioFormView.cpp

@@ -24,7 +24,7 @@
 #include <Wt/WComboBox>
 #include <Wt/WPushButton>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"

src/ui/settings/SettingsDatabaseFormView.cpp

@@ -30,7 +30,8 @@
 #include <Wt/WFormModel>
 #include <Wt/WStringListModel>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "database/Setting.hpp"
 
 #include "common/DirectoryValidator.hpp"

src/ui/settings/SettingsFirstConnectionFormView.cpp

@@ -24,7 +24,7 @@
 #include <Wt/WPushButton>
 #include <Wt/Auth/Identity>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"

src/ui/settings/SettingsMediaDirectoryFormView.cpp

@@ -25,7 +25,8 @@
 #include <Wt/WComboBox>
 #include <Wt/WPushButton>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "database/MediaDirectory.hpp"
 
 #include "common/DirectoryValidator.hpp"

src/ui/settings/SettingsUserFormView.cpp

@@ -27,7 +27,7 @@
 #include <Wt/WPushButton>
 #include <Wt/Auth/Identity>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"

src/ui/settings/SettingsUsers.cpp

@@ -25,7 +25,7 @@
 
 #include <Wt/Auth/Identity>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "SettingsUserFormView.hpp"
 #include "LmsApplication.hpp"