anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix whitespace at EOL.

Browse Source
This commit is contained in:
Richard Heck 2017-07-03 13:45:58 -04:00
parent 1506d762d6
commit 51aebc9327
104 changed files with 348 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BiblioInfo.h
View File

@ -59,7 +59,7 @@ public:
/// used for sorting.
/// This will be translated to the UI language if buf is null
/// otherwise, it will be translated to the buffer language.
docstring const getAuthorOrEditorList(Buffer const * buf = 0,
docstring const getAuthorOrEditorList(Buffer const * buf = 0,
bool full = false, bool forceshort = false) const;
/// Same for a specific author role (editor, author etc.)
docstring const getAuthorList(Buffer const * buf, docstring const & author,

2
src/BufferParams.h
View File

@ -161,7 +161,7 @@ public:
{ return removed_modules_; }
///
/// Add a module to the list of modules in use. This checks only that the
/// module is not already in the list, so use layoutModuleCanBeAdeed first
/// module is not already in the list, so use layoutModuleCanBeAdeed first
/// if you want to check for compatibility.
/// \return true if module was successfully added.
bool addLayoutModule(std::string const & modName);

2
src/CmdDef.h
View File

@ -59,7 +59,7 @@ private:
* Add a new command definition.
* @param name internal recursion level
*/
newCmdDefResult newCmdDef(std::string const & name,
newCmdDefResult newCmdDef(std::string const & name,
std::string const & def);
///

6
src/ColorCode.h
View File

@ -142,11 +142,11 @@ enum ColorCode {
Color_mathmacrolabel,
/// Macro math frame color
Color_mathmacroframe,
/// Macro math blended color
/// Macro math blended color
Color_mathmacroblend,
/// Macro template color for old parameters
/// Macro template color for old parameters
Color_mathmacrooldarg,
/// Macro template color for new parameters
/// Macro template color for new parameters
Color_mathmacronewarg,
/// Math inset frame color under focus
Color_mathframe,

2
src/ColorSet.h
View File

@ -78,7 +78,7 @@ public:
private:
///
void addColor(ColorCode c, std::string const & lyxname);
void addColor(ColorCode c, std::string const & lyxname);
///
class Information {
public:

8
src/Compare.h
View File

@ -22,7 +22,7 @@
namespace lyx {
/**
/**
* The options that are used by the Comparison algorithm
* and are set in the GuiCompare Dialog.
*/
@ -32,7 +32,7 @@ public:
CompareOptions()
: settings_from_new(0)
{}
/// Copy the settings from the new or old document
bool settings_from_new;
};
@ -89,14 +89,14 @@ public:
private:
/// Starts the comparison algorithm
int doCompare();
/// The new document's buffer
Buffer const * const new_buffer;
/// The old document's buffer
Buffer const * const old_buffer;
/// The buffer with the differences marked with track changes
Buffer * const dest_buffer;
/// The options that are set in the GuiCompare dialog
CompareOptions options_;

2
src/Converter.h
View File

@ -138,7 +138,7 @@ public:
//
void erase(std::string const & from, std::string const & to);
///
FormatList const
FormatList const
getReachableTo(std::string const & target, bool clear_visited);
///
FormatList const

26
src/Counters.h
View File

@ -34,7 +34,7 @@ public:
///
Counter();
///
Counter(docstring const & mc, docstring const & ls,
Counter(docstring const & mc, docstring const & ls,
docstring const & lsa);
/// \return true on success
bool read(Lexer & lex);
@ -54,7 +54,7 @@ public:
/// it. This is used when a counter is deleted.
/// \return whether we removed the master.
bool checkAndRemoveMaster(docstring const & cnt);
/// Returns a LaTeX-like string to format the counter.
/// Returns a LaTeX-like string to format the counter.
/** This is similar to what one gets in LaTeX when using
* "\the<counter>". The \c in_appendix bool tells whether we
* want the version shown in an appendix.
@ -63,8 +63,8 @@ public:
/// Similar, but used for formatted references in XHTML output.
/// E.g., for a section counter it might be "section \thesection"
docstring const & prettyFormat() const { return prettyformat_; }
/// Returns a map of LaTeX-like strings to format the counter.
/// Returns a map of LaTeX-like strings to format the counter.
/** For each language, the string is similar to what one gets
* in LaTeX when using "\the<counter>". The \c in_appendix
* bool tells whether we want the version shown in an
@ -91,10 +91,10 @@ private:
docstring labelstringappendix_;
/// Similar, but used for formatted references in XHTML output
docstring prettyformat_;
/// Cache of the labelstring with \\the<counter> expressions expanded,
/// Cache of the labelstring with \\the<counter> expressions expanded,
/// indexed by language
mutable StringMap flatlabelstring_;
/// Cache of the appendix labelstring with \\the<counter> expressions expanded,
/// Cache of the appendix labelstring with \\the<counter> expressions expanded,
/// indexed by language
mutable StringMap flatlabelstringappendix_;
};
@ -109,7 +109,7 @@ public:
/// from the document class (e.g., which ones are defined).
/// Instead, call Counters::reset().
Counters();
/// Add new counter newc having masterc as its master,
/// Add new counter newc having masterc as its master,
/// ls as its label, and lsa as its appendix label.
void newCounter(docstring const & newc,
docstring const & masterc,
@ -118,7 +118,7 @@ public:
/// Checks whether the given counter exists.
bool hasCounter(docstring const & c) const;
/// reads the counter name
/// \param makeNew whether to make a new counter if one
/// \param makeNew whether to make a new counter if one
/// doesn't already exist
/// \return true on success
bool read(Lexer & lex, docstring const & name, bool makenew);
@ -160,7 +160,7 @@ public:
*/
docstring counterLabel(docstring const & format,
std::string const & lang) const;
/// returns a formatted version of the counter, using the
/// returns a formatted version of the counter, using the
/// format given by Counter::prettyFormat().
docstring prettyCounter(docstring const & cntr,
std::string const & lang) const;
@ -180,8 +180,8 @@ public:
bool isLongtable() const { return longtable_; }
/// Set the state variable indicating whether we are in a longtable.
void isLongtable(bool s) { longtable_ = s; }
/// \name refstepcounter
/// \name refstepcounter
// @{
/// The currently active counter, so far as references go.
/// We're trying to track \refstepcounter in LaTeX, more or less.
@ -196,10 +196,10 @@ public:
void clearLastLayout() { layout_stack_.push_back(0); }
/// Call this when exiting things like footnotes.
void restoreLastLayout() { layout_stack_.pop_back(); }
///
///
void saveLastCounter()
{ counter_stack_.push_back(counter_stack_.back()); }
///
///
void restoreLastCounter() { counter_stack_.pop_back(); }
// @}
private:

16
src/Cursor.h
View File

@ -168,12 +168,12 @@ public:
/// set selection; this is lower level than (set|clear)Selection
void selection(bool sel) { selection_ = sel; }
/// do we have a multicell selection?
bool selIsMultiCell() const
bool selIsMultiCell() const
{ return selection_ && selBegin().idx() != selEnd().idx(); }
/// do we have a multiline selection?
bool selIsMultiLine() const
bool selIsMultiLine() const
{ return selection_ && selBegin().pit() != selEnd().pit(); }
///
///
void setWordSelection(bool set) { word_selection_ = set; }
///
bool wordSelection() { return word_selection_; }
@ -222,7 +222,7 @@ public:
void getPos(int & x, int & y) const;
/// return logical positions between which the cursor is situated
/**
* If the cursor is at the edge of a row, the position which is "over the
* If the cursor is at the edge of a row, the position which is "over the
* edge" will be returned as -1.
*/
void getSurroundingPos(pos_type & left_pos, pos_type & right_pos) const;
@ -251,11 +251,11 @@ public:
/// move visually to next/previous row
/**
* Assuming we were to keep moving left (right) from the current cursor
* position, place the cursor at the rightmost (leftmost) edge of the
* position, place the cursor at the rightmost (leftmost) edge of the
* new row to which we would move according to visual-mode cursor movement.
* This could be either the next or the previous row, depending on the
* direction in which we're moving, and whether we're in an LTR or RTL
* paragraph.
* direction in which we're moving, and whether we're in an LTR or RTL
* paragraph.
* @note: The new position may even be in a new paragraph.
* @note: This method will not move out of the current slice.
* @return: false if not moved (no more rows to move to in given direction)
@ -407,7 +407,7 @@ public:
public:
//private:
///
DocIterator const & beforeDispatchCursor() const { return beforeDispatchCursor_; }
///

2
src/CursorSlice.h
View File

@ -148,7 +148,7 @@ public:
bool at_end() const;
/// are we at the start of this slice
bool at_begin() const;
private:
/// pointer to 'owning' inset. This is some kind of cache.

2
src/DispatchResult.h
View File

@ -91,7 +91,7 @@ private:
Update::flags update_;
///
docstring message_;
///
///
bool need_buf_update_;
///
bool need_msg_update_;

16
src/DocIterator.h
View File

@ -265,22 +265,22 @@ private:
explicit DocIterator(Buffer * buf, Inset * inset);
/**
* Normally, when the cursor is at position i, it is painted *before*
* the character at position i. However, what if we want the cursor
* the character at position i. However, what if we want the cursor
* painted *after* position i? That's what boundary_ is for: if
* boundary_==true, the cursor is painted *after* position i-1, instead
* of before position i.
*
* Note 1: Usually, after i-1 or before i are actually the same place!
* However, this is not the case when i-1 and i are not painted
* However, this is not the case when i-1 and i are not painted
* contiguously, and in these cases we sometimes do want to have control
* over whether to paint before i or after i-1.
* Some concrete examples of where this happens:
* a. i-1 at the end of one row, i at the beginning of next row
* b. in bidi text, at transitions between RTL and LTR or vice versa
*
* Note 2: Why i and i-1? Why, if boundary_==false means: *before* i,
* couldn't boundary_==true mean: *after* i?
* Well, the reason is this: cursor position is not used only for
* Note 2: Why i and i-1? Why, if boundary_==false means: *before* i,
* couldn't boundary_==true mean: *after* i?
* Well, the reason is this: cursor position is not used only for
* painting the cursor, but it also affects other things, for example:
* where the next insertion will be placed (it is inserted at the current
* position, pushing anything at the current position and beyond forward).
@ -324,21 +324,21 @@ bool operator<(DocIterator const & p, DocIterator const & q)
}
inline
inline
bool operator>(DocIterator const & p, DocIterator const & q)
{
return q < p;
}
inline
inline
bool operator<=(DocIterator const & p, DocIterator const & q)
{
return !(q < p);
}
inline
inline
bool operator>=(DocIterator const & p, DocIterator const & q)
{
return !(p < q);

2
src/Encoding.h
View File

@ -130,7 +130,7 @@ public:
/// Represent any of the above packages
static int const any;
///
Encoding() : fixedwidth_(true), unsafe_(false), forced_(0),
Encoding() : fixedwidth_(true), unsafe_(false), forced_(0),
start_encodable_(0), package_(none), complete_(false) {}
///
Encoding(std::string const & n, std::string const & l,

6
src/Floating.h
View File

@ -107,13 +107,13 @@ private:
bool allowswide_;
///
bool allowssideways_;
///
///
mutable std::string html_tag_;
///
///
mutable std::string html_attrib_;
///
mutable std::string defaultcssclass_;
///
///
docstring html_style_;
};

2
src/FontInfo.h
View File

@ -106,7 +106,7 @@ public:
/// Is a given font fully resolved?
bool resolved() const;
/// The real color of the font. This can be the color that is
/// The real color of the font. This can be the color that is
/// set for painting, the color of the font or a default color.
Color realColor() const;
/// Sets the color which is used during painting

10
src/FuncRequest.h
View File

@ -37,7 +37,7 @@ public:
MENU, // A menu entry
TOOLBAR, // A toolbar icon
KEYBOARD, // a keyboard binding
COMMANDBUFFER,
COMMANDBUFFER,
LYXSERVER,
TOC
};
@ -58,7 +58,7 @@ public:
/// for changing requests a bit
FuncRequest(FuncRequest const & cmd, docstring const & arg,
Origin o = INTERNAL);
/// access the whole argument
docstring const & argument() const { return argument_; }
///
@ -75,7 +75,7 @@ public:
int y() const { return y_; }
///
void set_y(int y) { y_ = y; }
///
///
mouse_button::state button() const { return button_; }
///
KeyModifier modifier() { return modifier_; }
@ -86,9 +86,9 @@ public:
/// eating all characters up to the end of the command line
std::string getLongArg(unsigned int i) const;
///
///
static FuncRequest const unknown;
///
///
static FuncRequest const noaction;
private:
/// the action

8
src/Graph.h
View File

@ -49,17 +49,17 @@ private:
///
bool bfs_init(int, bool clear_visited, std::queue<int> & Q);
/// these represent the arrows connecting the nodes of the graph.
/// this is the basic representation of the graph: as a bunch of
/// this is the basic representation of the graph: as a bunch of
/// arrows.
struct Arrow {
///
Arrow(int f, int t, int i):
Arrow(int f, int t, int i):
from(f), to(t), id(i) {}
/// the vertex at the tail of the arrow
int from;
/// the vertex at the head
int to;
/// an id for this arrow, e.g., for use in describing paths
/// an id for this arrow, e.g., for use in describing paths
/// through the graph
int id;
};
@ -87,7 +87,7 @@ private:
/// of Format, this is easy, since the Format objects already have ints
/// as identifiers.)
std::vector<Vertex> vertices_;
/// a counter that we use to assign id's to the arrows
/// FIXME This technique assumes a correspondence between the
/// ids of the arrows and ids associated with Converters that

4
src/IndicesList.h
View File

@ -34,7 +34,7 @@ namespace lyx {
* \class IndicesList
*
* A class containing a vector of all defined indices within a
* document. It has methods for outputting a '|'-separated string
* document. It has methods for outputting a '|'-separated string
* of all elements, and for adding, removing and renaming elements.
*/
@ -94,7 +94,7 @@ public:
Index * find(docstring const & name);
Index const * find(docstring const & name) const;
/** \returns the Index with the shortcut \c shortcut.
/** \returns the Index with the shortcut \c shortcut.
* If not found, returns 0.
*/
Index * findShortcut(docstring const & shortcut);

14
src/KeyMap.h
View File

@ -26,7 +26,7 @@
namespace lyx {
namespace support {
class FileName;
class FileName;
}
/// Defines key maps and actions for key sequences
@ -42,7 +42,7 @@ public:
};
enum BindReadType {
MissingOK, //< It's OK if this file is missing.
Fallback, //< If missing, fallback to default "cua". This should only
Fallback, //< If missing, fallback to default "cua". This should only
//< be used when attempting to read the user-secified bind file.
Default //< Report error and return.
};
@ -65,7 +65,7 @@ public:
unsigned int r = 0);
/// returns the function bound to this key sequence, or
/// returns the function bound to this key sequence, or
/// FuncRequest::unknown if no binding exists for it.
/// @param r an internal recursion counter
// FIXME Surely there's a better way to do that?
@ -74,7 +74,7 @@ public:
/// clear all bindings
void clear();
/** Parse a bind file. If a valid unbind_map is given, put \unbind
/** Parse a bind file. If a valid unbind_map is given, put \unbind
* bindings to a separate KeyMap. This is used in the Shortcut preference
* dialog where main and user bind files are loaded separately so \unbind
* in user.bind can not nullify \bind in the master bind file.
@ -83,7 +83,7 @@ public:
* @param unbind_map pointer to a KeyMap that holds \unbind bindings
* @param rt how to respond if the file can't be found
*/
bool read(std::string const & bind_file, KeyMap * unbind_map = 0,
bool read(std::string const & bind_file, KeyMap * unbind_map = 0,
BindReadType rt = Default);
/** write to a bind file.
@ -126,7 +126,7 @@ public:
FuncRequest request;
KeySequence sequence;
KeyMap::ItemType tag;
};
};
typedef std::vector<Binding> BindingList;
/**
* Return all lfun and their associated bindings.
@ -185,7 +185,7 @@ private:
*/
Bindings findBindings(FuncRequest const & func,
KeySequence const & prefix) const;
void listBindings(BindingList & list, KeySequence const & prefix,
ItemType tag) const;

2
src/KeySequence.h
View File

@ -66,7 +66,7 @@ public:
ForGui, //< use platform specific translations and special characters
BindFile //< the format used in lyx bind files
};
/**
* Return the current sequence as a string.
* @param format output format

4
src/LaTeX.h
View File

@ -192,7 +192,7 @@ private:
std::string const & = std::string());
///
bool runMakeIndexNomencl(support::FileName const &,
bool runMakeIndexNomencl(support::FileName const &,
std::string const &, std::string const &);
///
@ -239,7 +239,7 @@ private:
///
OutputParams runparams;
/// Do we use biber?
bool biber;

10
src/LaTeXFonts.h
View File

@ -64,13 +64,13 @@ public:
bool osfDefault() const { return osfdefault_; }
/// Is this font available?
bool available(bool ot1, bool nomath);
/// Does this font provide an alternative without math?
/// Does this font provide an alternative without math?
bool providesNoMath(bool ot1, bool complete);
/// Does this font provide Old Style Figures?
bool providesOSF(bool ot1, bool complete, bool nomath);
/// Does this font provide optional true SmallCaps?
bool providesSC(bool ot1, bool complete, bool nomath);
/** does this font provide OSF and Small Caps only via
/** does this font provide OSF and Small Caps only via
* a single, undifferentiated expert option?
*/
bool hasMonolithicExpertSet(bool ot1, bool complete, bool nomath);
@ -89,7 +89,7 @@ public:
///
bool readFont(Lexer & lex);
private:
/// Return the preferred available package
/// Return the preferred available package
std::string const getAvailablePackage(bool dryrun);
/// Return the package options
std::string const getPackageOptions(bool ot1,
@ -139,8 +139,8 @@ private:
///
bool switchdefault_;
};
/** The list of available LaTeX fonts
*/
class LaTeXFonts {

32
src/Layout.h
View File

@ -132,7 +132,7 @@ public:
///
int requiredArgs() const;
///
docstring const & labelstring(bool in_appendix) const
docstring const & labelstring(bool in_appendix) const
{ return in_appendix ? labelstring_appendix_ : labelstring_; }
///
docstring const & endlabelstring() const { return endlabelstring_; }
@ -160,25 +160,25 @@ public:
std::string const & labeltag() const { return labeltag_; }
///
std::string const & itemtag() const { return itemtag_; }
///
///
std::string const & htmltag() const;
///
///
std::string const & htmlattr() const;
///
///
std::string const & htmlitemtag() const;
///
///
std::string const & htmlitemattr() const;
///
///
std::string const & htmllabeltag() const;
///
///
std::string const & htmllabelattr() const;
///
std::string defaultCSSClass() const;
///
bool htmllabelfirst() const { return htmllabelfirst_; }
///
///
docstring htmlstyle() const;
///
///
docstring const & htmlpreamble() const { return htmlpreamble_; }
///
bool htmltitle() const { return htmltitle_; }
@ -218,7 +218,7 @@ public:
///
bool operator==(Layout const &) const;
///
bool operator!=(Layout const & rhs) const
bool operator!=(Layout const & rhs) const
{ return !(*this == rhs); }
////////////////////////////////////////////////////////////////
@ -356,7 +356,7 @@ private:
std::string defaultCSSItemClass() const { return defaultCSSClass() + "_item"; }
///
std::string defaultCSSLabelClass() const { return defaultCSSClass() + "_label"; }
/// Name of the layout/paragraph environment
docstring name_;
@ -401,13 +401,13 @@ private:
/// Internal tag to surround the item text in a list.
std::string itemtag_;
/// The interpretation of this tag varies depending upon the latextype.
/// In an environment, it is the tag enclosing all content for this set of
/// paragraphs. So for quote, e.g,. it would be: blockquote. For itemize,
/// In an environment, it is the tag enclosing all content for this set of
/// paragraphs. So for quote, e.g,. it would be: blockquote. For itemize,
/// it would be: ul. (You get the idea.)
///
/// For a command, it is the tag enclosing the content of the command.
/// So, for section, it might be: h2.
///
///
/// For the paragraph type, it is the tag that will enclose each paragraph.
///
/// Defaults to "div".
@ -417,7 +417,7 @@ private:
mutable std::string htmlattr_;
/// Tag for individual paragraphs in an environment. In lists, this
/// would be something like "li". But it also needs to be set for
/// quotation, e.g., since the paragraphs in a quote need to be
/// quotation, e.g., since the paragraphs in a quote need to be
/// in "p" tags. Default is "div".
/// Note that when I said "environment", I meant it: This has no
/// effect for LATEX_PARAGRAPH type layouts.
@ -426,7 +426,7 @@ private:
mutable std::string htmlitemattr_;
/// Tag for labels, of whatever sort. One use for this is in setting
/// descriptions, in which case it would be: dt. Another use is to
/// customize the display of, say, the auto-generated label for
/// customize the display of, say, the auto-generated label for
/// sections. Defaults to "span".
/// If set to "NONE", this suppresses the printing of the label.
mutable std::string htmllabeltag_;

20
src/LayoutFile.h
View File

@ -42,30 +42,30 @@ private:
};
/// This class amounts to little more than a `strong typedef'.
///
/// A LayoutFile represents the layout information that is
///
/// A LayoutFile represents the layout information that is
/// contained in a *.layout file.
///
/// No document- (that is, Buffer-) specific information should
/// be placed in these objects. They are used as the basis for
///
/// No document- (that is, Buffer-) specific information should
/// be placed in these objects. They are used as the basis for
/// constructing DocumentClass objects, which are what represent
/// the layout information associated with a Buffer. (This is also
/// the layout information associated with a Buffer. (This is also
/// a subclass of TextClass, implemented in TextClass.{h,cpp}.)
/// Buffer-specific information should therefore be placed in a
/// DocumentClass object.
///
///
class LayoutFile : public TextClass {
public:
/// check whether the TeX class is available
bool isTeXClassAvailable() const { return tex_class_avail_; }
///
LayoutModuleList const & defaultModules() const
LayoutModuleList const & defaultModules() const
{ return default_modules_; }
///
LayoutModuleList const & providedModules() const
LayoutModuleList const & providedModules() const
{ return provided_modules_; }
///
LayoutModuleList const & excludedModules() const
LayoutModuleList const & excludedModules() const
{ return excluded_modules_; }
private:
/// noncopyable

6
src/LayoutModuleList.h
View File

@ -20,9 +20,9 @@ namespace lyx {
class LayoutFile;
/**
Represents a list of modules, such as might be associated with
Represents a list of modules, such as might be associated with
a particular document. Provides methods for adding modules, checking
if a module can be added, and, importantly, adapting the list to a
if a module can be added, and, importantly, adapting the list to a
new DocumentClass.
*/
class LayoutModuleList {
@ -50,7 +50,7 @@ public:
{ return lml_.insert(pos, str); }
///
void push_back(std::string const & str) { lml_.push_back(str); }
///
///
size_t size() const { return lml_.size(); }
/// This is needed in GuiDocument. It seems better than an
/// implicit conversion.

8
src/Lexer.h
View File

@ -27,7 +27,7 @@ namespace support { class FileName; }
class PushPopHelper;
/** A helper structure to describe a keyword for the Lexer.
Usually used bundled in C style arrays and passed to the
Usually used bundled in C style arrays and passed to the
Lexer using a LexerKeywordTable object.
*/
struct LexerKeyword
@ -110,8 +110,8 @@ public:
/// returns a lex code
int lex();
/// Read the next string, as delimited by double quotes or
/// whitespace. If esc is true, then we remember that some chars
/// Read the next string, as delimited by double quotes or
/// whitespace. If esc is true, then we remember that some chars
/// might be escaped: \" at least.
bool next(bool esc = false);
@ -120,7 +120,7 @@ public:
/// split a word if it contains a backslash.
bool nextToken();
/// Puts the rest of the line in the buffer, where it will
/// Puts the rest of the line in the buffer, where it will
/// be available via getString() or getDocString().
bool eatLine();

2
src/LyXAction.h
View File

@ -77,7 +77,7 @@ public:
* Creates a FuncRequest from a string of the form:
* lyx-function [argument]
* where the argument is optional and "lyx-function" is in the form you'd
* enter it in the mini-buffer.
* enter it in the mini-buffer.
*/
FuncRequest lookupFunc(std::string const & func_name) const;

4
src/MetricsInfo.h
View File

@ -108,13 +108,13 @@ public:
///
void draw(int x, int y, docstring const & str);
/// Determines the background color for the specified inset based on the
/// selection state, the background color inherited from the parent inset
/// selection state, the background color inherited from the parent inset
/// and the inset's own background color.
/// \param sel whether to take the selection state into account
ColorCode backgroundColor(Inset const * inset, bool sel = true) const;
/// Determines the text color based on the intended color, the
/// change tracking state and the selection state.
/// change tracking state and the selection state.
/// \param color what the color should be by default
Color textColor(Color const & color) const;

14
src/Mover.h
View File

@ -50,10 +50,10 @@ public:
* directory to the export location, since @c to and @c latex may
* not be equal in this case.
* \returns true if successful.
* NOTE: Although this routine simply calls do_copy() and
* NOTE: Although this routine simply calls do_copy() and
* Mover::do_copy() does not itself make any use of the @c latex argument,
* SpecialisedMover overrides do_copy(), so SpecialisedMover::copy(), which
* is just Mover::copy(), calls SpecialisedMover::do_copy(), and the @c latex
* is just Mover::copy(), calls SpecialisedMover::do_copy(), and the @c latex
* argument IS in that case used.
*/
bool
@ -104,9 +104,9 @@ protected:
* For example, an Xfig .fig file can contain references to external
* picture files. If such a reference has a relative path, then the
* copied .fig file will require a transformation of the picture file
* reference if it is to be found by Xfig.
* reference if it is to be found by Xfig.
*
* So, in this case, we need three arguments:
* So, in this case, we need three arguments:
* (i) @c from the location of the file to be moved
* (ii) @c to the location to which it should be moved
* (iii) @c latex the identifier that should be used in the sort of
@ -125,9 +125,9 @@ public:
* $$i is a placeholder for the name of the file to be moved,
* $$o is a placeholder for the name of the file after moving,
* $$l is a placeholder for the latex argument, as explained above.
* $$o and $$l can only differ if the file is copied from the temporary
* directory to the export location. If it is copied from the original
* location to the temporary directory, they are the same, so $$l may be
* $$o and $$l can only differ if the file is copied from the temporary
* directory to the export location. If it is copied from the original
* location to the temporary directory, they are the same, so $$l may be
* ignored in this case, as it is in the Mover baseclass.
*/
SpecialisedMover(std::string const & command)

8
src/Paragraph.h
View File

@ -68,7 +68,7 @@ public:
{
return first < s.first;
}
inline bool operator==(FontSpan const & s) const
{
return first == s.first && last == s.last;
@ -83,7 +83,7 @@ public:
{
return empty() ? 0 : last - first;
}
inline FontSpan intersect(FontSpan const & f) const
{
@ -100,7 +100,7 @@ public:
result.last = last;
return result;
}
inline bool empty() const
{
return first > last;
@ -468,7 +468,7 @@ public:
bool mw, ///<
pos_type pos, ///< start from here.
bool del = true) const;
void locateWord(pos_type & from, pos_type & to,
word_location const loc) const;
///

8
src/ParagraphParameters.h
View File

@ -80,13 +80,13 @@ public:
/// read the parameters from a string
void read (std::string str, bool merge = true);
/// read the parameters from a lex
void read(Lexer & lex, bool merge = true);
///
///
void apply(ParagraphParameters const & params, Layout const & layout);
// It would be nice to have a working version of this method, so that
// getStatus() could return information about what was possible.
// bool canApply(ParagraphParameters const & params, Layout const & layout)

2
src/SpellChecker.h
View File

@ -81,7 +81,7 @@ public:
/// how many valid dictionaries were found
virtual int numDictionaries() const = 0;
/// if speller can spell check whole paragraph return true
virtual bool canCheckParagraph() const { return false; }

4
src/Text.h
View File

@ -127,7 +127,7 @@ public:
/// truncates str to maxlenwith an ellipsis and replaces the characters '\n'
/// and '\t' with spaces
static void shortenForOutliner(docstring & str, size_t const maxlen);
/// Appends a possibly abbreviated representation of our text to \param os,
/// where \param maxlen defines the maximum size of \param os. If \param
/// shorten is true, then os is shortened as above.
@ -172,7 +172,7 @@ public:
void selectAll(Cursor & cur);
/// convenience function get the previous word or an empty string
docstring previousWord(CursorSlice const & sl) const;
/// what type of change operation to make
enum ChangeOp {
ACCEPT,

2
src/TextClass.h
View File

@ -451,7 +451,7 @@ public:
///
docstring const & htmlstyles() const { return htmlstyles_; }
/// Looks for the layout of "highest level", other than Part (or other
/// layouts with a negative toc number), for use in constructing TOCs and
/// layouts with a negative toc number), for use in constructing TOCs and
/// similar information.
Layout const & getTOCLayout() const;
/// the paragraph style to use for TOCs, Bibliography, etc

8
src/VCBackend.h
View File

@ -106,7 +106,7 @@ public:
/// Check the directory of file and all parent directories
/// for the existence of repository-info like .git or .svn
static bool checkparentdirs(support::FileName const & file, std::string const & vcsdir);
protected:
/// parse information from the version file
virtual void scanMaster() = 0;
@ -114,7 +114,7 @@ protected:
/// Prepare a version identifier suitable for RCS and CVS.
/// If needed converts last or relative number to the absolute revision.
bool makeRCSRevision(std::string const &version, std::string &revis) const;
/// GUI container for doVCCommandCall
int doVCCommand(std::string const & cmd, support::FileName const & path, bool reportError = true);
/**
@ -279,7 +279,7 @@ public:
virtual void getLog(support::FileName const &);
/// Check for messages in cvs output.
/// Check for messages in cvs output.
/// Returns conflict line.
std::string scanLogFile(support::FileName const & f, std::string & status);
@ -334,7 +334,7 @@ private:
static int doVCCommandCallWithOutput(std::string const & cmd,
support::FileName const & path,
support::FileName const & output);
/// return the quoted pathname if Directory or filename if File
virtual std::string const getTarget(OperationMode opmode) const;
/// collect the diff of file or directory against repository

4
src/frontends/Application.h
View File

@ -59,7 +59,7 @@ initialisation should be done before the instanciation of this class.
|
GuiView-1 (one or more in case of split-view mode).
| |
| <tab-widget-1-1>
| <tab-widget-1-1>
| | |
| | WorkArea-1-1-1 (M1-1 WorkAreas, M1-1 <= N)
| | | |
@ -73,7 +73,7 @@ initialisation should be done before the instanciation of this class.
| | | |
| | | Cursor
| |
| <tab-widget-1-2>
| <tab-widget-1-2>
|
GuiView-2 (one or more in case of split-view mode).
| |

2
src/frontends/Delegates.h
View File

@ -22,7 +22,7 @@ class Inset;
namespace frontend {
class GuiBufferViewDelegate
class GuiBufferViewDelegate
{
public:
virtual ~GuiBufferViewDelegate() {}

2
src/frontends/FontLoader.h
View File

@ -32,7 +32,7 @@ public:
~FontLoader();
/// Update fonts after zoom, dpi, font names, or norm change
// (basically by deleting all cached values)
// (basically by deleting all cached values)
void update();
/// Is the given font available ?

2
src/frontends/Painter.h
View File

@ -176,7 +176,7 @@ public:
char_type c, FontInfo const & f, preedit_style style) = 0;
/// start monochrome painting mode, i.e. map every color into [min,max]
virtual void enterMonochromeMode(Color const & min,
virtual void enterMonochromeMode(Color const & min,
Color const & max) = 0;
/// leave monochrome painting mode
virtual void leaveMonochromeMode() = 0;

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

@ -115,7 +115,7 @@ private:
/// noncopyable
ButtonController(ButtonController const &);
void operator=(ButtonController const &);
/// pimpl
class Private;
Private * d;

4
src/frontends/qt4/ButtonPolicy.h
View File

@ -66,7 +66,7 @@ class ButtonPolicy
public:
// The various poicies
enum Policy {
enum Policy {
/** Ok and Cancel buttons for dialogs with read-only operation.
Note: This scheme supports the relabelling of Cancel to Close and
vice versa.
@ -273,7 +273,7 @@ private:
/// noncopyable
ButtonPolicy(ButtonPolicy const &);
void operator=(ButtonPolicy const &);
/// pimpl
class Private;
Private * d;

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

@ -56,7 +56,7 @@ public:
///
void showPopup();
///
bool eventFilter(QObject * o, QEvent * e);
///

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

@ -47,7 +47,7 @@ enum KernelDocType
/** \c Dialog collects the different parts of a Model-Controller-View
* split of a generic dialog together.
*/
class Dialog
class Dialog
{
public:
/// \param lv is the access point for the dialog to the LyX kernel.

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

@ -70,7 +70,7 @@ private:
/// open a listbox and show the contents of the list. When reversed
/// is true, the contents of the list is filled bottom-up.
void showList(std::vector<std::string> const & list,
void showList(std::vector<std::string> const & list,
QPoint const & pos, bool reversed = false) const;
/// return the possible completions

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

@ -33,7 +33,7 @@ public:
~GuiCompare();
void closeEvent(QCloseEvent *);
private Q_SLOTS:
///
void slotOK();
@ -76,7 +76,7 @@ private:
/// enable or disable all controls and rename the Close/Cancel button
void enableControls(bool enable);
/// browse for a file
QString browse(QString const & in_name) const;
/// retrieve the buffer from the specified filename

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

@ -50,7 +50,7 @@ private:
void dispatchParams() {}
///
void enableControls();
private:
};

6
src/frontends/qt4/GuiCompleter.h
View File

@ -52,7 +52,7 @@ public:
void activate();
/// Do a completion as far as it is unique, but at least one character.
void tab();
/// Update the visibility of the popup and the inline completion.
/// This method might set the update flags of the cursor to request
/// a redraw.
@ -66,7 +66,7 @@ public:
docstring longestUniqueCompletion() const;
///
bool uniqueCompletionAvailable() const;
public Q_SLOTS:
/// Show the popup.
void showPopup();
@ -91,7 +91,7 @@ private Q_SLOTS:
void asyncHidePopup();
/// the asynchronous part of hideInline(cur)
void asyncHideInline();
private:
///
void setCurrentCompletion(QString const & s);

4
src/frontends/qt4/GuiDialog.h
View File

@ -22,7 +22,7 @@ namespace lyx {
namespace frontend {
/// Base class for historical LyX dialogs.
/**
/**
* \warning New dialogs should use the leaner classes \c DialogView or
* \c DockView depending on the intent. Eventually, old dialogs should be
* converted to \c DialogView too.
@ -97,7 +97,7 @@ public:
* to close or not (no point refreshing the display for example).
*/
bool isClosing() const { return is_closing_; }
///
bool needBufferOpen() const { return isBufferDependent(); }

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

@ -257,7 +257,7 @@ private:
bool providesOSF(QString const & font) const;
/// does this font provide true Small Caps?
bool providesSC(QString const & font) const;
/** does this font provide OSF and Small Caps only via
/** does this font provide OSF and Small Caps only via
* a single, undifferentiated expert option?
*/
bool hasMonolithicExpertSet(QString const & font) const;

16
src/frontends/qt4/GuiIdListModel.h
View File

@ -28,10 +28,10 @@ namespace frontend {
/**
* A QAbstractListModel that associates an identifying string with
* each item, as well as a display string. The display string is set
* with setUIString; the identifying string, with setIDString.
* with setUIString; the identifying string, with setIDString.
*
* This is intended to be used, for example, with GuiSelectionManager.
* In that case, one needs to recover from selectedModel which items
* In that case, one needs to recover from selectedModel which items
* have been selected. One may not wish to do so using the string that
* is there *displayed*, since, among other things, that string may be
* translated. So the id can be used to identify the items in this case.
@ -48,16 +48,16 @@ public:
{ return userData_.size(); }
///
virtual QVariant data(QModelIndex const & index,
virtual QVariant data(QModelIndex const & index,
int role = Qt::DisplayRole) const;
///
bool insertRows(int row, int count, QModelIndex const & parent = QModelIndex());
///
bool removeRows(int row, int count, QModelIndex const & parent = QModelIndex());
///
///
void clear() { removeRows(0, rowCount()); }
///
virtual bool setData (QModelIndex const & index,
virtual bool setData (QModelIndex const & index,
const QVariant & value, int role = Qt::EditRole );
///
virtual QMap<int, QVariant> itemData(QModelIndex const & index ) const;
@ -65,10 +65,10 @@ public:
// New methods
//////////////////////////////////////////////////////////////////////
///
void insertRow(int const i, QString const & uiString,
void insertRow(int const i, QString const & uiString,
std::string const & idString, QString const & ttString);
/// A convenience method, setting ttString to the same as uiString
void insertRow(int const i, QString const & uiString,
void insertRow(int const i, QString const & uiString,
std::string const & idString);
/// \return the index of the (first) item with idString
/// \return -1 if not found
@ -123,4 +123,4 @@ private:
}
}
#endif //GUIIDLISTMODEL_H
#endif //GUIIDLISTMODEL_H

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

@ -519,7 +519,7 @@ private:
// user_unbind_ holds \unbind bindings from user.bind
// When an item is inserted, it is added to user_bind_
// When an item from system_bind_ is deleted, it is added to user_unbind_
// When an item in user_bind_ or user_unbind_ is deleted, it is
// When an item in user_bind_ or user_unbind_ is deleted, it is
// deleted (unbind)
KeyMap system_bind_;
KeyMap user_bind_;

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

@ -36,7 +36,7 @@ class ProgressViewWidget : public QWidget, public Ui::ProgressViewUi
public:
ProgressViewWidget();
private:
};
class GuiProgressView : public DockView

4
src/frontends/qt4/GuiToolbar.h
View File

@ -67,8 +67,8 @@ class GuiToolbar : public QToolBar
public:
///
GuiToolbar(ToolbarInfo const &, GuiView &);
/// Reimplemented from QToolbar to detect whether the
/// Reimplemented from QToolbar to detect whether the
/// toolbar is restored with MainWindow::restoreState().
void setVisible(bool visible);

14
src/frontends/qt4/GuiView.h
View File

@ -110,7 +110,7 @@ public:
/// display a message in the view
/// could be called from any thread
void message(docstring const &);
bool getStatus(FuncRequest const & cmd, FuncStatus & flag);
/// dispatch command.
/// \return true if the \c FuncRequest has been dispatched.
@ -173,7 +173,7 @@ public:
///
TocModels & tocModels();
/// called on timeout
void autoSave();
@ -191,7 +191,7 @@ public:
/// \return the \c Workarea at index \c index
GuiWorkArea * workArea(int index);
/// Add a \c WorkArea
/// Add a \c WorkArea
/// \return the \c Workarea associated to \p Buffer
/// \retval 0 if no \c WorkArea is found.
GuiWorkArea * addWorkArea(Buffer & buffer);
@ -208,7 +208,7 @@ public:
GuiWorkArea const * currentMainWorkArea() const;
/// return the current document WorkArea (it may not have the focus).
GuiWorkArea * currentMainWorkArea();
/// Current ratio between physical pixels and device-independent pixels
double pixelRatio() const;
@ -304,7 +304,7 @@ public:
void hideAll() const;
/// Update all visible dialogs.
/**
/**
* Check the status of all visible dialogs and disable or reenable
* them as appropriate.
*
@ -374,7 +374,7 @@ private:
///
enum RenameKind { LV_WRITE_AS, LV_VC_RENAME, LV_VC_COPY };
/// Save a buffer as a new file.
/// Save a buffer as a new file.
/**
Write a buffer to a new file name and rename the buffer
according to the new file name.
@ -407,7 +407,7 @@ private:
/// closes the tabworkarea and all tabs. If we are in a close event,
/// all buffers will be closed, otherwise they will be hidden.
bool closeTabWorkArea(TabWorkArea * twa);
/// gives the user the possibility to save his work
/// gives the user the possibility to save his work
/// or to discard the changes. If hiding is true, the
/// document will be reloaded.
bool saveBufferIfNeeded(Buffer & buf, bool hiding);

6
src/frontends/qt4/GuiWorkArea_Private.h
View File

@ -127,7 +127,7 @@ struct GuiWorkArea::Private
delete screen_;
pixel_ratio_ = p->pixelRatio();
if (lyxrc.use_qimage) {
QImage *x =
QImage *x =
new QImage(static_cast<int>(pixel_ratio_ * p->viewport()->width()),
static_cast<int>(pixel_ratio_ * p->viewport()->height()),
QImage::Format_ARGB32_Premultiplied);
@ -136,7 +136,7 @@ struct GuiWorkArea::Private
#endif
screen_ = x;
} else {
QPixmap *x =
QPixmap *x =
new QPixmap(static_cast<int>(pixel_ratio_ * p->viewport()->width()),
static_cast<int>(pixel_ratio_ * p->viewport()->height()));
#if QT_VERSION >= 0x050000
@ -182,7 +182,7 @@ struct GuiWorkArea::Private
/// are ignored
bool dialog_mode_;
/// store the name of the context menu when the mouse is
/// pressed. This is used to get the correct context menu
/// pressed. This is used to get the correct context menu
/// when the menu is actually shown (after releasing on Windows)
/// and after the DEPM has done its job.
std::string context_menu_name_;

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

@ -65,7 +65,7 @@ private:
QGridLayout * layout_;
QList<QAction *> actions_;
bool tornoff_;
TearOff * tearoffwidget_;
TearOff * tearoffwidget_;
};

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

@ -94,7 +94,7 @@ public:
template<class F, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8>
R call(F f, P1& p1, P2& p2, P3& p3, P4& p4, P5& p5, P6& p6, P7& p7, P8& p8)
{
return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4),
return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4),
lyx::ref(p5), lyx::ref(p6), lyx::ref(p7), lyx::ref(p8)));
}

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

@ -38,7 +38,7 @@ class CheckedWidget
{
public:
CheckedWidget(QLineEdit * input, QWidget * label = 0);
///
///
bool check() const;
private:

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

@ -47,7 +47,7 @@ public:
///
void showPopup();
///
bool eventFilter(QObject * o, QEvent * e);
///

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

@ -86,7 +86,7 @@ private:
class TocModelSortProxyModel : public QSortFilterProxyModel
{
public:
TocModelSortProxyModel(QObject * w)
TocModelSortProxyModel(QObject * w)
: QSortFilterProxyModel(w)
{}

16
src/frontends/qt4/qt_helpers.h
View File

@ -35,7 +35,7 @@ namespace lyx {
namespace support { class FileName; }
class BufferParams;
namespace frontend {
class LengthCombo;
@ -50,11 +50,11 @@ Length widgetsToLength(QLineEdit const * input, QComboBox const * combo);
// all the code to remove default_unit argument when equal to the
// default.
void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
Length const & len,
Length const & len,
Length::UNIT default_unit = Length::defaultUnit());
/// method to set widgets from a string
void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
std::string const & len,
std::string const & len,
Length::UNIT default_unit = Length::defaultUnit());
/// method to set widgets from a docstring
void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
@ -123,18 +123,18 @@ support::FileName imageLibFileSearch(QString & dir, QString const & name,
relative to relpath.
\param title: title for dialog
\param filters: *.ps, etc
\param save: whether to save dialog info (current path, etc) for next use.
The \param labelN and \param dirN arguments provide for extra buttons
The \param labelN and \param dirN arguments provide for extra buttons
in the dialog (e.g., "Templates" and a path to that directory).
The difference between the functions concerns when we think we have a
relative path.
The difference between the functions concerns when we think we have a
relative path.
In \c browseRelToParent, we return a relative path only if it IS NOT of
In \c browseRelToParent, we return a relative path only if it IS NOT of
the form "../../foo.txt".
In \c browseRelToSub, we return a relative path only if it IS of the

30
src/insets/Inset.h
View File

@ -127,7 +127,7 @@ public:
/**
* This is typically used after this inset is created interactively.
* Intented purpose is to sanitize internal state with regard to current
* Buffer.
* Buffer.
**/
virtual void initView() {}
/// \return true if this inset is labeled.
@ -183,7 +183,7 @@ public:
FuncStatus & status) const;
/// cursor enters
virtual void edit(Cursor & cur, bool front,
virtual void edit(Cursor & cur, bool front,
EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
/// sets cursor recursively descending into nested editable insets
/**
@ -279,16 +279,16 @@ public:
/// number of columns in gridlike structures
virtual size_t ncols() const { return 0; }
/// Is called when the cursor leaves this inset.
/// Returns true if cursor is now invalid, e.g. if former
/// insets in higher cursor slices of \c old do not exist
/// Returns true if cursor is now invalid, e.g. if former
/// insets in higher cursor slices of \c old do not exist
/// anymore.
/// \c old is the old cursor, the last slice points to this.
/// \c cur is the new cursor. Use the update flags to cause a redraw.
virtual bool notifyCursorLeaves(Cursor const & /*old*/, Cursor & /*cur*/)
{ return false; }
/// Is called when the cursor enters this inset.
/// Returns true if cursor is now invalid, e.g. if former
/// insets in higher cursor slices of \c old do not exist
/// Returns true if cursor is now invalid, e.g. if former
/// insets in higher cursor slices of \c old do not exist
/// anymore.
/// \c cur is the new cursor, some slice points to this. Use the update
/// flags to cause a redraw.
@ -299,9 +299,9 @@ public:
virtual bool setMouseHover(BufferView const *, bool) const
{ return false; }
/// return true if this inset is hovered (under mouse)
/// This is by now only used by mathed to draw corners
/// This is by now only used by mathed to draw corners
/// (Inset::drawMarkers() and Inset::drawMarkers2()).
/// Other insets do not have to redefine this function to
/// Other insets do not have to redefine this function to
/// return the correct status of mouseHovered.
virtual bool mouseHovered(BufferView const *) const { return false; }
@ -374,7 +374,7 @@ public:
/// Returns true if the inset supports inline completions at the
/// cursor position. In this case the completion might be stored
/// in the BufferView's inlineCompletion property.
virtual bool inlineCompletionSupported(Cursor const & /*cur*/) const
virtual bool inlineCompletionSupported(Cursor const & /*cur*/) const
{ return false; }
/// Return true if the inline completion should be automatic.
virtual bool automaticInlineCompletion() const { return true; }
@ -385,7 +385,7 @@ public:
/// Returns completion suggestions at cursor position. Return an
/// null pointer if no completion is a available or possible.
/// The caller is responsible to free the returned object!
virtual CompletionList const * createCompletionList(Cursor const &) const
virtual CompletionList const * createCompletionList(Cursor const &) const
{ return 0; }
/// Returns the completion prefix to filter the suggestions for completion.
/// This is only called if completionList returned a non-null list.
@ -394,16 +394,16 @@ public:
/// The completion does not contain the prefix. If finished is true, the
/// completion is final. If finished is false, completion might only be
/// a partial completion.
virtual bool insertCompletion(Cursor & /*cur*/,
docstring const & /*completion*/, bool /*finished*/)
virtual bool insertCompletion(Cursor & /*cur*/,
docstring const & /*completion*/, bool /*finished*/)
{ return false; }
/// Get the completion inset position and size
virtual void completionPosAndDim(Cursor const &, int & /*x*/, int & /*y*/,
virtual void completionPosAndDim(Cursor const &, int & /*x*/, int & /*y*/,
Dimension & /*dim*/) const {}
/// returns true if the inset can hold an inset of given type
virtual bool insetAllowed(InsetCode) const { return false; }
/// should this inset use the empty layout by default rather than
/// should this inset use the empty layout by default rather than
/// the standard layout? (default: only if that is forced.)
virtual bool usePlainLayout() const { return forcePlainLayout(); }
/// if this inset has paragraphs should they be forced to use the
@ -429,7 +429,7 @@ public:
/// either plain text or Qt html, and formatToolTip will be called
/// on it before display in both cases.
virtual docstring toolTip(BufferView const & bv, int x, int y) const;
/// \return Context menu identifier. This function determines
/// whose Inset's menu should be shown for the given position.
virtual std::string contextMenu(BufferView const & bv, int x, int y) const;

2
src/insets/InsetArgument.h
View File

@ -56,7 +56,7 @@ public:
///
int docbook(odocstream &, OutputParams const &) const { return 0; }
///
docstring xhtml(XHTMLStream &, OutputParams const &) const
docstring xhtml(XHTMLStream &, OutputParams const &) const
{ return docstring(); }
///
void write(std::ostream & os) const;

6
src/insets/InsetCaption.h
View File

@ -52,7 +52,7 @@ private:
bool descendable(BufferView const &) const { return true; }
///
void metrics(MetricsInfo & mi, Dimension & dim) const;
///
///
void drawBackground(PainterInfo & pi, int x, int y) const;
///
void draw(PainterInfo & pi, int x, int y) const;
@ -77,14 +77,14 @@ private:
size_t max_length = INT_MAX) const;
///
int docbook(odocstream & os, OutputParams const & runparams) const;
///
///
docstring xhtml(XHTMLStream & os, OutputParams const & runparams) const;
///
void setCustomLabel(docstring const & label);
///
void addToToc(DocIterator const & di, bool output_active, UpdateType utype,
TocBackend & backend) const;
///
///
virtual bool forcePlainLayout(idx_type = 0) const { return true; }
/// Captions don't accept alignment, spacing, etc.
virtual bool allowParagraphCustomization(idx_type = 0) const { return false; }

4
src/insets/InsetCode.h
View File

@ -133,7 +133,7 @@ enum InsetCode {
///
MATH_CASES_CODE,
///
MATH_CHAR_CODE,
MATH_CHAR_CODE,
///
MATH_COLOR_CODE,
///
@ -225,7 +225,7 @@ enum InsetCode {
///
PREVIEW_CODE,
///
MATH_DIAGRAM_CODE,
MATH_DIAGRAM_CODE,
///
SCRIPT_CODE,
///

2
src/insets/InsetCommand.h
View File

@ -108,7 +108,7 @@ protected:
//@{
/// Build the complete LaTeX command
/// \see InsetCommandParams::getCommand
docstring const getCommand(OutputParams const & rp) const
docstring const getCommand(OutputParams const & rp) const
{ return p_.getCommand(rp); }
/// Return the command name
/// \see InsetCommandParams::getCmdName

8
src/insets/InsetCommandParams.h
View File

@ -69,7 +69,7 @@ public:
docstring const & defaultValue() const { return default_value_; }
///
bool operator==(ParamData const &) const;
///
///
bool operator!=(ParamData const & rhs) const
{ return !(*this == rhs); }
private:
@ -102,7 +102,7 @@ public:
///
const_iterator const end() const { return info_.end(); }
/// \return true if name corresponds to a parameter of some sort.
/// \return false if the parameter does not exist at all of it it
/// \return false if the parameter does not exist at all of it it
bool hasParam(std::string const & name) const;
///
ParamData const & operator[](std::string const & name) const;
@ -142,7 +142,7 @@ public:
/// are cleared except those that exist also in the new command.
/// What matters here is the parameter name, not position.
void setCmdName(std::string const & n);
/// FIXME Would be better removed, but is used in BufferView.cpp in
/// FIXME Would be better removed, but is used in BufferView.cpp in
/// ways that make removal hard.
docstring getFirstNonOptParam() const;
/// get parameter \p name
@ -159,7 +159,7 @@ public:
void clear();
///
static bool isCompatibleCommand(InsetCode code, std::string const & s);
///
///
ParamInfo const & info() const { return info_; }
///
docstring prepareCommand(OutputParams const & runparams,

6
src/insets/InsetHyperlink.h
View File

@ -24,7 +24,7 @@ class InsetHyperlink : public InsetCommand
public:
///
InsetHyperlink(Buffer * buf, InsetCommandParams const &);
/// \name Public functions inherited from Inset class
//@{
///
@ -59,14 +59,14 @@ public:
/// \name Static public methods obligated for InsetCommand derived classes
//@{
///
static bool isCompatibleCommand(std::string const & s)
static bool isCompatibleCommand(std::string const & s)
{ return s == "href"; }
///
static std::string defaultCommand() { return "href"; }
///
static ParamInfo const & findInfo(std::string const &);
//@}
private:
/// \name Private functions inherited from Inset class
//@{

12
src/insets/InsetIPA.h
View File

@ -29,7 +29,7 @@ namespace graphics {
/// An IPA inset with instant preview
class InsetIPA : public InsetText {
public:
///
InsetIPA(Buffer *);
@ -47,11 +47,11 @@ public:
bool neverIndent() const { return true; }
bool forceLocalFontSwitch() const { return true; }
InsetCode lyxCode() const { return IPA_CODE; }
docstring layoutName() const { return from_ascii("IPA"); }
bool descendable(BufferView const & /*bv*/) const { return true; }
void metrics(MetricsInfo & mi, Dimension & dim) const;
@ -73,7 +73,7 @@ public:
void write(std::ostream & os) const;
void edit(Cursor & cur, bool front, EntryDirection entry_from);
///
void latex(otexstream &, OutputParams const &) const;
///
@ -85,7 +85,7 @@ public:
///
bool insetAllowed(InsetCode code) const;
//@}
protected:
/// Retrieves the preview state. Returns true if preview
/// is enabled and the preview image is availabled.

6
src/insets/InsetInclude.h
View File

@ -159,15 +159,15 @@ private:
void setParams(InsetCommandParams const & params);
/// get the text displayed on the button
docstring screenLabel() const;
//@}
//@}
/// holds the entity name that defines the file location (SGML)
docstring const include_label;
/// The pointer never changes although *preview_'s contents may.
unique_ptr<RenderMonitoredPreview> const preview_;
///
///
mutable bool failedtoload_;
/// cache
mutable bool set_label_;

4
src/insets/InsetInfo.h
View File

@ -61,8 +61,8 @@ icon: argument is the name of the LFUN such as "paste". The syntax is the same
buffer: argument can be one of "name", "path", "class". This inset output the
filename, path, and textclass of this buffer.
lyxinfo: argument must (presently) be "version". This inset outputs information
lyxinfo: argument must (presently) be "version". This inset outputs information
about the version of LyX currently in use.
There is currently no GUI, no menu entry for this inset. A user can define a

6
src/insets/InsetLabel.h
View File

@ -19,7 +19,7 @@ namespace lyx {
class Counter;
class InsetLabel : public InsetCommand
class InsetLabel : public InsetCommand
{
public:
///
@ -70,7 +70,7 @@ public:
///
static std::string defaultCommand() { return "label"; }
///
static bool isCompatibleCommand(std::string const & s)
static bool isCompatibleCommand(std::string const & s)
{ return s == "label"; }
//@}
@ -80,7 +80,7 @@ public:
///
docstring screenLabel() const;
//@}
private:
/// \name Private functions inherited from Inset class
//@{

10
src/insets/InsetLayout.h
View File

@ -85,12 +85,12 @@ public:
FontInfo labelfont() const { return labelfont_; }
///
ColorCode bgcolor() const { return bgcolor_; }
///
///
Layout::LaTeXArgMap const & latexargs() const { return latexargs_; }
///
Layout::LaTeXArgMap const & postcommandargs() const { return postcommandargs_; }
/// Returns latexargs() + postcommandargs().
/// But note that it returns a *copy*, not a reference, so do not do
/// But note that it returns a *copy*, not a reference, so do not do
/// anything like:
/// Layout::LaTeXArgMap::iterator it = args().begin();
/// Layout::LaTeXArgMap::iterator en = args().end();
@ -120,7 +120,7 @@ public:
std::string const & htmlattr() const;
/// Tag for individual paragraphs in the inset. Default is none.
std::string const & htmlinnertag() const { return htmlinnertag_; }
/// Attributes for that tag. Default (if a tag is provided) is:
/// Attributes for that tag. Default (if a tag is provided) is:
/// class="name_inner".
std::string const & htmlinnerattr() const;
/// A label for this environment, possibly including a reference
@ -132,7 +132,7 @@ public:
///
inline std::string htmllabeltag() const { return "span"; }
///
std::string htmllabelattr() const
std::string htmllabelattr() const
{ return "class=\"" + defaultCSSClass() + "_label\""; }
/// CSS associated with this inset.
docstring htmlstyle() const;
@ -263,7 +263,7 @@ private:
std::set<std::string> requires_;
///
bool multipar_;
///
///
bool custompars_;
///
bool forceplain_;

4
src/insets/InsetListingsParams.h
View File

@ -38,7 +38,7 @@ public:
/// add key=value to params_. key_=value will be used if key=value already exists
/// unless replace=true.
void addParam(std::string const & key, std::string const & value,
void addParam(std::string const & key, std::string const & value,
bool replace = false);
/// add a few parameters
@ -84,7 +84,7 @@ public:
///
void clear() { params_.clear(); }
/// validate parameter, return an error message
docstring validate() const;

6
src/insets/InsetNomencl.h
View File

@ -60,7 +60,7 @@ public:
///
static std::string defaultCommand() { return "nomenclature"; }
///
static bool isCompatibleCommand(std::string const & s)
static bool isCompatibleCommand(std::string const & s)
{ return s == "nomenclature"; }
//@}
@ -93,7 +93,7 @@ public:
void validate(LaTeXFeatures & features) const;
///
int docbook(odocstream &, OutputParams const &) const;
///
///
docstring xhtml(XHTMLStream &, OutputParams const &) const;
///
InsetCode lyxCode() const;
@ -114,7 +114,7 @@ public:
///
static std::string defaultCommand() { return "printnomenclature"; }
///
static bool isCompatibleCommand(std::string const & s)
static bool isCompatibleCommand(std::string const & s)
{ return s == "printnomenclature"; }
//@}

2
src/insets/InsetQuotes.h
View File

@ -147,7 +147,7 @@ public:
///
docstring xhtml(XHTMLStream &, OutputParams const &) const;
///
///
void toString(odocstream &) const;
///
void forOutliner(docstring &, size_t const maxlen, bool const) const;

2
src/insets/InsetSpecialChar.h
View File

@ -82,7 +82,7 @@ public:
///
void toString(odocstream &) const;
///
bool isInToc() const { return true; }
bool isInToc() const { return true; }
///
void forOutliner(docstring &, size_t const, bool const) const;
///

2
src/insets/InsetTOC.h
View File

@ -70,7 +70,7 @@ private:
void makeTOCNoDepth(XHTMLStream & xs, Toc const & toc, const OutputParams & op) const;
///
void makeTOCEntry(XHTMLStream & xs, Paragraph const & par, OutputParams const & op) const;
/// \name Private functions inherited from Inset class
//@{
///

8
src/insets/InsetText.h
View File

@ -93,11 +93,11 @@ public:
WriteEverything = 7
};
///
docstring insetAsXHTML(XHTMLStream &, OutputParams const &,
docstring insetAsXHTML(XHTMLStream &, OutputParams const &,
XHTMLOptions) const;
///
void validate(LaTeXFeatures & features) const;
/// return the argument(s) only
void getArgs(otexstream & os, OutputParams const &, bool const post = false) const;
@ -169,7 +169,7 @@ public:
/// Update the counters of this inset and of its contents
virtual void updateBuffer(ParIterator const &, UpdateType);
///
///
void setMacrocontextPositionRecursive(DocIterator const & pos);
///
void toString(odocstream &) const;
@ -205,7 +205,7 @@ public:
/// \param prefix: a string that will preced the tooltip,
/// e.g., "Index: ".
/// \param len: length of the resulting string
/// NOTE This routine is kind of slow. It's fine to use it within the
/// NOTE This routine is kind of slow. It's fine to use it within the
/// GUI, but definitely do not try to use it in updateBuffer or anything
/// of that sort. (Note: unnecessary internal copies have been removed
/// since the previous note. The efficiency would have to be assessed

4
src/lyxfind.h
View File

@ -64,7 +64,7 @@ bool lyxfind(BufferView * bv, FuncRequest const & ev);
* The string is encoded by \c replace2string.
* \return whether we did anything
*/
bool lyxreplace(BufferView * bv,
bool lyxreplace(BufferView * bv,
FuncRequest const &, bool has_deleted = false);
/// find the next change in the buffer
@ -125,7 +125,7 @@ std::istringstream & operator>>(std::istringstream & is, lyx::FindAndReplaceOpti
/// Perform a FindAdv operation.
bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt);
/** Computes the simple-text or LaTeX export (depending on opt) of buf starting
** from cur and ending len positions after cur, if len is positive, or at the
** paragraph or innermost inset end if len is -1.

2
src/mathed/InsetMathAMSArray.h
View File

@ -42,7 +42,7 @@ public:
void infoize(odocstream & os) const;
///
void normalize(NormalStream &) const;
// Don't need mathmlize or htmlize, as this is handled by
// Don't need mathmlize or htmlize, as this is handled by
// InsetMathMatrix after being extracted in MathExtern.
// void mathmlize(MathStream &) const;
// void htmlize(HTMLStream &) const;

2
src/mathed/InsetMathExInt.h
View File

@ -26,7 +26,7 @@ namespace lyx {
// cell(1) is the stuff after the 'd'
// cell(2) is the lower bound
// cell(3) is the upper bound
// for sums:
// for sums:
// cell(0) is the main body
// cell(1) is the index (e.g., i), if the lower bound is "i = ..."
// or the whole lower bound if not

4
src/mathed/InsetMathGrid.h
View File

@ -225,7 +225,7 @@ public:
//void maple(MapleStream &) const;
///
void mathmlize(MathStream &) const;
///
///
void htmlize(HtmlStream &) const;
///
void htmlize(HtmlStream &, std::string attrib) const;
@ -267,7 +267,7 @@ protected:
// The following two functions are used in InsetMathHull and
// InsetMathSplit.
/// The value of a fixed col align for a certain hull type
/// The value of a fixed col align for a certain hull type
static char colAlign(HullType type, col_type col);
/// The value of a fixed col spacing for a certain hull type
static int colSpace(HullType type, col_type col);

12
src/mathed/InsetMathHull.h
View File

@ -59,7 +59,7 @@ public:
mode_type currentMode() const;
///
void metrics(MetricsInfo & mi, Dimension & dim) const;
///
///
void drawBackground(PainterInfo & pi, int x, int y) const;
///
void draw(PainterInfo &, int x, int y) const;
@ -143,7 +143,7 @@ public:
///
bool readQuiet(Lexer & lex);
///
int plaintext(odocstringstream &, OutputParams const &,
int plaintext(odocstringstream &, OutputParams const &,
size_t max_length = INT_MAX) const;
///
int docbook(odocstream &, OutputParams const &) const;
@ -155,7 +155,7 @@ public:
void htmlize(HtmlStream &) const;
///
void mathAsLatex(WriteStream &) const;
///
///
void toString(odocstream &) const;
///
void forOutliner(docstring &, size_t const, bool const) const;
@ -177,7 +177,7 @@ public:
///
static int displayMargin() { return 12; }
/// Force inset into LTR environment if surroundings are RTL
virtual bool forceLTR() const { return true; }
///
@ -217,7 +217,7 @@ private:
/// If so, we ignore LyXRC and wait for the image to be generated.
void preparePreview(DocIterator const & pos,
bool forexport = false) const;
/// like reloadPreview, but forces load
/// like reloadPreview, but forces load
/// used by image export
void loadPreview(DocIterator const & pos) const;
///
@ -288,7 +288,7 @@ public:
///
bool editable() const { return true; }
///
void edit(Cursor & cur, bool front,
void edit(Cursor & cur, bool front,
EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
///
Inset * editXY(Cursor & cur, int x, int y);

2
src/mathed/InsetMathMatrix.h
View File

@ -24,7 +24,7 @@ namespace lyx {
class InsetMathMatrix : public InsetMathGrid {
public:
///
explicit InsetMathMatrix(InsetMathGrid const &,
explicit InsetMathMatrix(InsetMathGrid const &,
docstring const & left, docstring const & right);
/// identifies MatrixInsets
InsetMathMatrix const * asMatrixInset() const { return this; }

4
src/mathed/InsetMathNest.h
View File

@ -107,7 +107,7 @@ public:
///
bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
///
bool mouseHovered(BufferView const * bv) const
bool mouseHovered(BufferView const * bv) const
{ return mouse_hover_[bv]; }
///
@ -193,7 +193,7 @@ protected:
bool lock_;
///
mutable std::map<BufferView const *, bool> mouse_hover_;
};
};

4
src/mathed/InsetMathSideset.h
View File

@ -107,9 +107,9 @@ private:
/// Italic correction as described in InsetMathScript.h
int nker(BufferView const * bv) const;
/// Whether there are two left scripts or one single cell
bool scriptl_;
bool scriptl_;
/// Whether there are two right scripts or one single cell
bool scriptr_;
bool scriptr_;
};

2
src/mathed/InsetMathUnknown.h
View File

@ -35,7 +35,7 @@ public:
///
docstring const & selection() const { return selection_; }
/// identifies UnknownInsets
InsetMathUnknown const * asUnknownInset() const { return this; }
/// identifies UnknownInsets

10
src/mathed/MathData.h
View File

@ -198,18 +198,18 @@ private:
///
void detachMacroParameters(DocIterator * dit, const size_type macroPos);
///
void attachMacroParameters(Cursor * cur, const size_type macroPos,
void attachMacroParameters(Cursor * cur, const size_type macroPos,
const size_type macroNumArgs, const int macroOptionals,
const bool fromInitToNormalMode, const bool interactiveInit,
const size_t appetite);
///
void collectOptionalParameters(Cursor * cur,
const size_type numOptionalParams, std::vector<MathData> & params,
void collectOptionalParameters(Cursor * cur,
const size_type numOptionalParams, std::vector<MathData> & params,
size_t & pos, MathAtom & scriptToPutAround,
const pos_type macroPos, const int thisPos, const int thisSlice);
///
void collectParameters(Cursor * cur,
const size_type numParams, std::vector<MathData> & params,
void collectParameters(Cursor * cur,
const size_type numParams, std::vector<MathData> & params,
size_t & pos, MathAtom & scriptToPutAround,
const pos_type macroPos, const int thisPos, const int thisSlice,
const size_t appetite);

12
src/mathed/MathMacroTemplate.h
View File

@ -30,7 +30,7 @@ public:
MathMacroTemplate(Buffer * buf);
///
MathMacroTemplate(Buffer * buf, docstring const & name, int nargs,
int optional, MacroType type,
int optional, MacroType type,
std::vector<MathData> const & optionalValues = std::vector<MathData>(),
MathData const & def = MathData(),
MathData const & display = MathData());
@ -79,10 +79,10 @@ public:
bool validMacro() const;
///
bool validName() const;
/// Remove everything from the name which makes it invalid
/// Remove everything from the name which makes it invalid
/// and return true iff it is valid.
bool fixNameAndCheckIfValid();
/// request "external features"
virtual void validate(LaTeXFeatures &) const;
@ -116,7 +116,7 @@ protected:
private:
friend class InsetLabelBox;
friend class DisplayLabelBox;
///
virtual Inset * clone() const;
@ -127,7 +127,7 @@ private:
void shiftArguments(size_t from, int by);
///
void insertParameter(Cursor & cur, DocIterator const & inset_pos,
int pos, bool greedy = false, bool addarg = true);
int pos, bool greedy = false, bool addarg = true);
///
void removeParameter(Cursor & cur, DocIterator const & inset_pos,
int pos, bool greedy = false);
@ -160,7 +160,7 @@ private:
mutable int argsInLook_;
///
int optionals_;
/// keeps the old optional default value when an
/// keeps the old optional default value when an
/// optional argument is disabled
std::vector<MathData> optionalValues_;

2
src/mathed/MathStream.h
View File

@ -302,7 +302,7 @@ private:
class MTag {
public:
///
MTag(char const * const tag, std::string attr = "")
MTag(char const * const tag, std::string attr = "")
: tag_(tag), attr_(attr) {}
///
char const * const tag_;

4
src/support/AppleScript.h
View File

@ -12,7 +12,7 @@
#ifndef LYX_SUPPORT_APPLESCRIPT_H
#define LYX_SUPPORT_APPLESCRIPT_H
#ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
#endif
/// What is returned by applescript_execute_command
@ -25,7 +25,7 @@ extern "C" {
/// Sets up apple script support
void setupApplescript();
#ifdef __cplusplus
#ifdef __cplusplus
}
#endif

2
src/support/ConsoleApplication.h
View File

@ -24,7 +24,7 @@ class ConsoleApplicationPrivate;
There should be only one instance of this class. No Qt object
initialisation should be done before the instantiation of this class.
This class could be moved to src/frontends/console in the future.
This would make sense if more console app related code is created.
This would make sense if more console app related code is created.
*/
class ConsoleApplication
{

4
src/support/ExceptionMessage.h
View File

@ -27,7 +27,7 @@ namespace support {
///
/// WarningException
/// Intended for unexpected situations that we do not expect
/// to compromise further operation. It has the effect of
/// to compromise further operation. It has the effect of
/// aborting whatever operation in in process.
///
/// BufferException
@ -36,7 +36,7 @@ namespace support {
/// closed, in emergency style.
///
/// ErrorException
/// Intended for situations that indicate a global problem
/// Intended for situations that indicate a global problem
/// with the program. It will lead to an emergency shutdown.
enum ExceptionType {

10
src/support/FileName.h
View File

@ -119,7 +119,7 @@ public:
bool isDirWritable() const;
/// \return list other files in the directory having optional extension 'ext'.
FileNameList dirList(std::string const & ext) const;
/// copy a file
/// \return true when file/directory is writable (write test file)
/// \warning This methods has different semantics when system level
@ -201,10 +201,10 @@ public:
/// change to a directory, return success
bool chdir() const;
/// \param buffer_path if empty, uses `pwd`
docstring const relPath(std::string const & path) const;
docstring const absoluteFilePath() const;
private:
@ -265,7 +265,7 @@ public:
std::string relFileName(std::string const & buffer_path = empty_string()) const;
/// \param buf_path if empty, uses `pwd`
std::string outputFileName(std::string const & buf_path = empty_string()) const;
/** @returns a mangled representation of the absolute file name
* suitable for use in the temp dir when, for example, converting
* an image file to another format.
@ -299,7 +299,7 @@ private:
};
/// \return true if these have the same absolute path name AND
/// \return true if these have the same absolute path name AND
/// if save_abs_path_ has the same value in both cases.
bool operator==(DocFileName const &, DocFileName const &);
///

8
src/support/SystemcallPrivate.h
View File

@ -24,7 +24,7 @@ class Systemcall;
/**
* Outputs to the console terminal the line buffered standard output and
* error of a spawned process when there is a controlling terminal and
* error of a spawned process when there is a controlling terminal and
* stdout/stderr have not been redirected.
*/
class SystemcallPrivate : public QObject
@ -47,14 +47,14 @@ public:
bool waitWhile(State, bool processEvents, int timeout = -1);
void startProcess(QString const & cmd, std::string const & path,
std::string const & lpath, bool detach);
int exitCode();
QString errorMessage() const;
QString exitStatusMessage() const;
QProcess* releaseProcess();
static void killProcess(QProcess * p);
@ -93,7 +93,7 @@ private:
void waitAndProcessEvents();
void processEvents();
void killProcess();
void killProcess();
};

6
src/support/debug.h
View File

@ -110,7 +110,7 @@ namespace Debug {
/// Return number of levels
int levelCount();
/// A function to convert debug level string names numerical values
Type value(std::string const & val);
@ -144,7 +144,7 @@ class LyXErr
public:
LyXErr(): dt_(Debug::NONE), stream_(0), enabled_(true),
second_stream_(0), second_enabled_(false) {}
/// Disable the stream completely
void disable();
/// Enable the stream after a possible call of disable()
@ -165,7 +165,7 @@ public:
/// Returns second stream
std::ostream & secondStream() { return *second_stream_; }
/// Sets second stream
void setSecondStream(std::ostream * os)
void setSecondStream(std::ostream * os)
{ second_enabled_ = (second_stream_ = os); }
/// Is the second stream is enabled?
bool secondEnabled() { return second_enabled_; }

8
src/support/lassert.h
View File

@ -31,15 +31,15 @@ LATTEST(expr)
This macro should be used when one just wants to test expr. If devel mode,
this will lead to an assertion. In release mode, we will simply continue. So
LATTEST should be used only if you know, in advance, that it will be safe to
continue with the usual program flow, but failure of expr still means that
continue with the usual program flow, but failure of expr still means that
there is something that needs to be fixed.
LASSERT(expr, escape)
This macro should be used when a failure of expr is not compatible with
This macro should be used when a failure of expr is not compatible with
continuing the ordinary program flow, but is something from which we can
recover. This might mean simply returning early from some routine; it might
mean resetting some variables to values known to be sane; it might mean
taking some other corrective action.
taking some other corrective action.
LWARNIF(expr)
This macro should be used when a failure of expr indicates that the current
@ -56,7 +56,7 @@ LAPPERR(expr)
This macro should be used if a failure of expr is incompatible with LyX
continuing to operate at all. In release mode, this issues an ErrorException,
which typically results in an emergency shutdown.
******************************************************************************/

36
src/support/linkback/LinkBack.h
View File

@ -6,30 +6,30 @@
// Copyright (c) 2004, Nisus Software, Inc.
// All rights reserved.
// Redistribution and use in source and binary forms, with or without
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// Redistributions of source code must retain the above copyright notice,
// Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
//
// Neither the name of the Nisus Software, Inc. nor the names of its
// contributors may be used to endorse or promote products derived from this
// Neither the name of the Nisus Software, Inc. nor the names of its
// contributors may be used to endorse or promote products derived from this
// software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
@ -50,7 +50,7 @@ NSString* LinkBackUniqueItemKey() ;
NSString* LinkBackEditMultipleMenuTitle() ;
NSString* LinkBackEditNoneMenuTitle() ;
//
//
// Deprecated Support Functions -- use LinkBack Data Category instead
//
id MakeLinkBackData(NSString* serverName, id appData) ;
@ -110,10 +110,10 @@ BOOL LinkBackDataBelongsToActiveApplication(id data) ;
@interface LinkBack : NSObject <LinkBack> {
LinkBack* peer ; // the client or server on the other side.
BOOL isServer ;
BOOL isServer ;
id delegate ;
NSPasteboard* pboard ;
id repobj ;
id repobj ;
NSString* sourceName ;
NSString* sourceApplicationName ;
NSString* key ;

32
src/support/linkback/LinkBackServer.h
View File

@ -6,30 +6,30 @@
// Copyright (c) 2004, Nisus Software, Inc.
// All rights reserved.
// Redistribution and use in source and binary forms, with or without
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// Redistributions of source code must retain the above copyright notice,
// Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
//
// Neither the name of the Nisus Software, Inc. nor the names of its
// contributors may be used to endorse or promote products derived from this
// Neither the name of the Nisus Software, Inc. nor the names of its
// contributors may be used to endorse or promote products derived from this
// software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
@ -57,7 +57,7 @@ NSString* MakeLinkBackServerName(NSString* bundleIdentifier, NSString* name) ;
+ (LinkBackServer*)LinkBackServerWithName:(NSString*)name inApplication:(NSString*)bundleIdentifier launchIfNeeded:(BOOL)flag fallbackURL:(NSURL*)url appName:(NSString*)appName ;
// This method is used by clients to connect
// This method is used by clients to connect
- (id)initWithName:(NSString*)name delegate:(id<LinkBackServerDelegate>)aDel;

Some files were not shown because too many files have changed in this diff Show More