[DEV] update to etk buffer remove
This commit is contained in:
parent
192bd045fa
commit
1359193a63
@ -18,11 +18,13 @@ before_script:
|
||||
- cd ewol; git checkout origin/dev -b dev; cd ..
|
||||
- cd ewol; git submodule init; cd ..
|
||||
- cd ewol; git submodule update; cd ..
|
||||
- if [ "$CXX" == "clang++" ]; then BUILDER=clang; else BUILDER=gcc; fi
|
||||
|
||||
#install Gcc to have lisstdc++ 4.8 & gcc 4.8
|
||||
install:
|
||||
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
|
||||
- sudo apt-get update -qq
|
||||
- sudo apt-get install -qq libstdc++-4.9-dev
|
||||
- sudo apt-get install -qq g++-4.8
|
||||
- sudo rm /usr/bin/gcc /usr/bin/g++
|
||||
- sudo ln -s /usr/bin/gcc-4.8 /usr/bin/gcc
|
||||
@ -30,8 +32,7 @@ install:
|
||||
|
||||
# build sequence with Lutin :
|
||||
script:
|
||||
- if [ "$CXX" == "clang++" ]; then ./ewol/build/lutin.py -C -P -cclang -mdebug -p edn; fi
|
||||
- if [ "$CXX" == "g++" ]; then ./ewol/build/lutin.py -C -P -cgcc -mdebug -p edn; fi
|
||||
- ./ewol/build/lutin.py -C -P -c$BUILDER -mdebug -p edn
|
||||
|
||||
#send e-mail on compilation result:
|
||||
notifications:
|
||||
|
@ -40,7 +40,7 @@
|
||||
</rule>
|
||||
<rule name="double quote text">
|
||||
<color>doubleQuoteText</color>
|
||||
<regex>"(.|\\[\\"])*?"</regex> <!-- " -->
|
||||
<regex>(U|u|u8)?"(.|\\[\\"])*?"</regex> <!-- " -->
|
||||
</rule>
|
||||
<rule name="simple quote text">
|
||||
<color>doubleQuoteText</color>
|
||||
@ -66,11 +66,11 @@
|
||||
</rule>
|
||||
<rule name="std type">
|
||||
<color>type</color>
|
||||
<regex>\bstd::[\w:]*\b</regex>
|
||||
<regex>\b(std(11)?|boost)::[\w:]*\b</regex>
|
||||
</rule>
|
||||
<rule name="my storage keyword">
|
||||
<color>storageKeyword</color>
|
||||
<regex>\b(inline|const|class|namespace|virtual|private|public|protected|friend|const|extern|auto|register|static|unsigned|signed|volatile|char|double|float|int|long|short|void|typedef|struct|union|enum)\b</regex>
|
||||
<regex>\b(inline|const|class|namespace|virtual|private|public|protected|friend|const|extern|mutable|auto|register|static|unsigned|signed|volatile|char|double|float|int|long|short|void|typedef|struct|union|enum)\b</regex>
|
||||
</rule>
|
||||
<rule name="my common Define">
|
||||
<color>commonDefine</color>
|
||||
@ -78,7 +78,7 @@
|
||||
</rule>
|
||||
<rule name="numeric constant">
|
||||
<color>number</color>
|
||||
<regex>\b(((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?)\b</regex>
|
||||
<regex>\b(((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(LL|L|l|UL|ul|u|U|F|f)?)\b</regex>
|
||||
</rule>
|
||||
<rule name="my boolean">
|
||||
<color>boolean</color>
|
||||
|
@ -6,6 +6,10 @@
|
||||
<color>doubleQuoteText</color>
|
||||
<regex>"(.|\\[\\"])*?"</regex>
|
||||
</rule>
|
||||
<rule name="my comment">
|
||||
<color>comment</color>
|
||||
<regex>#.*</regex>
|
||||
</rule>
|
||||
</pass1>
|
||||
<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
|
||||
<rule name="my keyword">
|
||||
|
@ -12,7 +12,6 @@
|
||||
#include <etk/types.h>
|
||||
#include <etk/os/FSNode.h>
|
||||
#include <ewol/ewol.h>
|
||||
#include <etk/Buffer.h>
|
||||
#include <ewol/object/Object.h>
|
||||
#include <ewol/widget/Widget.h>
|
||||
#include <ewol/compositing/Text.h>
|
||||
|
@ -27,7 +27,6 @@ namespace appl {
|
||||
#include <etk/os/FSNode.h>
|
||||
#include <appl/HighlightPattern.h>
|
||||
#include <appl/GlyphPainting.h>
|
||||
#include <etk/Buffer.h>
|
||||
#include <exml/exml.h>
|
||||
|
||||
namespace appl {
|
||||
|
@ -18,7 +18,6 @@ class HighlightPattern;
|
||||
#include <vector>
|
||||
#include <regex>
|
||||
#include <exml/exml.h>
|
||||
#include <etk/Buffer.h>
|
||||
|
||||
enum resultFind {
|
||||
HLP_FIND_ERROR,
|
||||
|
@ -14,16 +14,7 @@
|
||||
namespace appl {
|
||||
int32_t getLogId();
|
||||
};
|
||||
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
|
||||
#define APPL_BASE(info,data) \
|
||||
do { \
|
||||
if (info <= etk::log::getLevel(appl::getLogId())) { \
|
||||
std::stringbuf sb; \
|
||||
std::ostream tmpStream(&sb); \
|
||||
tmpStream << data; \
|
||||
etk::log::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \
|
||||
} \
|
||||
} while(0)
|
||||
#define APPL_BASE(info,data) TK_LOG_BASE(appl::getLogId(),info,data)
|
||||
|
||||
#define APPL_CRITICAL(data) APPL_BASE(1, data)
|
||||
#define APPL_ERROR(data) APPL_BASE(2, data)
|
||||
|
Loading…
x
Reference in New Issue
Block a user