Fix QString -> std::string compilation problem.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9988 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-05-31 22:06:07 +00:00
parent 6730c51c69
commit 7598e0b791
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2005-05-31 Angus Leeming <leeming@lyx.org>
* QBibtexDialog.C (addDatabase): fix QString ->std::string
compilation problem.
2005-05-31 Angus Leeming <leeming@lyx.org> 2005-05-31 Angus Leeming <leeming@lyx.org>
* validators.C (validate): allow ':' characters in file names. * validators.C (validate): allow ':' characters in file names.

View File

@ -150,9 +150,9 @@ void QBibtexDialog::addPressed()
void QBibtexDialog::addDatabase() void QBibtexDialog::addDatabase()
{ {
int const sel = add_->bibLB->currentItem(); int const sel = add_->bibLB->currentItem();
QString const file = trim(add_->bibED->text()); string const file = trim(fromqstr(add_->bibED->text()));
if (sel < 0 && file.isNull()) if (sel < 0 && file.empty())
return; return;
// Add the selected browser_bib keys to browser_database // Add the selected browser_bib keys to browser_database
@ -165,8 +165,8 @@ void QBibtexDialog::addDatabase()
} }
} }
if (!file.isEmpty()) { if (!file.empty()) {
QString const f = toqstr(ChangeExtension(fromqstr(file), "")); QString const f = toqstr(ChangeExtension(file, ""));
if ((databaseLB->findItem(f)) == 0) if ((databaseLB->findItem(f)) == 0)
databaseLB->insertItem(f); databaseLB->insertItem(f);
} }