feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Use FilePath for remote core files

Browse Source 
Change-Id: Ie5782c18ecafcd9725c89da51b118560e668861d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-06-29 15:39:04 +02:00
parent 3ac57b0340
commit 212527ecd5
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/debugger/loadcoredialog.cpp
View File

@@ -180,7 +180,7 @@ public:
QLabel *forceLocalLabel; QLabel *forceLocalLabel;
PathChooser *symbolFileName; PathChooser *symbolFileName;
PathChooser *localCoreFileName; PathChooser *localCoreFileName;
QLineEdit *remoteCoreFileName; PathChooser *remoteCoreFileName;
QPushButton *selectRemoteCoreButton; QPushButton *selectRemoteCoreButton;
PathChooser *overrideStartScriptFileName; PathChooser *overrideStartScriptFileName;
@@ -238,7 +238,7 @@ AttachCoreDialog::AttachCoreDialog(QWidget *parent)
d->forceLocalLabel->setText(tr("Use local core file:")); d->forceLocalLabel->setText(tr("Use local core file:"));
d->forceLocalLabel->setBuddy(d->forceLocalCheckBox); d->forceLocalLabel->setBuddy(d->forceLocalCheckBox);
d->remoteCoreFileName = new QLineEdit(this); d->remoteCoreFileName = new PathChooser(this);
d->selectRemoteCoreButton = new QPushButton(PathChooser::browseButtonLabel(), this); d->selectRemoteCoreButton = new QPushButton(PathChooser::browseButtonLabel(), this);
d->localCoreFileName = new PathChooser(this); d->localCoreFileName = new PathChooser(this);
@@ -304,9 +304,9 @@ AttachCoreDialog::~AttachCoreDialog()
int AttachCoreDialog::exec() int AttachCoreDialog::exec()
{ {
connect(d->selectRemoteCoreButton, &QAbstractButton::clicked, this, &AttachCoreDialog::selectRemoteCoreFile); connect(d->selectRemoteCoreButton, &QAbstractButton::clicked, this, &AttachCoreDialog::selectRemoteCoreFile);
connect(d->remoteCoreFileName, &QLineEdit::textChanged, this, &AttachCoreDialog::coreFileChanged); connect(d->remoteCoreFileName, &PathChooser::filePathChanged, this, &AttachCoreDialog::coreFileChanged);
connect(d->symbolFileName, &PathChooser::rawPathChanged, this, &AttachCoreDialog::changed); connect(d->symbolFileName, &PathChooser::filePathChanged, this, &AttachCoreDialog::changed);
connect(d->localCoreFileName, &PathChooser::rawPathChanged, this, &AttachCoreDialog::coreFileChanged); connect(d->localCoreFileName, &PathChooser::filePathChanged, this, &AttachCoreDialog::coreFileChanged);
connect(d->forceLocalCheckBox, &QCheckBox::stateChanged, this, &AttachCoreDialog::changed); connect(d->forceLocalCheckBox, &QCheckBox::stateChanged, this, &AttachCoreDialog::changed);
connect(d->kitChooser, &KitChooser::currentIndexChanged, this, &AttachCoreDialog::changed); connect(d->kitChooser, &KitChooser::currentIndexChanged, this, &AttachCoreDialog::changed);
connect(d->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); connect(d->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
@@ -342,9 +342,8 @@ bool AttachCoreDialog::useLocalCoreFile() const
return isLocalKit() || d->forceLocalCheckBox->isChecked(); return isLocalKit() || d->forceLocalCheckBox->isChecked();
} }
void AttachCoreDialog::coreFileChanged(const QString &core) void AttachCoreDialog::coreFileChanged(const FilePath &coreFile)
{ {
const FilePath coreFile = FilePath::fromUserInput(core);
if (coreFile.osType() != OsType::OsTypeWindows && coreFile.exists()) { if (coreFile.osType() != OsType::OsTypeWindows && coreFile.exists()) {
Kit *k = d->kitChooser->currentKit(); Kit *k = d->kitChooser->currentKit();
QTC_ASSERT(k, return); QTC_ASSERT(k, return);
@@ -387,7 +386,7 @@ void AttachCoreDialog::selectRemoteCoreFile()
if (dlg.exec() == QDialog::Rejected) if (dlg.exec() == QDialog::Rejected)
return; return;
d->localCoreFileName->setFilePath(dlg.localFile()); d->localCoreFileName->setFilePath(dlg.localFile());
d->remoteCoreFileName->setText(dlg.remoteFile().toUserOutput()); d->remoteCoreFileName->setFilePath(dlg.remoteFile());
changed(); changed();
} }
@@ -413,12 +412,12 @@ void AttachCoreDialog::setLocalCoreFile(const FilePath &coreFilePath)
void AttachCoreDialog::setRemoteCoreFile(const FilePath &coreFilePath) void AttachCoreDialog::setRemoteCoreFile(const FilePath &coreFilePath)
{ {
d->remoteCoreFileName->setText(coreFilePath.toUserOutput()); d->remoteCoreFileName->setFilePath(coreFilePath);
} }
FilePath AttachCoreDialog::remoteCoreFile() const FilePath AttachCoreDialog::remoteCoreFile() const
{ {
return FilePath::fromUserInput(d->remoteCoreFileName->text()); return d->remoteCoreFileName->filePath();
} }
void AttachCoreDialog::setKitId(Id id) void AttachCoreDialog::setKitId(Id id)

2
src/plugins/debugger/loadcoredialog.h
View File

@@ -66,7 +66,7 @@ public:
private: private:
void changed(); void changed();
void coreFileChanged(const QString &core); void coreFileChanged(const Utils::FilePath &core);
void selectRemoteCoreFile(); void selectRemoteCoreFile();
class AttachCoreDialogPrivate *d; class AttachCoreDialogPrivate *d;