X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=fb610e0623dd4fb566bd61ff69f4c1842378f7ab;hp=8c77f4ce123c257e48ed1969852c4a3bba4d808a;hb=1736d7414b96efc1189e56f22bd0407989c3a7c9;hpb=ef12cc4010e853348474b4ea15c383dd596d4858 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 8c77f4ce..fb610e06 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -25,8 +25,11 @@ #include "bufferviewconfig.h" #include "bufferviewfilter.h" #include "bufferviewmanager.h" -#include "chatline.h" -#include "chatline-old.h" +#ifdef SPUTDEV +# include "chatline.h" +#else +# include "chatline-old.h" +#endif #include "client.h" #include "clientbacklogmanager.h" #include "coreconnectdlg.h" @@ -266,7 +269,8 @@ void MainWin::setupNickWidget() { addDockWidget(Qt::RightDockWidgetArea, nickDock); ui.menuViews->addAction(nickDock->toggleViewAction()); - connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool))); + // See NickListDock::NickListDock(); + // connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool))); // attach the NickListWidget to the BufferModel and the default selection nickListWidget->setModel(Client::bufferModel()); @@ -484,7 +488,8 @@ void MainWin::setDisconnectedState() { AbstractUiMsg *MainWin::layoutMsg(const Message &msg) { #ifdef SPUTDEV - return new ChatLine(msg); + //return new ChatLine(msg); + return 0; #else return new ChatLineOld(msg); #endif