X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fnicklistwidget.cpp;h=f90a10f80197effc4a520b3ff41cb2d56d3a2183;hp=a47cc6e45aed273c969e15a542892472e163b8c5;hb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;hpb=7df097437df5c77a1fd772ff1a5b63d40d09ac4f

diff --git a/src/qtui/nicklistwidget.cpp b/src/qtui/nicklistwidget.cpp
index a47cc6e4..f90a10f8 100644
--- a/src/qtui/nicklistwidget.cpp
+++ b/src/qtui/nicklistwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -45,7 +45,7 @@ QDockWidget *NickListWidget::dock() const
     if (dock)
         return dock;
     else
-        return 0;
+        return nullptr;
 }
 
 
@@ -174,9 +174,9 @@ void NickListWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start,
             iter = nickViews.erase(iter);
             ui.stackedWidget->removeWidget(nickView);
             QAbstractItemModel *model = nickView->model();
-            nickView->setModel(0);
+            nickView->setModel(nullptr);
             if (QSortFilterProxyModel *filter = qobject_cast<QSortFilterProxyModel *>(model))
-                filter->setSourceModel(0);
+                filter->setSourceModel(nullptr);
             model->deleteLater();
             nickView->deleteLater();
         }
@@ -203,9 +203,9 @@ void NickListWidget::removeBuffer(BufferId bufferId)
     NickView *view = nickViews.take(bufferId);
     ui.stackedWidget->removeWidget(view);
     QAbstractItemModel *model = view->model();
-    view->setModel(0);
+    view->setModel(nullptr);
     if (QSortFilterProxyModel *filter = qobject_cast<QSortFilterProxyModel *>(model))
-        filter->setSourceModel(0);
+        filter->setSourceModel(nullptr);
     model->deleteLater();
     view->deleteLater();
 }
@@ -241,6 +241,14 @@ NickListDock::NickListDock(const QString &title, QWidget *parent)
 //   }
 }
 
+void NickListDock::setLocked(bool locked) {
+    if (locked) {
+        setFeatures(nullptr);
+    }
+    else {
+        setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable);
+    }
+}
 
 // NickListDock::~NickListDock() {
 //   QtUiSettings().setValue("ShowNickList", toggleViewAction()->isChecked());