refactor: clean up data method of model

This commit is contained in:
sithlord48 2025-01-29 19:23:40 -05:00 committed by Nick Bolton
parent beb4069845
commit 0ba35fca7a

View file

@ -1,5 +1,6 @@
/* /*
* Deskflow -- mouse and keyboard sharing utility * Deskflow -- mouse and keyboard sharing utility
* SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
* SPDX-FileCopyrightText: (C) 2012 Symless Ltd. * SPDX-FileCopyrightText: (C) 2012 Symless Ltd.
* SPDX-FileCopyrightText: (C) 2008 Volker Lanz <vl@fidra.de> * SPDX-FileCopyrightText: (C) 2008 Volker Lanz <vl@fidra.de>
* SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
@ -37,28 +38,26 @@ ScreenSetupModel::ScreenSetupModel(ScreenList &screens, int numColumns, int numR
QVariant ScreenSetupModel::data(const QModelIndex &index, int role) const QVariant ScreenSetupModel::data(const QModelIndex &index, int role) const
{ {
if (index.isValid() && index.row() < m_NumRows && index.column() < m_NumColumns) { if (!index.isValid() || index.row() > m_NumRows || index.row() < 0 || index.column() < 0 ||
switch (role) { index.column() > m_NumColumns)
case Qt::DecorationRole: return QVariant();
if (screen(index).isNull())
break;
return QIcon(screen(index).pixmap());
case Qt::ToolTipRole: if (screen(index).isNull())
if (screen(index).isNull()) return QVariant();
break;
return QString(tr("<center>Screen: <b>%1</b></center>"
"<br>Double click to edit settings"
"<br>Drag screen to the trashcan to remove it"))
.arg(screen(index).name());
case Qt::DisplayRole: switch (role) {
if (screen(index).isNull()) case Qt::DecorationRole:
break; return screen(index).pixmap();
return screen(index).name();
} case Qt::ToolTipRole:
return QString(tr("<center>Screen: <b>%1</b></center>"
"<br>Double click to edit settings"
"<br>Drag screen to the trashcan to remove it"))
.arg(screen(index).name());
case Qt::DisplayRole:
return screen(index).name();
} }
return QVariant(); return QVariant();
} }