diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:00 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:00 -0600 |
| commit | 6ade7e598a18691f3f92471c4441d856b3ac54dc (patch) | |
| tree | ca18ed733e273279bab574978806068e506c241a /qt/PlatQt.cpp | |
| parent | 5e3fc3a36b58c4e1cb48e31a350f76b7a81b3170 (diff) | |
| download | tqscintilla-6ade7e598a18691f3f92471c4441d856b3ac54dc.tar.gz tqscintilla-6ade7e598a18691f3f92471c4441d856b3ac54dc.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 5e3fc3a36b58c4e1cb48e31a350f76b7a81b3170.
Diffstat (limited to 'qt/PlatQt.cpp')
| -rw-r--r-- | qt/PlatQt.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/qt/PlatQt.cpp b/qt/PlatQt.cpp index 3b563c6..db5e94a 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 unicodeMode_) {unicodeMode = unicodeMode_;} + void SetUnicodeMode(bool tqunicodeMode_) {tqunicodeMode = tqunicodeMode_;} 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 unicodeMode; + bool tqunicodeMode; bool mypainter; TQPainter *painter; }; @@ -217,7 +217,7 @@ Surface *Surface::Allocate() return new SurfaceImpl; } -SurfaceImpl::SurfaceImpl() : unicodeMode(false), mypainter(false), painter(0) +SurfaceImpl::SurfaceImpl() : tqunicodeMode(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 = (unicodeMode ? TQString(qs[i]).utf8().length() : 1); + int l = (tqunicodeMode ? 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 (unicodeMode) + if (tqunicodeMode) return TQString::fromUtf8(s,len); TQString qs; @@ -594,7 +594,7 @@ PRectangle Window::GetPosition() if (w) { - const TQRect &r = w -> geometry(); + const TQRect &r = w -> tqgeometry(); rc.left = r.left(); rc.top = r.top(); @@ -661,7 +661,7 @@ void Window::SetFont(Font &font) void Window::SetCursor(Cursor curs) { - TQt::CursorShape qc; + TQt::tqCursorShape qc; switch (curs) { |