From 1eb9f4df776adc5dc5cf74a587288199bbf8b703 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 4 Sep 2009 00:24:42 +0200 Subject: Renamed: XmlPacket -> XmlData --- src/Common/Backends/NetworkUserBackend.cpp | 78 +++++++++++++++--------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'src/Common/Backends') diff --git a/src/Common/Backends/NetworkUserBackend.cpp b/src/Common/Backends/NetworkUserBackend.cpp index 00bd378..1b528ab 100644 --- a/src/Common/Backends/NetworkUserBackend.cpp +++ b/src/Common/Backends/NetworkUserBackend.cpp @@ -29,7 +29,7 @@ namespace Backends { const std::string NetworkUserBackend::name("NetworkUserBackend"); void NetworkUserBackend::SimpleUserRequest::sendRequest() { - XmlPacket packet; + XmlData packet; packet.setType(type); if(!timestamp.is_not_a_date_time()) @@ -39,7 +39,7 @@ void NetworkUserBackend::SimpleUserRequest::sendRequest() { } void NetworkUserBackend::IdUserRequest::sendRequest() { - XmlPacket packet; + XmlData packet; packet.setType(type); packet.set(idType, id); @@ -50,7 +50,7 @@ void NetworkUserBackend::IdUserRequest::sendRequest() { } void NetworkUserBackend::NameUserRequest::sendRequest() { - XmlPacket packet; + XmlData packet; packet.setType(type); packet.set("name", name); @@ -61,7 +61,7 @@ void NetworkUserBackend::NameUserRequest::sendRequest() { } void NetworkUserBackend::UserAddRequest::sendRequest() { - XmlPacket packet; + XmlData packet; packet.setType(check ? "CheckUserInfo" : "AddUser"); packet.set("uid", userInfo.getUid()); @@ -73,7 +73,7 @@ void NetworkUserBackend::UserAddRequest::sendRequest() { } void NetworkUserBackend::UserUpdateRequest::sendRequest() { - XmlPacket packet; + XmlData packet; packet.setType("UpdateUser"); packet.set("origUid", uid); @@ -86,7 +86,7 @@ void NetworkUserBackend::UserUpdateRequest::sendRequest() { } void NetworkUserBackend::GroupAddRequest::sendRequest() { - XmlPacket packet; + XmlData packet; packet.setType(check ? "CheckGroupInfo" : "AddGroup"); packet.set("gid", groupInfo.getGid()); @@ -96,7 +96,7 @@ void NetworkUserBackend::GroupAddRequest::sendRequest() { } void NetworkUserBackend::GroupUpdateRequest::sendRequest() { - XmlPacket packet; + XmlData packet; packet.setType("UpdateGroup"); packet.set("origGid", gid); @@ -107,7 +107,7 @@ void NetworkUserBackend::GroupUpdateRequest::sendRequest() { } void NetworkUserBackend::UserGroupRequest::sendRequest() { - XmlPacket packet; + XmlData packet; packet.setType(type); packet.set("uid", uid); packet.set("gid", gid); @@ -116,7 +116,7 @@ void NetworkUserBackend::UserGroupRequest::sendRequest() { } void NetworkUserBackend::PasswordRequest::sendRequest() { - XmlPacket packet; + XmlData packet; packet.setType("SetPassword"); packet.set("uid", uid); packet.set("password", password); @@ -132,7 +132,7 @@ boost::shared_ptr > NetworkUserBackend:: request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; @@ -143,11 +143,11 @@ boost::shared_ptr > NetworkUserBackend:: catch(...) {} } - const XmlPacket::List *users = result.first->getList("users"); + const XmlData::List *users = result.first->getList("users"); if(users) { boost::shared_ptr > userList(new std::map); - for(XmlPacket::List::const_iterator user = users->begin(); user != users->end(); ++user) { + for(XmlData::List::const_iterator user = users->begin(); user != users->end(); ++user) { UserInfo userInfo(user->get("uid"), user->get("username")); userInfo.setGid(user->get("gid")); userInfo.setFullName(user->get("fullName")); @@ -168,7 +168,7 @@ boost::shared_ptr NetworkUserBackend::getUserInfo(unsigned long application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; @@ -200,7 +200,7 @@ boost::shared_ptr NetworkUserBackend::getUserInfoByName(const st application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; @@ -232,7 +232,7 @@ boost::shared_ptr > NetworkUserBackend::getUserGro application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; @@ -243,12 +243,12 @@ boost::shared_ptr > NetworkUserBackend::getUserGro catch(...) {} } - const XmlPacket::List *groups = result.first->getList("groups"); + const XmlData::List *groups = result.first->getList("groups"); if(groups) { boost::shared_ptr > groupList(new std::set); - for(XmlPacket::List::const_iterator group = groups->begin(); group != groups->end(); ++group) + for(XmlData::List::const_iterator group = groups->begin(); group != groups->end(); ++group) groupList->insert(group->get("gid")); return groupList; @@ -264,7 +264,7 @@ boost::shared_ptr > NetworkUserBackend: application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; @@ -275,11 +275,11 @@ boost::shared_ptr > NetworkUserBackend: catch(...) {} } - const XmlPacket::List *groups = result.first->getList("groups"); + const XmlData::List *groups = result.first->getList("groups"); if(groups) { boost::shared_ptr > groupList(new std::map); - for(XmlPacket::List::const_iterator group = groups->begin(); group != groups->end(); ++group) { + for(XmlData::List::const_iterator group = groups->begin(); group != groups->end(); ++group) { GroupInfo groupInfo(group->get("gid"), group->get("name")); groupList->insert(std::make_pair(groupInfo.getGid(), groupInfo)); } @@ -297,7 +297,7 @@ boost::shared_ptr NetworkUserBackend::getGroupInfo(unsigned lon application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; @@ -323,7 +323,7 @@ boost::shared_ptr NetworkUserBackend::getGroupInfoByName(const application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; @@ -349,7 +349,7 @@ boost::shared_ptr > NetworkUserBackend::getGroupUs application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; @@ -360,11 +360,11 @@ boost::shared_ptr > NetworkUserBackend::getGroupUs catch(...) {} } - const XmlPacket::List *users = result.first->getList("users"); + const XmlData::List *users = result.first->getList("users"); if(users) { boost::shared_ptr > userList(new std::set); - for(XmlPacket::List::const_iterator user = users->begin(); user != users->end(); ++user) { + for(XmlData::List::const_iterator user = users->begin(); user != users->end(); ++user) { userList->insert(user->get("uid")); } @@ -381,7 +381,7 @@ boost::shared_ptr > NetworkUse application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; @@ -392,11 +392,11 @@ boost::shared_ptr > NetworkUse catch(...) {} } - const XmlPacket::List *list = result.first->getList("userGroupList"); + const XmlData::List *list = result.first->getList("userGroupList"); if(list) { boost::shared_ptr > ret(new std::multimap); - for(XmlPacket::List::const_iterator entry = list->begin(); entry != list->end(); ++entry) + for(XmlData::List::const_iterator entry = list->begin(); entry != list->end(); ++entry) ret->insert(std::make_pair(entry->get("uid"), entry->get("gid"))); return ret; @@ -413,7 +413,7 @@ void NetworkUserBackend::checkUserInfo(const UserInfo &userInfo) throw(Core::Exc application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; } @@ -425,7 +425,7 @@ void NetworkUserBackend::addUser(const UserInfo &userInfo) throw(Core::Exception application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; } @@ -437,7 +437,7 @@ void NetworkUserBackend::updateUser(unsigned long uid, const Common::UserInfo &u application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; } @@ -449,7 +449,7 @@ void NetworkUserBackend::deleteUser(unsigned long uid) throw(Core::Exception) { application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; } @@ -462,7 +462,7 @@ void NetworkUserBackend::checkGroupInfo(const GroupInfo &groupInfo) throw(Core:: application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; } @@ -474,7 +474,7 @@ void NetworkUserBackend::addGroup(const GroupInfo &groupInfo) throw(Core::Except application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; } @@ -486,7 +486,7 @@ void NetworkUserBackend::updateGroup(unsigned long gid, const GroupInfo &groupIn application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; } @@ -498,7 +498,7 @@ void NetworkUserBackend::deleteGroup(unsigned long gid) throw(Core::Exception) { application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; } @@ -511,7 +511,7 @@ void NetworkUserBackend::addUserToGroup(unsigned long uid, unsigned long gid) th application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; } @@ -523,7 +523,7 @@ void NetworkUserBackend::deleteUserFromGroup(unsigned long uid, unsigned long gi application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; } @@ -536,7 +536,7 @@ void NetworkUserBackend::setPassword(unsigned long uid, const std::string &passw application->getRequestManager()->sendRequest(connection, request); request->wait(); - std::pair, Core::Exception> result = request->getResult(); + std::pair, Core::Exception> result = request->getResult(); if(!result.first || result.second) throw result.second; } -- cgit v1.2.3