Conflict fixed: mainwindow.cpp and httpclient.cpp

[speedfreak] / Client / usersettings.cpp

diff --git a/Client/usersettings.cpp b/Client/usersettings.cpp
index fa6527f..be95562 100644 (file)
--- a/Client/usersettings.cpp
+++ b/Client/usersettings.cpp
@@ -47,6 +47,12 @@ void UserSettings::writeLoginSettings( QString userName, QString password)
     settings.setValue("password", password);
 }
 
+void getLoginInfo(QString *userName, QString *password)
+{
+    UserSettings myLogin;
+    myLogin.readLoginSettings( userName, password);
+}
+
 void saveLogin( QString userName, QString password)
 {
     UserSettings myLogin;
@@ -65,7 +71,7 @@ bool loginSaved()
 
     myLogin.readLoginSettings( &userName, &password);
 
-    if (userName.length() > 0)
+    if (userName.compare(""))
     {
         return true;
     }