summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-22 09:33:44 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-22 09:33:44 (GMT)
commit04e6c3982dbca31bc6040a734ebfba153404ec41 (patch)
treebd221a301d5993c06172ee7ccbc135d808fd52d9
parent279761bbf59a5129793896dcc8fc2bc04955b1a4 (diff)
downloadswift-contrib-04e6c3982dbca31bc6040a734ebfba153404ec41.zip
swift-contrib-04e6c3982dbca31bc6040a734ebfba153404ec41.tar.bz2
Moved QtEventLoop to Swiften.
-rw-r--r--Swift/QtUI/QtSwift.h4
-rw-r--r--Swiften/EventLoop/Qt/QtEventLoop.h (renamed from Swift/QtUI/QtMainEventLoop.h)10
2 files changed, 5 insertions, 9 deletions
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_;
diff --git a/Swift/QtUI/QtMainEventLoop.h b/Swiften/EventLoop/Qt/QtEventLoop.h
index 2df3ad0..9c7d2f1 100644
--- a/Swift/QtUI/QtMainEventLoop.h
+++ b/Swiften/EventLoop/Qt/QtEventLoop.h
@@ -1,5 +1,4 @@
-#ifndef SWIFT_QtMainEventLoop_H
-#define SWIFT_QtMainEventLoop_H
+#pragma once
#include <QObject>
#include <QEvent>
@@ -7,10 +6,9 @@
#include "Swiften/EventLoop/EventLoop.h"
-class QtMainEventLoop : public QObject, public Swift::EventLoop
-{
+class QtEventLoop : public QObject, public Swift::EventLoop {
public:
- QtMainEventLoop() {}
+ QtEventLoop() {}
virtual void post(const Swift::Event& event) {
QCoreApplication::postEvent(this, new Event(event));
@@ -36,5 +34,3 @@ class QtMainEventLoop : public QObject, public Swift::EventLoop
Swift::Event event_;
};
};
-
-#endif