------------------------------------------------------------
revno: 4
committer: Fredrik Ullner <ull...@gmail.com>
branch nick: dc-plugin-sdk
timestamp: Sun 2013-07-21 21:33:05 +0200
message:
Fix some compiler warnings in cpp/pluginsdk
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
dotnet/All.sln
--
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 18:55:07 +0000
+++ cpp/pluginsdk/Config.cpp 2013-07-21 19:33:05 +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;
+ return config == NULL ? false : true;
}
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 18:55:07 +0000
+++ cpp/pluginsdk/Connections.cpp 2013-07-21 19:33:05 +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;
+ return connections == NULL ? false : true;
}
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 18:55:07 +0000
+++ cpp/pluginsdk/Hooks.cpp 2013-07-21 19:33:05 +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;
+ return hooks == NULL ? false : true;
}
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;
+ bool bbBreak = *bBreak == dcTrue ? true : false;
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 18:55:07 +0000
+++ cpp/pluginsdk/Hubs.cpp 2013-07-21 19:33:05 +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;
+ return hubs == NULL ? false : true;
}
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 18:55:07 +0000
+++ cpp/pluginsdk/Logger.cpp 2013-07-21 19:33:05 +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;
+ return logger == NULL ? false : true;
}
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 18:55:07 +0000
+++ cpp/pluginsdk/Queue.cpp 2013-07-21 19:33:05 +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;
+ return queue == NULL ? false : true;
}
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 18:55:07 +0000
+++ cpp/pluginsdk/Tagger.cpp 2013-07-21 19:33:05 +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;
+ return tagger == NULL ? false : true;
}
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 18:55:07 +0000
+++ cpp/pluginsdk/UI.cpp 2013-07-21 19:33:05 +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;
+ return ui == NULL ? false : true;
}
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 18:55:07 +0000
+++ cpp/pluginsdk/Util.cpp 2013-07-21 19:33:05 +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;
+ return utils == NULL ? false : true;
}
void Util::init(DCUtilsPtr coreUtils) { utils = coreUtils; }
DCUtilsPtr Util::handle() { return utils; }
=== modified file 'dotnet/All.sln'
--- dotnet/All.sln 2013-07-21 19:27:58 +0000
+++ dotnet/All.sln 2013-07-21 19:33:05 +0000
@@ -6,6 +6,9 @@
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DCPlugin.DataTypes", "DCPlugin.DataTypes\DCPlugin.DataTypes.csproj", "{A1802054-67C3-447E-9CBE-3D7DE4125809}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyPlugin", "MyPlugin\MyPlugin.csproj", "{332FA47C-A780-4088-BE69-B17E57F97FE4}"
+ ProjectSection(ProjectDependencies) = postProject
+ {AD19E16A-0150-4CB8-B621-12A1833A9137} = {AD19E16A-0150-4CB8-B621-12A1833A9137}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : linuxdcpp-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
