linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 428
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: coreupgrade
timestamp: Thu 2011-05-12 00:36:52 -0500
message:
  Add hint url to WulforUtil
modified:
  linux/WulforUtil.cc
  linux/WulforUtil.hh
  linux/downloadqueue.cc


--
lp:~linuxdcpp-team/linuxdcpp/coreupgrade
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/coreupgrade

Your team LinuxDC++ Team is subscribed to branch lp:~linuxdcpp-team/linuxdcpp/coreupgrade.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/coreupgrade/+edit-subscription

=== modified file 'linux/WulforUtil.cc'
--- linux/WulforUtil.cc	2011-04-15 06:24:54 +0000
+++ linux/WulforUtil.cc	2011-05-12 05:36:52 +0000
@@ -130,48 +130,53 @@
 	return addresses;
 }
 
-string WulforUtil::getNicks(const string &cid)
-{
-	return getNicks(CID(cid));
-}
-
-string WulforUtil::getNicks(const CID& cid)
-{
-	return Util::toString(ClientManager::getInstance()->getNicks(cid));
-}
-
-string WulforUtil::getNicks(const UserPtr& user)
-{
-	return getNicks(user->getCID());
-}
-
-string WulforUtil::getHubNames(const string &cid)
-{
-	return getHubNames(CID(cid));
-}
-
-string WulforUtil::getHubNames(const CID& cid)
-{
-	StringList hubs = ClientManager::getInstance()->getHubNames(cid);
+string WulforUtil::getNicks(const string& cid, const std::string& hintUrl)
+{
+	return getNicks(CID(cid), hintUrl);
+}
+
+string WulforUtil::getNicks(const CID& cid, const std::string& hintUrl)
+{
+	return Util::toString(ClientManager::getInstance()->getNicks(cid, hintUrl));
+}
+
+string WulforUtil::getNicks(const UserPtr& user, const std::string& hintUrl)
+{
+	return getNicks(user->getCID(), hintUrl);
+}
+
+string WulforUtil::getNicks(const HintedUser& user)
+{
+	return getNicks(user.user->getCID(), user.hint);
+}
+
+string WulforUtil::getHubNames(const string &cid, const std::string& hintUrl)
+{
+	return getHubNames(CID(cid), hintUrl);
+}
+
+string WulforUtil::getHubNames(const CID& cid, const std::string& hintUrl)
+{
+	StringList hubs = ClientManager::getInstance()->getHubNames(cid, hintUrl);
 	if (hubs.empty())
 		return C_("User", "Offline");
 	else
 		return Util::toString(hubs);
 }
 
-string WulforUtil::getHubNames(const UserPtr& user)
-{
-	return getHubNames(user->getCID());
-}
-
-StringList WulforUtil::getHubAddress(const CID& cid)
-{
-	return ClientManager::getInstance()->getHubs(cid);
-}
-
-StringList WulforUtil::getHubAddress(const UserPtr& user)
-{
-	return getHubAddress(user->getCID());
+string WulforUtil::getHubNames(const UserPtr& user, const std::string& hintUrl)
+{
+	return getHubNames(user->getCID(), hintUrl);
+}
+
+StringList WulforUtil::getHubAddress(const CID& cid, const std::string& hintUrl)
+{
+	return ClientManager::getInstance()->getHubs(cid, hintUrl);
+}
+
+StringList WulforUtil::getHubAddress(const UserPtr& user, const std::string& hintUrl)
+{
+	return getHubAddress(user->getCID(), hintUrl);
 }
 
 string WulforUtil::getTextFromMenu(GtkMenuItem *item)

=== modified file 'linux/WulforUtil.hh'
--- linux/WulforUtil.hh	2010-12-10 05:50:31 +0000
+++ linux/WulforUtil.hh	2011-05-12 05:36:52 +0000
@@ -35,14 +35,15 @@
 		static std::string linuxSeparator(const std::string &ps);
 		static std::string windowsSeparator(const std::string &ps);
 		static std::vector<std::string> getLocalIPs();
-		static std::string getNicks(const std::string &cid);
-		static std::string getNicks(const dcpp::CID& cid);
-		static std::string getNicks(const dcpp::UserPtr& user);
-		static std::string getHubNames(const std::string &cid);
-		static std::string getHubNames(const dcpp::CID& cid);
-		static std::string getHubNames(const dcpp::UserPtr& user);
-		static dcpp::StringList getHubAddress(const dcpp::CID& cid);
-		static dcpp::StringList getHubAddress(const dcpp::UserPtr& user);
+		static std::string getNicks(const std::string& cid, const std::string& hintUrl);
+		static std::string getNicks(const dcpp::CID& cid, const std::string& hintUrl);
+		static std::string getNicks(const dcpp::UserPtr& user, const std::string& hintUrl);
+		static std::string getNicks(const dcpp::HintedUser& user);
+		static std::string getHubNames(const std::string &cid, const std::string& hintUrl);
+		static std::string getHubNames(const dcpp::CID& cid, const std::string& hintUrl);
+		static std::string getHubNames(const dcpp::UserPtr& user, const std::string& hintUrl);
+		static dcpp::StringList getHubAddress(const dcpp::CID& cid, const std::string& hintUrl);
+		static dcpp::StringList getHubAddress(const dcpp::UserPtr& user, const std::string& hintUrl);
 		static std::string getTextFromMenu(GtkMenuItem *item);
 		static std::vector<std::string>& getCharsets();
 		static void openURI(const std::string &uri);

=== modified file 'linux/downloadqueue.cc'
--- linux/downloadqueue.cc	2011-04-15 06:24:54 +0000
+++ linux/downloadqueue.cc	2011-05-12 05:36:52 +0000
@@ -1246,14 +1246,14 @@
 	params["Users"] = "";
 	for (QueueItem::SourceConstIter it = item->getSources().begin(); it != item->getSources().end(); ++it)
 	{
-		if (it->getUser()->isOnline())
+		if (it->getUser().user->isOnline())
 			++online;
 
 		if (params["Users"].size() > 0)
 			params["Users"] += ", ";
 
 		nick = WulforUtil::getNicks(it->getUser());
-		source[nick] = it->getUser()->getCID().toBase32();
+		source[nick] = it->getUser().user->getCID().toBase32();
 		params["Users"] += nick;
 	}
 	if (params["Users"].empty())
@@ -1319,7 +1319,7 @@
 	for (QueueItem::SourceConstIter it = item->getBadSources().begin(); it != item->getBadSources().end(); ++it)
 	{
 		nick = WulforUtil::getNicks(it->getUser());
-		source[nick] = it->getUser()->getCID().toBase32();
+		source[nick] = it->getUser().user->getCID().toBase32();
 
 		if (!it->isSet(QueueItem::Source::FLAG_REMOVED))
 		{