Merge pull request #5158

ezavod (2):
      fix(chatform): check for empty path when exporting profile
      refactor(chatform): consistent usage of file dialogs

src/chatlog/content/filetransferwidget.cpp

@@ -507,8 +507,7 @@ void FileTransferWidget::handleButton(QPushButton* btn)
                 QFileDialog::getSaveFileName(Q_NULLPTR,
                                              tr("Save a file", "Title of the file saving dialog"),
                                              Settings::getInstance().getGlobalAutoAcceptDir() + "/"
-                                                 + fileInfo.fileName,
+                                                 + fileInfo.fileName);
-                                             0, 0);
             acceptTransfer(path);
         }
     }

src/widget/form/addfriendform.cpp

@@ -231,7 +231,7 @@ static inline bool checkIsValidId(const QString& id)
 
 void AddFriendForm::onImportOpenClicked()
 {
-    const QString path = QFileDialog::getOpenFileName(tabWidget, tr("Open contact list"));
+    const QString path = QFileDialog::getOpenFileName(Q_NULLPTR, tr("Open contact list"));
     if (path.isEmpty()) {
         return;
     }

src/widget/form/chatform.cpp

@@ -1067,8 +1067,7 @@ void ChatForm::onExportChat()
     QDateTime now = QDateTime::currentDateTime();
     QList<History::HistMessage> msgs = history->getChatHistoryFromDate(pk, epochStart, now);
 
-    QString path = QFileDialog::getSaveFileName(0, tr("Save chat log"), QString{}, QString{}, 0,
+    QString path = QFileDialog::getSaveFileName(Q_NULLPTR, tr("Save chat log"));
-                                                QFileDialog::DontUseNativeDialog);
     if (path.isEmpty()) {
         return;
     }

src/widget/form/genericchatform.cpp

@@ -472,7 +472,7 @@ void GenericChatForm::onEmoteInsertRequested(QString str)
 
 void GenericChatForm::onSaveLogClicked()
 {
-    QString path = QFileDialog::getSaveFileName(0, tr("Save chat log"));
+    QString path = QFileDialog::getSaveFileName(Q_NULLPTR, tr("Save chat log"));
     if (path.isEmpty())
         return;
 

src/widget/form/profileform.cpp

@@ -348,10 +348,13 @@ void ProfileForm::onExportClicked()
 {
     const QString current = profileInfo->getProfileName() + Core::TOX_EXT;
     //:save dialog title
-    const QString path = QFileDialog::getSaveFileName(Q_NULLPTR, tr("Export profile"),
+    const QString path = QFileDialog::getSaveFileName(Q_NULLPTR, tr("Export profile"), current,
-                                                      QDir::home().filePath(current),
                                                       //: save dialog filter
-                                                      tr("Tox save file (*.tox)"), nullptr);
+                                                      tr("Tox save file (*.tox)"));
+    if (path.isEmpty()) {
+        return;
+    }
+
     const IProfileInfo::SaveResult result = profileInfo->exportProfile(path);
     if (result == IProfileInfo::SaveResult::OK) {
         return;
@@ -413,8 +416,11 @@ void ProfileForm::onSaveQrClicked()
 {
     const QString current = profileInfo->getProfileName() + ".png";
     const QString path = QFileDialog::getSaveFileName(
-                Q_NULLPTR, tr("Save", "save qr image"), QDir::home().filePath(current),
+                Q_NULLPTR, tr("Save", "save qr image"), current,
-                tr("Save QrCode (*.png)", "save dialog filter"), nullptr);
+                tr("Save QrCode (*.png)", "save dialog filter"));
+    if (path.isEmpty()) {
+        return;
+    }
 
     const IProfileInfo::SaveResult result = profileInfo->saveQr(*qr->getImage(), path);
     if (result == IProfileInfo::SaveResult::OK) {

src/widget/form/settings/advancedform.cpp

@@ -99,8 +99,7 @@ void AdvancedForm::on_cbMakeToxPortable_stateChanged()
 void AdvancedForm::on_btnExportLog_clicked()
 {
     QString savefile =
-        QFileDialog::getSaveFileName(this, tr("Save File"), QDir::homePath(), tr("Logs (*.log)"), 0,
+        QFileDialog::getSaveFileName(Q_NULLPTR, tr("Save File"), QString{}, tr("Logs (*.log)"));
-                                     QFileDialog::DontUseNativeDialog);
 
     if (savefile.isNull() || savefile.isEmpty()) {
         qDebug() << "Debug log save file was not properly chosen";

src/widget/tool/profileimporter.cpp

@@ -53,7 +53,7 @@ bool ProfileImporter::importProfile()
     // TODO: Change all QFileDialog instances across project to use
     // this instead of Q_NULLPTR. Possibly requires >Qt 5.9 due to:
     // https://bugreports.qt.io/browse/QTBUG-59184
-    QString path = QFileDialog::getOpenFileName(Q_NULLPTR, title, dir, filter, 0);
+    QString path = QFileDialog::getOpenFileName(Q_NULLPTR, title, dir, filter);
 
     return importProfile(path);
 }