linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5
committer: Fredrik Ullner <ullner@xxxxxxxxx>
branch nick: dc-plugin-sdk
timestamp: Sun 2013-07-21 21:44:36 +0200
message:
  Changed the compiler warning fix slightly
modified:
  cpp/pluginsdk/Config.cpp
  cpp/pluginsdk/Connections.cpp
  cpp/pluginsdk/Hooks.cpp
  cpp/pluginsdk/Hubs.cpp
  cpp/pluginsdk/Logger.cpp
  cpp/pluginsdk/Queue.cpp
  cpp/pluginsdk/Tagger.cpp
  cpp/pluginsdk/UI.cpp
  cpp/pluginsdk/Util.cpp


--
lp:dc-plugin-sdk
https://code.launchpad.net/~dcplusplus-team/dc-plugin-sdk/trunk

Your team Dcplusplus-team is subscribed to branch lp:dc-plugin-sdk.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dc-plugin-sdk/trunk/+edit-subscription

=== modified file 'cpp/pluginsdk/Config.cpp'
--- cpp/pluginsdk/Config.cpp	2013-07-21 19:33:05 +0000
+++ cpp/pluginsdk/Config.cpp	2013-07-21 19:44:36 +0000
@@ -30,7 +30,7 @@
 bool Config::init(string pluginGuid) {
 	if(!Core::handle()) { return false; }
 	init(reinterpret_cast<DCConfigPtr>(Core::handle()->query_interface(DCINTF_CONFIG, DCINTF_CONFIG_VER)), move(pluginGuid));
-	return config == NULL ? false : true;
+	return config != NULL;
 }
 void Config::init(DCConfigPtr coreConfig, string pluginGuid) { config = coreConfig; guid = move(pluginGuid); }
 DCConfigPtr Config::handle() { return config; }

=== modified file 'cpp/pluginsdk/Connections.cpp'
--- cpp/pluginsdk/Connections.cpp	2013-07-21 19:33:05 +0000
+++ cpp/pluginsdk/Connections.cpp	2013-07-21 19:44:36 +0000
@@ -29,7 +29,7 @@
 bool Connections::init() {
 	if(!Core::handle()) { return false; }
 	init(reinterpret_cast<DCConnectionPtr>(Core::handle()->query_interface(DCINTF_DCPP_CONNECTIONS, DCINTF_DCPP_CONNECTIONS_VER)));
-	return connections == NULL ? false : true;
+	return connections != NULL;
 }
 void Connections::init(DCConnectionPtr coreConnections) { connections = coreConnections; }
 DCConnectionPtr Connections::handle() { return connections; }

=== modified file 'cpp/pluginsdk/Hooks.cpp'
--- cpp/pluginsdk/Hooks.cpp	2013-07-21 19:33:05 +0000
+++ cpp/pluginsdk/Hooks.cpp	2013-07-21 19:44:36 +0000
@@ -30,7 +30,7 @@
 bool Hooks::init() {
 	if(!Core::handle()) { return false; }
 	init(reinterpret_cast<DCHooksPtr>(Core::handle()->query_interface(DCINTF_HOOKS, DCINTF_HOOKS_VER)));
-	return hooks == NULL ? false : true;
+	return hooks != NULL;
 }
 void Hooks::init(DCHooksPtr coreHooks) { hooks = coreHooks; }
 DCHooksPtr Hooks::handle() { return hooks; }
@@ -167,7 +167,7 @@
 }
 
 Bool DCAPI Hooks::eventCallback(dcptr_t pObject, dcptr_t pData, dcptr_t pCommon, Bool* bBreak) {
-	bool bbBreak = *bBreak == dcTrue ? true : false;
+	bool bbBreak = *bBreak == dcTrue;
 	auto ret = events[reinterpret_cast<char*>(pCommon)].second(pObject, pData, bbBreak) ? True : False;
 	*bBreak = bbBreak ? True : False;
 	return ret;

=== modified file 'cpp/pluginsdk/Hubs.cpp'
--- cpp/pluginsdk/Hubs.cpp	2013-07-21 19:33:05 +0000
+++ cpp/pluginsdk/Hubs.cpp	2013-07-21 19:44:36 +0000
@@ -29,7 +29,7 @@
 bool Hubs::init() {
 	if(!Core::handle()) { return false; }
 	init(reinterpret_cast<DCHubPtr>(Core::handle()->query_interface(DCINTF_DCPP_HUBS, DCINTF_DCPP_HUBS_VER)));
-	return hubs == NULL ? false : true;
+	return hubs != NULL;
 }
 void Hubs::init(DCHubPtr coreHub) { hubs = coreHub; }
 DCHubPtr Hubs::handle() { return hubs; }

=== modified file 'cpp/pluginsdk/Logger.cpp'
--- cpp/pluginsdk/Logger.cpp	2013-07-21 19:33:05 +0000
+++ cpp/pluginsdk/Logger.cpp	2013-07-21 19:44:36 +0000
@@ -29,7 +29,7 @@
 bool Logger::init() {
 	if(!Core::handle()) { return false; }
 	init(reinterpret_cast<DCLogPtr>(Core::handle()->query_interface(DCINTF_LOGGING, DCINTF_LOGGING_VER)));
-	return logger == NULL ? false : true;
+	return logger != NULL;
 }
 void Logger::init(DCLogPtr coreLogger) { logger = coreLogger; }
 DCLogPtr Logger::handle() { return logger; }

=== modified file 'cpp/pluginsdk/Queue.cpp'
--- cpp/pluginsdk/Queue.cpp	2013-07-21 19:33:05 +0000
+++ cpp/pluginsdk/Queue.cpp	2013-07-21 19:44:36 +0000
@@ -29,7 +29,7 @@
 bool Queue::init() {
 	if(!Core::handle()) { return false; }
 	init(reinterpret_cast<DCQueuePtr>(Core::handle()->query_interface(DCINTF_DCPP_QUEUE, DCINTF_DCPP_QUEUE_VER)));
-	return queue == NULL ? false : true;
+	return queue != NULL;
 }
 void Queue::init(DCQueuePtr coreQueue) { queue = coreQueue; }
 DCQueuePtr Queue::handle() { return queue; }

=== modified file 'cpp/pluginsdk/Tagger.cpp'
--- cpp/pluginsdk/Tagger.cpp	2013-07-21 19:33:05 +0000
+++ cpp/pluginsdk/Tagger.cpp	2013-07-21 19:44:36 +0000
@@ -29,7 +29,7 @@
 bool Tagger::init() {
 	if(!Core::handle()) { return false; }
 	init(reinterpret_cast<DCTaggerPtr>(Core::handle()->query_interface(DCINTF_DCPP_TAGGER, DCINTF_DCPP_TAGGER_VER)));
-	return tagger == NULL ? false : true;
+	return tagger != NULL;
 }
 void Tagger::init(DCTaggerPtr coreTagger) { tagger = coreTagger; }
 DCTaggerPtr Tagger::handle() { return tagger; }

=== modified file 'cpp/pluginsdk/UI.cpp'
--- cpp/pluginsdk/UI.cpp	2013-07-21 19:33:05 +0000
+++ cpp/pluginsdk/UI.cpp	2013-07-21 19:44:36 +0000
@@ -31,7 +31,7 @@
 bool UI::init(string pluginGuid) {
 	if(!Core::handle()) { return false; }
 	init(reinterpret_cast<DCUIPtr>(Core::handle()->query_interface(DCINTF_DCPP_UI, DCINTF_DCPP_UI_VER)), move(pluginGuid));
-	return ui == NULL ? false : true;
+	return ui != NULL;
 }
 void UI::init(DCUIPtr coreUI, string pluginGuid) { ui = coreUI; guid = move(pluginGuid); }
 DCUIPtr UI::handle() { return ui; }

=== modified file 'cpp/pluginsdk/Util.cpp'
--- cpp/pluginsdk/Util.cpp	2013-07-21 19:33:05 +0000
+++ cpp/pluginsdk/Util.cpp	2013-07-21 19:44:36 +0000
@@ -29,7 +29,7 @@
 bool Util::init() {
 	if(!Core::handle()) { return false; }
 	init(reinterpret_cast<DCUtilsPtr>(Core::handle()->query_interface(DCINTF_DCPP_UTILS, DCINTF_DCPP_UTILS_VER)));
-	return utils == NULL ? false : true;
+	return utils != NULL;
 }
 void Util::init(DCUtilsPtr coreUtils) { utils = coreUtils; }
 DCUtilsPtr Util::handle() { return utils; }