summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/QtMainEventLoop.h40
-rw-r--r--Swift/QtUI/QtSwift.h4
2 files changed, 2 insertions, 42 deletions
diff --git a/Swift/QtUI/QtMainEventLoop.h b/Swift/QtUI/QtMainEventLoop.h
deleted file mode 100644
index 2df3ad0..0000000
--- a/Swift/QtUI/QtMainEventLoop.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef SWIFT_QtMainEventLoop_H
-#define SWIFT_QtMainEventLoop_H
-
-#include <QObject>
-#include <QEvent>
-#include <QCoreApplication>
-
-#include "Swiften/EventLoop/EventLoop.h"
-
-class QtMainEventLoop : public QObject, public Swift::EventLoop
-{
- public:
- QtMainEventLoop() {}
-
- virtual void post(const Swift::Event& event) {
- QCoreApplication::postEvent(this, new Event(event));
- }
-
- virtual bool event(QEvent* qevent) {
- Event* event = dynamic_cast<Event*>(qevent);
- if (event) {
- handleEvent(event->event_);
- //event->deleteLater(); FIXME: Leak?
- return true;
- }
-
- return false;
- }
-
- private:
- struct Event : public QEvent {
- Event(const Swift::Event& event) :
- QEvent(QEvent::User), event_(event) {
- }
-
- Swift::Event event_;
- };
-};
-
-#endif
diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h
index 223316e..263dc05 100644
--- a/Swift/QtUI/QtSwift.h
+++ b/Swift/QtUI/QtSwift.h
@@ -2,7 +2,7 @@
#define SWIFT_QtSwift_H
#include "Swiften/Base/String.h"
-#include "QtMainEventLoop.h"
+#include "Swiften/EventLoop/Qt/QtEventLoop.h"
#include "QtLoginWindowFactory.h"
#include "QtMainWindowFactory.h"
#include "QtChatWindowFactory.h"
@@ -31,7 +31,7 @@ namespace Swift {
QtChatWindowFactory *chatWindowFactory_;
QtMainWindowFactory *rosterWindowFactory_;
QtLoginWindowFactory *loginWindowFactory_;
- QtMainEventLoop clientMainThreadCaller_;
+ QtEventLoop clientMainThreadCaller_;
QtSettingsProvider *settings_;
QtSystemTray* systemTray_;
QSplitter* splitter_;