From b40ba0cf91603b695f1f2380cbd39966a458f22f Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 27 Sep 2009 19:58:24 +0200 Subject: Use Unicode-aware String class instead of std::string --- src/Client/Requests/DaemonCommandRequest.h | 5 ++--- src/Client/Requests/DaemonFSInfoRequest.h | 5 ++--- src/Client/Requests/DaemonStatusRequest.h | 6 ++---- src/Client/Requests/UserLists/UserListDownloadRequest.h | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) (limited to 'src/Client/Requests') diff --git a/src/Client/Requests/DaemonCommandRequest.h b/src/Client/Requests/DaemonCommandRequest.h index 04e0304..e4efa99 100644 --- a/src/Client/Requests/DaemonCommandRequest.h +++ b/src/Client/Requests/DaemonCommandRequest.h @@ -23,7 +23,6 @@ #include "../export.h" #include -#include namespace Mad { namespace Client { @@ -31,14 +30,14 @@ namespace Requests { class MAD_CLIENT_EXPORT DaemonCommandRequest : public Common::Request { private: - std::string daemon; + Core::String daemon; bool reboot; protected: virtual void sendRequest(); public: - DaemonCommandRequest(Common::Application *application, const std::string &daemon0, bool reboot0) + DaemonCommandRequest(Common::Application *application, const Core::String &daemon0, bool reboot0) : Common::Request(application), daemon(daemon0), reboot(reboot0) {} }; diff --git a/src/Client/Requests/DaemonFSInfoRequest.h b/src/Client/Requests/DaemonFSInfoRequest.h index 50c0783..7d20645 100644 --- a/src/Client/Requests/DaemonFSInfoRequest.h +++ b/src/Client/Requests/DaemonFSInfoRequest.h @@ -24,7 +24,6 @@ #include -#include namespace Mad { namespace Client { @@ -32,13 +31,13 @@ namespace Requests { class MAD_CLIENT_EXPORT DaemonFSInfoRequest : public Common::Request { private: - std::string daemon; + Core::String daemon; protected: virtual void sendRequest(); public: - DaemonFSInfoRequest(Common::Application *application, const std::string &daemon0) : Common::Request(application), daemon(daemon0) {} + DaemonFSInfoRequest(Common::Application *application, const Core::String &daemon0) : Common::Request(application), daemon(daemon0) {} }; } diff --git a/src/Client/Requests/DaemonStatusRequest.h b/src/Client/Requests/DaemonStatusRequest.h index 1cdc82e..23e9e29 100644 --- a/src/Client/Requests/DaemonStatusRequest.h +++ b/src/Client/Requests/DaemonStatusRequest.h @@ -24,21 +24,19 @@ #include -#include - namespace Mad { namespace Client { namespace Requests { class MAD_CLIENT_EXPORT DaemonStatusRequest : public Common::Request { private: - std::string daemon; + Core::String daemon; protected: virtual void sendRequest(); public: - DaemonStatusRequest(Common::Application *application, const std::string &daemon0) : Common::Request(application), daemon(daemon0) {} + DaemonStatusRequest(Common::Application *application, const Core::String &daemon0) : Common::Request(application), daemon(daemon0) {} }; } diff --git a/src/Client/Requests/UserLists/UserListDownloadRequest.h b/src/Client/Requests/UserLists/UserListDownloadRequest.h index 570899f..13536f8 100644 --- a/src/Client/Requests/UserLists/UserListDownloadRequest.h +++ b/src/Client/Requests/UserLists/UserListDownloadRequest.h @@ -29,13 +29,13 @@ namespace UserLists { class UserListDownloadRequest : public Common::Request { private: - std::string name; + Core::String name; protected: virtual void sendRequest(); public: - UserListDownloadRequest(Common::Application *application, const std::string &name0) + UserListDownloadRequest(Common::Application *application, const Core::String &name0) : Common::Request(application), name(name0) {} }; -- cgit v1.2.3