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

Reduced header file includes somewhat

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2385 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Asger Ottar Alstrup 2001-07-29 15:34:18 +00:00
parent 45b15f7207
commit da76673568
50 changed files with 191 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sourcedoc/Doxyfile.in
View File

@ -45,7 +45,7 @@ OUTPUT_LANGUAGE = English
# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
EXTRACT_ALL = NO
EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
@ -121,12 +121,12 @@ CLASS_DIAGRAMS = YES
# If the SOURCE_BROWSER tag is set to YES then a list of source files will
# be generated. Documented entities will be cross-referenced with these sources.
SOURCE_BROWSER = NO
SOURCE_BROWSER = YES
# Setting the INLINE_SOURCES tag to YES will include the body
# of functions and classes directly in the documentation.
INLINE_SOURCES = NO
INLINE_SOURCES = YES
# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
# doxygen to hide any special comment blocks from generated source code
@ -307,7 +307,7 @@ INPUT_FILTER =
# of all compounds will be generated. Enable this if the project
# contains a lot of classes, structs, unions or interfaces.
ALPHABETICAL_INDEX = NO
ALPHABETICAL_INDEX = YES
# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
@ -591,7 +591,7 @@ PERL_PATH = /usr/bin/perl
# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
HAVE_DOT = NO
HAVE_DOT = YES
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
@ -636,7 +636,7 @@ DOT_PATH =
# the specified constraint. Beware that most browsers cannot cope with very
# large images.
MAX_DOT_GRAPH_WIDTH = 1024
MAX_DOT_GRAPH_WIDTH = 1280
# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
# (in pixels) of the graphs generated by dot. If a graph becomes larger than
@ -644,7 +644,7 @@ MAX_DOT_GRAPH_WIDTH = 1024
# the specified constraint. Beware that most browsers cannot cope with very
# large images.
MAX_DOT_GRAPH_HEIGHT = 1024
MAX_DOT_GRAPH_HEIGHT = 2000
#---------------------------------------------------------------------------
# Configuration::addtions related to the search engine

1
src/BufferView2.C
View File

@ -31,6 +31,7 @@
#include "language.h"
#include "gettext.h"
#include "undo_funcs.h"
#include "debug.h"
extern BufferList bufferlist;

2
src/BufferView_pimpl.C
View File

@ -17,6 +17,7 @@
#include "LyXView.h"
#include "commandtags.h"
#include "lyxfunc.h"
#include "debug.h"
#include "font.h"
#include "bufferview_funcs.h"
#include "TextCache.h"
@ -25,6 +26,7 @@
#include "lyxrc.h"
#include "intl.h"
#include "support/LAssert.h"
#include "support/lstrings.h"
#include "frontends/Dialogs.h"
#include "insets/insetbib.h"
#include "insets/insettext.h"

124
src/Bullet.C
View File

@ -19,6 +19,7 @@
#endif
#include "Bullet.h"
#include "support/LAssert.h"
/** The four LaTeX itemize environment default bullets
*/
@ -52,6 +53,104 @@ Bullet::Bullet(int f, int c, int s)
}
Bullet::Bullet(string const & t)
: font(MIN), character(MIN), size(MIN), user_text(1), text(t)
{
#ifdef ENABLE_ASSERTIONS
testInvariant();
#endif
}
void Bullet::setCharacter(int c)
{
if (c < MIN || c >= CHARMAX) {
character = MIN;
} else {
character = c;
}
user_text = 0;
#ifdef ENABLE_ASSERTIONS
testInvariant();
#endif
}
void Bullet::setFont(int f)
{
if (f < MIN || f >= FONTMAX) {
font = MIN;
} else {
font = f;
}
user_text = 0;
#ifdef ENABLE_ASSERTIONS
testInvariant();
#endif
}
void Bullet::setSize(int s)
{
if (s < MIN || s >= SIZEMAX) {
size = MIN;
} else {
size = s;
}
user_text = 0;
#ifdef ENABLE_ASSERTIONS
testInvariant();
#endif
}
void Bullet::setText(string const & t)
{
font = character = size = MIN;
user_text = 1;
text = t;
#ifdef ENABLE_ASSERTIONS
testInvariant();
#endif
}
int Bullet::getCharacter() const
{
return character;
}
int Bullet::getFont() const
{
return font;
}
int Bullet::getSize() const
{
return size;
}
Bullet & Bullet::operator=(Bullet const & b)
{
#ifdef ENABLE_ASSERTIONS
b.testInvariant();
#endif
font = b.font;
character = b.character;
size = b.size;
user_text = b.user_text;
text = b.text;
#ifdef ENABLE_ASSERTIONS
this->testInvariant();
#endif
return *this;
}
string const & Bullet::getText() const
{
if (user_text == 0) {
@ -267,3 +366,28 @@ string const Bullet::bulletEntry(short int f, short int c)
return BulletPanels[f][c];
}
#ifdef ENABLE_ASSERTIONS
void Bullet::testInvariant() const {
lyx::Assert(font >= MIN);
lyx::Assert(font < FONTMAX);
lyx::Assert(character >= MIN);
lyx::Assert(character < CHARMAX);
lyx::Assert(size >= MIN);
lyx::Assert(size < SIZEMAX);
lyx::Assert(user_text >= -1);
lyx::Assert(user_text <= 1);
// now some relational/operational tests
if (user_text == 1) {
lyx::Assert(font == -1 && (character == -1 && size == -1));
// Assert(!text.empty()); // this isn't necessarily an error
}
// else if (user_text == -1) {
// Assert(!text.empty()); // this also isn't necessarily an error
// }
// else {
// // user_text == 0
// Assert(text.empty()); // not usually true
// }
}
#endif

134
src/Bullet.h
View File

@ -21,8 +21,6 @@
#include "LString.h"
#include "support/LAssert.h"
///
class Bullet {
public:
@ -55,28 +53,7 @@ public:
protected:
#ifdef ENABLE_ASSERTIONS
///
void testInvariant() const {
lyx::Assert(font >= MIN);
lyx::Assert(font < FONTMAX);
lyx::Assert(character >= MIN);
lyx::Assert(character < CHARMAX);
lyx::Assert(size >= MIN);
lyx::Assert(size < SIZEMAX);
lyx::Assert(user_text >= -1);
lyx::Assert(user_text <= 1);
// now some relational/operational tests
if (user_text == 1) {
lyx::Assert(font == -1 && (character == -1 && size == -1));
// Assert(!text.empty()); // this isn't necessarily an error
}
// else if (user_text == -1) {
// Assert(!text.empty()); // this also isn't necessarily an error
// }
// else {
// // user_text == 0
// Assert(text.empty()); // not usually true
// }
}
void testInvariant() const;
#endif
private:
/**
@ -132,115 +109,6 @@ private:
};
/*----------------Inline Bullet Member Functions------------------*/
inline
Bullet::Bullet(string const & t)
: font(MIN), character(MIN), size(MIN), user_text(1), text(t)
{
#ifdef ENABLE_ASSERTIONS
testInvariant();
#endif
}
inline
void Bullet::setCharacter(int c)
{
if (c < MIN || c >= CHARMAX) {
character = MIN;
} else {
character = c;
}
user_text = 0;
#ifdef ENABLE_ASSERTIONS
testInvariant();
#endif
}
inline
void Bullet::setFont(int f)
{
if (f < MIN || f >= FONTMAX) {
font = MIN;
} else {
font = f;
}
user_text = 0;
#ifdef ENABLE_ASSERTIONS
testInvariant();
#endif
}
inline
void Bullet::setSize(int s)
{
if (s < MIN || s >= SIZEMAX) {
size = MIN;
} else {
size = s;
}
user_text = 0;
#ifdef ENABLE_ASSERTIONS
testInvariant();
#endif
}
inline
void Bullet::setText(string const & t)
{
font = character = size = MIN;
user_text = 1;
text = t;
#ifdef ENABLE_ASSERTIONS
testInvariant();
#endif
}
inline
int Bullet::getCharacter() const
{
return character;
}
inline
int Bullet::getFont() const
{
return font;
}
inline
int Bullet::getSize() const
{
return size;
}
inline
Bullet & Bullet::operator=(Bullet const & b)
{
#ifdef ENABLE_ASSERTIONS
b.testInvariant();
#endif
font = b.font;
character = b.character;
size = b.size;
user_text = b.user_text;
text = b.text;
#ifdef ENABLE_ASSERTIONS
this->testInvariant();
#endif
return *this;
}
/*-----------------End Bullet Member Functions-----------------*/
inline
bool operator!=(Bullet const & b1, Bullet const & b2)
{

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2001-07-29 Asger Alstrup Nielsen <alstrup@alstrup>
* *: Reduced header file dependencies all over.
2001-07-30 Baruch Even <baruch@lyx.org>
* buffer.C (readInset): Stop auto-converting InsetFig to InsetGraphics.

1
src/DepTable.C
View File

@ -21,6 +21,7 @@
#include "support/lyxlib.h"
#include "support/filetools.h"
#include <fstream>
#include "debug.h"
using std::make_pair;
using std::ofstream;

1
src/FontInfo.C
View File

@ -19,6 +19,7 @@
#include "debug.h"
#include "lyxrc.h" // lyxrc.use_scalable_fonts
#include "support/lstrings.h"
#include "support/lyxlib.h"
#include "frontends/GUIRunTime.h"
using std::endl;

1
src/LColor.h
View File

@ -18,7 +18,6 @@
#include <map>
#include "LString.h"
#include <boost/utility.hpp>
/**
This is a stateless class.

1
src/LyXSendto.C
View File

@ -10,6 +10,7 @@
#include "buffer.h"
#include "lyx_gui_misc.h"
#include "support/syscall.h"
#include "support/lstrings.h"
#include "gettext.h"
#include "bufferview_funcs.h"
#include "exporter.h"

2
src/LyXView.h
View File

@ -12,7 +12,7 @@
#include "LString.h"
#include "frontends/Timeout.h"
#include "layout.h"
#include "layout.h" // Just for LyXTextClass::size_type (sic)
class Buffer;
class Toolbar;

1
src/MenuBackend.C
View File

@ -15,6 +15,7 @@
#pragma implementation
#endif
#include <algorithm>
#include "MenuBackend.h"
#include "lyxlex.h"
#include "LyXAction.h"

1
src/TextCache.C
View File

@ -21,6 +21,7 @@
#include "TextCache.h"
#include "buffer.h"
#include "bufferlist.h"
#include "debug.h"
using std::ostream;
using std::for_each;

1
src/bufferlist.C
View File

@ -28,6 +28,7 @@
#include "support/filetools.h"
#include "support/lyxmanip.h"
#include "support/lyxfunctional.h"
#include "support/LAssert.h"
#include "lyx_gui_misc.h"
#include "lastfiles.h"
#include "debug.h"

5
src/bufferlist.h
View File

@ -18,8 +18,9 @@
#pragma interface
#endif
#include "buffer.h"
#include "debug.h"
class Buffer;
class UpdatableInset;
#include <vector>
#include <boost/utility.hpp>
/** A class to hold all the buffers in a structure

5
src/commandtags.h
View File

@ -12,11 +12,6 @@
#include <iosfwd>
#if 1
// For NO_LATEX
#include "lyxfont.h"
#endif
/** These are all the lyxfunctions (as enums).
Please add new functions at the end of the enum, right
before LFUN_LASTACTION.

1
src/converter.C
View File

@ -30,6 +30,7 @@
#include "support/lyxfunctional.h"
#include "gettext.h"
#include "BufferView.h"
#include "debug.h"
using std::vector;
using std::queue;

1
src/frontends/controllers/ControlDialogs.h
View File

@ -49,7 +49,6 @@ protected:
#include "LyXView.h"
#include "BufferView.h"
template <class Base>
ControlDialog<Base>::ControlDialog(LyXView & lv, Dialogs & d)

1
src/frontends/controllers/ControlExternal.C
View File

@ -30,6 +30,7 @@
#include "Liason.h"
#include "LyXView.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include "frontends/FileDialog.h"
#include "lyx_gui_misc.h" // WriteAlert
#include "gettext.h"

1
src/frontends/controllers/ControlPreamble.C
View File

@ -22,6 +22,7 @@
#include "Liason.h"
#include "gettext.h"
#include "BufferView.h"
#include "support/LAssert.h"
ControlPreamble::ControlPreamble(LyXView & lv, Dialogs & d)
: ControlDialog<ControlConnectBD>(lv, d),

1
src/frontends/controllers/ControlVCLog.C
View File

@ -28,6 +28,7 @@
#include "LyXView.h"
#include "Dialogs.h"
#include "lyxrc.h"
#include "support/lyxlib.h"
using SigC::slot;
using std::endl;

1
src/frontends/xforms/Dialogs.C
View File

@ -16,6 +16,7 @@
#endif
#include "Dialogs.h"
#include "BufferView.h"
#include "xformsBC.h"

1
src/frontends/xforms/FormDocument.C
View File

@ -39,6 +39,7 @@
#include "CutAndPaste.h"
#include "bufferview_funcs.h"
#include "xforms_helpers.h"
#include "debug.h"
using Liason::setMinibuffer;
using SigC::slot;

1
src/frontends/xforms/FormFiledialog.C
View File

@ -24,6 +24,7 @@ using std::sort;
#include "lyx_gui_misc.h" // for WriteFSAlert
#include "support/FileInfo.h"
#include "support/lyxlib.h"
#include "support/lstrings.h"
#include "gettext.h"
#include "frontends/Dialogs.h"

1
src/frontends/xforms/FormPreferences.C
View File

@ -37,6 +37,7 @@
#include "combox.h"
#include "debug.h"
#include "support/filetools.h"
#include "support/LAssert.h"
#include "lyx_gui_misc.h" // idex, scex
#include "lyxlex.h"
#include "input_validators.h"

1
src/graphics/ImageLoader.C
View File

@ -12,6 +12,7 @@
#endif
#include <config.h>
#include "debug.h"
#include "ImageLoader.h"
#include "frontends/support/LyXImage.h"

1
src/insets/figinset.C
View File

@ -43,6 +43,7 @@
#include <cstdlib>
#include <cctype>
#include <cmath>
#include <cerrno>
#include "figinset.h"
#include "lyx_main.h"

1
src/insets/insetcollapsable.C
View File

@ -25,6 +25,7 @@
#include "debug.h"
#include "lyxtext.h"
#include "font.h"
#include "lyxlex.h"
class LyXText;

1
src/insets/insetexternal.C
View File

@ -30,6 +30,7 @@
#include "support/path.h"
#include "support/syscall.h"
#include "gettext.h"
#include "debug.h"
using std::endl;

1
src/insets/insetminipage.C
View File

@ -25,6 +25,7 @@
#include "support/lstrings.h"
#include "debug.h"
#include "gettext.h"
#include "lyxlex.h"
using std::ostream;
using std::endl;

1
src/insets/insetspecialchar.C
View File

@ -19,6 +19,7 @@
#include "BufferView.h"
#include "Painter.h"
#include "font.h"
#include "lyxlex.h"
using std::ostream;
using std::max;

1
src/insets/insettabular.C
View File

@ -40,6 +40,7 @@
#include "language.h"
#include "BufferView.h"
#include "undo_funcs.h"
#include "support/LAssert.h"
using std::ostream;
using std::ifstream;

2
src/layout.h
View File

@ -18,7 +18,7 @@
#pragma interface
#endif
#include "lyxlex.h"
class LyXLeX;
#include "lyxfont.h"
#include "Spacing.h"
#include <boost/utility.hpp>

2
src/lyx_cb.C
View File

@ -18,8 +18,10 @@
#include "lyx_cb.h"
#include "lyx_gui_misc.h"
#include "lyx_main.h"
#include "buffer.h"
#include "bufferlist.h"
#include "bufferview_funcs.h"
#include "debug.h"
#include "lastfiles.h"
#include "LyXView.h"
#include "lyxrc.h"

2
src/lyx_gui.C
View File

@ -10,6 +10,7 @@
#include <config.h>
#include <cstdlib>
#include <fcntl.h>
#ifdef __GNUG__
#pragma implementation
@ -19,6 +20,7 @@
#include FORMS_H_LOCATION
#include "support/filetools.h"
#include "support/os.h"
#include "support/lyxlib.h"
#include "figure_form.h"
#include "print_form.h"
#include "tex-strings.h"

1
src/lyx_gui_misc.C
View File

@ -27,6 +27,7 @@
#include "bufferview_funcs.h"
#include "support/filetools.h"
#include "lyxrc.h"
#include "debug.h"
using std::pair;
using std::make_pair;

1
src/lyx_main.C
View File

@ -26,6 +26,7 @@
#include "lyxrc.h"
#include "support/path.h"
#include "support/filetools.h"
#include "buffer.h"
#include "bufferlist.h"
#include "debug.h"
#include "support/FileInfo.h"

1
src/lyxfunc.C
View File

@ -31,6 +31,7 @@
#endif
#include "support/lyxalgo.h"
#include "support/LAssert.h"
#include "version.h"
#include "kbmap.h"
#include "lyxfunc.h"

1
src/lyxlex.C
View File

@ -19,6 +19,7 @@
#include "lyxlex.h"
#include "lyxlex_pimpl.h"
#include "debug.h"
#include "support/filetools.h"
#include "support/lstrings.h"

5
src/lyxrc.h
View File

@ -16,8 +16,9 @@
#pragma interface
#endif
#include "bufferparams.h"
#include <boost/utility.hpp>
#include "bufferparams.h" // Just to get the enum BufferParams::PAPER_SIZE (sic)
// #include <boost/utility.hpp>
/// This contains the runtime configuration of LyX
class LyXRC //: public noncopyable {

1
src/mathed/formulamacro.C
View File

@ -36,6 +36,7 @@
#include "support/LOstream.h"
#include "debug.h"
#include "lyxlex.h"
#include "lyxfont.h"
using std::ostream;

1
src/minibuffer.C
View File

@ -22,6 +22,7 @@
#include "support/lyxalgo.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include "LyXView.h"
#include "XFormsView.h"
#include "gettext.h"

4
src/paragraph.h
View File

@ -20,7 +20,7 @@
#include <vector>
#include "insets/inset.h"
#include "insets/inset.h" // Just for Inset::Code
#include "layout.h"
class ParagraphParameters;
@ -139,7 +139,7 @@ public:
std::ostream &, TexRow & texrow);
///
bool hasSameLayout(Paragraph const * par) const;
///
void makeSameLayout(Paragraph const * par);

1
src/paragraph_pimpl.C
View File

@ -20,6 +20,7 @@
#include "encoding.h"
#include "lyxrc.h"
#include "debug.h"
#include "support/LAssert.h"
extern int tex_code_break_column;

6
src/support/filetools.C
View File

@ -27,6 +27,12 @@
#pragma implementation "filetools.h"
#endif
#include <cstdlib>
#include <fcntl.h>
#include <cerrno>
#include "debug.h"
#include "support/lstrings.h"
#include "filetools.h"
#include "LSubstring.h"
#include "lyx_gui_misc.h"

7
src/support/filetools.h
View File

@ -11,15 +11,8 @@
#pragma interface
#endif
#include <cstdlib>
#include <fcntl.h>
#include <cerrno>
#include <vector>
#include "debug.h"
#include "LString.h"
#include "support/lstrings.h"
///

1
src/support/os_unix.C
View File

@ -5,6 +5,7 @@
#include "os.h"
#include "support/filetools.h"
#include "support/lstrings.h"
string os::binpath_ = string();
string os::binname_ = string();

1
src/tabular.C
View File

@ -30,6 +30,7 @@
#include "LaTeXFeatures.h"
#include "support/lstrings.h"
#include "support/lyxmanip.h"
#include "support/LAssert.h"
#include "insets/insettabular.h"
#include "insets/insettext.h"
#include "gettext.h"

1
src/text.C
View File

@ -17,6 +17,7 @@
#include "layout.h"
#include "paragraph.h"
#include "support/textutils.h"
#include "support/LAssert.h"
#include "insets/insetbib.h"
#include "insets/insettext.h"
#include "insets/insetspecialchar.h"

1
src/undo_funcs.C
View File

@ -19,6 +19,7 @@
#include "buffer.h"
#include "insets/inset.h"
#include "debug.h"
#include "support/LAssert.h"
/// the flag used by FinishUndo();
bool undo_finished;