anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cosmetics. And silence some warnings.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23110 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-02-21 20:04:17 +00:00
parent 4c5c14ff62
commit dde5b63fd5
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,12 +75,12 @@ public:
GuiCompletionModel(QObject * parent, Inset::CompletionListPtr l)
: QAbstractListModel(parent), list(l) {}
///
int columnCount(const QModelIndex & parent = QModelIndex()) const
int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const
{
return 2;
}
///
int rowCount(const QModelIndex & parent = QModelIndex()) const
int rowCount(const QModelIndex & /*parent*/ = QModelIndex()) const
{
if (list.get() == 0)
return 0;
@ -248,12 +248,12 @@ void GuiCompleter::updateVisibility(Cursor & cur, bool start, bool keep, bool cu
// we inserted something and are in a possible popup state?
if (!popupVisible() && possiblePopupState && start
&& cur.inset().automaticPopupCompletion())
popup_timer_.start(lyxrc.completion_popup_delay * 1000.0);
popup_timer_.start(int(lyxrc.completion_popup_delay * 1000));
// we inserted something and are in a possible inline completion state?
if (!inlineVisible() && possibleInlineState && start
&& cur.inset().automaticInlineCompletion())
inline_timer_.start(lyxrc.completion_inline_delay * 1000.0);
inline_timer_.start(int(lyxrc.completion_inline_delay * 1000));
// update prefix if popup is visible or if it will be visible soon
if (popupVisible() || inlineVisible()

20
src/insets/Inset.h
View File

@ -295,7 +295,7 @@ public:
/// returns the string shown in the gui.
virtual docstring data(size_t idx) const =0;
/// returns the resource string used to load an icon.
virtual std::string icon(size_t idx) const { return std::string(); }
virtual std::string icon(size_t /*idx*/) const { return std::string(); }
};
typedef boost::shared_ptr<CompletionList> CompletionListPtr;
@ -304,7 +304,8 @@ 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 { return false; }
virtual bool inlineCompletionSupported(Cursor const & /*cur*/) const
{ return false; }
/// Return true if the inline completion should be automatic.
virtual bool automaticInlineCompletion() const { return true; }
/// Return true if the popup completion should be automatic.
@ -312,20 +313,21 @@ public:
/// Returns completion suggestions at cursor position. Return an
/// null pointer if no completion is a available or possible.
virtual CompletionListPtr completionList(Cursor const &) const
{
return CompletionListPtr();
}
{ return CompletionListPtr(); }
/// Returns the completion prefix to filter the suggestions for completion.
/// This is only called if completionList returned a non-null list.
virtual docstring completionPrefix(Cursor const &) const { return docstring(); }
virtual docstring completionPrefix(Cursor const &) const
{ return docstring(); }
/// Do a completion at the cursor position. Return true on success.
/// 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) { return false; }
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, Dimension & dim) const {}
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; }