From: André Pönitz Date: Sun, 12 Aug 2007 14:03:48 +0000 (+0000) Subject: some renamimg X-Git-Tag: 1.6.10~8942 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1a0f0fa18654603668668ce58f194648907bbaf1;p=features.git some renamimg git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19458 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/TexStream.cpp b/src/TexStream.cpp new file mode 100644 index 0000000000..b3d9f50362 --- /dev/null +++ b/src/TexStream.cpp @@ -0,0 +1,99 @@ +#include "LaTeXStream.h" + +#include +#include + +namespace lyx { + +//////////////////////////////////////////////////////////////// +// +// LaTeXStreamBuffer +// +//////////////////////////////////////////////////////////////// + + +class LaTeXStreamBuffer : public std::streambuf +{ +public: + explicit LaTeXStreamBuffer(std::streambuf * sbuf); + int line() const { return line_; } + +protected: + int overflow(int); + int sync(); + +private: + std::streambuf * sbuf_; + int line_; +}; + + +LaTeXStreamBuffer::LaTeXStreamBuffer(std::streambuf *sb) + : sbuf_(sb), line_(0) +{ + setp(0, 0); + setg(0, 0, 0); +} + +int LaTeXStreamBuffer::overflow(int c) +{ + if (c == '\n') + ++line_; + return c; +} + + +int LaTeXStreamBuffer::sync() +{ + sbuf_->pubsync(); + return 0; +} + + +//////////////////////////////////////////////////////////////// +// +// LaTeXStream +// +//////////////////////////////////////////////////////////////// + +LaTeXStream::LaTeXStream(std::streambuf * sbuf) + : std::ostream(sbuf_ = new LaTeXStreamBuffer(sbuf)) +{} + + +LaTeXStream::~LaTeXStream() +{ + delete sbuf_; +} + + +int LaTeXStream::line() const +{ + return sbuf_->line(); +} + + +//////////////////////////////////////////////////////////////// +// +// Test +// +//////////////////////////////////////////////////////////////// + +#if 0 + +int main(int argc, char *argv[]) +{ + LaTeXStream out(std::cout.rdbuf()); + char c; + while (std::cin) { + if (std::cin.get(c)) + out.put(c); + } + std::cout << "line count: " << out.line() << std::endl; + + return 0; +} + +#endif + +} diff --git a/src/TexStream.h b/src/TexStream.h new file mode 100644 index 0000000000..bdd32fc877 --- /dev/null +++ b/src/TexStream.h @@ -0,0 +1,23 @@ +#ifndef LATEXSTREAM_H +#define LATEXSTREAM_H + +#include +#include + +namespace lyx { + +class LaTeXStreamBuffer; + +class LaTeXStream : public std::ostream +{ +public: + LaTeXStream(std::streambuf * sbuf); + ~LaTeXStream(); + int line() const; +private: + LaTeXStreamBuffer * sbuf_; +}; + +} // namespace lyx + +#endif diff --git a/src/support/LaTeXStream.cpp b/src/support/LaTeXStream.cpp deleted file mode 100644 index b3d9f50362..0000000000 --- a/src/support/LaTeXStream.cpp +++ /dev/null @@ -1,99 +0,0 @@ -#include "LaTeXStream.h" - -#include -#include - -namespace lyx { - -//////////////////////////////////////////////////////////////// -// -// LaTeXStreamBuffer -// -//////////////////////////////////////////////////////////////// - - -class LaTeXStreamBuffer : public std::streambuf -{ -public: - explicit LaTeXStreamBuffer(std::streambuf * sbuf); - int line() const { return line_; } - -protected: - int overflow(int); - int sync(); - -private: - std::streambuf * sbuf_; - int line_; -}; - - -LaTeXStreamBuffer::LaTeXStreamBuffer(std::streambuf *sb) - : sbuf_(sb), line_(0) -{ - setp(0, 0); - setg(0, 0, 0); -} - -int LaTeXStreamBuffer::overflow(int c) -{ - if (c == '\n') - ++line_; - return c; -} - - -int LaTeXStreamBuffer::sync() -{ - sbuf_->pubsync(); - return 0; -} - - -//////////////////////////////////////////////////////////////// -// -// LaTeXStream -// -//////////////////////////////////////////////////////////////// - -LaTeXStream::LaTeXStream(std::streambuf * sbuf) - : std::ostream(sbuf_ = new LaTeXStreamBuffer(sbuf)) -{} - - -LaTeXStream::~LaTeXStream() -{ - delete sbuf_; -} - - -int LaTeXStream::line() const -{ - return sbuf_->line(); -} - - -//////////////////////////////////////////////////////////////// -// -// Test -// -//////////////////////////////////////////////////////////////// - -#if 0 - -int main(int argc, char *argv[]) -{ - LaTeXStream out(std::cout.rdbuf()); - char c; - while (std::cin) { - if (std::cin.get(c)) - out.put(c); - } - std::cout << "line count: " << out.line() << std::endl; - - return 0; -} - -#endif - -} diff --git a/src/support/LaTeXStream.h b/src/support/LaTeXStream.h deleted file mode 100644 index bdd32fc877..0000000000 --- a/src/support/LaTeXStream.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef LATEXSTREAM_H -#define LATEXSTREAM_H - -#include -#include - -namespace lyx { - -class LaTeXStreamBuffer; - -class LaTeXStream : public std::ostream -{ -public: - LaTeXStream(std::streambuf * sbuf); - ~LaTeXStream(); - int line() const; -private: - LaTeXStreamBuffer * sbuf_; -}; - -} // namespace lyx - -#endif