diff options
Diffstat (limited to 'Swift/QtUI/QtSwift.cpp')
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 10 | 
1 files changed, 8 insertions, 2 deletions
| diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index 2aaa27e..7e204e9 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -5,12 +5,13 @@  #include "QtLoginWindow.h"  #include "QtChatTabs.h"  #include "QtMainWindowFactory.h"  #include "Roster/QtTreeWidgetFactory.h"  #include "QtSystemTray.h"  #include "QtSoundPlayer.h" +#include "QtXMLConsoleWidgetFactory.h"  #include <boost/bind.hpp>  #include <QSplitter>  #include "Swiften/Application/Application.h"  #include "Swiften/Application/Platform/PlatformApplication.h"  #include "Swiften/Base/String.h" @@ -29,24 +30,27 @@ QtSwift::QtSwift(bool netbookMode) {  		splitter_ = NULL;  	}  	QCoreApplication::setApplicationName("Swift");  	QCoreApplication::setOrganizationName("Swift");  	QCoreApplication::setOrganizationDomain("swift.im");  	QCoreApplication::setApplicationVersion(buildVersion); + +	tabs_ = new QtChatTabs();  	settings_ = new QtSettingsProvider();  	application_ = new PlatformApplication("Swift");  	treeWidgetFactory_ = new QtTreeWidgetFactory();   	systemTray_ = new QtSystemTray();  	loginWindowFactory_ = new QtLoginWindowFactory(splitter_, systemTray_, settings_); -	chatWindowFactory_ = new QtChatWindowFactory(treeWidgetFactory_, splitter_, settings_); +	chatWindowFactory_ = new QtChatWindowFactory(treeWidgetFactory_, splitter_, settings_, tabs_);  	rosterWindowFactory_ = new QtMainWindowFactory(treeWidgetFactory_); +	xmlConsoleWidgetFactory_ = new QtXMLConsoleWidgetFactory(tabs_);  	soundPlayer_ = new QtSoundPlayer();  	if (splitter_) {  		splitter_->show();  	} -	mainController_ = new MainController(chatWindowFactory_, rosterWindowFactory_, loginWindowFactory_, treeWidgetFactory_, settings_, application_, systemTray_, soundPlayer_); +	mainController_ = new MainController(chatWindowFactory_, rosterWindowFactory_, loginWindowFactory_, treeWidgetFactory_, settings_, application_, systemTray_, soundPlayer_, xmlConsoleWidgetFactory_);  }  QtSwift::~QtSwift() {  	delete chatWindowFactory_;  	delete rosterWindowFactory_;  	delete loginWindowFactory_; @@ -54,9 +58,11 @@ QtSwift::~QtSwift() {  	delete mainController_;  	delete settings_;  	delete application_;  	delete systemTray_;  	delete splitter_;  	delete soundPlayer_; +	delete tabs_; +	delete xmlConsoleWidgetFactory_;  }  } | 
 Swift
 Swift