diff --git a/src/dfm-base/utils/networkutils.cpp b/src/dfm-base/utils/networkutils.cpp index 1de93f4682..02eb43f362 100644 --- a/src/dfm-base/utils/networkutils.cpp +++ b/src/dfm-base/utils/networkutils.cpp @@ -198,11 +198,11 @@ QMap NetworkUtils::cifsMountHostInfo() continue; // net work mount must start with // QString srcHostAndPort = mnt_fs_get_source(fs); - if (!srcHostAndPort.contains(QRegExp("^//"))) + if (!srcHostAndPort.contains(QRegularExpression("^//"))) continue; const QString &mountPath = mnt_fs_get_target(fs); - srcHostAndPort = srcHostAndPort.replace(QRegExp("^//"), ""); + srcHostAndPort = srcHostAndPort.replace(QRegularExpression("^//"), ""); srcHostAndPort = srcHostAndPort.left(srcHostAndPort.indexOf("/")); table.insert(mountPath, srcHostAndPort); } diff --git a/src/plugins/filemanager/core/dfmplugin-workspace/views/renamebar.cpp b/src/plugins/filemanager/core/dfmplugin-workspace/views/renamebar.cpp index 4f3706bc6a..80afde2115 100644 --- a/src/plugins/filemanager/core/dfmplugin-workspace/views/renamebar.cpp +++ b/src/plugins/filemanager/core/dfmplugin-workspace/views/renamebar.cpp @@ -75,6 +75,12 @@ void RenameBar::setVisible(bool visible) } } } + if (visible) { + QLineEdit *lineEdit { std::get<1>(d->replaceOperatorItems) }; + if (lineEdit) + lineEdit->setFocus(); + } + return QFrame::setVisible(visible); }