anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-21 17:51:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix doxygen operation ; stop #warning causing errors on Sun CC 6.0

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1919 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Allan Rae 2001-04-17 00:19:49 +00:00
parent 2b8fe23472
commit 4e61c013f4
31 changed files with 150 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2001-04-15 Allan Rae <rae@lyx.org>
* Makefile.am (sourcedoc/Doxyfile): ensure modifications to doxygen
configuration file take effect.
(DISTCLEANFILES): clean out sourcedoc/
* sourcedoc/Doxyfile.in(FILE_PATTERNS): make sure we only filter
things that should be filtered. Now you can run it after you started
compiling stuff as well.
2001-03-29 Angus Leeming <a.leeming@ic.ac.uk>
* configure.in: changed AC_INIT(src/lyx.C) to AC_INIT(src/main.C)

12
Makefile.am
View File

@ -1,8 +1,10 @@
AUTOMAKE_OPTIONS = foreign
DISTCLEANFILES= *.orig *.rej *~ *.bak lyx.1 core
DISTCLEANFILES = -r *.orig *.rej *~ *.bak lyx.1 core $(srcdir)/sourcedoc/*~ \
$(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
$(srcdir)/sourcedoc/man $(srcdir)/sourcedoc/Doxyfile
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
$(srcdir)/configure $(srcdir)/development/lyx.spec \
$(srcdir)/acinclude.m4
$(srcdir)/acinclude.m4 $(srcdir)/sourcedoc/Doxyfile
SUBDIRS = intl po sigc++ boost src lib
EXTRA_DIST = ANNOUNCE OLD-CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
@ -50,10 +52,14 @@ bindist:
@echo "*** $(bindistfile) has been created."
sourcedoc:
sourcedoc: sourcedoc/Doxyfile
cd sourcedoc; \
doxygen ./Doxyfile
sourcedoc/Doxyfile: sourcedoc/Doxyfile.in config.status
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
lgbtags:
etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*

60
po/POTFILES.in
View File

@ -10,8 +10,8 @@ src/CutAndPaste.C
src/debug.C
src/exporter.C
src/ext_l10n.h
src/figure_form.C
src/figureForm.C
src/figure_form.C
src/FontLoader.C
src/frontends/controllers/ButtonController.h
src/frontends/controllers/character.C
@ -90,67 +90,67 @@ src/frontends/qt2/paragraphdlgimpl.C
src/frontends/qt2/tabularcreatedlgimpl.C
src/frontends/xforms/combox.C
src/frontends/xforms/FileDialog.C
src/frontends/xforms/form_bibitem.C
src/frontends/xforms/FormBibitem.C
src/frontends/xforms/form_bibtex.C
src/frontends/xforms/form_bibitem.C
src/frontends/xforms/FormBibtex.C
src/frontends/xforms/form_bibtex.C
src/frontends/xforms/form_browser.C
src/frontends/xforms/form_character.C
src/frontends/xforms/FormCharacter.C
src/frontends/xforms/form_citation.C
src/frontends/xforms/form_character.C
src/frontends/xforms/FormCitation.C
src/frontends/xforms/form_copyright.C
src/frontends/xforms/form_citation.C
src/frontends/xforms/FormCopyright.C
src/frontends/xforms/form_credits.C
src/frontends/xforms/form_copyright.C
src/frontends/xforms/FormCredits.C
src/frontends/xforms/form_document.C
src/frontends/xforms/form_credits.C
src/frontends/xforms/FormDocument.C
src/frontends/xforms/form_error.C
src/frontends/xforms/form_document.C
src/frontends/xforms/FormError.C
src/frontends/xforms/form_external.C
src/frontends/xforms/form_error.C
src/frontends/xforms/FormExternal.C
src/frontends/xforms/form_filedialog.C
src/frontends/xforms/form_external.C
src/frontends/xforms/FormFiledialog.C
src/frontends/xforms/form_graphics.C
src/frontends/xforms/form_filedialog.C
src/frontends/xforms/FormGraphics.C
src/frontends/xforms/form_include.C
src/frontends/xforms/form_graphics.C
src/frontends/xforms/FormInclude.C
src/frontends/xforms/form_index.C
src/frontends/xforms/form_include.C
src/frontends/xforms/FormIndex.C
src/frontends/xforms/form_index.C
src/frontends/xforms/FormLog.C
src/frontends/xforms/FormMathsBitmap.C
src/frontends/xforms/form_maths_deco.C
src/frontends/xforms/FormMathsDeco.C
src/frontends/xforms/form_maths_delim.C
src/frontends/xforms/form_maths_deco.C
src/frontends/xforms/FormMathsDelim.C
src/frontends/xforms/form_maths_matrix.C
src/frontends/xforms/form_maths_delim.C
src/frontends/xforms/FormMathsMatrix.C
src/frontends/xforms/form_maths_panel.C
src/frontends/xforms/form_maths_matrix.C
src/frontends/xforms/FormMathsPanel.C
src/frontends/xforms/form_maths_space.C
src/frontends/xforms/form_maths_panel.C
src/frontends/xforms/FormMathsSpace.C
src/frontends/xforms/form_minipage.C
src/frontends/xforms/form_maths_space.C
src/frontends/xforms/FormMinipage.C
src/frontends/xforms/form_paragraph.C
src/frontends/xforms/form_minipage.C
src/frontends/xforms/FormParagraph.C
src/frontends/xforms/form_preamble.C
src/frontends/xforms/form_paragraph.C
src/frontends/xforms/FormPreamble.C
src/frontends/xforms/form_preferences.C
src/frontends/xforms/form_preamble.C
src/frontends/xforms/FormPreferences.C
src/frontends/xforms/form_print.C
src/frontends/xforms/form_preferences.C
src/frontends/xforms/FormPrint.C
src/frontends/xforms/form_ref.C
src/frontends/xforms/form_print.C
src/frontends/xforms/FormRef.C
src/frontends/xforms/form_search.C
src/frontends/xforms/form_ref.C
src/frontends/xforms/FormSearch.C
src/frontends/xforms/form_tabular.C
src/frontends/xforms/form_search.C
src/frontends/xforms/FormTabular.C
src/frontends/xforms/form_tabular_create.C
src/frontends/xforms/form_tabular.C
src/frontends/xforms/FormTabularCreate.C
src/frontends/xforms/form_toc.C
src/frontends/xforms/form_tabular_create.C
src/frontends/xforms/FormToc.C
src/frontends/xforms/form_url.C
src/frontends/xforms/form_toc.C
src/frontends/xforms/FormUrl.C
src/frontends/xforms/form_url.C
src/frontends/xforms/FormVCLog.C
src/frontends/xforms/input_validators.C
src/frontends/xforms/Menubar_pimpl.C

2
sourcedoc/Doxyfile.in
View File

@ -251,7 +251,7 @@ INPUT = @top_srcdir@/src
# and *.h) to filter out the source-files in the directories. If left
# blank all files are included.
FILE_PATTERNS =
FILE_PATTERNS = *.C *.h *.c
# The RECURSIVE tag can be used to turn specify whether or not subdirectories
# should be searched for input files as well. Possible values are YES and NO.

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2001-04-16 Allan Rae <rae@lyx.org>
* tabular-old.C (l_getline):
* spellchecker.C (sc_check_word):
* lyxfunc.C (Dispatch): #warning triggers an error on Sun CC 6.0 as
an unrecognised preprocessor directive. So ensure they're wrapped.
2001-04-14 Dekel Tsur <dekelts@tau.ac.il>
* src/exporter.C (Export): Give an error message when path to file

7
src/frontends/gnome/ChangeLog
View File

@ -1,3 +1,10 @@
2001-04-16 Allan Rae <rae@lyx.org>
* gnomeBC.C (setButtonLabel):
* Menubar_pimpl.C (updateAllLists):
* GnomeBase.C (loadXML): #warning triggers an error on Sun CC 6.0 as
an unrecognised preprocessor directive. So ensure they're wrapped.
2001-04-03 Baruch Even <baruch@lyx.org>
* FileDialog.C: Added file to provide the gnome file dialog.

2
src/frontends/gnome/GnomeBase.C
View File

@ -37,7 +37,9 @@ GnomeBase::~GnomeBase()
void GnomeBase::loadXML() const
{
#ifdef WITH_WARNINGS
#warning Change this before declaring it production code! (be 20010325)
#endif
string const path("src/frontends/gnome/dialogs/;frontends/gnome/dialogs/;/home/baruch/prog/lyx/graphics/src/frontends/gnome/dialogs/");
string const file = FileOpenSearch(path, file_, "glade");

2
src/frontends/gnome/Menubar_pimpl.C
View File

@ -92,7 +92,9 @@ void Menubar::Pimpl::set(string const & menu_name)
void Menubar::Pimpl::updateAllLists()
{
#ifdef WITH_WARNINGS
#warning Implement me! (be 20010324)
#endif
#if 0
// update lists
if (toc_.size() > 0)

2
src/frontends/gnome/gnomeBC.C
View File

@ -29,7 +29,9 @@ void gnomeBC::setButtonEnabled(Gtk::Button * btn, bool enabled)
void gnomeBC::setButtonLabel(Gtk::Button * obj, string const & label)
{
#ifdef WITH_WARNINGS
#warning Implement me! (be 20010329)
#endif
// There is no methods set_text!
//obj->set_text(label);
}

6
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,9 @@
2001-04-16 Allan Rae <rae@lyx.org>
* xforms_helpers.C (formatted):
* Menubar_pimpl.C (add_toc): #warning triggers an error on Sun CC 6.0
as an unrecognised preprocessor directive. So ensure they're wrapped.
2001-04-06 John Levon <moz@compsoc.man.ac.uk>
* FormTabularCreate.C: pass a pair of uints to the controller

2
src/frontends/xforms/Menubar_pimpl.C
View File

@ -370,7 +370,9 @@ void Menubar::Pimpl::add_toc(int menu, string const & extra_label,
add_toc2(menu, extra_label, smn, win,
toc_list[0], 0, toc_list[0].size(), 0);
#else
#ifdef WITH_WARNINGS
#warning Fix Me! (Lgb)
#endif
Buffer::Lists toc_list = owner_->buffer()->getLists();
Buffer::Lists::const_iterator cit = toc_list.begin();
Buffer::Lists::const_iterator end = toc_list.end();

2
src/frontends/xforms/xforms_helpers.C
View File

@ -38,7 +38,9 @@ void setEnabled(FL_OBJECT * ob, bool enable)
// Take a string and add breaks so that it fits into a desired label width, w
string formatted(string const & sin, int w, int size, int style)
{
#ifdef WITH_WARNINGS
#warning Why cant this be done by a one pass algo? (Lgb)
#endif
string sout;
if (sin.empty()) return sout;

6
src/graphics/ChangeLog
View File

@ -1,3 +1,9 @@
2001-04-16 Allan Rae <rae@lyx.org>
* ImageLoaderXPM.C (runImageLoader): #warning triggers an error on Sun
CC 6.0 as an unrecognised preprocessor directive. So ensure they're
wrapped.
2001-04-02 Baruch Even <baruch@lyx.org>
* GraphicsCacheItem.[Ch]: Changed to used the Converter class instead

2
src/graphics/ImageLoaderXPM.C
View File

@ -62,7 +62,9 @@ ImageLoaderXPM::runImageLoader(string const & filename)
Display * display = fl_get_display();
//(BE 2000-08-05)
#ifdef WITH_WARNINGS
#warning This might be a dirty thing, but I dont know any other solution.
#endif
Screen * screen = ScreenOfDisplay(display, fl_screen);
Pixmap pixmap;

11
src/insets/ChangeLog
View File

@ -1,3 +1,14 @@
2001-04-16 Allan Rae <rae@lyx.org>
* insettoc.C (Ascii):
* insettext.C (draw):
* insettabular.C (setPos):
* insetminipage.C (Read):
* insetfloat.C (placement):
* insetcaption.C (Ascii, DocBook):
* figinset.C (runqueue): #warning triggers an error on Sun CC 6.0 as
an unrecognised preprocessor directive. So ensure they're wrapped.
2001-04-13 Juergen Vigna <jug@sad.it>
* insettext.C: tried to avoid unneeded redraws.

2
src/insets/figinset.C
View File

@ -521,8 +521,10 @@ void runqueue()
t2 << "GHOSTVIEW=" << fl_get_canvas_id(figinset_canvas)
<< ' ' << p->data->bitmap;
// now set up ghostview property on a window
// #ifdef WITH_WARNINGS
// #warning BUG seems that the only bug here
// might be the hardcoded dpi.. Bummer!
// #endif
ostringstream t1;
t1 << "0 0 0 0 " << p->data->wid << ' '
<< p->data->hgh << " 72 72 0 0 0 0";

4
src/insets/insetcaption.C
View File

@ -114,13 +114,17 @@ int InsetCaption::Latex(Buffer const * buf, ostream & os,
int InsetCaption::Ascii(Buffer const * /*buf*/,
ostream & /*os*/, int /*linelen*/) const
{
#ifdef WITH_WARNINGS
#warning Implement me!
#endif
return 0;
}
int InsetCaption::DocBook(Buffer const * /*buf*/, ostream & /*os*/) const
{
#ifdef WITH_WARNINGS
#warning Implement me!
#endif
return 0;
}

2
src/insets/insetfloat.C
View File

@ -230,7 +230,9 @@ void InsetFloat::placement(string const & p)
{
// Here we should only allow the placement to be set
// if a valid value.
#ifdef WITH_WARNINGS
#warning FIX!
#endif
floatPlacement_ = p;
}

2
src/insets/insetminipage.C
View File

@ -149,7 +149,9 @@ void InsetMinipage::Read(Buffer const * buf, LyXLex & lex)
<< endl;
}
}
#ifdef WITH_WARNINGS
#warning Remove me before final 1.2.0 (Jug)
#endif
// this is only for compatibility to the intermediate format and should
// vanish till the final 1.2.0!
if (lex.IsOK()) {

2
src/insets/insettabular.C
View File

@ -1236,7 +1236,9 @@ void InsetTabular::setPos(BufferView * bv, int x, int y) const
int lx = tabular->GetWidthOfColumn(actcell) -
tabular->GetAdditionalWidth(actcell);
#if 0
#ifdef WITH_WARNINGS
#warning Jürgen, can you rewrite this to _not_ use the sequencing operator. (Lgb)
#endif
for (; !tabular->IsLastCellInRow(actcell) && (lx < x);
++actcell,lx += tabular->GetWidthOfColumn(actcell) +
tabular->GetAdditionalWidth(actcell - 1));

4
src/insets/insettext.C
View File

@ -384,8 +384,10 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
}
x += TEXT_TO_INSET_OFFSET;
#ifdef WITH_WARNINGS
#warning Jürgen, why is this a block of its own? (Lgb)
#warning because you told me to define variables only in local contest (Jug)!
#warning because you told me to define variables only in local context (Jug)!
#endif
{
int y = 0;
Row * row = TEXT(bv)->GetRowNearY(y);

2
src/insets/insettoc.C
View File

@ -71,7 +71,9 @@ int InsetTOC::Ascii(Buffer const * buffer, std::ostream & os, int) const
it != toc.end(); ++it)
os << string(4 * it->depth, ' ') << it->str << endl;
#else
#ifdef WITH_WARNINGS
#warning Fix Me! (Lgb)
#endif
string type;
string const cmdname = getCmdName();
if (cmdname == "tableofcontents" )

2
src/lyxfunc.C
View File

@ -999,7 +999,9 @@ string const LyXFunc::Dispatch(int ac,
owner->view()->allFloats(0,1);
break;
#else
#ifdef WITH_WARNINGS
#warning Find another implementation here (or another lyxfunc)!
#endif
#endif
case LFUN_HELP_COPYRIGHT:
owner->getDialogs()->showCopyright();

7
src/mathed/ChangeLog
View File

@ -1,3 +1,10 @@
2001-04-16 Allan Rae <rae@lyx.org>
* formula.C (Latex, getLabelList, LocalDispatch):
* math_parser.C (mathed_parse):
* math_parinset.C (Write): #warning triggers an error on Sun CC 6.0 as
an unrecognised preprocessor directive. So ensure they're wrapped.
2001-04-04 Lars Gullik Bjønnes <larsbj@birdstep.com>
* formula.C (draw): adjust for cursor_visible

8
src/mathed/formula.C
View File

@ -262,8 +262,10 @@ void InsetFormula::Write(Buffer const * buf, ostream & os) const
int InsetFormula::Latex(Buffer const *, ostream & os, bool fragile, bool) const
{
//#ifdef WITH_WARNINGS
//#warning Alejandro, the number of lines is not returned in this case
// This problem will disapear at 0.13.
//#endif
return mathed_write(par, os, fragile, label_);
}
@ -556,8 +558,10 @@ void InsetFormula::display(bool dspf)
vector<string> const InsetFormula::getLabelList() const
{
//#ifdef WITH_WARNINGS
//#warning This is dirty, I know. Ill clean it at 0.11
// Correction, the only way to clean this is with a new kernel: 0.13.
//#endif
vector<string> label_list;
@ -895,7 +899,9 @@ InsetFormula::LocalDispatch(BufferView * bv, kb_action action,
//BUG
// mt->SetNumbered(!mt->IsNumbered());
#ifdef WITH_WARNINGS
#warning This is a terrible hack! We should find a better solution.
#endif
while (mathcursor->getLabel() == MathedXIter::error_label) {
if (LocalDispatch(bv, LFUN_LEFT, string()) == FINISHED)
return DISPATCHED;
@ -1023,7 +1029,9 @@ InsetFormula::LocalDispatch(BufferView * bv, kb_action action,
string old_label = is_multiline(par->GetType())
? mathcursor->getLabel() : label_;
#ifdef WITH_WARNINGS
#warning This is a terrible hack! We should find a better solution.
#endif
// This is needed because in some positions
// mathcursor->cursor->crow is equal to 0, and therefore
// the label cannot be inserted.

2
src/mathed/math_parinset.C
View File

@ -296,7 +296,9 @@ void MathParInset::Write(ostream & os, bool fragile)
if (l) {
os << '\\' << l->name << ' ';
} else {
#ifdef WITH_WARNINGS
#warning this does not compile on gcc 2.97
#endif
//lyxerr << "Illegal symbol code[" << c
// << " " << str.end() - s << " " << data.fcode() << "]";
}

4
src/mathed/math_parser.C
View File

@ -134,7 +134,9 @@ enum lexcode_enum {
lexcode_enum lexcode[256];
#ifdef WITH_WARNINGS
#warning Replace with string
#endif
//char yytext[256];
array<char, 256> yytext;
int yylineno;
@ -626,7 +628,9 @@ void mathed_parse(MathedArray & array, unsigned flags = 0,
if (accent) {
data.insertInset(doAccent(bg), LM_TC_INSET);
} else {
#ifdef WITH_WARNINGS
#warning This is suspisious! (Lgb)
#endif
// it should not take a bool as second arg (Lgb)
data.insertInset(bg, true);
}

2
src/spellchecker.C
View File

@ -633,7 +633,9 @@ void sc_clean_up_after_error()
isp_result * sc_check_word(string const & word)
{
isp_result * result = new isp_result;
#ifdef WITH_WARNINGS
#warning Why isnt word_ok a bool? (Lgb)
#endif
int word_ok = pspell_manager_check(sc, word.c_str());
Assert(word_ok != -1);

5
src/support/ChangeLog
View File

@ -1,3 +1,8 @@
2001-04-16 Allan Rae <rae@lyx.org>
* tempname.C (make_tempfile): #warning triggers an error on Sun CC 6.0
as an unrecognised preprocessor directive. So ensure they're wrapped.
2001-03-15 Lars Gullik Bjønnes <larsbj@trylle.birdstep.com>
* several files: remove CXX_WORKING_NAMESPACES

2
src/support/tempname.C
View File

@ -25,9 +25,11 @@ int make_tempfile(char * templ)
::mktemp(templ);
return ::open(templ, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
#else
#ifdef WITH_WARNINGS
#warning FIX FIX FIX
#endif
#endif
#endif
}
} // namespace anon

2
src/tabular-old.C
View File

@ -125,7 +125,9 @@ bool getTokenValue(string const & str, const char * token, bool & flag)
inline
void l_getline(istream & is, string & str)
{
#ifdef WITH_WARNINGS
#warning old l_getline
#endif
getline(is, str);
while(str.empty())
getline(is, str);