------------------------------------------------------------
revno: 3130
committer: poy <p...@123gen.com>
branch nick: trunk
timestamp: Sun 2012-11-11 17:28:14 +0100
message:
plugin SDK: simplify init
modified:
plugins/Dev/Plugin.cpp
pluginsdk/cpp/pluginsdk/Config.cpp
pluginsdk/cpp/pluginsdk/Config.h
pluginsdk/cpp/pluginsdk/Hooks.cpp
pluginsdk/cpp/pluginsdk/Hooks.h
pluginsdk/cpp/pluginsdk/Logger.cpp
pluginsdk/cpp/pluginsdk/Logger.h
pluginsdk/cpp/pluginsdk/UI.cpp
pluginsdk/cpp/pluginsdk/UI.h
pluginsdk/cpp/pluginsdk/Util.cpp
pluginsdk/cpp/pluginsdk/Util.h
--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk
Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'plugins/Dev/Plugin.cpp'
--- plugins/Dev/Plugin.cpp 2012-11-11 16:16:24 +0000
+++ plugins/Dev/Plugin.cpp 2012-11-11 16:28:14 +0000
@@ -111,11 +111,11 @@
void Plugin::onLoad(DCCorePtr core, bool install, Bool& loadRes) {
hubs = reinterpret_cast<DCHubPtr>(core->query_interface(DCINTF_DCPP_HUBS, DCINTF_DCPP_HUBS_VER));
- if(!Config::init(core) || !Hooks::init(core) || !Logger::init(core) || !UI::init(core) || !Util::init(core) || !hubs) {
+ Core::init(core);
+ if(!Config::init() || !Hooks::init() || !Logger::init() || !UI::init() || !Util::init() || !hubs) {
loadRes = False;
return;
}
- Core::init(core);
if(install) {
Config::setConfig("Enabled", true);
=== modified file 'pluginsdk/cpp/pluginsdk/Config.cpp'
--- pluginsdk/cpp/pluginsdk/Config.cpp 2012-11-11 16:16:24 +0000
+++ pluginsdk/cpp/pluginsdk/Config.cpp 2012-11-11 16:28:14 +0000
@@ -20,12 +20,15 @@
#include "Config.h"
+#include "Core.h"
+
namespace dcapi {
DCConfigPtr Config::config;
-bool Config::init(DCCorePtr core) {
- init(reinterpret_cast<DCConfigPtr>(core->query_interface(DCINTF_CONFIG, DCINTF_CONFIG_VER)));
+bool Config::init() {
+ if(!Core::handle()) { return false; }
+ init(reinterpret_cast<DCConfigPtr>(Core::handle()->query_interface(DCINTF_CONFIG, DCINTF_CONFIG_VER)));
return config;
}
void Config::init(DCConfigPtr coreConfig) { config = coreConfig; }
=== modified file 'pluginsdk/cpp/pluginsdk/Config.h'
--- pluginsdk/cpp/pluginsdk/Config.h 2012-11-11 16:16:24 +0000
+++ pluginsdk/cpp/pluginsdk/Config.h 2012-11-11 16:28:14 +0000
@@ -33,7 +33,7 @@
class Config
{
public:
- static bool init(DCCorePtr core);
+ static bool init();
static void init(DCConfigPtr coreConfig);
static DCConfigPtr handle();
=== modified file 'pluginsdk/cpp/pluginsdk/Hooks.cpp'
--- pluginsdk/cpp/pluginsdk/Hooks.cpp 2012-11-11 16:16:24 +0000
+++ pluginsdk/cpp/pluginsdk/Hooks.cpp 2012-11-11 16:28:14 +0000
@@ -20,13 +20,16 @@
#include "Hooks.h"
+#include "Core.h"
+
namespace dcapi {
DCHooksPtr Hooks::hooks;
map<string, pair<subsHandle, Hooks::Callback>> Hooks::events;
-bool Hooks::init(DCCorePtr core) {
- init(reinterpret_cast<DCHooksPtr>(core->query_interface(DCINTF_HOOKS, DCINTF_HOOKS_VER)));
+bool Hooks::init() {
+ if(!Core::handle()) { return false; }
+ init(reinterpret_cast<DCHooksPtr>(Core::handle()->query_interface(DCINTF_HOOKS, DCINTF_HOOKS_VER)));
return hooks;
}
void Hooks::init(DCHooksPtr coreHooks) { hooks = coreHooks; }
=== modified file 'pluginsdk/cpp/pluginsdk/Hooks.h'
--- pluginsdk/cpp/pluginsdk/Hooks.h 2012-11-11 16:16:24 +0000
+++ pluginsdk/cpp/pluginsdk/Hooks.h 2012-11-11 16:28:14 +0000
@@ -39,7 +39,7 @@
class Hooks
{
public:
- static bool init(DCCorePtr core);
+ static bool init();
static void init(DCHooksPtr coreHooks);
static DCHooksPtr handle();
=== modified file 'pluginsdk/cpp/pluginsdk/Logger.cpp'
--- pluginsdk/cpp/pluginsdk/Logger.cpp 2012-11-11 16:16:24 +0000
+++ pluginsdk/cpp/pluginsdk/Logger.cpp 2012-11-11 16:28:14 +0000
@@ -20,12 +20,15 @@
#include "Logger.h"
+#include "Core.h"
+
namespace dcapi {
DCLogPtr Logger::logger;
-bool Logger::init(DCCorePtr core) {
- init(reinterpret_cast<DCLogPtr>(core->query_interface(DCINTF_LOGGING, DCINTF_LOGGING_VER)));
+bool Logger::init() {
+ if(!Core::handle()) { return false; }
+ init(reinterpret_cast<DCLogPtr>(Core::handle()->query_interface(DCINTF_LOGGING, DCINTF_LOGGING_VER)));
return logger;
}
void Logger::init(DCLogPtr coreLogger) { logger = coreLogger; }
=== modified file 'pluginsdk/cpp/pluginsdk/Logger.h'
--- pluginsdk/cpp/pluginsdk/Logger.h 2012-11-11 16:16:24 +0000
+++ pluginsdk/cpp/pluginsdk/Logger.h 2012-11-11 16:28:14 +0000
@@ -33,7 +33,7 @@
class Logger
{
public:
- static bool init(DCCorePtr core);
+ static bool init();
static void init(DCLogPtr coreLogger);
static DCLogPtr handle();
=== modified file 'pluginsdk/cpp/pluginsdk/UI.cpp'
--- pluginsdk/cpp/pluginsdk/UI.cpp 2012-11-11 16:16:24 +0000
+++ pluginsdk/cpp/pluginsdk/UI.cpp 2012-11-11 16:28:14 +0000
@@ -20,13 +20,16 @@
#include "UI.h"
+#include "Core.h"
+
namespace dcapi {
DCUIPtr UI::ui;
unordered_map<string, UI::Command> UI::commands;
-bool UI::init(DCCorePtr core) {
- init(reinterpret_cast<DCUIPtr>(core->query_interface(DCINTF_DCPP_UI, DCINTF_DCPP_UI_VER)));
+bool UI::init() {
+ if(!Core::handle()) { return false; }
+ init(reinterpret_cast<DCUIPtr>(Core::handle()->query_interface(DCINTF_DCPP_UI, DCINTF_DCPP_UI_VER)));
return ui;
}
void UI::init(DCUIPtr coreUI) { ui = coreUI; }
=== modified file 'pluginsdk/cpp/pluginsdk/UI.h'
--- pluginsdk/cpp/pluginsdk/UI.h 2012-11-11 16:16:24 +0000
+++ pluginsdk/cpp/pluginsdk/UI.h 2012-11-11 16:28:14 +0000
@@ -37,7 +37,7 @@
class UI
{
public:
- static bool init(DCCorePtr core);
+ static bool init();
static void init(DCUIPtr coreUI);
static DCUIPtr handle();
=== modified file 'pluginsdk/cpp/pluginsdk/Util.cpp'
--- pluginsdk/cpp/pluginsdk/Util.cpp 2012-11-11 16:16:24 +0000
+++ pluginsdk/cpp/pluginsdk/Util.cpp 2012-11-11 16:28:14 +0000
@@ -20,12 +20,15 @@
#include "Util.h"
+#include "Core.h"
+
namespace dcapi {
DCUtilsPtr Util::utils;
-bool Util::init(DCCorePtr core) {
- init(reinterpret_cast<DCUtilsPtr>(core->query_interface(DCINTF_DCPP_UTILS, DCINTF_DCPP_UTILS_VER)));
+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;
}
void Util::init(DCUtilsPtr coreUtils) { utils = coreUtils; }
=== modified file 'pluginsdk/cpp/pluginsdk/Util.h'
--- pluginsdk/cpp/pluginsdk/Util.h 2012-11-11 16:16:24 +0000
+++ pluginsdk/cpp/pluginsdk/Util.h 2012-11-11 16:28:14 +0000
@@ -36,7 +36,7 @@
class Util
{
public:
- static bool init(DCCorePtr core);
+ static bool init();
static void init(DCUtilsPtr coreUtils);
static DCUtilsPtr handle();
_______________________________________________
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
