mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-23 05:25:26 +00:00
remove some lyx:: etc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18012 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
c8d600da14
commit
3ca52db8d1
@ -16,10 +16,6 @@
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
CheckedWidget::~CheckedWidget()
|
||||
{}
|
||||
|
||||
|
||||
BCView::BCView(ButtonController const & p)
|
||||
: parent(p)
|
||||
{}
|
||||
|
@ -39,7 +39,7 @@ class ButtonPolicy;
|
||||
class CheckedWidget {
|
||||
public:
|
||||
///
|
||||
virtual ~CheckedWidget();
|
||||
virtual ~CheckedWidget() {}
|
||||
|
||||
/** Returns true if the widget is in a valid state.
|
||||
* Might also change the visual appearance of the widget,
|
||||
@ -95,7 +95,7 @@ class GuiBC : public BCView {
|
||||
public:
|
||||
///
|
||||
GuiBC(ButtonController const & parent,
|
||||
lyx::docstring const & cancel, lyx::docstring const & close);
|
||||
docstring const & cancel, docstring const & close);
|
||||
|
||||
//@{
|
||||
/** Store pointers to these widgets. The pointers are _not_
|
||||
@ -124,10 +124,10 @@ private:
|
||||
/// Enable/Disable a button
|
||||
virtual void setButtonEnabled(Button * obj, bool enable) const = 0;
|
||||
/// Set the Label on the button
|
||||
virtual void setButtonLabel(Button * obj, lyx::docstring const & label) const = 0;
|
||||
virtual void setButtonLabel(Button * obj, docstring const & label) const = 0;
|
||||
|
||||
lyx::docstring const cancel_label_;
|
||||
lyx::docstring const close_label_;
|
||||
docstring const cancel_label_;
|
||||
docstring const close_label_;
|
||||
|
||||
Button * okay_;
|
||||
Button * apply_;
|
||||
|
@ -42,10 +42,10 @@ public:
|
||||
void next();
|
||||
|
||||
/// return date of change
|
||||
lyx::docstring const getChangeDate();
|
||||
docstring const getChangeDate();
|
||||
|
||||
/// return author of change
|
||||
lyx::docstring const getChangeAuthor();
|
||||
docstring const getChangeAuthor();
|
||||
|
||||
/// accept the current change
|
||||
void accept();
|
||||
|
@ -68,8 +68,8 @@ public:
|
||||
std::string const
|
||||
getTemplateFilters(std::string const & template_name) const;
|
||||
///
|
||||
lyx::docstring const browse(lyx::docstring const & input_file,
|
||||
lyx::docstring const & template_name) const;
|
||||
docstring const browse(docstring const & input_file,
|
||||
docstring const & template_name) const;
|
||||
|
||||
/// Read the Bounding Box from a eps or ps-file
|
||||
std::string const readBB(std::string const & file);
|
||||
|
@ -39,7 +39,7 @@ public:
|
||||
virtual bool isBufferDependent() const { return true; }
|
||||
|
||||
/// The title displayed by the dialog reflects the \c LOGTYPE
|
||||
lyx::docstring const title() const;
|
||||
docstring const title() const;
|
||||
/// put the log file into the ostream
|
||||
void getContents(std::ostream & ss) const;
|
||||
|
||||
|
@ -52,18 +52,18 @@ public:
|
||||
Movers const & movers() const { return movers_; }
|
||||
|
||||
/// various file pickers
|
||||
lyx::docstring const browsebind(lyx::docstring const & file) const;
|
||||
lyx::docstring const browseUI(lyx::docstring const & file) const;
|
||||
lyx::docstring const browsekbmap(lyx::docstring const & file) const;
|
||||
lyx::docstring const browsedict(lyx::docstring const & file) const;
|
||||
docstring const browsebind(docstring const & file) const;
|
||||
docstring const browseUI(docstring const & file) const;
|
||||
docstring const browsekbmap(docstring const & file) const;
|
||||
docstring const browsedict(docstring const & file) const;
|
||||
|
||||
/// general browse
|
||||
lyx::docstring const browse(lyx::docstring const & file,
|
||||
lyx::docstring const & title) const;
|
||||
docstring const browse(docstring const & file,
|
||||
docstring const & title) const;
|
||||
|
||||
/// browse directory
|
||||
lyx::docstring const browsedir(lyx::docstring const & path,
|
||||
lyx::docstring const & title) const;
|
||||
docstring const browsedir(docstring const & path,
|
||||
docstring const & title) const;
|
||||
|
||||
/// set a color
|
||||
void setColor(LColor_color col, std::string const & hex);
|
||||
|
@ -43,7 +43,7 @@ public:
|
||||
virtual kb_action getLfun() const { return LFUN_BUFFER_PRINT; }
|
||||
|
||||
/// Browse for a file
|
||||
lyx::docstring const browse(lyx::docstring const &) const;
|
||||
docstring const browse(docstring const &) const;
|
||||
///
|
||||
PrinterParams & params() const;
|
||||
private:
|
||||
|
@ -26,7 +26,7 @@ public:
|
||||
///
|
||||
ControlRef(Dialog &);
|
||||
///
|
||||
std::vector<lyx::docstring> const getLabelList(std::string const &) const;
|
||||
std::vector<docstring> const getLabelList(std::string const &) const;
|
||||
///
|
||||
void gotoRef(std::string const &);
|
||||
///
|
||||
|
@ -37,12 +37,12 @@ public:
|
||||
virtual bool isBufferDependent() const { return true; }
|
||||
|
||||
/// The title displayed by the dialog reflects source type.
|
||||
lyx::docstring const title() const;
|
||||
docstring const title() const;
|
||||
|
||||
/** get the source code of selected paragraphs, or the whole document
|
||||
\param fullSource get full source code
|
||||
*/
|
||||
lyx::docstring const updateContent(bool fullSource);
|
||||
docstring const updateContent(bool fullSource);
|
||||
};
|
||||
|
||||
} // namespace frontend
|
||||
|
@ -21,7 +21,6 @@
|
||||
#include "FuncStatus.h"
|
||||
#include "lyxfunc.h"
|
||||
|
||||
using lyx::docstring;
|
||||
|
||||
using std::string;
|
||||
|
||||
@ -34,10 +33,6 @@ Dialog::Dialog(LyXView & lv, string const & name)
|
||||
{}
|
||||
|
||||
|
||||
Dialog::~Dialog()
|
||||
{}
|
||||
|
||||
|
||||
void Dialog::ApplyButton()
|
||||
{
|
||||
apply();
|
||||
@ -208,7 +203,7 @@ Dialog::Controller::Controller(Dialog & parent)
|
||||
bool Dialog::Controller::canApply() const
|
||||
{
|
||||
FuncRequest const fr(getLfun(), dialog().name());
|
||||
FuncStatus const fs(lyx::getStatus(fr));
|
||||
FuncStatus const fs(getStatus(fr));
|
||||
return fs.enabled();
|
||||
}
|
||||
|
||||
|
@ -37,7 +37,6 @@ public:
|
||||
/// \param name is the identifier given to the dialog by its parent
|
||||
/// container.
|
||||
Dialog(LyXView & lv, std::string const & name);
|
||||
~Dialog();
|
||||
|
||||
/** The Dialog's name is the means by which a dialog identifies
|
||||
* itself to the kernel.
|
||||
@ -228,7 +227,7 @@ public:
|
||||
/** \param parent Dialog owning this Controller.
|
||||
* \param title is the dialog title displayed by the WM.
|
||||
*/
|
||||
View(Dialog & parent, lyx::docstring title);
|
||||
View(Dialog & parent, docstring title);
|
||||
virtual ~View() {}
|
||||
|
||||
/** \name Generic View
|
||||
@ -266,9 +265,9 @@ public:
|
||||
virtual void partialUpdate(int id);
|
||||
|
||||
/// sets the title of the dialog (window caption)
|
||||
void setTitle(lyx::docstring const &);
|
||||
void setTitle(docstring const &);
|
||||
/// gets the title of the dialog (window caption)
|
||||
lyx::docstring const & getTitle() const;
|
||||
docstring const & getTitle() const;
|
||||
|
||||
/** \name View Access
|
||||
* Enable the derived classes to access the other parts of the whole.
|
||||
@ -290,7 +289,7 @@ protected:
|
||||
|
||||
private:
|
||||
Dialog & p_;
|
||||
lyx::docstring title_;
|
||||
docstring title_;
|
||||
};
|
||||
|
||||
} // namespace frontend
|
||||
|
Loading…
Reference in New Issue
Block a user