X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fqtui.cpp;h=1b513a76fc0a272506483c310301ebc411f46afd;hb=981b43a699b4dd6da16e45f74d59443b68ad4b9c;hp=8ec12ef50be39ef42c50d29bf5faadca4b75dcaf;hpb=4775cbfc0dde54bad2a483a51409f392187a20f3;p=quassel.git

diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp
index 8ec12ef5..1b513a76 100644
--- a/src/qtui/qtui.cpp
+++ b/src/qtui/qtui.cpp
@@ -20,18 +20,19 @@
 
 #include "qtui.h"
 
+#include "abstractnotificationbackend.h"
 #include "actioncollection.h"
 #include "chatlinemodel.h"
 #include "mainwin.h"
-#include "abstractnotificationbackend.h"
+#include "networkmodelactionprovider.h"
 #include "qtuimessageprocessor.h"
+#include "qtuisettings.h"
 #include "qtuistyle.h"
 #include "types.h"
-#include "uisettings.h"
 #include "util.h"
 
 QHash<QString, ActionCollection *> QtUi::_actionCollections;
-MainWin *QtUi::_mainWin = 0;
+QPointer<MainWin> QtUi::_mainWin = 0;
 QList<AbstractNotificationBackend *> QtUi::_notificationBackends;
 QList<AbstractNotificationBackend::Notification> QtUi::_notifications;
 QtUiStyle *QtUi::_style = 0;
@@ -42,7 +43,9 @@ QtUi::QtUi() : AbstractUi() {
     return;
   }
 
-  UiSettings uiSettings;
+  _actionProvider = new NetworkModelActionProvider(this);
+
+  QtUiSettings uiSettings;
   loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
 
   _mainWin = new MainWin();