Merge branch 'feature/new-gui' of github.com:amnezia-vpn/amnezia-client into feature/new-gui

This commit is contained in:
vladimir.kuznetsov 2023-09-01 20:21:33 +05:00
commit 7fc4ea0c68
12 changed files with 35 additions and 29 deletions

View file

@ -97,7 +97,7 @@ void ImportController::extractConfigFromFile(const QString &fileName)
}
}
void ImportController::extractConfigFromData(QString &data)
void ImportController::extractConfigFromData(QString data)
{
auto configFormat = checkConfigFormat(data);
if (configFormat == ConfigTypes::OpenVpn) {

View file

@ -22,7 +22,7 @@ public:
public slots:
void importConfig();
void extractConfigFromFile(const QString &fileName);
void extractConfigFromData(QString &data);
void extractConfigFromData(QString data);
void extractConfigFromCode(QString code);
bool extractConfigFromQr(const QByteArray &data);
QString getConfig();