]> git.lyx.org Git - features.git/commitdiff
add #pragme interface/implementation
authorAndré Pönitz <poenitz@gmx.net>
Wed, 11 Sep 2002 09:14:57 +0000 (09:14 +0000)
committerAndré Pönitz <poenitz@gmx.net>
Wed, 11 Sep 2002 09:14:57 +0000 (09:14 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5263 a592a061-630c-0410-9148-cb99ea01b6c8

46 files changed:
src/mathed/math_autocorrect.C
src/mathed/math_autocorrect.h
src/mathed/math_diffinset.C
src/mathed/math_diffinset.h
src/mathed/math_diminset.C
src/mathed/math_diminset.h
src/mathed/math_ertinset.C
src/mathed/math_ertinset.h
src/mathed/math_exfuncinset.C
src/mathed/math_exfuncinset.h
src/mathed/math_exintinset.C
src/mathed/math_exintinset.h
src/mathed/math_extern.C
src/mathed/math_extern.h
src/mathed/math_factory.C
src/mathed/math_factory.h
src/mathed/math_inset.C
src/mathed/math_inset.h
src/mathed/math_iterator.C
src/mathed/math_iterator.h
src/mathed/math_liminset.C
src/mathed/math_liminset.h
src/mathed/math_mathmlstream.C
src/mathed/math_mathmlstream.h
src/mathed/math_metricsinfo.C
src/mathed/math_metricsinfo.h
src/mathed/math_parboxinset.C
src/mathed/math_parboxinset.h
src/mathed/math_parinset.C
src/mathed/math_parinset.h
src/mathed/math_pos.C
src/mathed/math_pos.h
src/mathed/math_replace.h
src/mathed/math_streamstr.C
src/mathed/math_streamstr.h
src/mathed/math_support.C
src/mathed/math_support.h
src/mathed/math_symbolinset.C
src/mathed/math_symbolinset.h
src/mathed/math_textinset.C
src/mathed/math_textinset.h
src/mathed/preview.C
src/mathed/preview.h
src/mathed/ref_inset.h
src/mathed/textpainter.C
src/mathed/textpainter.h

index 02e35619e8be12a1fc0290c8b3e30d2da7e45663..c8ba7ca628199185ca5d24fd21231d55e9584c42 100644 (file)
@@ -1,3 +1,7 @@
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include <config.h>
 
 #include "LString.h"
index 30495d05b050e14a99d957f69db97c83bcdbeff2..8a3c75bea1d17203c39046fae6dbd39fa8686664 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef MATHAUTOCORRECT_H
 #define MATHAUTOCORRECT_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 class MathAtom;
 
 // make "corrections" according to file lib/autocorrect
index 92011f9f5e1cd3f8a3bc68a576a83ef3cea9ee9b..e0fa73675b9449af4568a5839cfed75200b3e65a 100644 (file)
@@ -1,3 +1,7 @@
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include "math_diffinset.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
index c526279d3f0a44df155c4da8afe64787116b98be..707c710a0f26573f4916c53007734ae976635343 100644 (file)
@@ -2,6 +2,10 @@
 #ifndef MATH_DIFFINSET_H
 #define MATH_DIFFINSET_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 // d f(x)/dx in one block
 // for interfacing external programs
 
index 88282f0749cec85962b15918cf46047515cc27ff..b851b75db950288c0a86e3c0f4d7770ad519fc8b 100644 (file)
@@ -1,3 +1,8 @@
+
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include "math_diminset.h"
 #include "Lsstream.h"
 #include "textpainter.h"
index 064807bf49bd7da7665f04a6a94d6be4b9d697e0..1c49c04260bb1737fd6695bfdd08bb3a14aded3f 100644 (file)
@@ -2,6 +2,10 @@
 #ifndef MATH_DIMINSET_H
 #define MATH_DIMINSET_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "math_inset.h"
 #include "dimension.h"
 
index 9112f9c3420bcdf00a83cbe936e96a56fff41f46..14f6bc7fed800b00b6ac2b5f52516a09c0cd9839 100644 (file)
@@ -1,10 +1,15 @@
+
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include <config.h>
 
 #include "math_ertinset.h"
 #include "math_mathmlstream.h"
-
 #include "support/LOstream.h"
 
+
 MathInset * MathErtInset::clone() const
 {
        return new MathErtInset(*this);
index 1f50ce80d50ccf4ad57b2ec8949e5ff330af2b5e..96614a524f5d3e3792f0ac0358816016b3e0af71 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef MATH_ERTINSET_H
 #define MATH_ERTINSET_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "math_textinset.h"
 
 // implements support for \parbox
index 4941d3fc7a4d59f22d21831105acb9ce574c8ad9..93cd53e79f7ed3a6cb74cc938ab36e95f25f02b6 100644 (file)
@@ -1,3 +1,8 @@
+
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include <config.h>
 
 #include "math_exfuncinset.h"
index fe240065b849afb80db8c6ac1dedc71a8185d16a..7a9d13c945be1ff7211e9f208bfeeceb7fcdc6e0 100644 (file)
@@ -2,6 +2,10 @@
 #ifndef MATH_EXFUNCINSET_H
 #define MATH_EXFUNCINSET_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "math_nestinset.h"
 
 // f(x) in one block (as opposed to 'f','(','x',')' or 'f','x')
index 97754e10f21744ec6314662710b4f8ee8c0b55cc..f39b8ba6428b1f3aeeaeabd8793251a73e3bba9a 100644 (file)
@@ -1,3 +1,9 @@
+
+
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include <config.h>
 
 #include "math_exintinset.h"
@@ -9,8 +15,6 @@
 
 #include <boost/scoped_ptr.hpp>
 
-using std::endl;
-
 
 MathExIntInset::MathExIntInset(string const & name)
        : MathNestInset(4), symbol_(name)
@@ -51,13 +55,13 @@ void MathExIntInset::normalize(NormalStream & os) const
 
 void MathExIntInset::metrics(MathMetricsInfo &) const
 {
-       lyxerr << "should not happen" << endl;
+       lyxerr << "should not happen\n";
 }
 
 
 void MathExIntInset::draw(MathPainterInfo &, int, int) const
 {
-       lyxerr << "should not happen" << endl;
+       lyxerr << "should not happen\n";
 }
 
 
@@ -111,5 +115,5 @@ void MathExIntInset::mathmlize(MathMLStream & os) const
 
 void MathExIntInset::write(WriteStream &) const
 {
-       lyxerr << "should not happen" << endl;
+       lyxerr << "should not happen\n";
 }
index 7c3866df1d119c16abc99127955ff7afdff52bd9..8e44465b7fffeea55c20c28ba8e4d3d487285997 100644 (file)
@@ -2,6 +2,10 @@
 #ifndef MATH_EXINTINSET_H
 #define MATH_EXINTINSET_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 // \int_l^u f(x) dx in one block (as opposed to 'f','(','x',')' or 'f','x')
 // or \sum, \prod...  for interfacing external programs
 
index ae8a0fee85633951df8fae003f4bc88663fe29a4..4585b1f4e63dc24c66b2955c577e823f02547b64 100644 (file)
@@ -1,3 +1,8 @@
+
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 // This file contains most of the magic that extracts "context
 // information" from the unstructered layout-oriented stuff in an
 // MathArray.
index 933129c1a6e74507593f937a25519d75ca6b430b..9e2f23c8b532fba0f936d99793c76babf998471f 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef MATH_EXTERN_H
 #define MATH_EXTERN_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "LString.h"
 
 class NormalStream;
index 0887d0ab942f429c35723cf6f07404edeb6c526a..0795f1411bc77461c05085aee0085848ba64a9ca 100644 (file)
@@ -1,3 +1,8 @@
+
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include <config.h>
 
 #include "math_parser.h"
index b53efdda646cd0a5164a536df346177d1a886539..da5fb9f367001710231406101dbf8a26d0b5af9d 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef MATH_FACTORY_H
 #define MATH_FACTORY_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "LString.h"
 #include "math_atom.h"
 
index 1eb8465e99761a7a579b8eb3c20920127e5e5f02..62cc723c085cb583b58e311d85d8ef78fa803ec0 100644 (file)
  *   the GNU General Public Licence version 2 or later.
  */
 
+#include <config.h>
+
 #ifdef __GNUG__
-#pragma implementation
+#pragma implementation 
 #endif
 
-#include <config.h>
-
-#include "Lsstream.h"
 #include "math_inset.h"
+#include "Lsstream.h"
 #include "math_scriptinset.h"
 #include "math_mathmlstream.h"
 #include "math_cursor.h"
@@ -34,9 +34,7 @@
 #include "BufferView.h"
 #include "formulabase.h"
 
-
 using std::ostream;
-using std::vector;
 
 
 int MathInset::height() const
@@ -45,14 +43,6 @@ int MathInset::height() const
 }
 
 
-ostream & operator<<(ostream & os, MathAtom const & at)
-{
-       WriteStream wi(os, false, false);
-       at->write(wi);
-       return os;
-}
-
-
 MathInset::size_type MathInset::nargs() const
 {
        return 0;
@@ -303,6 +293,14 @@ MathArray asArray(string const & str)
 }
 
 
+ostream & operator<<(ostream & os, MathAtom const & at)
+{
+       WriteStream wi(os, false, false);
+       at->write(wi);
+       return os;
+}
+
+
 Dialogs & getDialogs()
 {
        return mathcursor->formula()->view()->owner()->getDialogs();
index a1b2f2c8dadd54985c5c20d14cdc59bd18ffb6d0..358a1c564db8e72109f3336729dd9ddeebca2276 100644 (file)
 #ifndef MATH_INSET_H
 #define MATH_INSET_H
 
-#include <config.h>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
+#include <config.h>
+
 #include "LString.h"
 #include "frontends/mouse_state.h"
 #include "math_data.h"
index 0ea30539f44aa24ea9c33d9eded7d134431ae575..8f508907e8bbed52a78ce3fe1d2307141bb078f0 100644 (file)
@@ -1,3 +1,7 @@
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include <config.h>
 
 #include "math_iterator.h"
index 15d790ddba5bbe5e04c8a0447da3d8c61a9d77e5..8d71416a66e92d8c9ce624750e5a6138031843e4 100644 (file)
@@ -2,6 +2,10 @@
 #ifndef MATH_ITERATOR_H
 #define MATH_ITERATOR_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "math_pos.h"
 #include <vector>
 
index 5c1b1d8a4b9d8f83bc2276b21d62792269121734..8c9da0db21ca8fca8fbfebb2c44420e7d4a54fdd 100644 (file)
@@ -1,3 +1,8 @@
+
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include "math_liminset.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
index c1ecb90fdb1e48882e0f4ab2036a9ad39d2ba2b8..8ed4ae4c63d304e8c77170c41ae7eb079d7646ac 100644 (file)
@@ -2,6 +2,10 @@
 #ifndef MATH_LIMINSET_H
 #define MATH_LIMINSET_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 // lim_{x->x0} f(x) in one block
 // for interfacing external programs
 
index 81b1a73ca8ccb8eb1b5bc5d841e58adb8f00ab18..4829f80bf9bf9b5628b25c656e6709d3330b2a02 100644 (file)
@@ -1,3 +1,8 @@
+
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include <config.h>
 
 #include "math_mathmlstream.h"
index ebd7c652420dde39b2ab9c2bd96aa46564e4b1b9..9ed06a5e00a8a91df02867627f67ada0dc9be5f3 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef MATH_MATHMLSTREAM_H
 #define MATH_MATHMLSTREAM_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
 
 // Please keep all four streams in one file until the interface has
 // settled.
index 15f2ed82e9fd521617fd9b3f6fb19ba9ead332fc..9ffe4fb6fae377018b892c303f98328113a06c8d 100644 (file)
@@ -1,4 +1,8 @@
 
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include <config.h>
 
 #include "math_metricsinfo.h"
index bd8a46d15be1a9db2f4e22cb820f491b0a839151..3dc911b7b6f69c64d472edfa66819cd48fdc1e12 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef MATH_METRICSINFO_H
 #define MATH_METRICSINFO_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "lyxfont.h"
 #include "LString.h"
 
index eac138f455b34c92471c6ea46043de3ddebb0ece..8e0b3b140a6a13d3cb89a25d354147e84fe3d1c9 100644 (file)
@@ -1,12 +1,14 @@
 
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include "math_parboxinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "lyxlength.h"
 #include "debug.h"
 
-using std::vector;
-
 
 MathParboxInset::MathParboxInset()
        : lyx_width_(0), tex_width_("0mm"), position_('c')
index e03bf2de98626974f2ddd3656bdb87ee8bc7cf39..56306d50d1eff8b97f87c1e1f182e4df7e38f390 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef MATH_PARBOXINSET_H
 #define MATH_PARBOXINSET_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "math_textinset.h"
 
 // implements support for \parbox
index 371d458938d47c6e517c4b5988e0db055804cc8e..a1b868e9554feae701c8cd60614578edb548dbcf 100644 (file)
@@ -1,10 +1,15 @@
+
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include <config.h>
 
 #include "math_parinset.h"
 #include "math_mathmlstream.h"
-
 #include "support/LOstream.h"
 
+
 MathParInset::MathParInset(MathArray const & ar)
 {
        cells_[0] = ar;
index e807a5867e9862d9c3350eec2d720a8275f1b032..fe6db21be5006d71ef533d9cbbb295d3636f4a6d 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef MATH_PARINSET_H
 #define MATH_PARINSET_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "math_hullinset.h"
 
 class MathParInset : public MathHullInset {
index 53162528a71d5045566fc8774d566d7445d857a9..2dfa32839bf15579d95ac930014e290bcb85da9b 100644 (file)
@@ -1,15 +1,16 @@
-#include "config.h"
 
-#include <iostream>
+#ifdef __GNUG__
+#pragma implementation 
+#endif
 
+#include "config.h"
 #include "math_pos.h"
 #include "math_inset.h"
 #include "debug.h"
 #include "support/LAssert.h"
+#include "support/LOstream.h"
 
 
-using std::ostream;
-
 MathCursorPos::MathCursorPos()
        : par_(0), idx_(0), pos_(0)
 {}
@@ -43,7 +44,7 @@ void MathCursorPos::getPos(int & x, int & y) const
 }
 
 
-ostream & operator<<(ostream & os, MathCursorPos const & p)
+std::ostream & operator<<(std::ostream & os, MathCursorPos const & p)
 {
        os << "(par: " << p.par_ << " idx: " << p.idx_ << " pos: " << p.pos_ << ")";
        return os;
index d238fb93f69c1617546ebd77e4fb1244f0b62b92..806827bcfdf58ccaa9975bb359f4724aa21c145e 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef MATH_POS_H
 #define MATH_POS_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include <iosfwd>
 #include "math_data.h"
 
index 0aa9d03663f6c34ed723244a165d75fb7f442a36..369ab5f51022c7dde0cf7e3b3e0f426fe6714d11 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef MATH_REPLACE_H
 #define MATH_REPLACE_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "math_data.h"
 
 struct ReplaceData {
index 71068bceb766649d709d20039f14e116740e6509..974a7913b8425d9e0ff922901b74f684638ca456 100644 (file)
@@ -1,3 +1,8 @@
+
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include <config.h>
 
 #include "math_streamstr.h"
index 065c7c8c6acaa52d49bb02c21495ec475f4400ec..72be3a0ca294c5201df930d90e77dd9b50da3bd4 100644 (file)
@@ -1,7 +1,12 @@
 // -*- C++ -*-
+
 #ifndef MATH_STREAMSTR_H
 #define MATH_STREAMSTR_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "LString.h"
 
 class WriteStream;
index 34896fbaeb6bbfe5228b50b440a5a4bc96f30b6c..cdaca8d9fc4de932729762a274a70b1ab45522cf 100644 (file)
@@ -1,6 +1,9 @@
-#include <config.h>
 
-#include <map>
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
+#include <config.h>
 
 #include "math_support.h"
 #include "lyxfont.h"
@@ -15,8 +18,8 @@
 #include "commandtags.h"
 #include "dimension.h"
 
-using std::map;
-using std::endl;
+#include <map>
+
 using std::max;
 
 
@@ -318,7 +321,7 @@ named_deco_struct deco_table[] = {
 };
 
 
-map<string, deco_struct> deco_list;
+std::map<string, deco_struct> deco_list;
 
 // sort the table on startup
 struct init_deco_table {
@@ -338,7 +341,7 @@ static init_deco_table dummy;
 
 deco_struct const * search_deco(string const & name)
 {
-       map<string, deco_struct>::const_iterator p = deco_list.find(name);
+       std::map<string, deco_struct>::const_iterator p = deco_list.find(name);
        return (p == deco_list.end()) ? 0 : &(p->second);
 }
 
index 76d4a6f4b029d0a36910c3d0c41493584fcd13f0..ab974aa2378e869b8084bcced1cf017712a45905 100644 (file)
@@ -3,6 +3,10 @@
 #ifndef MATH_SUPPORT_H
 #define MATH_SUPPORT_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "LString.h"
 
 class MathPainterInfo;
index 65b36b8b8a7a78a5f441d252386f80c7b1414f35..1bacd342c35172565a593a7a935d035c1dce6597 100644 (file)
@@ -1,3 +1,8 @@
+
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include <config.h>
 
 #include "math_symbolinset.h"
@@ -9,9 +14,6 @@
 #include "debug.h"
 
 
-using std::ostream;
-
-
 MathSymbolInset::MathSymbolInset(const latexkeys * l)
        : sym_(l), h_(0)
 {}
@@ -175,7 +177,7 @@ void MathSymbolInset::write(WriteStream & os) const
 }
 
 
-void MathSymbolInset::infoize(ostream & os) const
+void MathSymbolInset::infoize(std::ostream & os) const
 {
        os << "Symbol: " << name();
 }
index 0c99bbaad293691cd11342da98093165deed200f..30fd215e8458081a5593366b9d3230f8a1dc57e9 100644 (file)
@@ -2,6 +2,10 @@
 #ifndef MATH_SYMBOLINSET_H
 #define MATH_SYMBOLINSET_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "math_diminset.h"
 
 struct latexkeys;
index ce30f3f184cbd567a83721da5545671758c980e5..97105704f3c46d3b77e67c5dea6afcd0de0fa1ab 100644 (file)
@@ -1,4 +1,8 @@
 
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include "math_textinset.h"
 #include "math_metricsinfo.h"
 #include "debug.h"
index 309d319ce1fea404a1cc0ebb1fdc3d4ad6553c4c..db8b391daa1f9cd17bcfe78d794095503f6e1b9c 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef MATH_TEXTINSET_H
 #define MATH_TEXTINSET_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "math_gridinset.h"
 
 // not yet a substitute for the real text inset...
index 3448fce4df74c7b715d26abb552b2e5abbfca1f6..bb404fc79b9c95ad20c9ccb1395c98e954876501 100644 (file)
@@ -1 +1 @@
-// code is currently directly inseide InsetFormula
+// code is currently directly inside InsetFormula
index 9ce6b42217dbd35dd3b0bdc7907ef58e063c67f5..a7536499354b92a05d389aa9beb739e583a9e32f 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef PREVIEW_H
 #define PREVIEW_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "LString.h"
 
 bool preview(string const & str);
index 91a0b2798d58ce89d5eb77f113eb6dc9cdc88883..2a2c89e64741dd29783e6f7d678c1ee9dc199fa7 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef REF_INSET_H
 #define REF_INSET_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "command_inset.h"
 
 // for \ref 
index 86c38f8cf1f130251b3f51fd4255d31cbc227248..5f464b57548ca34a7ffebd0d4310af63d6b59943 100644 (file)
@@ -1,5 +1,10 @@
-#include <iostream>
+
+#ifdef __GNUG__
+#pragma implementation 
+#endif
+
 #include "textpainter.h"
+#include "support/LOstream.h"
 
 
 TextPainter::TextPainter(int xmax, int ymax)
index f2a720e8deac6459307b25fde36dee65f5dc5896..9e689112740ffb8238f3adcd408074795cccc144 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef TEXTPAINTER_H
 #define TEXTPAINTER_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include <vector>
 #include <iosfwd>