From c8a0b97d2ee97f4ec8d6f6ba57a7d11eb0c0d4a2 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Wed, 23 Jul 2008 09:21:22 +0000 Subject: [PATCH] move LyXerr QString specialisation to support/qstring_helpers git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25829 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/qt_helpers.cpp | 6 ------ src/frontends/qt4/qt_helpers.h | 3 --- src/support/qstring_helpers.cpp | 9 +++++++++ src/support/qstring_helpers.h | 4 ++++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/frontends/qt4/qt_helpers.cpp b/src/frontends/qt4/qt_helpers.cpp index fc9bf190e8..395eb4edf9 100644 --- a/src/frontends/qt4/qt_helpers.cpp +++ b/src/frontends/qt4/qt_helpers.cpp @@ -57,12 +57,6 @@ using namespace lyx::support; namespace lyx { -LyXErr & operator<<(LyXErr & err, QString const & str) -{ - return err << fromqstr(str); -} - - FileName libFileSearch(QString const & dir, QString const & name, QString const & ext) { diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h index 66ec9e6f96..234ba00426 100644 --- a/src/frontends/qt4/qt_helpers.h +++ b/src/frontends/qt4/qt_helpers.h @@ -33,9 +33,6 @@ namespace lyx { namespace support { class FileName; } class BufferParams; -class LyXErr; - -LyXErr & operator<<(LyXErr &, QString const &); namespace frontend { diff --git a/src/support/qstring_helpers.cpp b/src/support/qstring_helpers.cpp index 2211af8e4e..5a79ad11b6 100644 --- a/src/support/qstring_helpers.cpp +++ b/src/support/qstring_helpers.cpp @@ -12,6 +12,9 @@ #include +#include "support/qstring_helpers.h" + +#include "support/debug.h" #include "support/docstring.h" #include @@ -19,6 +22,12 @@ namespace lyx { +LyXErr & operator<<(LyXErr & err, QString const & str) +{ + return err << fromqstr(str); +} + + QString toqstr(char const * str) { return QString::fromUtf8(str); diff --git a/src/support/qstring_helpers.h b/src/support/qstring_helpers.h index d5f2921af7..9c28092811 100644 --- a/src/support/qstring_helpers.h +++ b/src/support/qstring_helpers.h @@ -18,6 +18,10 @@ class QString; namespace lyx { +class LyXErr; + +LyXErr & operator<<(LyXErr &, QString const &); + /** * toqstr - convert a UTF8 encoded char * into a QString * -- 2.39.2