X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fmainwin.cpp;h=e705654ac9a3f33e2dcb2dc5ae73c2e910ad199c;hb=d52b78268ad6ab09f896508a94dd7be47a720153;hp=7b177c1ae6287a70e8ecac80c2531c8f817c37f0;hpb=cf7c5679c2475bb563cd64e15477c485d89368a3;p=quassel.git

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 7b177c1a..e705654a 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -62,10 +62,12 @@
 #include "global.h"
 #include "qtuistyle.h"
 
+
 MainWin::MainWin(QtUi *_gui, QWidget *parent)
   : QMainWindow(parent),
     gui(_gui),
     sslLabel(new QLabel()),
+    _titleSetter(this),
     systray(new QSystemTrayIcon(this)),
     activeTrayIcon(":/icons/quassel-icon-active.png"),
     onlineTrayIcon(":/icons/quassel-icon.png"),
@@ -141,13 +143,8 @@ void MainWin::init() {
   ui.bufferWidget->setModel(Client::bufferModel());
   ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
 
-  if(Global::SPUTDEV) {
-    //showSettingsDlg();
-    //showAboutDlg();
-    //showNetworkDlg();
-    //exit(1);
-  }
-
+  _titleSetter.setModel(Client::bufferModel());
+  _titleSetter.setSelectionModel(Client::bufferModel()->standardSelectionModel());
 }
 
 MainWin::~MainWin() {
@@ -484,8 +481,11 @@ void MainWin::setDisconnectedState() {
 }
 
 AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {
-  if(Global::SPUTDEV) return new ChatLine(msg);
+#ifdef SPUTDEV
+  return new ChatLine(msg);
+#else
   return new ChatLineOld(msg);
+#endif
 }
 
 void MainWin::showCoreConnectionDlg(bool autoConnect) {
@@ -615,6 +615,7 @@ void MainWin::makeTrayIconBlink() {
 }
 
 
+
 void MainWin::clientNetworkCreated(NetworkId id) {
   const Network *net = Client::network(id);
   QAction *act = new QAction(net->networkName(), this);