summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/browserdialog.cpp5
-rw-r--r--src/downloadmanager.cpp9
-rw-r--r--src/listdialog.cpp2
-rw-r--r--src/main.cpp4
-rw-r--r--src/moapplication.cpp2
-rw-r--r--src/modinfobackup.h2
-rw-r--r--src/modinfodialogconflicts.cpp9
-rw-r--r--src/modinfodialogfiletree.h3
-rw-r--r--src/modinfodialognexus.h2
-rw-r--r--src/modinfoforeign.cpp2
-rw-r--r--src/modinforegular.cpp2
-rw-r--r--src/modinfoseparator.h2
-rw-r--r--src/modlist.cpp2
-rw-r--r--src/overwriteinfodialog.cpp1
-rw-r--r--src/pluginlist.cpp2
-rw-r--r--src/previewgenerator.cpp5
-rw-r--r--src/profile.cpp2
-rw-r--r--src/transfersavesdialog.cpp2
18 files changed, 33 insertions, 25 deletions
diff --git a/src/browserdialog.cpp b/src/browserdialog.cpp
index e186ad63..c34d211f 100644
--- a/src/browserdialog.cpp
+++ b/src/browserdialog.cpp
@@ -138,9 +138,8 @@ void BrowserDialog::maximizeWidth()
int contentWidth = getCurrentView()->page()->contentsSize().width();
- QDesktopWidget screen;
- int currentScreen = screen.screenNumber(this);
- int screenWidth = screen.screenGeometry(currentScreen).size().width();
+ QScreen* screen = this->window()->windowHandle()->screen();
+ int screenWidth = screen->geometry().size().width();
int targetWidth = std::min<int>(std::max<int>(viewportWidth, contentWidth) + frameWidth, screenWidth);
this->resize(targetWidth, height());
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 648b102a..ec1faed4 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -717,7 +717,7 @@ void DownloadManager::refreshAlphabeticalTranslation()
m_AlphabeticalTranslation.push_back(pos);
}
- qSort(m_AlphabeticalTranslation.begin(), m_AlphabeticalTranslation.end(), LessThanWrapper(this));
+ std::sort(m_AlphabeticalTranslation.begin(), m_AlphabeticalTranslation.end(), LessThanWrapper(this));
}
@@ -1155,7 +1155,12 @@ QDateTime DownloadManager::getFileTime(int index) const
DownloadInfo *info = m_ActiveDownloads.at(index);
if (!info->m_Created.isValid()) {
- info->m_Created = QFileInfo(info->m_Output).created();
+ QFileInfo fileInfo(info->m_Output);
+ info->m_Created = fileInfo.birthTime();
+ if (!info->m_Created.isValid())
+ info->m_Created = fileInfo.metadataChangeTime();
+ if (!info->m_Created.isValid())
+ info->m_Created = fileInfo.lastModified();
}
return info->m_Created;
diff --git a/src/listdialog.cpp b/src/listdialog.cpp
index 52bba80d..b9857070 100644
--- a/src/listdialog.cpp
+++ b/src/listdialog.cpp
@@ -61,7 +61,7 @@ void ListDialog::on_filterEdit_textChanged(QString filter)
if (newChoices.length() == 1) {
QListWidgetItem *item = ui->choiceList->item(0);
- ui->choiceList->setItemSelected(item, true);
+ item->setSelected(true);
ui->choiceList->setCurrentItem(item);
}
diff --git a/src/main.cpp b/src/main.cpp
index c6c87a64..b83e581b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -646,8 +646,8 @@ int runApplication(MOApplication &application, SingleInstance &instance,
const int monitor = settings.value("window_monitor").toInt();
if (monitor != -1) {
- QDesktopWidget* desktop = QApplication::desktop();
- const QPoint center = desktop->availableGeometry(monitor).center();
+ QGuiApplication::screens().at(monitor)->geometry().center();
+ const QPoint center = QGuiApplication::screens().at(monitor)->geometry().center();
splash.move(center - splash.rect().center());
}
}
diff --git a/src/moapplication.cpp b/src/moapplication.cpp
index 5652833a..e07db437 100644
--- a/src/moapplication.cpp
+++ b/src/moapplication.cpp
@@ -50,7 +50,7 @@ public:
if(element == QStyle::PE_IndicatorItemViewItemDrop) {
painter->setRenderHint(QPainter::Antialiasing, true);
- QColor col(option->palette.foreground().color());
+ QColor col(option->palette.windowText().color());
QPen pen(col);
pen.setWidth(2);
col.setAlpha(50);
diff --git a/src/modinfobackup.h b/src/modinfobackup.h
index cab613c9..393c2e38 100644
--- a/src/modinfobackup.h
+++ b/src/modinfobackup.h
@@ -6,6 +6,8 @@
class ModInfoBackup : public ModInfoRegular
{
+ Q_OBJECT
+
friend class ModInfo;
public:
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index 511d48ad..6dd1fe4e 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -7,7 +7,6 @@
using namespace MOShared;
using namespace MOBase;
-namespace shell = MOBase::shell;
// if there are more than 50 selected items in the conflict tree, don't bother
// checking whether menu items apply to them, just show all of them
@@ -935,7 +934,7 @@ ConflictItem GeneralConflictsTab::createOverwriteItem(
auto origin = ToQString(ds.getOriginByID(alternatives.back().first).getName());
return ConflictItem(
- ToQString(altString), std::move(relativeName), QString::null, index,
+ ToQString(altString), std::move(relativeName), QString(), index,
std::move(fileName), true, std::move(origin), archive);
}
@@ -943,8 +942,8 @@ ConflictItem GeneralConflictsTab::createNoConflictItem(
FileEntry::Index index, bool archive, QString fileName, QString relativeName)
{
return ConflictItem(
- QString::null, std::move(relativeName), QString::null, index,
- std::move(fileName), false, QString::null, archive);
+ QString(), std::move(relativeName), QString(), index,
+ std::move(fileName), false, QString(), archive);
}
ConflictItem GeneralConflictsTab::createOverwrittenItem(
@@ -958,7 +957,7 @@ ConflictItem GeneralConflictsTab::createOverwrittenItem(
QString altOrigin = after;
return ConflictItem(
- QString::null, std::move(relativeName), std::move(after),
+ QString(), std::move(relativeName), std::move(after),
index, std::move(fileName), true, std::move(altOrigin), archive);
}
diff --git a/src/modinfodialogfiletree.h b/src/modinfodialogfiletree.h
index f9fa62d4..42773899 100644
--- a/src/modinfodialogfiletree.h
+++ b/src/modinfodialogfiletree.h
@@ -2,9 +2,12 @@
#define MODINFODIALOGFILETREE_H
#include "modinfodialogtab.h"
+#include <QFileSystemModel>
class FileTreeTab : public ModInfoDialogTab
{
+ Q_OBJECT;
+
public:
FileTreeTab(ModInfoDialogTabContext cx);
diff --git a/src/modinfodialognexus.h b/src/modinfodialognexus.h
index 7f894dbf..1cfa2057 100644
--- a/src/modinfodialognexus.h
+++ b/src/modinfodialognexus.h
@@ -32,6 +32,8 @@ signals:
class NexusTab : public ModInfoDialogTab
{
+ Q_OBJECT;
+
public:
NexusTab(ModInfoDialogTabContext cx);
diff --git a/src/modinfoforeign.cpp b/src/modinfoforeign.cpp
index b599d4eb..7312d5b7 100644
--- a/src/modinfoforeign.cpp
+++ b/src/modinfoforeign.cpp
@@ -55,7 +55,7 @@ ModInfoForeign::ModInfoForeign(const QString &modName,
PluginContainer *pluginContainer)
: ModInfoWithConflictInfo(pluginContainer, directoryStructure),
m_ReferenceFile(referenceFile), m_Archives(archives) {
- m_CreationTime = QFileInfo(referenceFile).created();
+ m_CreationTime = QFileInfo(referenceFile).birthTime();
switch (modType) {
case ModInfo::EModType::MOD_DLC:
m_Name = tr("DLC: ") + modName;
diff --git a/src/modinforegular.cpp b/src/modinforegular.cpp
index 448447e1..12137bcb 100644
--- a/src/modinforegular.cpp
+++ b/src/modinforegular.cpp
@@ -39,7 +39,7 @@ ModInfoRegular::ModInfoRegular(PluginContainer *pluginContainer, const IPluginGa
, m_NexusBridge(pluginContainer)
{
testValid();
- m_CreationTime = QFileInfo(path.absolutePath()).created();
+ m_CreationTime = QFileInfo(path.absolutePath()).birthTime();
// read out the meta-file for information
readMeta();
if (m_GameName.compare(game->gameShortName(), Qt::CaseInsensitive) != 0)
diff --git a/src/modinfoseparator.h b/src/modinfoseparator.h
index 3560d786..4b1e5217 100644
--- a/src/modinfoseparator.h
+++ b/src/modinfoseparator.h
@@ -6,6 +6,8 @@
class ModInfoSeparator:
public ModInfoRegular
{
+ Q_OBJECT;
+
friend class ModInfo;
public:
diff --git a/src/modlist.cpp b/src/modlist.cpp
index e2398cd6..abe4fd5d 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -1322,7 +1322,7 @@ bool ModList::moveSelection(QAbstractItemView *itemView, int direction)
QModelIndexList rows = selectionModel->selectedRows();
if (direction > 0) {
for (int i = 0; i < rows.size() / 2; ++i) {
- rows.swap(i, rows.size() - i - 1);
+ rows.swapItemsAt(i, rows.size() - i - 1);
}
}
for (QModelIndex idx : rows) {
diff --git a/src/overwriteinfodialog.cpp b/src/overwriteinfodialog.cpp
index 0a884ac9..a9ef8bef 100644
--- a/src/overwriteinfodialog.cpp
+++ b/src/overwriteinfodialog.cpp
@@ -32,7 +32,6 @@ using namespace MOBase;
class MyFileSystemModel : public QFileSystemModel {
-
public:
MyFileSystemModel(QObject *parent)
: QFileSystemModel(parent), m_RegularColumnCount(0) {}
diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp
index 2edb92f5..85160a88 100644
--- a/src/pluginlist.cpp
+++ b/src/pluginlist.cpp
@@ -1304,7 +1304,7 @@ bool PluginList::eventFilter(QObject *obj, QEvent *event)
}
if (keyEvent->key() == Qt::Key_Down) {
for (int i = 0; i < rows.size() / 2; ++i) {
- rows.swap(i, rows.size() - i - 1);
+ rows.swapItemsAt(i, rows.size() - i - 1);
}
}
for (QModelIndex idx : rows) {
diff --git a/src/previewgenerator.cpp b/src/previewgenerator.cpp
index 280d69aa..f317393e 100644
--- a/src/previewgenerator.cpp
+++ b/src/previewgenerator.cpp
@@ -22,14 +22,11 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include <QLabel>
#include <QImageReader>
#include <QTextEdit>
-#include <QDesktopWidget>
#include <utility.h>
PreviewGenerator::PreviewGenerator()
{
-
- QDesktopWidget desk;
- m_MaxSize = desk.screenGeometry().size() * 0.8;
+ m_MaxSize = QGuiApplication::primaryScreen()->size() * 0.8;
}
void PreviewGenerator::registerPlugin(MOBase::IPluginPreview *plugin)
diff --git a/src/profile.cpp b/src/profile.cpp
index ef387027..4ac15333 100644
--- a/src/profile.cpp
+++ b/src/profile.cpp
@@ -899,7 +899,7 @@ void Profile::rename(const QString &newName)
{
QDir profileDir(Settings::instance().getProfileDirectory());
profileDir.rename(name(), newName);
- m_Directory = profileDir.absoluteFilePath(newName);
+ m_Directory.setPath(profileDir.absoluteFilePath(newName));
}
QVariant Profile::setting(const QString &section, const QString &name,
diff --git a/src/transfersavesdialog.cpp b/src/transfersavesdialog.cpp
index 130df14f..451f56d4 100644
--- a/src/transfersavesdialog.cpp
+++ b/src/transfersavesdialog.cpp
@@ -61,7 +61,7 @@ public:
virtual QDateTime getCreationTime() const override
{
- return QFileInfo(m_File).created();
+ return QFileInfo(m_File).birthTime();
}
virtual QString getSaveGroupIdentifier() const override
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-22 03:17:12 +0000