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

Merge branch 'master' of git.lyx.org:lyx

Browse Source
This commit is contained in:
Juergen Spitzmueller 2012-10-05 10:00:13 +02:00
commit 08157b5050
5 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/support/Makefile.am
View File

@ -156,18 +156,21 @@ check_convert_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT
check_convert_LDFLAGS = $(QT4_LDFLAGS) check_convert_LDFLAGS = $(QT4_LDFLAGS)
check_convert_SOURCES = \ check_convert_SOURCES = \
tests/check_convert.cpp \ tests/check_convert.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp tests/boost.cpp
check_filetools_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI) check_filetools_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS) check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS)
check_filetools_SOURCES = \ check_filetools_SOURCES = \
tests/check_filetools.cpp \ tests/check_filetools.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp tests/boost.cpp
check_lstrings_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI) check_lstrings_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI)
check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS) check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
check_lstrings_SOURCES = \ check_lstrings_SOURCES = \
tests/check_lstrings.cpp \ tests/check_lstrings.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp tests/boost.cpp
makeregfiles: ${check_PROGRAMS} makeregfiles: ${check_PROGRAMS}

13
src/support/tests/check_convert.cpp
View File

@ -1,7 +1,6 @@
#include <config.h> #include <config.h>
#include "../convert.h" #include "../convert.h"
#include "../docstring.h"
#include <iostream> #include <iostream>
@ -9,18 +8,6 @@ using lyx::convert;
using namespace std; 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() void convert_int()
{ {
cout << convert<int>("123") << '\n' cout << convert<int>("123") << '\n'

10
src/support/tests/check_filetools.cpp
View File

@ -10,16 +10,6 @@ using namespace lyx::support;
using namespace std; 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() void test_normalizePath()
{ {
cout << FileName("/foo/../bar").absFileName() << endl; cout << FileName("/foo/../bar").absFileName() << endl;

10
src/support/tests/check_lstrings.cpp
View File

@ -10,16 +10,6 @@ using namespace lyx;
using namespace std; 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() void test_lowercase()
{ {
cout << to_ascii(docstring(1, lowercase(char_type('A')))) << endl; cout << to_ascii(docstring(1, lowercase(char_type('A')))) << endl;

23
src/support/tests/dummy_functions.cpp Normal file
View 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;
}
}