1 files changed, 5 insertions, 2 deletions
diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h
index 42fb50f..1ea8886 100644
--- a/Swift/QtUI/QtSwift.h
+++ b/Swift/QtUI/QtSwift.h
@@ -50,6 +50,8 @@ namespace Swift {
 	class URIHandler;
 	class SettingsProviderHierachy;
 	class XMLSettingsProvider;
+	class StatusCache;
+	class QtSingleWindow;
 		
 	class QtSwift : public QObject {
 		Q_OBJECT
@@ -59,7 +61,7 @@ namespace Swift {
 			~QtSwift();
 		private:
 			XMLSettingsProvider* loadSettingsFile(const QString& fileName);
-			QMap<QString, QString> loadEmoticonsFile(const QString& fileName);
+			void loadEmoticonsFile(const QString& fileName, std::map<std::string, std::string>& emoticons);
 		private:
 			QtEventLoop clientMainThreadCaller_;
 			PlatformTLSFactories tlsFactories_;
@@ -71,7 +73,7 @@ namespace Swift {
 			QtSettingsProvider* qtSettings_;
 			XMLSettingsProvider* xmlSettings_;
 			SettingsProviderHierachy* settingsHierachy_;
-			QSplitter* splitter_;
+			QtSingleWindow* splitter_;
 			QtSoundPlayer* soundPlayer_;
 			Dock* dock_;
 			URIHandler* uriHandler_;
@@ -81,6 +83,7 @@ namespace Swift {
 			CertificateStorageFactory* certificateStorageFactory_;
 			AutoUpdater* autoUpdater_;
 			Notifier* notifier_;
+			StatusCache* statusCache_;
 			PlatformIdleQuerier idleQuerier_;
 			ActualIdleDetector idleDetector_;
 #if defined(SWIFTEN_PLATFORM_MACOSX)