Merge branch 'brupelo-master'

edbee · Feb 22, 2019 · d7a6c96 · d7a6c96
2 parents 198eb20 + 993a379
commit d7a6c96
Show file tree

Hide file tree

Showing 78 changed files with 447 additions and 329 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,9 @@ Makefile
 *-build-*
 
 edbee-lib-doxydocs
+edbee-lib_dll.pro
+lib
+dll
 
 # cmake ignores
 CMakeCache.txt
@@ -38,4 +41,4 @@ edbee-test/edbee-test
 
 .vs/
 edbee-lib/debug/
-edbee-lib/release/
+edbee-lib/release/
diff --git a/edbee-lib/edbee-lib.pri b/edbee-lib/edbee-lib.pri
@@ -3,161 +3,162 @@
 INCLUDEPATH += $$PWD
 
 SOURCES += \
-	$$PWD/edbee/util/mem/debug_new.cpp \
-	$$PWD/edbee/util/mem/debug_allocs.cpp \
-	$$PWD/edbee/util/simpleprofiler.cpp \
-	$$PWD/edbee/util/textcodecdetector.cpp \
-	$$PWD/edbee/util/lineending.cpp \
-	$$PWD/edbee/texteditorwidget.cpp \
-	$$PWD/edbee/views/textrenderer.cpp \
-	$$PWD/edbee/models/textdocument.cpp \
-	$$PWD/edbee/models/chardocument/chartextdocument.cpp \
-	$$PWD/edbee/models/texteditorconfig.cpp \
-	$$PWD/edbee/models/texteditorkeymap.cpp \
-	$$PWD/edbee/models/textundostack.cpp \
-	$$PWD/edbee/views/textcaretcache.cpp \
-	$$PWD/edbee/models/textlexer.cpp \
-	$$PWD/edbee/models/textrange.cpp \
-	$$PWD/edbee/views/textselection.cpp \
-	$$PWD/edbee/models/textdocumentscopes.cpp \
-	$$PWD/edbee/lexers/grammartextlexer.cpp \
-	$$PWD/edbee/util/gapvector.h \
-	$$PWD/edbee/util/lineoffsetvector.cpp \
-	$$PWD/edbee/models/textlinedata.cpp \
-	$$PWD/edbee/models/textbuffer.cpp \
-	$$PWD/edbee/models/chardocument/chartextbuffer.cpp \
-	$$PWD/edbee/texteditorcontroller.cpp \
-	$$PWD/edbee/texteditorcommand.cpp \
-	$$PWD/edbee/commands/selectioncommand.cpp \
-	$$PWD/edbee/commands/undocommand.cpp \
-	$$PWD/edbee/commands/redocommand.cpp \
-	$$PWD/edbee/commands/replaceselectioncommand.cpp \
-	$$PWD/edbee/commands/copycommand.cpp \
-	$$PWD/edbee/commands/cutcommand.cpp \
-	$$PWD/edbee/commands/pastecommand.cpp \
-	$$PWD/edbee/io/textdocumentserializer.cpp \
-	$$PWD/edbee/util/test.cpp \
-	$$PWD/edbee/util/textcodec.cpp \
-	$$PWD/edbee/io/tmlanguageparser.cpp \
-	$$PWD/edbee/commands/debugcommand.cpp \
-	$$PWD/edbee/util/regexp.cpp \
-	$$PWD/edbee/io/tmthemeparser.cpp \
-	$$PWD/edbee/io/baseplistparser.cpp \
-	$$PWD/edbee/io/jsonparser.cpp \
-	$$PWD/edbee/models/textgrammar.cpp \
-	$$PWD/edbee/models/texteditorcommandmap.cpp \
-	$$PWD/edbee/views/components/texteditorautocompletecomponent.cpp \
-	$$PWD/edbee/views/components/texteditorcomponent.cpp \
-	$$PWD/edbee/views/components/texteditorrenderer.cpp \
-	$$PWD/edbee/views/components/textmargincomponent.cpp \
-	$$PWD/edbee/views/texttheme.cpp \
-	$$PWD/edbee/views/texteditorscrollarea.cpp \
-	$$PWD/edbee/models/textsearcher.cpp \
-	$$PWD/edbee/commands/findcommand.cpp \
-	$$PWD/edbee/io/keymapparser.cpp \
-	$$PWD/edbee/commands/tabcommand.cpp \
-	$$PWD/edbee/edbee.cpp \
-	$$PWD/edbee/models/textdocumentfilter.cpp \
-	$$PWD/edbee/util/cascadingqvariantmap.cpp \
-	$$PWD/edbee/commands/duplicatecommand.cpp \
-	$$PWD/edbee/commands/newlinecommand.cpp \
-	$$PWD/edbee/util/util.cpp \
-	$$PWD/edbee/commands/removecommand.cpp \
-	$$PWD/edbee/models/change.cpp \
-	$$PWD/edbee/models/changes/abstractrangedchange.cpp \
-	$$PWD/edbee/models/changes/linedatalistchange.cpp \
-	$$PWD/edbee/models/changes/linedatachange.cpp \
-	$$PWD/edbee/models/changes/selectionchange.cpp \
-	$$PWD/edbee/models/changes/textchange.cpp \
-	$$PWD/edbee/models/changes/textchangewithcaret.cpp \
-	$$PWD/edbee/models/changes/mergablechangegroup.cpp \
-	$$PWD/edbee/commands/commentcommand.cpp \
-	$$PWD/edbee/util/rangesetlineiterator.cpp \
-	$$PWD/edbee/models/dynamicvariables.cpp \
-	$$PWD/edbee/util/rangelineiterator.cpp \
-	$$PWD/edbee/data/factorykeymap.cpp \
-	$$PWD/edbee/data/factorycommandmap.cpp \
-	$$PWD/edbee/commands/movelinecommand.cpp \
-    $$PWD/edbee/models/textautocompleteprovider.cpp
+    $$PWD/edbee/commands/commentcommand.cpp \
+    $$PWD/edbee/commands/copycommand.cpp \
+    $$PWD/edbee/commands/cutcommand.cpp \
+    $$PWD/edbee/commands/debugcommand.cpp \
+    $$PWD/edbee/commands/duplicatecommand.cpp \
+    $$PWD/edbee/commands/findcommand.cpp \
+    $$PWD/edbee/commands/movelinecommand.cpp \
+    $$PWD/edbee/commands/newlinecommand.cpp \
+    $$PWD/edbee/commands/pastecommand.cpp \
+    $$PWD/edbee/commands/redocommand.cpp \
+    $$PWD/edbee/commands/removecommand.cpp \
+    $$PWD/edbee/commands/replaceselectioncommand.cpp \
+    $$PWD/edbee/commands/selectioncommand.cpp \
+    $$PWD/edbee/commands/tabcommand.cpp \
+    $$PWD/edbee/commands/undocommand.cpp \
+    $$PWD/edbee/data/factorycommandmap.cpp \
+    $$PWD/edbee/data/factorykeymap.cpp \
+    $$PWD/edbee/edbee.cpp \
+    $$PWD/edbee/io/baseplistparser.cpp \
+    $$PWD/edbee/io/jsonparser.cpp \
+    $$PWD/edbee/io/keymapparser.cpp \
+    $$PWD/edbee/io/textdocumentserializer.cpp \
+    $$PWD/edbee/io/tmlanguageparser.cpp \
+    $$PWD/edbee/io/tmthemeparser.cpp \
+    $$PWD/edbee/lexers/grammartextlexer.cpp \
+    $$PWD/edbee/models/change.cpp \
+    $$PWD/edbee/models/changes/abstractrangedchange.cpp \
+    $$PWD/edbee/models/changes/linedatachange.cpp \
+    $$PWD/edbee/models/changes/linedatalistchange.cpp \
+    $$PWD/edbee/models/changes/mergablechangegroup.cpp \
+    $$PWD/edbee/models/changes/selectionchange.cpp \
+    $$PWD/edbee/models/changes/textchange.cpp \
+    $$PWD/edbee/models/changes/textchangewithcaret.cpp \
+    $$PWD/edbee/models/chardocument/chartextbuffer.cpp \
+    $$PWD/edbee/models/chardocument/chartextdocument.cpp \
+    $$PWD/edbee/models/dynamicvariables.cpp \
+    $$PWD/edbee/models/textautocompleteprovider.cpp \
+    $$PWD/edbee/models/textbuffer.cpp \
+    $$PWD/edbee/models/textdocument.cpp \
+    $$PWD/edbee/models/textdocumentfilter.cpp \
+    $$PWD/edbee/models/textdocumentscopes.cpp \
+    $$PWD/edbee/models/texteditorcommandmap.cpp \
+    $$PWD/edbee/models/texteditorconfig.cpp \
+    $$PWD/edbee/models/texteditorkeymap.cpp \
+    $$PWD/edbee/models/textgrammar.cpp \
+    $$PWD/edbee/models/textlexer.cpp \
+    $$PWD/edbee/models/textlinedata.cpp \
+    $$PWD/edbee/models/textrange.cpp \
+    $$PWD/edbee/models/textsearcher.cpp \
+    $$PWD/edbee/models/textundostack.cpp \
+    $$PWD/edbee/texteditorcommand.cpp \
+    $$PWD/edbee/texteditorcontroller.cpp \
+    $$PWD/edbee/texteditorwidget.cpp \
+    $$PWD/edbee/util/cascadingqvariantmap.cpp \
+    $$PWD/edbee/util/gapvector.h \
+    $$PWD/edbee/util/lineending.cpp \
+    $$PWD/edbee/util/lineoffsetvector.cpp \
+    $$PWD/edbee/util/mem/debug_allocs.cpp \
+    $$PWD/edbee/util/mem/debug_new.cpp \
+    $$PWD/edbee/util/rangelineiterator.cpp \
+    $$PWD/edbee/util/rangesetlineiterator.cpp \
+    $$PWD/edbee/util/regexp.cpp \
+    $$PWD/edbee/util/simpleprofiler.cpp \
+    $$PWD/edbee/util/test.cpp \
+    $$PWD/edbee/util/textcodec.cpp \
+    $$PWD/edbee/util/textcodecdetector.cpp \
+    $$PWD/edbee/util/util.cpp \
+    $$PWD/edbee/views/components/texteditorautocompletecomponent.cpp \
+    $$PWD/edbee/views/components/texteditorcomponent.cpp \
+    $$PWD/edbee/views/components/texteditorrenderer.cpp \
+    $$PWD/edbee/views/components/textmargincomponent.cpp \
+    $$PWD/edbee/views/textcaretcache.cpp \
+    $$PWD/edbee/views/texteditorscrollarea.cpp \
+    $$PWD/edbee/views/textrenderer.cpp \
+    $$PWD/edbee/views/textselection.cpp \
+    $$PWD/edbee/views/texttheme.cpp
 
 HEADERS += \
-	$$PWD/edbee/util/logging.h \
-	$$PWD/edbee/util/mem/debug_new.h \
-	$$PWD/edbee/util/mem/debug_allocs.h \
-	$$PWD/edbee/util/simpleprofiler.h \
-	$$PWD/edbee/util/textcodecdetector.h \
-	$$PWD/edbee/util/lineending.h \
-	$$PWD/edbee/texteditorwidget.h \
-	$$PWD/edbee/views/textrenderer.h \
-	$$PWD/edbee/models/textdocument.h \
-	$$PWD/edbee/models/chardocument/chartextdocument.h \
-	$$PWD/edbee/models/texteditorconfig.h \
-	$$PWD/edbee/models/texteditorkeymap.h \
-	$$PWD/edbee/models/textundostack.h \
-	$$PWD/edbee/texteditorcontroller.h \
-	$$PWD/edbee/views/textcaretcache.h \
-	$$PWD/edbee/models/textlexer.h \
-	$$PWD/edbee/models/textrange.h \
-	$$PWD/edbee/views/textselection.h \
-	$$PWD/edbee/models/textdocumentscopes.h \
-	$$PWD/edbee/lexers/grammartextlexer.h \
-	$$PWD/edbee/util/lineoffsetvector.h \
-	$$PWD/edbee/models/textlinedata.h \
-	$$PWD/edbee/models/textbuffer.h \
-	$$PWD/edbee/models/chardocument/chartextbuffer.h \
-	$$PWD/edbee/texteditorcommand.h \
-	$$PWD/edbee/commands/selectioncommand.h \
-	$$PWD/edbee/commands/undocommand.h \
-	$$PWD/edbee/commands/redocommand.h \
-	$$PWD/edbee/commands/replaceselectioncommand.h \
-	$$PWD/edbee/commands/copycommand.h \
-	$$PWD/edbee/commands/cutcommand.h \
-	$$PWD/edbee/commands/pastecommand.h \
-	$$PWD/edbee/models/textdocumentfilter.h \
-	$$PWD/edbee/debug.h \
-	$$PWD/edbee/io/textdocumentserializer.h \
-	$$PWD/edbee/util/test.h \
-	$$PWD/edbee/util/textcodec.h \
-	$$PWD/edbee/io/tmlanguageparser.h \
-	$$PWD/edbee/commands/debugcommand.h \
-	$$PWD/edbee/util/regexp.h \
-	$$PWD/edbee/io/tmthemeparser.h \
-	$$PWD/edbee/io/baseplistparser.h \
-	$$PWD/edbee/io/jsonparser.h \
-	$$PWD/edbee/models/textgrammar.h \
-	$$PWD/edbee/models/texteditorcommandmap.h \
-	$$PWD/edbee/views/components/texteditorautocompletecomponent.h \
-	$$PWD/edbee/views/components/texteditorcomponent.h \
-	$$PWD/edbee/views/components/texteditorrenderer.h \
-	$$PWD/edbee/views/components/textmargincomponent.h \
-	$$PWD/edbee/views/texttheme.h \
-	$$PWD/edbee/views/texteditorscrollarea.h \
-	$$PWD/edbee/models/textsearcher.h \
-	$$PWD/edbee/commands/findcommand.h \
-	$$PWD/edbee/io/keymapparser.h \
-	$$PWD/edbee/commands/tabcommand.h \
-	$$PWD/edbee/edbee.h \
-	$$PWD/edbee/util/cascadingqvariantmap.h \
-	$$PWD/edbee/commands/duplicatecommand.h \
-	$$PWD/edbee/commands/newlinecommand.h \
-	$$PWD/edbee/util/util.h \
-	$$PWD/edbee/commands/removecommand.h \
-	$$PWD/edbee/models/change.h \
-	$$PWD/edbee/models/changes/abstractrangedchange.h \
-	$$PWD/edbee/models/changes/linedatalistchange.h \
-	$$PWD/edbee/models/changes/linedatachange.h \
-	$$PWD/edbee/models/changes/selectionchange.h \
-	$$PWD/edbee/models/changes/textchange.h \
-	$$PWD/edbee/models/changes/textchangewithcaret.h \
-	$$PWD/edbee/models/changes/mergablechangegroup.h \
-	$$PWD/edbee/commands/commentcommand.h \
-	$$PWD/edbee/util/rangesetlineiterator.h \
-	$$PWD/edbee/models/dynamicvariables.h \
-	$$PWD/edbee/util/rangelineiterator.h \
-	$$PWD/edbee/data/factorykeymap.h \
-	$$PWD/edbee/data/factorycommandmap.h \
-	$$PWD/edbee/commands/movelinecommand.h \
-  $$PWD/edbee/models/textautocompleteprovider.h
+    $$PWD/edbee/commands/commentcommand.h \
+    $$PWD/edbee/commands/copycommand.h \
+    $$PWD/edbee/commands/cutcommand.h \
+    $$PWD/edbee/commands/debugcommand.h \
+    $$PWD/edbee/commands/duplicatecommand.h \
+    $$PWD/edbee/commands/findcommand.h \
+    $$PWD/edbee/commands/movelinecommand.h \
+    $$PWD/edbee/commands/newlinecommand.h \
+    $$PWD/edbee/commands/pastecommand.h \
+    $$PWD/edbee/commands/redocommand.h \
+    $$PWD/edbee/commands/removecommand.h \
+    $$PWD/edbee/commands/replaceselectioncommand.h \
+    $$PWD/edbee/commands/selectioncommand.h \
+    $$PWD/edbee/commands/tabcommand.h \
+    $$PWD/edbee/commands/undocommand.h \
+    $$PWD/edbee/data/factorycommandmap.h \
+    $$PWD/edbee/data/factorykeymap.h \
+    $$PWD/edbee/debug.h \
+    $$PWD/edbee/edbee.h \
+    $$PWD/edbee/exports.h \
+    $$PWD/edbee/io/baseplistparser.h \
+    $$PWD/edbee/io/jsonparser.h \
+    $$PWD/edbee/io/keymapparser.h \
+    $$PWD/edbee/io/textdocumentserializer.h \
+    $$PWD/edbee/io/tmlanguageparser.h \
+    $$PWD/edbee/io/tmthemeparser.h \
+    $$PWD/edbee/lexers/grammartextlexer.h \
+    $$PWD/edbee/models/change.h \
+    $$PWD/edbee/models/changes/abstractrangedchange.h \
+    $$PWD/edbee/models/changes/linedatachange.h \
+    $$PWD/edbee/models/changes/linedatalistchange.h \
+    $$PWD/edbee/models/changes/mergablechangegroup.h \
+    $$PWD/edbee/models/changes/selectionchange.h \
+    $$PWD/edbee/models/changes/textchange.h \
+    $$PWD/edbee/models/changes/textchangewithcaret.h \
+    $$PWD/edbee/models/chardocument/chartextbuffer.h \
+    $$PWD/edbee/models/chardocument/chartextdocument.h \
+    $$PWD/edbee/models/dynamicvariables.h \
+    $$PWD/edbee/models/textautocompleteprovider.h \
+    $$PWD/edbee/models/textbuffer.h \
+    $$PWD/edbee/models/textdocument.h \
+    $$PWD/edbee/models/textdocumentfilter.h \
+    $$PWD/edbee/models/textdocumentscopes.h \
+    $$PWD/edbee/models/texteditorcommandmap.h \
+    $$PWD/edbee/models/texteditorconfig.h \
+    $$PWD/edbee/models/texteditorkeymap.h \
+    $$PWD/edbee/models/textgrammar.h \
+    $$PWD/edbee/models/textlexer.h \
+    $$PWD/edbee/models/textlinedata.h \
+    $$PWD/edbee/models/textrange.h \
+    $$PWD/edbee/models/textsearcher.h \
+    $$PWD/edbee/models/textundostack.h \
+    $$PWD/edbee/texteditorcommand.h \
+    $$PWD/edbee/texteditorcontroller.h \
+    $$PWD/edbee/texteditorwidget.h \
+    $$PWD/edbee/util/cascadingqvariantmap.h \
+    $$PWD/edbee/util/lineending.h \
+    $$PWD/edbee/util/lineoffsetvector.h \
+    $$PWD/edbee/util/logging.h \
+    $$PWD/edbee/util/mem/debug_allocs.h \
+    $$PWD/edbee/util/mem/debug_new.h \
+    $$PWD/edbee/util/rangelineiterator.h \
+    $$PWD/edbee/util/rangesetlineiterator.h \
+    $$PWD/edbee/util/regexp.h \
+    $$PWD/edbee/util/simpleprofiler.h \
+    $$PWD/edbee/util/test.h \
+    $$PWD/edbee/util/textcodec.h \
+    $$PWD/edbee/util/textcodecdetector.h \
+    $$PWD/edbee/util/util.h \
+    $$PWD/edbee/views/components/texteditorautocompletecomponent.h \
+    $$PWD/edbee/views/components/texteditorcomponent.h \
+    $$PWD/edbee/views/components/texteditorrenderer.h \
+    $$PWD/edbee/views/components/textmargincomponent.h \
+    $$PWD/edbee/views/textcaretcache.h \
+    $$PWD/edbee/views/texteditorscrollarea.h \
+    $$PWD/edbee/views/textrenderer.h \
+    $$PWD/edbee/views/textselection.h \
+    $$PWD/edbee/views/texttheme.h
 
 ## Extra dependencies
 ##====================

diff --git a/edbee-lib/edbee/commands/commentcommand.h b/edbee-lib/edbee/commands/commentcommand.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "edbee/exports.h"
+
 #include <QString>
 
 #include "edbee/texteditorcommand.h"
@@ -16,7 +18,7 @@ class TextEditorController;
 /// This command is used for commenting / decommenting a line
 /// We cannot implement this truely at the moment, we first need support for making
 /// scope-based 'environment-variables' so we can creating something like TM_COMMENT_START
-class CommentCommand : public TextEditorCommand
+class EDBEE_EXPORT CommentCommand : public TextEditorCommand
 {  
 public:
     CommentCommand( bool block );

diff --git a/edbee-lib/edbee/commands/copycommand.h b/edbee-lib/edbee/commands/copycommand.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "edbee/exports.h"
+
 #include <QString>
 
 #include "edbee/texteditorcommand.h"
@@ -15,7 +17,7 @@ class TextEditorController;
 
 
 /// This command is used for copying data to the clipboard
-class CopyCommand : public TextEditorCommand
+class EDBEE_EXPORT CopyCommand : public TextEditorCommand
 {
 public:
     static const QString EDBEE_TEXT_TYPE;

diff --git a/edbee-lib/edbee/commands/cutcommand.h b/edbee-lib/edbee/commands/cutcommand.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "edbee/exports.h"
+
 #include "edbee/texteditorcommand.h"
 
 namespace edbee {
@@ -16,7 +18,7 @@ class TextEditorController;
 /// and places onto the clipboard.
 ///
 /// When pressing cut without selection, the full line is cut
-class CutCommand : public TextEditorCommand
+class EDBEE_EXPORT CutCommand : public TextEditorCommand
 {
 public:
     virtual void execute( TextEditorController* controller );