Merge branch 'develop' into audio-mobile

src/ui/auth/LmsAuth.cpp

@@ -17,15 +17,16 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "LmsAuth.hpp"
 
+#include "LmsApplication.hpp"
+
 namespace UserInterface {
 
-LmsAuth::LmsAuth(Database::Handler& db)
-: Wt::Auth::AuthWidget(db.getAuthService(),
-		db.getUserDatabase(),
-		db.getLogin())
+LmsAuth::LmsAuth()
+: Wt::Auth::AuthWidget(DbHandler().getAuthService(),
+		DbHandler().getUserDatabase(),
+		DbHandler().getLogin())
 {
 	// Root div has to be a container
 	this->setStyleClass("container");

src/ui/auth/LmsAuth.hpp

@@ -26,15 +26,13 @@
 #include <Wt/Auth/AuthWidget>
 #include <Wt/WContainerWidget>
 
-#include "database/DatabaseHandler.hpp"
-
 namespace UserInterface {
 
 class LmsAuth : public Wt::Auth::AuthWidget
 {
 	public:
 
-		LmsAuth(Database::Handler& db);
+		LmsAuth();
 
 		// LoggedInView is delegated to LmsHome
 		void createLoggedInView () ;