diff --git a/doc/Scintilla/ScintillaHistory.html b/doc/Scintilla/ScintillaHistory.html index a4a74d6..916b219 100755 --- a/doc/Scintilla/ScintillaHistory.html +++ b/doc/Scintilla/ScintillaHistory.html @@ -4592,7 +4592,7 @@ Tool bar.
  • - tqStatus bar now on Windows as well as GTK+. + Status bar now on Windows as well as GTK+.
  • Input fields in Find and Replace dialogs now have history on both Windows and @@ -4879,7 +4879,7 @@ Borland compatible makefile.
  • - tqStatus bar showing caret position in GTK+ version of SciTE. + Status bar showing caret position in GTK+ version of SciTE.
  • Bug fixes to selection drawing when part of selection outside window, mouse release over diff --git a/doc/html/classQextScintilla-members.html b/doc/html/classQextScintilla-members.html index 50240f1..acc90ba 100644 --- a/doc/html/classQextScintilla-members.html +++ b/doc/html/classQextScintilla-members.html @@ -956,7 +956,7 @@ setWrapMode(WrapMode mode)QextScintilla [virtual, slot] setWrapVisualFlags(WrapVisualFlag eflag, WrapVisualFlag sflag=WrapFlagNone, int sindent=0)QextScintilla showUserList(int id, const TQStringList &list)QextScintilla - tqsizeHint() const QextScintillaBase [virtual] + sizeHint() const QextScintillaBase [virtual] SloppyBraceMatch enum valueQextScintilla SmallRectangle enum valueQextScintilla standardCommands() const QextScintilla [inline] diff --git a/doc/html/classQextScintillaBase-members.html b/doc/html/classQextScintillaBase-members.html index 2a37d2f..4983d70 100644 --- a/doc/html/classQextScintillaBase-members.html +++ b/doc/html/classQextScintillaBase-members.html @@ -747,7 +747,7 @@ SendScintilla(unsigned int msg, const TQColor &col) (defined in QextScintillaBase)QextScintillaBase SendScintilla(unsigned int msg, unsigned long wParam, TQPainter *hdc, const TQRect &rc, long cpMin, long cpMax) (defined in QextScintillaBase)QextScintillaBase SendScintilla(unsigned int msg, unsigned long wParam, const TQPixmap *lParam) (defined in QextScintillaBase)QextScintillaBase [inline] - tqsizeHint() const QextScintillaBase [virtual] + sizeHint() const QextScintillaBase [virtual] startDrag()QextScintillaBase [protected, virtual] STYLE_BRACEBAD enum value (defined in QextScintillaBase)QextScintillaBase STYLE_BRACELIGHT enum value (defined in QextScintillaBase)QextScintillaBase diff --git a/doc/html/classQextScintillaBase.html b/doc/html/classQextScintillaBase.html index 0efb8d3..d6e700d 100644 --- a/doc/html/classQextScintillaBase.html +++ b/doc/html/classQextScintillaBase.html @@ -2306,7 +2306,7 @@ long SendScintilla (unsigned int msg, const TQColor &col) long SendScintilla (unsigned int msg, unsigned long wParam, TQPainter *hdc, const TQRect &rc, long cpMin, long cpMax)
  • long SendScintilla (unsigned int msg, unsigned long wParam, const TQPixmap *lParam) -
  • virtual TQSize tqsizeHint () const +
  • virtual TQSize sizeHint () const
  • TQWidget * viewport () const

    Static Public Member Functions

    @@ -2938,12 +2938,12 @@ Returns a pointer to a QextScin Send the Scintilla message msg with the optional parameters wParam and lParam.

    - +

    - + diff --git a/doc/html/functions_0x73.html b/doc/html/functions_0x73.html index 9e1937a..1960d09 100644 --- a/doc/html/functions_0x73.html +++ b/doc/html/functions_0x73.html @@ -334,7 +334,7 @@ Here is a list of all documented class members with links to the class documenta : QextScintillaLexerHTML
  • showUserList() : QextScintilla
  • SingleQuotedHereDocument : QextScintillaLexerPerl, QextScintillaLexerBash
  • SingleQuotedString -: QextScintillaLexerSQL, QextScintillaLexerRuby, QextScintillaLexerPython, QextScintillaLexerPerl, QextScintillaLexerCSS, QextScintillaLexerCPP, QextScintillaLexerBash
  • tqsizeHint() +: QextScintillaLexerSQL, QextScintillaLexerRuby, QextScintillaLexerPython, QextScintillaLexerPerl, QextScintillaLexerCSS, QextScintillaLexerCPP, QextScintillaLexerBash
  • sizeHint() : QextScintillaBase
  • SloppyBraceMatch : QextScintilla
  • SmallRectangle : QextScintilla
  • Spaces diff --git a/doc/html/functions_func_0x73.html b/doc/html/functions_func_0x73.html index 77b5034..1190596 100644 --- a/doc/html/functions_func_0x73.html +++ b/doc/html/functions_func_0x73.html @@ -159,7 +159,7 @@ : QextScintilla
  • setWrapMode() : QextScintillaPrinter, QextScintilla
  • setWrapVisualFlags() : QextScintilla
  • showUserList() -: QextScintilla
  • tqsizeHint() +: QextScintilla
  • sizeHint() : QextScintillaBase
  • standardCommands() : QextScintilla
  • startDrag() : QextScintillaBase
  • startRecording() diff --git a/include/Scintilla.iface b/include/Scintilla.iface index 6154ca5..3df40c3 100755 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -1407,16 +1407,16 @@ set void SetFocus=2380(bool focus,) get bool GetFocus=2381(,) # Change error status - 0 = OK. -set void SettqStatus=2382(int statusCode,) +set void SetStatus=2382(int statusCode,) # Get error status. -get int GettqStatus=2383(,) +get int GetStatus=2383(,) # Set whether the mouse is captured when its button is pressed. set void SetMouseDownCaptures=2384(bool captures,) # Get whether mouse gets captured. get bool GetMouseDownCaptures=2385(,) -enu tqCursorShape=SC_CURSOR +enu CursorShape=SC_CURSOR val SC_CURSORNORMAL=-1 val SC_CURSORWAIT=4 # Sets the cursor to one of the SC_CURSOR* values. diff --git a/qt/PlatQt.cpp b/qt/PlatQt.cpp index db5e94a..9f31d0d 100644 --- a/qt/PlatQt.cpp +++ b/qt/PlatQt.cpp @@ -661,7 +661,7 @@ void Window::SetFont(Font &font) void Window::SetCursor(Cursor curs) { - TQt::tqCursorShape qc; + TQt::CursorShape qc; switch (curs) { diff --git a/qt/SciListBox.cpp b/qt/SciListBox.cpp index ef2475b..f873d7c 100644 --- a/qt/SciListBox.cpp +++ b/qt/SciListBox.cpp @@ -98,7 +98,7 @@ void ListBoxX::Create(Window &parent,int,Point,int,bool) void ListBoxX::SetAverageCharWidth(int) { - // We rely on TQListBox::tqsizeHint() for the size of the list box rather + // We rely on TQListBox::sizeHint() for the size of the list box rather // than make calculations based on the average character width and the // number of visible rows. } @@ -121,7 +121,7 @@ PRectangle ListBoxX::GetDesiredRect() if (slb) { - TQSize sh = slb -> tqsizeHint(); + TQSize sh = slb -> sizeHint(); rc.right = sh.width(); rc.bottom = sh.height(); diff --git a/qt/qextscintillabase.cpp b/qt/qextscintillabase.cpp index aa58b9e..2131ab6 100644 --- a/qt/qextscintillabase.cpp +++ b/qt/qextscintillabase.cpp @@ -73,7 +73,7 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f) TQGridLayout *tqlayout = new TQGridLayout(this,2,2); txtarea = new TQWidget(this,0,WRepaintNoErase|WResizeNoErase); - txtarea -> tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); + txtarea -> setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); txtarea -> setMouseTracking(TRUE); txtarea -> setAcceptDrops(TRUE); txtarea -> setFocusPolicy(WheelFocus); @@ -563,12 +563,12 @@ void QextScintillaBase::handleHSb(int val) // Return the current prefered size. -TQSize QextScintillaBase::tqsizeHint() const +TQSize QextScintillaBase::sizeHint() const { int height = sci -> vs.lineHeight * sci -> pdoc -> LinesTotal(); if (sci -> horizontalScrollBarVisible) - height += hsb -> tqsizeHint().height(); + height += hsb -> sizeHint().height(); return TQSize(sci -> scrollWidth,height); } diff --git a/qt/qextscintillabase.h b/qt/qextscintillabase.h index d4e73ba..1e5a792 100644 --- a/qt/qextscintillabase.h +++ b/qt/qextscintillabase.h @@ -2243,7 +2243,7 @@ public: } //! Returns the recommended size of the widget. - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; //! Returns the viewport widget. This is the widget that actually //! contains the text. diff --git a/src/Editor.cpp b/src/Editor.cpp index 1abb78a..045e384 100755 --- a/src/Editor.cpp +++ b/src/Editor.cpp @@ -346,7 +346,7 @@ Editor::Editor() { hasFocus = false; hideSelection = false; inOverstrike = false; - errortqStatus = 0; + errorStatus = 0; mouseDownCaptures = true; bufferedDraw = true; @@ -7210,11 +7210,11 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { return hasFocus; case SCI_SETSTATUS: - errortqStatus = wParam; + errorStatus = wParam; break; case SCI_GETSTATUS: - return errortqStatus; + return errorStatus; case SCI_SETMOUSEDOWNCAPTURES: mouseDownCaptures = wParam != 0; diff --git a/src/Editor.h b/src/Editor.h index 7dca342..2ce166d 100755 --- a/src/Editor.h +++ b/src/Editor.h @@ -204,7 +204,7 @@ protected: // ScintillaBase subclass needs access to much of Editor bool hasFocus; bool hideSelection; bool inOverstrike; - int errortqStatus; + int errorStatus; bool mouseDownCaptures; /** In bufferedDraw mode, graphics operations are drawn to a pixmap and then copied to
    • virtual TQSize QextScintillaBase::tqsizeHint virtual TQSize QextScintillaBase::sizeHint (  )