فهرست منبع

WebServer: Convert document_root_path from DeprecatedString to String

Ben Wiederhake 2 سال پیش
والد
کامیت
f0586d74d7

+ 1 - 1
Userland/Services/WebServer/Configuration.cpp

@@ -11,7 +11,7 @@ namespace WebServer {
 
 static Configuration* s_configuration = nullptr;
 
-Configuration::Configuration(DeprecatedString document_root_path, Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> credentials)
+Configuration::Configuration(String document_root_path, Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> credentials)
     : m_document_root_path(move(document_root_path))
     , m_credentials(move(credentials))
 {

+ 3 - 3
Userland/Services/WebServer/Configuration.h

@@ -15,15 +15,15 @@ namespace WebServer {
 
 class Configuration {
 public:
-    Configuration(DeprecatedString document_root_path, Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> credentials = {});
+    Configuration(String document_root_path, Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> credentials = {});
 
-    DeprecatedString const& document_root_path() const { return m_document_root_path; }
+    String const& document_root_path() const { return m_document_root_path; }
     Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> const& credentials() const { return m_credentials; }
 
     static Configuration const& the();
 
 private:
-    DeprecatedString m_document_root_path;
+    String m_document_root_path;
     Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> m_credentials;
 };
 

+ 1 - 1
Userland/Services/WebServer/main.cpp

@@ -68,7 +68,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     if (!username.is_empty() && !password.is_empty())
         credentials = HTTP::HttpRequest::BasicAuthenticationCredentials { username, password };
 
-    WebServer::Configuration configuration(real_document_root_path.to_deprecated_string(), credentials);
+    WebServer::Configuration configuration(real_document_root_path, credentials);
 
     Core::EventLoop loop;