anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-13 20:09:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build fixes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4869 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-08-06 00:54:20 +00:00
parent f2206522a9
commit 7072a496e2
15 changed files with 44 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2002-08-06 John Levon <levon@movementarian.org>
* lyxfunc.C:
* kbmap.C: small cleanup
* vspace.h:
* vspace.C: add const
2002-08-05 John Levon <levon@movementarian.org>
* LyXAction.C: back to tabular-insert

9
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,12 @@
2002-08-06 John Levon <levon@movementarian.org>
* ui/QSpellcheckerDialogBase.ui:
* QSpellcheckerDialog.h:
* QSpellchecker.h:
* QSpellchecker.C: remove options()
* QtView.C: fix build
2002-07-31 John Levon <levon@movementarian.org>
* io_callback.h: make a more proper class

4
src/frontends/qt2/QLPainter.C
View File

@ -117,7 +117,7 @@ Painter & QLPainter::lines(int const * xp, int const * yp,
// FIXME ?
// Must use new as np is not known at compile time.
boost::scoped_array<QCOORD> points(new QCOORD [np * 2]);
boost::scoped_array<QCOORD> points(new QCOORD[np * 2]);
int j = 0;
@ -158,7 +158,7 @@ Painter & QLPainter::fillPolygon(int const * xp, int const * yp,
// FIXME ?
// Must use new as np is not known at compile time.
boost::scoped_array<QCOORD> points(new QCOORD [np * 2]);
boost::scoped_array<QCOORD> points(new QCOORD[np * 2]);
int j = 0;

3
src/frontends/qt2/QParagraphDialog.C
View File

@ -67,6 +67,3 @@ void QParagraphDialog::enableLinespacingValue(int)
bool const enable = linespacing->currentItem()==4;
linespacingValue->setEnabled(enable);
}

6
src/frontends/qt2/QSpellchecker.C
View File

@ -70,12 +70,6 @@ void QSpellchecker::replace()
}
void QSpellchecker::options()
{
controller().options();
}
void QSpellchecker::spellcheck()
{
controller().check();

1
src/frontends/qt2/QSpellchecker.h
View File

@ -35,7 +35,6 @@ private:
void add();
void ignore();
void replace();
void options();
void spellcheck();
/// Apply changes

3
src/frontends/qt2/QSpellcheckerDialog.h
View File

@ -40,9 +40,6 @@ protected slots:
virtual void ignoreClicked() {
form_->ignore();
}
virtual void optionsClicked() {
form_->options();
}
virtual void suggestionChanged(const QString &);
virtual void replaceChanged(const QString &);

4
src/frontends/qt2/QtView.C
View File

@ -111,13 +111,13 @@ void QtView::focus_command_widget()
void QtView::update_view_state_qt()
{
statusBar()->message(currentState(view()).c_str());
statusBar()->message(currentState(view().get()).c_str());
}
void QtView::update_view_state()
{
statusBar()->message(currentState(view()).c_str());
statusBar()->message(currentState(view().get()).c_str());
}

1
src/frontends/qt2/lengthcombo.C
View File

@ -16,6 +16,7 @@
LengthCombo::LengthCombo(QWidget * parent, char * name)
: QComboBox(parent, name)
{
// FIXME: check these should all be here, I think not
insertItem(_("cm"));
insertItem(_("in"));
insertItem(_("pt"));

2
src/frontends/qt2/lengthcombo.h
View File

@ -38,4 +38,4 @@ signals:
};
#endif
#endif // LENGTHCOMBO_H

34
src/frontends/qt2/ui/QSpellcheckerDialog.ui
View File

@ -13,7 +13,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>314</width>
<width>310</width>
<height>379</height>
</rect>
</property>
@ -105,17 +105,6 @@
<string>Accept word for this session</string>
</property>
</widget>
<widget row="10" column="0" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>optionsPB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Options...</string>
</property>
</widget>
<spacer row="10" column="1" >
<property>
<name>name</name>
@ -238,6 +227,13 @@
<name>name</name>
<cstring>replaceCO</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
<name>focusPolicy</name>
<enum>StrongFocus</enum>
@ -258,13 +254,6 @@
<name>duplicatesEnabled</name>
<bool>false</bool>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property>
<name>toolTip</name>
<string>Replace with selected word</string>
@ -324,12 +313,6 @@
<receiver>QSpellcheckerDialogBase</receiver>
<slot>addClicked()</slot>
</connection>
<connection>
<sender>optionsPB</sender>
<signal>clicked()</signal>
<receiver>QSpellcheckerDialogBase</receiver>
<slot>optionsClicked()</slot>
</connection>
<connection>
<sender>spellcheckPB</sender>
<signal>clicked()</signal>
@ -354,7 +337,6 @@
<tabstop>ignorePB</tabstop>
<tabstop>replacePB_3</tabstop>
<tabstop>addPB</tabstop>
<tabstop>optionsPB</tabstop>
<tabstop>closePB</tabstop>
</tabstops>
</UI>

5
src/kbmap.C
View File

@ -78,7 +78,7 @@ int kb_keymap::lookup(LyXKeySymPtr key,
key_modifier::state check =
static_cast<key_modifier::state>(mod & ~mask);
if (*(cit->code) == *(key) && cit->mod.first == check) {
if (*(cit->code) == *key && cit->mod.first == check) {
// match found
if (cit->table.get()) {
// this is a prefix key - set new map
@ -115,7 +115,8 @@ string const kb_keymap::print() const
void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
{
LyXKeySymPtr code = seq->sequence[r];
if ( ! code->isOK() ) return;
if (!code->isOK())
return;
key_modifier::state const mod1 = seq->modifiers[r].first;
key_modifier::state const mod2 = seq->modifiers[r].second;

17
src/lyxfunc.C
View File

@ -215,11 +215,10 @@ void LyXFunc::processKeySym(LyXKeySymPtr keysym,
if ((action != LFUN_CANCEL) && (action != LFUN_META_FAKE)) {
// remove Caps Lock and Mod2 as a modifiers
action = keyseq.addkey(keysym, (state | meta_fake_bit));
if (lyxerr.debugging(Debug::KEY)) {
lyxerr << "action now set to ["
<< action << "]" << endl;
}
lyxerr[Debug::KEY] << "action now set to ["
<< action << "]" << endl;
}
// Dont remove this unless you know what you are doing.
meta_fake_bit = key_modifier::none;
@ -248,11 +247,10 @@ void LyXFunc::processKeySym(LyXKeySymPtr keysym,
// the modifiers? (Lgb)
action = keyseq.addkey(keysym, key_modifier::none);
if (lyxerr.debugging(Debug::KEY)) {
lyxerr << "Removing modifiers...\n"
<< "Action now set to ["
<< action << "]" << endl;
}
lyxerr[Debug::KEY] << "Removing modifiers...\n"
<< "Action now set to ["
<< action << "]" << endl;
if (action == LFUN_UNKNOWN_ACTION) {
owner->message(_("Unknown function."));
return;
@ -260,7 +258,6 @@ void LyXFunc::processKeySym(LyXKeySymPtr keysym,
}
if (action == LFUN_SELFINSERT) {
// This is very X dependent.
char c = keysym->getISOEncoded();
string argument;

2
src/vspace.C
View File

@ -470,7 +470,7 @@ string const VSpace::asLatexCommand(BufferParams const & params) const
int VSpace::inPixels(BufferView * bv) const
int VSpace::inPixels(BufferView const * bv) const
{
// Height of a normal line in pixels (zoom factor considered)
int const default_height = bv->text->defaultHeight(); // [pixels]

4
src/vspace.h
View File

@ -66,7 +66,7 @@ public:
/// the latex representation
string const asLatexCommand(BufferParams const & params) const;
/// the size of the space on-screen
int inPixels(BufferView * bv) const;
int inPixels(BufferView const * bv) const;
private:
/// This VSpace kind
vspace_kind kind_;
@ -76,4 +76,4 @@ private:
bool keep_;
};
#endif
#endif // VSPACE_H