diff options
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/README | 10 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaDocument.h | 2 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaEdit.cpp.template | 10 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaEdit.h.template | 6 | ||||
| -rw-r--r-- | qt/ScintillaEditPy/README | 22 | ||||
| -rw-r--r-- | qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template | 6 |
6 files changed, 28 insertions, 28 deletions
@@ -3,7 +3,7 @@ README for building of Scintilla on Qt There are three different Scintilla libraries that can be produced:
ScintillaEditBase
-A basic widget callable from C++ which is small and can be used just as is
+A basic widget callable from C++ which is small and can be used just as is
or with higher level functionality added.
ScintillaEdit
@@ -16,7 +16,7 @@ A Python callable version of ScintillaEdit using the PySide bindings. Building a library
ScintillaEditBase can be built without performing any generation steps.
-The ScintillaEditBase/ScintillaEditBase.pro project can be loaded into
+The ScintillaEditBase/ScintillaEditBase.pro project can be loaded into
Qt Creator and the "Build All" command performed.
Alternatively, run "qmake" to build make files and then use the platform
make to build. Most commonly, use "make" on Unix and "nmake"
@@ -24,15 +24,15 @@ on Windows. On Linux, qmake may be called qmake-qt5 or qmake-qt4.
-ScintillaEdit requires a generation command be run first. From the
+ScintillaEdit requires a generation command be run first. From the
ScintillaEdit directory:
python WidgetGen.py
After the generation command has run, the ScintillaEdit.h and
ScintillaEdit.cpp files will have been populated with the Scintilla API
-methods.
+methods.
To build, use Qt Creator or qmake and make as for ScintillaEditBase.
-ScintillaEditPy is more complex and instructions are found in
+ScintillaEditPy is more complex and instructions are found in
ScintillaEditPy/README.
diff --git a/qt/ScintillaEdit/ScintillaDocument.h b/qt/ScintillaEdit/ScintillaDocument.h index cd84b4ddd..8ae7414f9 100644 --- a/qt/ScintillaEdit/ScintillaDocument.h +++ b/qt/ScintillaEdit/ScintillaDocument.h @@ -84,7 +84,7 @@ signals: void style_needed(int pos); void lexer_changed(); void error_occurred(int status); - + friend class ::WatcherHelper; }; diff --git a/qt/ScintillaEdit/ScintillaEdit.cpp.template b/qt/ScintillaEdit/ScintillaEdit.cpp.template index bf5895342..9fb18fd4e 100644 --- a/qt/ScintillaEdit/ScintillaEdit.cpp.template +++ b/qt/ScintillaEdit/ScintillaEdit.cpp.template @@ -57,25 +57,25 @@ void ScintillaEdit::set_doc(ScintillaDocument *pdoc_) { send(SCI_SETDOCPOINTER, 0, (sptr_t)(pdoc_->pointer())); } -long ScintillaEdit::format_range(bool draw, QPaintDevice* target, QPaintDevice* measure, +long ScintillaEdit::format_range(bool draw, QPaintDevice* target, QPaintDevice* measure, const QRect& print_rect, const QRect& page_rect, long range_start, long range_end) { Sci_RangeToFormat to_format; - + to_format.hdc = target; to_format.hdcTarget = measure; - + to_format.rc.left = print_rect.left(); to_format.rc.top = print_rect.top(); to_format.rc.right = print_rect.right(); to_format.rc.bottom = print_rect.bottom(); - + to_format.rcPage.left = page_rect.left(); to_format.rcPage.top = page_rect.top(); to_format.rcPage.right = page_rect.right(); to_format.rcPage.bottom = page_rect.bottom(); - + to_format.chrg.cpMin = range_start; to_format.chrg.cpMax = range_end; diff --git a/qt/ScintillaEdit/ScintillaEdit.h.template b/qt/ScintillaEdit/ScintillaEdit.h.template index d9853eb1a..875f2bee8 100644 --- a/qt/ScintillaEdit/ScintillaEdit.h.template +++ b/qt/ScintillaEdit/ScintillaEdit.h.template @@ -48,14 +48,14 @@ public: } // Exposing the FORMATRANGE api with both underscore & qt style names - long format_range(bool draw, QPaintDevice* target, QPaintDevice* measure, + long format_range(bool draw, QPaintDevice* target, QPaintDevice* measure, const QRect& print_rect, const QRect& page_rect, long range_start, long range_end); - long formatRange(bool draw, QPaintDevice* target, QPaintDevice* measure, + long formatRange(bool draw, QPaintDevice* target, QPaintDevice* measure, const QRect& print_rect, const QRect& page_rect, long range_start, long range_end) { return format_range(draw, target, measure, print_rect, page_rect, - range_start, range_end); + range_start, range_end); } /* ++Autogenerated -- start of section automatically generated from Scintilla.iface */ diff --git a/qt/ScintillaEditPy/README b/qt/ScintillaEditPy/README index a9f4fbef1..d0c653d20 100644 --- a/qt/ScintillaEditPy/README +++ b/qt/ScintillaEditPy/README @@ -4,7 +4,7 @@ This directory is for building a Python encapsulation of Scintilla for use with PySide. For C++ libraries see the README in the parent directory.
Prerequisites
-
+
PySide and ScintillaEditPy currently only support Python 2.x.
CMake may be used to rebuild PySide and is required on Windows.
@@ -30,16 +30,16 @@ The qmake program may be called qmake-qt5 or qmake-qt4. It can be found with:
which qmake-qt5 || which qmake-qt4 || which qmake
-On Windows, the PySide library packages can be downloaded from
+On Windows, the PySide library packages can be downloaded from
http://developer.qt.nokia.com/wiki/PySide_Binaries_Windows
-The PySide development files must be built from source using CMake as
+The PySide development files must be built from source using CMake as
described on the PySide site. This will create a Unix-style set of [bin, include,
-lib, and share] directories in packaging\setuptools\install-py<ver>-qt<qver>.
+lib, and share] directories in packaging\setuptools\install-py<ver>-qt<qver>.
There is no standard place for the PySide development files so copy them
to "\usr", creating it if needed.
On OS X, a combined package with PySide libraries and PySide development
-files can be downloaded from
+files can be downloaded from
http://developer.qt.nokia.com/wiki/PySide_Binaries_MacOSX
This package works best in combination with the Qt libraries for Mac from
http://qt.nokia.com/downloads/downloads#qt-lib
@@ -54,21 +54,21 @@ script which is run: python sepbuild.py
-This script first runs the WidgetGen.py script to fill out the ScintillaEdit.h,
+This script first runs the WidgetGen.py script to fill out the ScintillaEdit.h,
ScintillaEdit.cpp and ScintillaConstants.py files.
-A short file "sepbuild.pri" is written out which contains a series of version and
+A short file "sepbuild.pri" is written out which contains a series of version and
path properties discovered by sepbuild.py which are used by qmake.
Then it runs PySide's "shiboken" program to create C++ code that will act as a
-bridge between Python and the C++ libraries. This code goes into the
+bridge between Python and the C++ libraries. This code goes into the
ScintillaEditPy/ScintillaEditPy directory. Several log files are produced which can
help uncover problems in the bridge if it fails to build.
The qmake program is run to produce make files from ScintillaEditPy.pro.
The system make program is then run to build the library. The library is located in
-the scintilla/bin directory as ScintillaEditPy.so for Unix systems and
+the scintilla/bin directory as ScintillaEditPy.so for Unix systems and
ScintillaEditPy.pyd for Windows.
A demonstration program can be run:
@@ -76,12 +76,12 @@ A demonstration program can be run: python testsepq.py
The individual steps in the script can be run manually if wanted although the
-shiboken program has complex arguments and differs between systems so run
+shiboken program has complex arguments and differs between systems so run
sepbuild.py and copy the section starting with a line containing "generatorrunner"
and continuing to "typesystem_ScintillaEdit.xml".
On Windows, it is more difficult to set up an environment to debug ScintillaEditPy
-since all the libraries have to be debug or all have to be release. The easy path
+since all the libraries have to be debug or all have to be release. The easy path
is to always build for release with "nmake release".
To remove generated code, run "python sepbuild.py --clean".
diff --git a/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template b/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template index f9f166e56..f7196a274 100644 --- a/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template +++ b/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template @@ -11,9 +11,9 @@ <object-type name="ScintillaEdit"> <!-- ++Autogenerated start of section automatically generated from Scintilla.iface --> <!-- ~~Autogenerated end of section automatically generated from Scintilla.iface --> - - <!-- Custom implementation of get and set_margin_mask_n: mask is defined - as an int but is really a bitfield and the numeric value can be + + <!-- Custom implementation of get and set_margin_mask_n: mask is defined + as an int but is really a bitfield and the numeric value can be greater than max value of an int --> <modify-function signature="set_margin_mask_n(sptr_t, sptr_t)"> <inject-code> |