Merge pull request #27243 from 3x380V/app

App: Random fixes 1
This commit is contained in:
Kacper Donat
2026-02-02 17:40:40 +01:00
committed by GitHub
14 changed files with 133 additions and 136 deletions

View File

@@ -1098,12 +1098,12 @@ SelectModule::Dict SelectModule::exportHandler(const QStringList& fileNames, con
QFileInfo fi(fileName);
QString ext = fi.completeSuffix().toLower();
std::map<std::string, std::string> filters = App::GetApplication().getExportFilters(
ext.toLatin1()
ext.toStdString()
);
if (filters.empty()) {
ext = fi.suffix().toLower();
filters = App::GetApplication().getExportFilters(ext.toLatin1());
filters = App::GetApplication().getExportFilters(ext.toStdString());
}
fileExtension[ext].push_back(fileName);
@@ -1168,12 +1168,12 @@ SelectModule::Dict SelectModule::importHandler(const QStringList& fileNames, con
QFileInfo fi(fileName);
QString ext = fi.completeSuffix().toLower();
std::map<std::string, std::string> filters = App::GetApplication().getImportFilters(
ext.toLatin1()
ext.toStdString()
);
if (filters.empty()) {
ext = fi.suffix().toLower();
filters = App::GetApplication().getImportFilters(ext.toLatin1());
filters = App::GetApplication().getImportFilters(ext.toStdString());
}
fileExtension[ext].push_back(fileName);

View File

@@ -2453,10 +2453,10 @@ void MainWindow::loadUrls(App::Document* doc, const QList<QUrl>& urls)
info.setFile(info.symLinkTarget());
}
std::vector<std::string> module = App::GetApplication().getImportModules(
info.completeSuffix().toLatin1()
info.completeSuffix().toStdString()
);
if (module.empty()) {
module = App::GetApplication().getImportModules(info.suffix().toLatin1());
module = App::GetApplication().getImportModules(info.suffix().toStdString());
}
if (!module.empty()) {
// ok, we support files with this extension