summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-10-27 19:06:56 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-10-27 19:07:55 (GMT)
commit6810a2896f27e7ee07aee847f5e8dbccd1f6ec89 (patch)
treef7ea87f030e57cb4494a4f897506fb18fc3d2241 /Documentation
parenta7da393cfc807048d320ddba8a1c7d24ef23a46e (diff)
downloadswift-contrib-6810a2896f27e7ee07aee847f5e8dbccd1f6ec89.zip
swift-contrib-6810a2896f27e7ee07aee847f5e8dbccd1f6ec89.tar.bz2
Remove MainEventLoop singleton.
The event loop now needs to be explicitly passed to clients using it.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot1.cpp2
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot2.cpp2
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot3.cpp6
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp6
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp6
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoComponent.cpp6
6 files changed, 14 insertions, 14 deletions
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot1.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot1.cpp
index df1da12..ec9c583 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot1.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot1.cpp
@@ -11,7 +11,7 @@ using namespace Swift;
int main(int, char**) {
SimpleEventLoop eventLoop;
- Client client(JID("echobot@wonderland.lit"), "mypass");
+ Client client(&eventLoop, JID("echobot@wonderland.lit"), "mypass");
client.connect();
eventLoop.run();
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot2.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot2.cpp
index dcecbcb..fb24e46 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot2.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot2.cpp
@@ -20,7 +20,7 @@ void handleMessageReceived(Message::ref message);
int main(int, char**) {
SimpleEventLoop eventLoop;
- client = new Client(JID("echobot@wonderland.lit"), "mypass");
+ client = new Client(&eventLoop, JID("echobot@wonderland.lit"), "mypass");
client->onConnected.connect(&handleConnected);
client->onMessageReceived.connect(bind(&handleMessageReceived, _1));
client->connect();
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot3.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot3.cpp
index b5e6972..d3e3d97 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot3.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot3.cpp
@@ -14,8 +14,8 @@ using namespace boost;
class EchoBot {
public:
- EchoBot() {
- client = new Client(JID("echobot@wonderland.lit"), "mypass");
+ EchoBot(EventLoop* eventLoop) {
+ client = new Client(eventLoop, JID("echobot@wonderland.lit"), "mypass");
client->onConnected.connect(bind(&EchoBot::handleConnected, this));
client->onMessageReceived.connect(
bind(&EchoBot::handleMessageReceived, this, _1));
@@ -47,7 +47,7 @@ class EchoBot {
int main(int, char**) {
SimpleEventLoop eventLoop;
- EchoBot bot;
+ EchoBot bot(&eventLoop);
eventLoop.run();
return 0;
}
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp
index 9cedc43..e54346d 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp
@@ -15,9 +15,9 @@ using namespace boost;
//...
class EchoBot {
public:
- EchoBot() {
+ EchoBot(EventLoop* eventLoop) {
//...
- client = new Client(JID("echobot@wonderland.lit"), "mypass");
+ client = new Client(eventLoop, JID("echobot@wonderland.lit"), "mypass");
client->onConnected.connect(bind(&EchoBot::handleConnected, this));
client->onMessageReceived.connect(
bind(&EchoBot::handleMessageReceived, this, _1));
@@ -82,7 +82,7 @@ class EchoBot {
int main(int, char**) {
SimpleEventLoop eventLoop;
- EchoBot bot;
+ EchoBot bot(&eventLoop);
eventLoop.run();
return 0;
}
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp
index d675062..000b2ce 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp
@@ -15,9 +15,9 @@ using namespace boost;
//...
class EchoBot {
public:
- EchoBot() {
+ EchoBot(EventLoop* eventLoop) {
//...
- client = new Client(JID("echobot@wonderland.lit"), "mypass");
+ client = new Client(eventLoop, JID("echobot@wonderland.lit"), "mypass");
client->onConnected.connect(bind(&EchoBot::handleConnected, this));
client->onMessageReceived.connect(
bind(&EchoBot::handleMessageReceived, this, _1));
@@ -90,7 +90,7 @@ class EchoBot {
int main(int, char**) {
SimpleEventLoop eventLoop;
- EchoBot bot;
+ EchoBot bot(&eventLoop);
eventLoop.run();
return 0;
}
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoComponent.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoComponent.cpp
index 67f469d..b99aec5 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoComponent.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoComponent.cpp
@@ -14,8 +14,8 @@ using namespace boost;
class EchoComponent {
public:
- EchoComponent() {
- component = new Component(JID("echo.wonderland.lit"), "EchoSecret");
+ EchoComponent(EventLoop* eventLoop) {
+ component = new Component(eventLoop, JID("echo.wonderland.lit"), "EchoSecret");
component->onConnected.connect(bind(&EchoComponent::handleConnected, this));
component->onMessageReceived.connect(
bind(&EchoComponent::handleMessageReceived, this, _1));
@@ -58,7 +58,7 @@ class EchoComponent {
int main(int, char**) {
SimpleEventLoop eventLoop;
- EchoComponent bot;
+ EchoComponent bot(&eventLoop);
eventLoop.run();
return 0;
}