diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-05-02 19:10:45 +0200 | 
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-07-10 12:17:52 +0200 | 
| commit | 984692dc629ca3712d482b174a67557dd9e635a8 (patch) | |
| tree | dca8185a36528d94dd2c93ba8d930908271ca2cc /launcher/ui/pages/instance | |
| parent | c1bcbf8c63ef4543fdf0d5529089721d2b4a01dd (diff) | |
| download | PrismLauncher-984692dc629ca3712d482b174a67557dd9e635a8.tar.gz PrismLauncher-984692dc629ca3712d482b174a67557dd9e635a8.tar.bz2 PrismLauncher-984692dc629ca3712d482b174a67557dd9e635a8.zip | |
refactor: fix deprecation up to Qt 5.15
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Diffstat (limited to 'launcher/ui/pages/instance')
| -rw-r--r-- | launcher/ui/pages/instance/LogPage.cpp | 2 | ||||
| -rw-r--r-- | launcher/ui/pages/instance/ScreenshotsPage.cpp | 2 | ||||
| -rw-r--r-- | launcher/ui/pages/instance/ServersPage.cpp | 8 | 
3 files changed, 10 insertions, 2 deletions
| diff --git a/launcher/ui/pages/instance/LogPage.cpp b/launcher/ui/pages/instance/LogPage.cpp index 8fefb44c..3d9fb025 100644 --- a/launcher/ui/pages/instance/LogPage.cpp +++ b/launcher/ui/pages/instance/LogPage.cpp @@ -63,7 +63,7 @@ public:          {              case Qt::FontRole:                  return m_font; -            case Qt::TextColorRole: +            case Qt::ForegroundRole:              {                  MessageLevel::Enum level = (MessageLevel::Enum) QIdentityProxyModel::data(index, LogModel::LevelRole).toInt();                  return m_colors->getFront(level); diff --git a/launcher/ui/pages/instance/ScreenshotsPage.cpp b/launcher/ui/pages/instance/ScreenshotsPage.cpp index 51163e28..75eb5a3f 100644 --- a/launcher/ui/pages/instance/ScreenshotsPage.cpp +++ b/launcher/ui/pages/instance/ScreenshotsPage.cpp @@ -270,7 +270,7 @@ ScreenshotsPage::ScreenshotsPage(QString path, QWidget *parent)      ui->listView->setViewMode(QListView::IconMode);      ui->listView->setResizeMode(QListView::Adjust);      ui->listView->installEventFilter(this); -    ui->listView->setEditTriggers(0); +    ui->listView->setEditTriggers(QAbstractItemView::NoEditTriggers);      ui->listView->setItemDelegate(new CenteredEditingDelegate(this));      ui->listView->setContextMenuPolicy(Qt::CustomContextMenu);      connect(ui->listView, &QListView::customContextMenuRequested, this, &ScreenshotsPage::ShowContextMenu); diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp index 3971d422..b9583d86 100644 --- a/launcher/ui/pages/instance/ServersPage.cpp +++ b/launcher/ui/pages/instance/ServersPage.cpp @@ -288,7 +288,11 @@ public:              return false;          }          beginMoveRows(QModelIndex(), row, row, QModelIndex(), row - 1); +#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0) +        m_servers.swapItemsAt(row-1, row); +#else          m_servers.swap(row-1, row); +#endif          endMoveRows();          scheduleSave();          return true; @@ -306,7 +310,11 @@ public:              return false;          }          beginMoveRows(QModelIndex(), row, row, QModelIndex(), row + 2); +#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0) +        m_servers.swapItemsAt(row+1, row); +#else          m_servers.swap(row+1, row); +#endif          endMoveRows();          scheduleSave();          return true; | 
