summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Controllers/EventWindowController.cpp3
-rw-r--r--Swift/QtUI/EventViewer/QtEventWindow.cpp2
-rw-r--r--Swift/QtUI/EventViewer/QtEventWindow.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/Swift/Controllers/EventWindowController.cpp b/Swift/Controllers/EventWindowController.cpp
index fcafec9..a8c8f11 100644
--- a/Swift/Controllers/EventWindowController.cpp
+++ b/Swift/Controllers/EventWindowController.cpp
@@ -18,7 +18,8 @@ EventWindowController::EventWindowController(EventController* eventController, E
}
EventWindowController::~EventWindowController() {
- delete window_;
+ // Don't delete this, since Qt owns it
+ //delete window_;
}
void EventWindowController::handleEventQueueEventAdded(boost::shared_ptr<StanzaEvent> event) {
diff --git a/Swift/QtUI/EventViewer/QtEventWindow.cpp b/Swift/QtUI/EventViewer/QtEventWindow.cpp
index b56ee78..5200740 100644
--- a/Swift/QtUI/EventViewer/QtEventWindow.cpp
+++ b/Swift/QtUI/EventViewer/QtEventWindow.cpp
@@ -23,7 +23,7 @@
namespace Swift {
-QtEventWindow::QtEventWindow(UIEventStream* eventStream, QWidget* parent) : QWidget(parent) {
+QtEventWindow::QtEventWindow(UIEventStream* eventStream) {
QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
layout->setContentsMargins(0,0,0,0);
layout->setSpacing(0);
diff --git a/Swift/QtUI/EventViewer/QtEventWindow.h b/Swift/QtUI/EventViewer/QtEventWindow.h
index b49660a..03f009b 100644
--- a/Swift/QtUI/EventViewer/QtEventWindow.h
+++ b/Swift/QtUI/EventViewer/QtEventWindow.h
@@ -22,7 +22,7 @@ namespace Swift {
class QtEventWindow : public QWidget, public EventWindow {
Q_OBJECT
public:
- QtEventWindow(UIEventStream* eventStream, QWidget* parent = 0);
+ QtEventWindow(UIEventStream* eventStream);
~QtEventWindow();
void addEvent(boost::shared_ptr<StanzaEvent> event, bool active);
void removeEvent(boost::shared_ptr<StanzaEvent> event);