anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dialog::bufferFilepath -> Dialog::bufferFilePath

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34241 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-04-21 01:19:30 +00:00
parent 72a6c77a51
commit 61fa96cbae
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/qt4/Dialog.cpp
View File

@ -91,7 +91,7 @@ bool Dialog::isBufferReadonly() const
}
QString Dialog::bufferFilepath() const
QString Dialog::bufferFilePath() const
{
return toqstr(buffer().filePath());
}

2
src/frontends/qt4/Dialog.h
View File

@ -235,7 +235,7 @@ public:
//@{
bool isBufferAvailable() const;
bool isBufferReadonly() const;
QString bufferFilepath() const;
QString bufferFilePath() const;
//@}
/// The type of the current buffer.

4
src/frontends/qt4/GuiBibtex.cpp
View File

@ -435,7 +435,7 @@ QString GuiBibtex::browseBib(QString const & in_name) const
QString const label1 = qt_("Documents|#o#O");
QString const dir1 = toqstr(lyxrc.document_path);
QStringList const filter(qt_("BibTeX Databases (*.bib)"));
return browseRelFile(in_name, bufferFilepath(),
return browseRelFile(in_name, bufferFilePath(),
qt_("Select a BibTeX database to add"), filter, false, label1, dir1);
}
@ -445,7 +445,7 @@ QString GuiBibtex::browseBst(QString const & in_name) const
QString const label1 = qt_("Documents|#o#O");
QString const dir1 = toqstr(lyxrc.document_path);
QStringList const filter(qt_("BibTeX Styles (*.bst)"));
return browseRelFile(in_name, bufferFilepath(),
return browseRelFile(in_name, bufferFilePath(),
qt_("Select a BibTeX style"), filter, false, label1, dir1);
}

4
src/frontends/qt4/GuiCompare.cpp
View File

@ -159,7 +159,7 @@ QString GuiCompare::browse(QString const & in_name) const
QString filename;
if (lyxview().documentBufferView()) {
QString path = bufferFilepath();
QString path = bufferFilePath();
filename = browseRelFile(in_name, path, title, filters, false,
qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
} else {
@ -274,7 +274,7 @@ Buffer const * GuiCompare::bufferFromFileName(string const & file) const
if (FileName::isAbsolute(file))
fname.set(file);
else if (lyxview().documentBufferView())
fname = support::makeAbsPath(file, fromqstr(bufferFilepath()));
fname = support::makeAbsPath(file, fromqstr(bufferFilePath()));
if (fname.empty()
|| (!fname.exists() && !theBufferList().getBuffer(fname))) {

4
src/frontends/qt4/GuiDocument.cpp
View File

@ -1639,7 +1639,7 @@ void GuiDocument::browseLayout()
QString const label1 = qt_("Layouts|#o#O");
QString const dir1 = toqstr(lyxrc.document_path);
QStringList const filter(qt_("LyX Layout (*.layout)"));
QString file = browseRelFile(QString(), bufferFilepath(),
QString file = browseRelFile(QString(), bufferFilePath(),
qt_("Local layout file"), filter, false,
label1, dir1);
@ -1647,7 +1647,7 @@ void GuiDocument::browseLayout()
return;
FileName layoutFile = support::makeAbsPath(fromqstr(file),
fromqstr(bufferFilepath()));
fromqstr(bufferFilePath()));
int const ret = Alert::prompt(_("Local layout file"),
_("The layout file you have selected is a local layout\n"

8
src/frontends/qt4/GuiExternal.cpp
View File

@ -296,7 +296,7 @@ void GuiExternal::getbbClicked()
if (filename.empty())
return;
FileName const abs_file(support::makeAbsPath(filename, fromqstr(bufferFilepath())));
FileName const abs_file(support::makeAbsPath(filename, fromqstr(bufferFilePath())));
// try to get it from the file, if possible
string bb = readBB_from_PSFile(abs_file);
@ -460,7 +460,7 @@ static void getCrop(external::ClipData & data,
void GuiExternal::updateContents()
{
string const name =
params_.filename.outputFileName(fromqstr(bufferFilepath()));
params_.filename.outputFileName(fromqstr(bufferFilePath()));
fileED->setText(toqstr(name));
int index = 0;
@ -570,7 +570,7 @@ void GuiExternal::updateTemplate()
void GuiExternal::applyView()
{
params_.filename.set(fromqstr(fileED->text()), fromqstr(bufferFilepath()));
params_.filename.set(fromqstr(fileED->text()), fromqstr(bufferFilePath()));
params_.settemplate(getTemplate(externalCO->currentIndex()).lyxName);
params_.draft = draftCB->isChecked();
@ -633,7 +633,7 @@ QString GuiExternal::browse(QString const & input,
QString const & template_name) const
{
QString const title = qt_("Select external file");
QString const bufpath = bufferFilepath();
QString const bufpath = bufferFilePath();
QStringList const filter = templateFilters(template_name);
QString const label1 = qt_("Documents|#o#O");

12
src/frontends/qt4/GuiGraphics.cpp
View File

@ -495,9 +495,9 @@ void GuiGraphics::paramsToDialog(InsetGraphicsParams const & igp)
// set the right default unit
Length::UNIT const defaultUnit = Length::defaultUnit();
//lyxerr << bufferFilepath();
//lyxerr << bufferFilePath();
string const name =
igp.filename.outputFileName(fromqstr(bufferFilepath()));
igp.filename.outputFileName(fromqstr(bufferFilePath()));
filename->setText(toqstr(name));
// set the bounding box values
@ -647,7 +647,7 @@ void GuiGraphics::applyView()
{
InsetGraphicsParams & igp = params_;
igp.filename.set(fromqstr(filename->text()), fromqstr(bufferFilepath()));
igp.filename.set(fromqstr(filename->text()), fromqstr(bufferFilePath()));
// the bb section
igp.bb.erase();
@ -794,7 +794,7 @@ QString GuiGraphics::browse(QString const & in_name) const
if (!clip.isDirectory())
clipdir = addName(package().system_support().absFileName(), "clipart");
return browseRelFile(in_name, bufferFilepath(),
return browseRelFile(in_name, bufferFilePath(),
title, fileFilters(QString()), false,
qt_("Clipart|#C#c"), toqstr(clipdir),
qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
@ -803,7 +803,7 @@ QString GuiGraphics::browse(QString const & in_name) const
string GuiGraphics::readBoundingBox(string const & file)
{
FileName const abs_file = support::makeAbsPath(file, fromqstr(bufferFilepath()));
FileName const abs_file = support::makeAbsPath(file, fromqstr(bufferFilePath()));
// try to get it from the file, if possible. Zipped files are
// unzipped in the readBB_from_PSFile-Function
@ -832,7 +832,7 @@ string GuiGraphics::readBoundingBox(string const & file)
bool GuiGraphics::isFileNameValid(string const & fname) const
{
// It may be that the filename is relative.
return support::makeAbsPath(fname, fromqstr(bufferFilepath())).isReadableFile();
return support::makeAbsPath(fname, fromqstr(bufferFilePath())).isReadableFile();
}

2
src/frontends/qt4/GuiPrint.cpp
View File

@ -84,7 +84,7 @@ void GuiPrint::change_adaptor()
void GuiPrint::browseClicked()
{
QString file =
browseRelFile(QString(), bufferFilepath(), qt_("Print to file"),
browseRelFile(QString(), bufferFilePath(), qt_("Print to file"),
QStringList(qt_("PostScript files (*.ps)")), true);
if (!file.isEmpty()) {
fileED->setText(file);