diff --git a/ChangeLog b/ChangeLog index d801b7e..d09cbfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,7 +96,7 @@ Possibly fixed a possible problem with double clicking under Windows. 2006/07/02 14:27:26 phil Added setWrapVisualFlags(), WrapMode::WrapCharacter, WrapVisualFlag to QextScintilla. -The tqlayout cache is now set according to the wrap mode. +The layout cache is now set according to the wrap mode. Setting a wrap mode now disables the horizontal scrollbar. diff --git a/doc/Scintilla/ScintillaDoc.html b/doc/Scintilla/ScintillaDoc.html index 34af1a5..a32f9ef 100755 --- a/doc/Scintilla/ScintillaDoc.html +++ b/doc/Scintilla/ScintillaDoc.html @@ -2886,7 +2886,7 @@ struct TextToFind { Use SCI_GETENDSTYLED to retrieve the current "styled to" position and SCI_STARTSTYLING - to reset the styling position and mask (0x1f in the default tqlayout of 5 style bits and 3 indicator bits) + to reset the styling position and mask (0x1f in the default layout of 5 style bits and 3 indicator bits) when you are done.

The number of bits used for styles can be altered with

Much of the time used by Scintilla is spent on laying out and drawing text. The same text - tqlayout calculations may be performed many times even when the data used in these calculations - does not change. To avoid these unnecessary calculations in some circumstances, the line tqlayout + layout calculations may be performed many times even when the data used in these calculations + does not change. To avoid these unnecessary calculations in some circumstances, the line layout cache can store the results of the calculations. The cache is invalidated whenever the - underlying data, such as the contents or styling of the document changes. Caching the tqlayout of + underlying data, such as the contents or styling of the document changes. Caching the layout of the whole document has the most effect, making dynamic line wrap as much as 20 times faster but this requires 7 times the memory required by the document contents plus around 80 bytes per line.

diff --git a/doc/Scintilla/ScintillaHistory.html b/doc/Scintilla/ScintillaHistory.html index c10e86e..94a7984 100755 --- a/doc/Scintilla/ScintillaHistory.html +++ b/doc/Scintilla/ScintillaHistory.html @@ -578,7 +578,7 @@ Empty ranges can no longer be dragged.
  • - Crash fixed when calls made that use tqlayout inside the painted notification. + Crash fixed when calls made that use layout inside the painted notification.
  • Bug fixed where Scintilla created pixmap buffers that were too large leading @@ -595,8 +595,8 @@ SciTE HTML exporter no longer honours monospaced font setting.
  • - Line tqlayout cache in page mode caches the line of the caret. An assertion is - now used to ensure that the tqlayout reentrancy problem that caused this + Line layout cache in page mode caches the line of the caret. An assertion is + now used to ensure that the layout reentrancy problem that caused this is easier to find.
  • @@ -1285,7 +1285,7 @@ Bug fixed where SCI_LINEENDWRAP would move too far when line ends are visible.
  • - Bugs fixed where calltips with tqunicode or other non-ASCII text would display + Bugs fixed where calltips with unicode or other non-ASCII text would display incorrectly.
  • @@ -1533,7 +1533,7 @@ Bug in SciTE on Windows fixed where clipboard commands stopped working.
  • - Crashing bugs in display fixed in line tqlayout cache. + Crashing bugs in display fixed in line layout cache.
  • Crashing bug may be fixed on AMD64 processor on GTK+. @@ -2954,7 +2954,7 @@ Released on 15 March 2002.
  • - Line tqlayout cache implemented to improve performance by maintaining + Line layout cache implemented to improve performance by maintaining the positioning of characters on lines. Can be set to cache nothing, the line with the caret, the visible page or the whole document.
    • diff --git a/doc/html/classQextScintillaPrinter.html b/doc/html/classQextScintillaPrinter.html index 8ed8223..a53693e 100644 --- a/doc/html/classQextScintillaPrinter.html +++ b/doc/html/classQextScintillaPrinter.html @@ -36,7 +36,7 @@

    Detailed Description

    The QextScintillaPrinter class is a sub-class of the TQt TQPrinter class that is able to print the text of a Scintilla document.

    -The class can be further sub-classed to alter to tqlayout of the text, adding headers and footers for example. +The class can be further sub-classed to alter to layout of the text, adding headers and footers for example.

    Constructor & Destructor Documentation

    diff --git a/include/Platform.h b/include/Platform.h index 3cc849b..33245b9 100755 --- a/include/Platform.h +++ b/include/Platform.h @@ -354,7 +354,7 @@ public: virtual void SetClip(PRectangle rc)=0; virtual void FlushCachedState()=0; - virtual void SetUnicodeMode(bool tqunicodeMode_)=0; + virtual void SetUnicodeMode(bool unicodeMode_)=0; virtual void SetDBCSMode(int codePage)=0; #if defined(PLAT_QT) @@ -412,7 +412,7 @@ public: static ListBox *Allocate(); virtual void SetFont(Font &font)=0; - virtual void Create(Window &parent, int ctrlID, Point location, int lineHeight_, bool tqunicodeMode_)=0; + virtual void Create(Window &parent, int ctrlID, Point location, int lineHeight_, bool unicodeMode_)=0; virtual void SetAverageCharWidth(int width)=0; virtual void SetVisibleRows(int rows)=0; virtual int GetVisibleRows() const=0; diff --git a/include/Scintilla.iface b/include/Scintilla.iface index aff26d8..c3e5b56 100755 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -1075,10 +1075,10 @@ val SC_CACHE_CARET=1 val SC_CACHE_PAGE=2 val SC_CACHE_DOCUMENT=3 -# Sets the degree of caching of tqlayout information. +# Sets the degree of caching of layout information. set void SetLayoutCache=2272(int mode,) -# Retrieve the degree of caching of tqlayout information. +# Retrieve the degree of caching of layout information. get int GetLayoutCache=2273(,) # Sets the document width assumed for scrolling. diff --git a/qt/PlatQt.cpp b/qt/PlatQt.cpp index 1f09377..3b563c6 100644 --- a/qt/PlatQt.cpp +++ b/qt/PlatQt.cpp @@ -194,7 +194,7 @@ public: void SetClip(PRectangle rc); void FlushCachedState() {painter -> flush();} - void SetUnicodeMode(bool tqunicodeMode_) {tqunicodeMode = tqunicodeMode_;} + void SetUnicodeMode(bool unicodeMode_) {unicodeMode = unicodeMode_;} void SetDBCSMode(int codePage) {} void DrawXPM(PRectangle rc,const XPM *xpm); @@ -207,7 +207,7 @@ private: static TQColor convertTQColor(const ColourAllocated &col, unsigned alpha = 0xff); - bool tqunicodeMode; + bool unicodeMode; bool mypainter; TQPainter *painter; }; @@ -217,7 +217,7 @@ Surface *Surface::Allocate() return new SurfaceImpl; } -SurfaceImpl::SurfaceImpl() : tqunicodeMode(false), mypainter(false), painter(0) +SurfaceImpl::SurfaceImpl() : unicodeMode(false), mypainter(false), painter(0) { } @@ -448,7 +448,7 @@ void SurfaceImpl::MeasureWidths(Font &font_,const char *s,int len, { totalWidth += fm.width(qs[i]); - int l = (tqunicodeMode ? TQString(qs[i]).utf8().length() : 1); + int l = (unicodeMode ? TQString(qs[i]).utf8().length() : 1); while (l--) positions[ui++] = totalWidth; @@ -533,7 +533,7 @@ bool SurfaceImpl::setFont(Font &font_) // Convert a Scintilla string to a TQt Unicode string. TQString SurfaceImpl::convertText(const char *s,int len) { - if (tqunicodeMode) + if (unicodeMode) return TQString::fromUtf8(s,len); TQString qs; diff --git a/qt/ScintillaQt.cpp b/qt/ScintillaQt.cpp index 355c245..e4c0559 100644 --- a/qt/ScintillaQt.cpp +++ b/qt/ScintillaQt.cpp @@ -446,7 +446,7 @@ TQString ScintillaTQt::textRange(const SelectionText *text) // Copy the selected text to the clipboard. void ScintillaTQt::CopyToClipboard(const SelectionText &selectedText) { - TQApplication::tqclipboard() -> setText(textRange(&selectedText)); + TQApplication::clipboard() -> setText(textRange(&selectedText)); } @@ -466,7 +466,7 @@ void ScintillaTQt::Copy() // Implement paste. void ScintillaTQt::Paste() { - TQString str = TQApplication::tqclipboard() -> text(); + TQString str = TQApplication::clipboard() -> text(); if (str.isEmpty()) return; @@ -607,7 +607,7 @@ void ScintillaTQt::ClaimSelection() if (isSel) { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); // If we support X11 style selection then make it available // now. diff --git a/qt/qextscintillabase.cpp b/qt/qextscintillabase.cpp index 2131ab6..5aaa7b1 100644 --- a/qt/qextscintillabase.cpp +++ b/qt/qextscintillabase.cpp @@ -70,7 +70,7 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f) { sci = 0; - TQGridLayout *tqlayout = new TQGridLayout(this,2,2); + TQGridLayout *layout = new TQGridLayout(this,2,2); txtarea = new TQWidget(this,0,WRepaintNoErase|WResizeNoErase); txtarea -> setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); @@ -78,14 +78,14 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f) txtarea -> setAcceptDrops(TRUE); txtarea -> setFocusPolicy(WheelFocus); txtarea -> setFocusProxy(this); - tqlayout -> addWidget(txtarea,0,0); + layout -> addWidget(txtarea,0,0); vsb = new TQScrollBar(Qt::Vertical,this); - tqlayout -> addWidget(vsb,0,1); + layout -> addWidget(vsb,0,1); connect(vsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleVSb(int))); hsb = new TQScrollBar(Qt::Horizontal,this); - tqlayout -> addWidget(hsb,1,0); + layout -> addWidget(hsb,1,0); connect(hsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleHSb(int))); txtarea -> installEventFilter(this); @@ -104,7 +104,7 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f) lexersLinked = TRUE; } - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); if (cb -> supportsSelection()) connect(cb,TQT_SIGNAL(selectionChanged()),TQT_SLOT(handleSelection())); @@ -329,7 +329,7 @@ void QextScintillaBase::mousePress(TQMouseEvent *me) case MidButton: { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); if (cb -> supportsSelection()) { @@ -488,7 +488,7 @@ void QextScintillaBase::keyPressEvent(TQKeyEvent *ke) // key. if (ke -> text().length() == 1) { - if ((key = ke -> text()[0].tqunicode()) >= 0x80) + if ((key = ke -> text()[0].unicode()) >= 0x80) key = 0; } else @@ -577,6 +577,6 @@ TQSize QextScintillaBase::sizeHint() const // Handle the selection changing. void QextScintillaBase::handleSelection() { - if (!TQApplication::tqclipboard() -> ownsSelection()) + if (!TQApplication::clipboard() -> ownsSelection()) sci -> UnclaimSelection(); } diff --git a/qt/qextscintillalexercss.cpp b/qt/qextscintillalexercss.cpp index ff15caa..6983202 100644 --- a/qt/qextscintillalexercss.cpp +++ b/qt/qextscintillalexercss.cpp @@ -199,16 +199,16 @@ const char *QextScintillaLexerCSS::keywords(int set) const "border-top-style border-right-style " "border-bottom-style border-left-style border-style " "top right bottom left position z-index direction " - "tqunicode-bidi min-width max-width min-height " + "unicode-bidi min-width max-width min-height " "max-height overflow clip visibility content quotes " "counter-reset counter-increment marker-offset size " "marks page-break-before page-break-after " "page-break-inside page orphans widows font-stretch " - "font-size-adjust tqunicode-range units-per-em src " + "font-size-adjust unicode-range units-per-em src " "panose-1 stemv stemh slope cap-height x-height " "ascent descent widths bbox definition-src baseline " "centerline mathline topline text-shadow " - "caption-side table-tqlayout border-collapse " + "caption-side table-layout border-collapse " "border-spacing empty-cells speak-header cursor " "outline outline-width outline-style outline-color " "volume speak pause-before pause-after pause " diff --git a/qt/qextscintillaprinter.h b/qt/qextscintillaprinter.h index 3478b91..a938c1a 100644 --- a/qt/qextscintillaprinter.h +++ b/qt/qextscintillaprinter.h @@ -38,7 +38,7 @@ class QextScintillaBase; //! \brief The QextScintillaPrinter class is a sub-class of the TQt TQPrinter //! class that is able to print the text of a Scintilla document. //! -//! The class can be further sub-classed to alter to tqlayout of the text, adding +//! The class can be further sub-classed to alter to layout of the text, adding //! headers and footers for example. class TQEXTSCINTILLA_EXPORT QextScintillaPrinter : public TQPrinter { diff --git a/src/AutoComplete.cpp b/src/AutoComplete.cpp index daa5fbb..753adca 100755 --- a/src/AutoComplete.cpp +++ b/src/AutoComplete.cpp @@ -45,11 +45,11 @@ bool AutoComplete::Active() { void AutoComplete::Start(Window &parent, int ctrlID, int position, Point location, int startLen_, - int lineHeight, bool tqunicodeMode) { + int lineHeight, bool unicodeMode) { if (active) { Cancel(); } - lb->Create(parent, ctrlID, location, lineHeight, tqunicodeMode); + lb->Create(parent, ctrlID, location, lineHeight, unicodeMode); lb->Clear(); active = true; startLen = startLen_; diff --git a/src/AutoComplete.h b/src/AutoComplete.h index 8fd84c8..10577ca 100755 --- a/src/AutoComplete.h +++ b/src/AutoComplete.h @@ -36,7 +36,7 @@ public: /// Display the auto completion list positioned to be near a character position void Start(Window &parent, int ctrlID, int position, Point location, - int startLen_, int lineHeight, bool tqunicodeMode); + int startLen_, int lineHeight, bool unicodeMode); /// The stop chars are characters which, when typed, cause the auto completion list to disappear void SetStopChars(const char *stopChars_); diff --git a/src/Editor.cpp b/src/Editor.cpp index db27cb0..41c67a3 100755 --- a/src/Editor.cpp +++ b/src/Editor.cpp @@ -1949,7 +1949,7 @@ void Editor::LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayou // See if chars, styles, indicators, are all the same bool allSame = true; const int styleMask = pdoc->stylingBitsMask; - // Check base line tqlayout + // Check base line layout char styleByte = 0; int numCharsInLine = 0; while (numCharsInLine < lineLength) { @@ -1997,7 +1997,7 @@ void Editor::LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayou char styleByte = 0; int styleMask = pdoc->stylingBitsMask; ll->styleBitsSet = 0; - // Fill base line tqlayout + // Fill base line layout for (int charInDoc = posLineStart; charInDoc < posLineEnd; charInDoc++) { char chDoc = pdoc->CharAt(charInDoc); styleByte = pdoc->StyleAt(charInDoc); @@ -2892,7 +2892,7 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) { //ElapsedTime et; if (lineDoc != lineDocPrevious) { ll.Set(0); - // For rectangular selection this accesses the tqlayout cache so should be after tqlayout returned. + // For rectangular selection this accesses the layout cache so should be after layout returned. lineIterator.SetAt(lineDoc); ll.Set(RetrieveLineLayout(lineDoc)); LayoutLine(lineDoc, surface, vs, ll, wrapWidth); @@ -2930,7 +2930,7 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) { DrawLine(surface, vs, lineDoc, visibleLine, xStart, rcLine, ll, subLine); //durPaint += et.Duration(true); - // Restore the previous styles for the brace highlights in case tqlayout is in cache. + // Restore the previous styles for the brace highlights in case layout is in cache. ll->RestoreBracesHighlight(rangeLine, braces); bool expanded = cs.GetExpanded(lineDoc);