mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 16:20:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'qt_follow_up' into 'master'

Browse Source 
Cleanup changes in Qt applications

See merge request OpenMW/openmw!4225
This commit is contained in:
psi29a 2024-07-05 08:11:42 +00:00
commit 804b589a68
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/opencs/view/world/datadisplaydelegate.cpp
View File

@ -71,7 +71,7 @@ bool CSVWorld::DataDisplayDelegate::eventFilter(QObject* target, QEvent* event)
QColor themeColor = QApplication::palette().text().color();
if (themeColor != mPixmapsColor)
{
mPixmapsColor = themeColor;
mPixmapsColor = std::move(themeColor);
buildPixmaps();
}

8
apps/opencs/view/world/scriptsubview.cpp
View File

@ -212,7 +212,7 @@ void CSVWorld::ScriptSubView::useHint(const std::string& hint)
if (hint.empty())
return;
unsigned line = 0, column = 0;
int line = 0, column = 0;
char c;
std::istringstream stream(hint.c_str() + 1);
switch (hint[0])
@ -222,8 +222,8 @@ void CSVWorld::ScriptSubView::useHint(const std::string& hint)
{
QModelIndex index = mModel->getModelIndex(getUniversalId().getId(), mColumn);
QString source = mModel->data(index).toString();
unsigned stringSize = source.length();
unsigned pos, dummy;
int stringSize = static_cast<int>(source.length());
int pos, dummy;
if (!(stream >> c >> dummy >> pos))
return;
@ -234,7 +234,7 @@ void CSVWorld::ScriptSubView::useHint(const std::string& hint)
pos = stringSize;
}
for (unsigned i = 0; i <= pos; ++i)
for (int i = 0; i <= pos; ++i)
{
if (source[i] == '\n')
{

7
components/misc/scalableicon.cpp
View File

@ -36,7 +36,12 @@ namespace Misc
return QIcon();
QFile iconFile(fileName);
iconFile.open(QIODevice::ReadOnly);
if (!iconFile.open(QIODevice::ReadOnly))
{
qDebug() << "Failed to open icon file:" << fileName;
return QIcon();
}
auto content = iconFile.readAll();
if (!content.startsWith("<?xml"))
return QIcon(fileName);

14
components/platform/application.cpp
View File

@ -43,7 +43,12 @@ namespace Platform
setStyle("windows");
QFile file(getStyleSheetPath());
file.open(QIODevice::ReadOnly);
if (!file.open(QIODevice::ReadOnly))
{
qDebug() << "Failed to open style sheet file:" << getStyleSheetPath();
return;
}
setStyleSheet(file.readAll());
}
}
@ -60,7 +65,12 @@ namespace Platform
setStyle("windows");
QFile file(getStyleSheetPath());
file.open(QIODevice::ReadOnly);
if (!file.open(QIODevice::ReadOnly))
{
qDebug() << "Failed to open style sheet file:" << getStyleSheetPath();
return;
}
setStyleSheet(file.readAll());
}
else