diff --git a/krusader/Panel/krlayoutfactory.h b/krusader/Panel/krlayoutfactory.h --- a/krusader/Panel/krlayoutfactory.h +++ b/krusader/Panel/krlayoutfactory.h @@ -47,7 +47,7 @@ static bool parseFiles(); static bool parseFile(QString path, QDomDocument &doc); - static bool parseRessource(QString path, QDomDocument &doc); + static bool parseResource(QString path, QDomDocument &doc); static bool parseContent(QByteArray content, QString fileName, QDomDocument &doc); static void getLayoutNames(QDomDocument doc, QStringList &names); static QDomElement findLayout(QDomDocument doc, QString layoutName); diff --git a/krusader/Panel/krlayoutfactory.cpp b/krusader/Panel/krlayoutfactory.cpp --- a/krusader/Panel/krlayoutfactory.cpp +++ b/krusader/Panel/krlayoutfactory.cpp @@ -69,18 +69,10 @@ if (_parsed) return true; - QString mainFilePath = QStandardPaths::locate(QStandardPaths::DataLocation, MAIN_FILE); - - if (!mainFilePath.isEmpty()) - _parsed = parseFile(mainFilePath, _mainDoc); - else - qWarning() << "can't locate" << MAIN_FILE; - - if (!_parsed) - _parsed = parseRessource(MAIN_FILE_RC_PATH, _mainDoc); - - if (!_parsed) + _parsed = parseResource(MAIN_FILE_RC_PATH, _mainDoc); + if (!_parsed) { return false; + } QStringList extraFilePaths = QStandardPaths::locateAll(QStandardPaths::DataLocation, EXTRA_FILE_MASK); @@ -108,7 +100,7 @@ return success; } -bool KrLayoutFactory::parseRessource(QString path, QDomDocument &doc) +bool KrLayoutFactory::parseResource(QString path, QDomDocument &doc) { QResource res(path); if (res.isValid()) {