Skip to content

Commit 837ed00

Browse files
committed
chore: fix compilation warnings
1. Added error handling for translation file loading in both main.cpp files 2. Removed redundant Qt::AA_UseHighDpiPixmaps attribute setting 3. Replaced DHiDPIHelper::loadNxPixmap with DIcon::loadNxPixmap for better compatibility chore: 修复编译警告 1. 在两个 main.cpp 文件中添加了翻译文件加载的错误处理 2. 移除了冗余的 Qt::AA_UseHighDpiPixmaps 属性设置 3. 使用 DIcon::loadNxPixmap 替代 DHiDPIHelper::loadNxPixmap 以获得更好的 兼容性
1 parent 7289481 commit 837ed00

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/dde-abrecovery/main.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ int main(int argc, char *argv[])
2222
a.setQuitOnLastWindowClosed(false);
2323

2424
QTranslator translator;
25-
translator.load("/usr/share/deepin-update-ui/translations/dde-rollback_" + getCurrentLocale());
25+
if (!translator.load("/usr/share/deepin-update-ui/translations/dde-rollback_" + getCurrentLocale())) {
26+
qWarning() << "Failed to load translation file for locale" << getCurrentLocale();
27+
}
28+
2629
a.installTranslator(&translator);
2730

2831
DLogManager::registerConsoleAppender();

src/dde-update/checksystemwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ ErrorFrame::ErrorFrame(QWidget *parent)
222222

223223
m_buttonSpacer->changeSize(0, 0);
224224
m_titleSpacer->changeSize(0, 0);
225-
m_iconLabel->setPixmap(DHiDPIHelper::loadNxPixmap(":img/failed.svg"));
225+
m_iconLabel->setPixmap(DIcon::loadNxPixmap(":img/failed.svg"));
226226
const QList<UpdateModel::UpdateAction> actions = {{UpdateModel::Reboot, UpdateModel::EnterDesktop}};
227227
m_title->setText(tr("Checked for some errors"));
228228

src/dde-update/main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ int main(int argc, char *argv[])
3030

3131
// qt默认当最后一个窗口析构后,会自动退出程序,这里设置成false,防止插拔时,没有屏幕,导致进程退出
3232
QApplication::setQuitOnLastWindowClosed(false);
33-
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
3433

3534
DApplication *app = nullptr;
3635
#if (DTK_VERSION < DTK_VERSION_CHECK(5, 4, 0, 0))
@@ -41,8 +40,6 @@ int main(int argc, char *argv[])
4140

4241
// qt默认当最后一个窗口析构后,会自动退出程序,这里设置成false,防止插拔时,没有屏幕,导致进程退出
4342
QApplication::setQuitOnLastWindowClosed(false);
44-
//解决Qt在Retina屏幕上图片模糊问题
45-
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
4643
app->setOrganizationName("deepin");
4744
app->setApplicationName("dde-update");
4845
app->setApplicationVersion("2015.1.0");
@@ -84,7 +81,10 @@ int main(int argc, char *argv[])
8481
DGuiApplicationHelper::instance()->setApplicationPalette(pa);
8582

8683
QTranslator translatorLanguage;
87-
translatorLanguage.load("/usr/share/deepin-update-ui/translations/dde-update_" + getCurrentLocale());
84+
if (!translatorLanguage.load("/usr/share/deepin-update-ui/translations/dde-update_" + getCurrentLocale())) {
85+
qWarning() << "Failed to load translation file for locale" << getCurrentLocale();
86+
}
87+
8888
app->installTranslator(&translatorLanguage);
8989

9090
UpdateWorker::instance()->init();

0 commit comments

Comments
 (0)