mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Merge branch 'master' of git.lyx.org:lyx
This commit is contained in:
commit
08157b5050
@ -156,18 +156,21 @@ check_convert_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT
|
||||
check_convert_LDFLAGS = $(QT4_LDFLAGS)
|
||||
check_convert_SOURCES = \
|
||||
tests/check_convert.cpp \
|
||||
tests/dummy_functions.cpp \
|
||||
tests/boost.cpp
|
||||
|
||||
check_filetools_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
|
||||
check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS)
|
||||
check_filetools_SOURCES = \
|
||||
tests/check_filetools.cpp \
|
||||
tests/dummy_functions.cpp \
|
||||
tests/boost.cpp
|
||||
|
||||
check_lstrings_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
|
||||
check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
|
||||
check_lstrings_SOURCES = \
|
||||
tests/check_lstrings.cpp \
|
||||
tests/dummy_functions.cpp \
|
||||
tests/boost.cpp
|
||||
|
||||
makeregfiles: ${check_PROGRAMS}
|
||||
|
@ -1,7 +1,6 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "../convert.h"
|
||||
#include "../docstring.h"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@ -9,18 +8,6 @@ using lyx::convert;
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
||||
namespace lyx {
|
||||
// Dummy LyXRC support
|
||||
struct LyXRC { string icon_set; } lyxrc;
|
||||
|
||||
// Keep the linker happy on Windows
|
||||
void lyx_exit(int) {}
|
||||
|
||||
docstring const _(string const & s) { return from_ascii(s); }
|
||||
}
|
||||
|
||||
|
||||
void convert_int()
|
||||
{
|
||||
cout << convert<int>("123") << '\n'
|
||||
|
@ -10,16 +10,6 @@ using namespace lyx::support;
|
||||
|
||||
using namespace std;
|
||||
|
||||
namespace lyx {
|
||||
// Dummy LyXRC support
|
||||
struct LyXRC { string icon_set; } lyxrc;
|
||||
|
||||
// Keep the linker happy on Windows
|
||||
void lyx_exit(int) {}
|
||||
|
||||
docstring const _(string const & s) { return from_ascii(s); }
|
||||
}
|
||||
|
||||
void test_normalizePath()
|
||||
{
|
||||
cout << FileName("/foo/../bar").absFileName() << endl;
|
||||
|
@ -10,16 +10,6 @@ using namespace lyx;
|
||||
|
||||
using namespace std;
|
||||
|
||||
namespace lyx {
|
||||
// Dummy LyXRC support
|
||||
struct LyXRC { string icon_set; } lyxrc;
|
||||
|
||||
// Keep the linker happy on Windows
|
||||
void lyx_exit(int) {}
|
||||
|
||||
docstring const _(string const & s) { return from_ascii(s); }
|
||||
}
|
||||
|
||||
void test_lowercase()
|
||||
{
|
||||
cout << to_ascii(docstring(1, lowercase(char_type('A')))) << endl;
|
||||
|
23
src/support/tests/dummy_functions.cpp
Normal file
23
src/support/tests/dummy_functions.cpp
Normal file
@ -0,0 +1,23 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "../Messages.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
namespace lyx {
|
||||
// Dummy LyXRC support
|
||||
struct LyXRC { string icon_set; } lyxrc;
|
||||
|
||||
// Keep the linker happy on Windows
|
||||
void lyx_exit(int) {}
|
||||
|
||||
docstring const _(string const & s) { return from_ascii(s); }
|
||||
|
||||
// Dummy language support
|
||||
Messages const & getGuiMessages()
|
||||
{
|
||||
static Messages lyx_messages;
|
||||
|
||||
return lyx_messages;
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user