From 979f5621d7cb2015eef214b0258dac1d6cd4c742 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 11 Jul 2023 13:32:20 +0900 Subject: [PATCH] Drop compatibility code for TQLineEdit Signed-off-by: Michele Calgaro --- doc/html/ntqlineedit.html | 45 ---------------------------- doc/html/porting.html | 37 +++++++++++++++-------- doc/html/propertydocs | 18 ----------- doc/html/propertyindex | 2 -- doc/html/qlineedit-h.html | 14 --------- doc/html/qlineedit-members.html | 5 ---- doc/man/man3/tqlineedit.3qt | 53 --------------------------------- doc/porting3.doc | 31 ++++++++++++------- src/widgets/ntqlineedit.h | 14 --------- src/widgets/qlineedit.cpp | 39 +----------------------- 10 files changed, 45 insertions(+), 213 deletions(-) diff --git a/doc/html/ntqlineedit.html b/doc/html/ntqlineedit.html index 923c3de0..1fbd6ad7 100644 --- a/doc/html/ntqlineedit.html +++ b/doc/html/ntqlineedit.html @@ -55,8 +55,6 @@ body { background: #ffffff; color: black; }
  • int cursorPosition () const
  • bool validateAndSet ( const TQString & newText, int newPos, int newMarkAnchor, int newMarkDrag )  (obsolete)
  • int alignment () const
    • -
  • void cursorLeft ( bool mark, int steps = 1 )  (obsolete)
    • -
  • void cursorRight ( bool mark, int steps = 1 )  (obsolete)
  • void cursorForward ( bool mark, int steps = 1 )
  • void cursorBackward ( bool mark, int steps = 1 )
  • void cursorWordForward ( bool mark )
    • @@ -74,8 +72,6 @@ body { background: #ffffff; color: black; }
  • int selectionStart () const
  • bool isUndoAvailable () const
  • bool isRedoAvailable () const
    • -
  • bool hasMarkedText () const  (obsolete)
    • -
  • TQString markedText () const  (obsolete)
  • bool dragEnabled () const
  • TQString inputMask () const
  • void setInputMask ( const TQString & inputMask )
    • @@ -123,10 +119,8 @@ body { background: #ffffff; color: black; }
  • EchoMode echoMode - the line edit's echo mode
  • bool edited - whether the line edit has been edited. Use modified instead  (obsolete)
  • bool frame - whether the line edit draws itself with a frame
    • -
  • bool hasMarkedText - whether part of the text has been selected by the user. Use hasSelectedText instead  (read only)  (obsolete)
  • bool hasSelectedText - whether there is any text selected  (read only)
  • TQString inputMask - the validation input mask
    • -
  • TQString markedText - the text selected by the user. Use selectedText instead  (read only)  (obsolete)
  • int maxLength - the maximum permitted length of the text
  • bool modified - whether the line edit's contents has been modified by the user  (read only)
  • bool readOnly - whether the line edit is read only
    • @@ -139,7 +133,6 @@ body { background: #ffffff; color: black; }

    Detailed Description

    @@ -309,24 +302,9 @@ each character moved over is added to the selection; if mark is FALSE the selection is cleared.

    See also cursorBackward(). -

    void TQLineEdit::cursorLeft ( bool mark, int steps = 1 ) -

    -This function is obsolete. It is provided to keep old source working. We strongly advise against using it in new code. -

    -For compatibilty with older applications only. Use cursorBackward() -instead. -

    See also cursorBackward(). -

    int TQLineEdit::cursorPosition () const

    Returns the current cursor position for this line edit. See the "cursorPosition" property for details. -

    void TQLineEdit::cursorRight ( bool mark, int steps = 1 ) -

    -This function is obsolete. It is provided to keep old source working. We strongly advise against using it in new code. -

    -

    Use cursorForward() instead. -

    See also cursorForward(). -

    void TQLineEdit::cursorWordBackward ( bool mark )

    Moves the cursor one word backward. If mark is TRUE, the word @@ -388,9 +366,6 @@ use selectedText(), select

    bool TQLineEdit::hasAcceptableInput () const

    Returns TRUE if the input satisfies the inputMask and the validator; otherwise returns FALSE. See the "acceptableInput" property for details. -

    bool TQLineEdit::hasMarkedText () const -

    Returns TRUE if part of the text has been selected by the user. Use hasSelectedText instead; otherwise returns FALSE. -See the "hasMarkedText" property for details.

    bool TQLineEdit::hasSelectedText () const

    Returns TRUE if there is any text selected; otherwise returns FALSE. See the "hasSelectedText" property for details. @@ -439,9 +414,6 @@ validator), the signal returnPressed() is emitted.

    This signal is emitted when the line edit has lost focus.

    See also focus, TQWidget::focusInEvent(), and TQWidget::focusOutEvent(). -

    TQString TQLineEdit::markedText () const -

    Returns the text selected by the user. Use selectedText instead. -See the "markedText" property for details.

    int TQLineEdit::maxLength () const

    Returns the maximum permitted length of the text. See the "maxLength" property for details. @@ -463,13 +435,6 @@ selected text, providing the line edit is not read-only Redoes the last operation if redo is available. -

    void TQLineEdit::repaintArea ( int from, int to ) [protected] -

    -This function is obsolete. It is provided to keep old source working. We strongly advise against using it in new code. -

    -Repaints all characters from from to to. If cursorPos is -between from and to, ensures that cursorPos is visible. -

    void TQLineEdit::returnPressed () [signal]

    @@ -636,11 +601,6 @@ two-pixel frame, otherwise the line edit draws itself without any frame.

    Set this property's value with setFrame() and get this property's value with frame(). -

    bool hasMarkedText

    -This function is obsolete. It is provided to keep old source working. We strongly advise against using it in new code. -

    This property holds whether part of the text has been selected by the user. Use hasSelectedText instead. -

    -

    Get this property's value with hasMarkedText().

    bool hasSelectedText

    This property holds whether there is any text selected.

    hasSelectedText() returns TRUE if some or all of the text has been @@ -695,11 +655,6 @@ with validators.

    See also maxLength.

    Set this property's value with setInputMask() and get this property's value with inputMask(). -

    TQString markedText

    -This function is obsolete. It is provided to keep old source working. We strongly advise against using it in new code. -

    This property holds the text selected by the user. Use selectedText instead. -

    -

    Get this property's value with markedText().

    int maxLength

    This property holds the maximum permitted length of the text.

    If the text is too long, it is truncated at the limit. diff --git a/doc/html/porting.html b/doc/html/porting.html index 50f7fb04..44202c10 100644 --- a/doc/html/porting.html +++ b/doc/html/porting.html @@ -64,7 +64,9 @@ you're a registered licensee.

  • Namespace -
  • Removed Functions +
  • Removed Properties + +
  • Removed Functions
  • Obsoleted Functions @@ -228,12 +230,26 @@ have been changed:
  • _WS_*_ becomes Q_WS_*
  • _CC_*_ becomes Q_CC_* +

    Removed Properties +

    +

    All these properties have been removed in TQt 3.x: +

      +
    • TQLineEdit::hasMarkedText. Use TQLineEdit::hasSelectedText instead. +
    • TQLineEdit::markedText. Use TQLineEdit::selectedText instead. +
    • TQToolButton::offIconSet. Use TQToolButton::iconSet instead. +
    • TQToolButton::onIconSet. Use TQToolButton::iconSet instead. +

    Removed Functions

    -

    All these functions have been removed in TQt 3.x: +

    All these functions have been removed in TQt 3.x:

    • TQFont::charSet()
    • TQFont::setCharSet() +
    • TQLineEdit::cursorLeft(bool mark, int steps = 1). Use TQLineEdit::cursorBackward instead. +
    • TQLineEdit::cursorRight(bool mark, int steps = 1). Use TQLineEdit::cursorForward instead. +
    • TQLineEdit::hasMarkedText() const. Use TQLineEdit::hasSelectedText instead. +
    • TQLineEdit::markedText() const. Use TQLineEdit::selectedText instead. +
    • TQLineEdit::repaintArea(int, int). Use TQLineEdit::update instead.
    • TQMenuBar::setActItem()
    • TQMenuBar::setWindowsAltMode()
    • TQObject::initMetaObject() @@ -246,6 +262,12 @@ have been changed:
    • TQString::visual()
    • TQStyle::set...() functions
    • TQStyle::drawArrow() +
    • TQToolButton::iconSet(bool on) const +
    • TQToolButton::offIconSet() const +
    • TQToolButton::onIconSet() const +
    • TQToolButton::setIconSet(const & set, bool on) +
    • TQToolButton::setOffIconSet(const TQIconSet &) +
    • TQToolButton::setOnIconSet(const TQIconSet &)
    • TQWidget::setFontPropagation()
    • TQWidget::setPalettePropagation()
    @@ -305,11 +327,6 @@ new code.
  • TQFontDatabase::weight( const TQString & family, const TQString & style, const TQString & ) const
  • TQLabel::autoResize() const
  • TQLabel::setAutoResize( bool enable ) -
  • TQLineEdit::cursorLeft( bool mark, int steps = 1 ) -
  • TQLineEdit::cursorRight( bool mark, int steps = 1 ) -
  • TQLineEdit::hasMarkedText() const -
  • TQLineEdit::markedText() const -
  • TQLineEdit::repaintArea( int, int )
  • TQListBox::cellHeight( int i ) const
  • TQListBox::cellHeight() const
  • TQListBox::cellWidth() const @@ -357,12 +374,6 @@ new code.
  • TQTabDialog::setTabEnabled( const char *name, bool enable )
  • TQTextStream::TQTextStream( TQString & str, int filemode )
  • TQToolBar::TQToolBar( const TQString & label, TQMainWindow *, ToolBarDock = DockTop, bool newLine = FALSE, const char *name = 0 ) -
  • TQToolButton::iconSet( bool on ) const -
  • TQToolButton::offIconSet() const -
  • TQToolButton::onIconSet() const -
  • TQToolButton::setIconSet( const TQIconSet & set, bool on ) -
  • TQToolButton::setOffIconSet( const TQIconSet & ) -
  • TQToolButton::setOnIconSet( const TQIconSet & )
  • TQToolTip::enabled()
  • TQToolTip::setEnabled( bool enable )
  • TQTranslator::find( const char *context, const char *sourceText, const char *comment = 0 ) const diff --git a/doc/html/propertydocs b/doc/html/propertydocs index ea60364b..8f33f3e3 100644 --- a/doc/html/propertydocs +++ b/doc/html/propertydocs @@ -2112,15 +2112,6 @@ frame. <p>Set this property's value with <a href="ntqlineedit.html#setFrame">setFrame</a>() and get this property's value with <a href="ntqlineedit.html#frame">frame</a>(). - - QLineEdit::hasMarkedText - -<b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code. -<p> <p>This property holds whether part of the text has been selected by the user. Use hasSelectedText instead. -<p> -<p>Get this property's value with <a href="ntqlineedit.html#hasMarkedText">hasMarkedText</a>(). - - QLineEdit::hasSelectedText @@ -2183,15 +2174,6 @@ with <a href="ntqlineedit.html#setValidator">validators</a>. <p>Set this property's value with <a href="ntqlineedit.html#setInputMask">setInputMask</a>() and get this property's value with <a href="ntqlineedit.html#inputMask">inputMask</a>(). - - QLineEdit::markedText - -<b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code. -<p> <p>This property holds the text selected by the user. Use selectedText instead. -<p> -<p>Get this property's value with <a href="ntqlineedit.html#markedText">markedText</a>(). - - QLineEdit::maxLength diff --git a/doc/html/propertyindex b/doc/html/propertyindex index a5bd9514..8c57d45f 100644 --- a/doc/html/propertyindex +++ b/doc/html/propertyindex @@ -175,10 +175,8 @@ "QLineEdit/echoMode" ntqlineedit.html#echoMode-prop "QLineEdit/edited" ntqlineedit.html#edited-prop "QLineEdit/frame" ntqlineedit.html#frame-prop -"QLineEdit/hasMarkedText" ntqlineedit.html#hasMarkedText-prop "QLineEdit/hasSelectedText" ntqlineedit.html#hasSelectedText-prop "QLineEdit/inputMask" ntqlineedit.html#inputMask-prop -"QLineEdit/markedText" ntqlineedit.html#markedText-prop "QLineEdit/maxLength" ntqlineedit.html#maxLength-prop "QLineEdit/modified" ntqlineedit.html#modified-prop "QLineEdit/readOnly" ntqlineedit.html#readOnly-prop diff --git a/doc/html/qlineedit-h.html b/doc/html/qlineedit-h.html index db6bbda5..996e4f29 100644 --- a/doc/html/qlineedit-h.html +++ b/doc/html/qlineedit-h.html @@ -105,9 +105,7 @@ class Q_EXPORT TQLineEdit : public TQFrame TQ_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) TQ_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false ) TQ_PROPERTY( bool modified READ isModified ) - TQ_PROPERTY( bool hasMarkedText READ hasMarkedText DESIGNABLE false ) TQ_PROPERTY( bool hasSelectedText READ hasSelectedText ) - TQ_PROPERTY( TQString markedText READ markedText DESIGNABLE false ) TQ_PROPERTY( TQString selectedText READ selectedText ) TQ_PROPERTY( bool dragEnabled READ dragEnabled WRITE setDragEnabled ) TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) @@ -145,10 +143,6 @@ public: int alignment() const; -#ifndef TQT_NO_COMPAT - void cursorLeft( bool mark, int steps = 1 ) { cursorForward( mark, -steps ); } - void cursorRight( bool mark, int steps = 1 ) { cursorForward( mark, steps ); } -#endif void cursorForward( bool mark, int steps = 1 ); void cursorBackward( bool mark, int steps = 1 ); void cursorWordForward( bool mark ); @@ -171,11 +165,6 @@ public: bool isUndoAvailable() const; bool isRedoAvailable() const; -#ifndef TQT_NO_COMPAT - bool hasMarkedText() const { return hasSelectedText(); } - TQString markedText() const { return selectedText(); } -#endif - bool dragEnabled() const; TQString inputMask() const; @@ -237,9 +226,6 @@ protected: void contextMenuEvent( TQContextMenuEvent * ); virtual TQPopupMenu *createPopupMenu(); void windowActivationChange( bool ); -#ifndef TQT_NO_COMPAT - void repaintArea( int, int ) { update(); } -#endif private slots: void clipboardChanged(); diff --git a/doc/html/qlineedit-members.html b/doc/html/qlineedit-members.html index 934673a9..30bf4f68 100644 --- a/doc/html/qlineedit-members.html +++ b/doc/html/qlineedit-members.html @@ -81,9 +81,7 @@ body { background: #ffffff; color: black; }
  • cursor()
  • cursorBackward()
  • cursorForward() -
  • cursorLeft()
  • cursorPosition() -
  • cursorRight()
  • cursorWordBackward()
  • cursorWordForward()
  • customEvent() @@ -147,7 +145,6 @@ body { background: #ffffff; color: black; }
  • handle()
  • hasAcceptableInput()
  • hasFocus() -
  • hasMarkedText()
  • hasMouse()
  • hasMouseTracking()
  • hasSelectedText() @@ -213,7 +210,6 @@ body { background: #ffffff; color: black; }
  • mapToGlobal()
  • mapToParent()
  • margin() -
  • markedText()
  • maxLength()
  • maximumHeight()
  • maximumSize() @@ -263,7 +259,6 @@ body { background: #ffffff; color: black; }
  • removeChild()
  • removeEventFilter()
  • repaint() -
  • repaintArea()
  • reparent()
  • resetInputContext()
  • resize() diff --git a/doc/man/man3/tqlineedit.3qt b/doc/man/man3/tqlineedit.3qt index 0e4f64b3..6c7e2320 100644 --- a/doc/man/man3/tqlineedit.3qt +++ b/doc/man/man3/tqlineedit.3qt @@ -67,12 +67,6 @@ Inherits QFrame. .BI "int \fBalignment\fR () const" .br .ti -1c -.BI "void cursorLeft ( bool mark, int steps = 1 ) \fI(obsolete)\fR" -.br -.ti -1c -.BI "void cursorRight ( bool mark, int steps = 1 ) \fI(obsolete)\fR" -.br -.ti -1c .BI "void \fBcursorForward\fR ( bool mark, int steps = 1 )" .br .ti -1c @@ -124,12 +118,6 @@ Inherits QFrame. .BI "bool \fBisRedoAvailable\fR () const" .br .ti -1c -.BI "bool hasMarkedText () const \fI(obsolete)\fR" -.br -.ti -1c -.BI "QString markedText () const \fI(obsolete)\fR" -.br -.ti -1c .BI "bool \fBdragEnabled\fR () const" .br .ti -1c @@ -253,18 +241,12 @@ Inherits QFrame. .BI "bool \fBframe\fR - whether the line edit draws itself with a frame" .br .ti -1c -.BI "bool hasMarkedText - whether part of the text has been selected by the user. Use hasSelectedText instead \fI(read " "only" ")\fR \fI(obsolete)\fR" -.br -.ti -1c .BI "bool \fBhasSelectedText\fR - whether there is any text selected \fI(read " "only" ")\fR" .br .ti -1c .BI "QString \fBinputMask\fR - the validation input mask" .br .ti -1c -.BI "QString markedText - the text selected by the user. Use selectedText instead \fI(read " "only" ")\fR \fI(obsolete)\fR" -.br -.ti -1c .BI "int \fBmaxLength\fR - the maximum permitted length of the text" .br .ti -1c @@ -294,9 +276,6 @@ Inherits QFrame. .ti -1c .BI "virtual QPopupMenu * \fBcreatePopupMenu\fR ()" .br -.ti -1c -.BI "void repaintArea ( int from, int to ) \fI(obsolete)\fR" -.br .in -1c .SH DESCRIPTION The QLineEdit widget is a one-line text editor. @@ -400,20 +379,8 @@ See also cursorForward(). Moves the cursor forward \fIsteps\fR characters. If \fImark\fR is TRUE each character moved over is added to the selection; if \fImark\fR is FALSE the selection is cleared. .PP See also cursorBackward(). -.SH "void QLineEdit::cursorLeft ( bool mark, int steps = 1 )" -\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. -.PP -For compatibilty with older applications only. Use cursorBackward() instead. -.PP -See also cursorBackward(). .SH "int QLineEdit::cursorPosition () const" Returns the current cursor position for this line edit. See the "cursorPosition" property for details. -.SH "void QLineEdit::cursorRight ( bool mark, int steps = 1 )" -\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. -.PP -Use cursorForward() instead. -.PP -See also cursorForward(). .SH "void QLineEdit::cursorWordBackward ( bool mark )" Moves the cursor one word backward. If \fImark\fR is TRUE, the word is also selected. .PP @@ -454,8 +421,6 @@ Returns TRUE if the line edit draws itself with a frame; otherwise returns FALSE \fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. use selectedText(), selectionStart() .SH "bool QLineEdit::hasAcceptableInput () const" Returns TRUE if the input satisfies the inputMask and the validator; otherwise returns FALSE. See the "acceptableInput" property for details. -.SH "bool QLineEdit::hasMarkedText () const" -Returns TRUE if part of the text has been selected by the user. Use hasSelectedText instead; otherwise returns FALSE. See the "hasMarkedText" property for details. .SH "bool QLineEdit::hasSelectedText () const" Returns TRUE if there is any text selected; otherwise returns FALSE. See the "hasSelectedText" property for details. .SH "void QLineEdit::home ( bool mark )" @@ -486,8 +451,6 @@ Reimplemented from QWidget. This signal is emitted when the line edit has lost focus. .PP See also focus, QWidget::focusInEvent(), and QWidget::focusOutEvent(). -.SH "QString QLineEdit::markedText () const" -Returns the text selected by the user. Use selectedText instead. See the "markedText" property for details. .SH "int QLineEdit::maxLength () const" Returns the maximum permitted length of the text. See the "maxLength" property for details. .SH "QSize QLineEdit::minimumSizeHint () const\fC [virtual]\fR" @@ -504,10 +467,6 @@ If the end result would not be acceptable to the current validator, nothing happ See also copy() and cut(). .SH "void QLineEdit::redo ()\fC [virtual slot]\fR" Redoes the last operation if redo is available. -.SH "void QLineEdit::repaintArea ( int from, int to )\fC [protected]\fR" -\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. -.PP -Repaints all characters from \fIfrom\fR to \fIto\fR. If cursorPos is between from and to, ensures that cursorPos is visible. .SH "void QLineEdit::returnPressed ()\fC [signal]\fR" This signal is emitted when the Return or Enter key is pressed. Note that if there is a validator() or inputMask() set on the line edit, the returnPressed() signal will only be emitted if the input follows the inputMask() and the validator() returns \fCAcceptable\fR. .PP @@ -641,12 +600,6 @@ This property holds whether the line edit draws itself with a frame. If enabled (the default) the line edit draws itself inside a two-pixel frame, otherwise the line edit draws itself without any frame. .PP Set this property's value with setFrame() and get this property's value with frame(). -.SH "bool hasMarkedText" -\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. -.PP -This property holds whether part of the text has been selected by the user. Use hasSelectedText instead. -.PP -Get this property's value with hasMarkedText(). .SH "bool hasSelectedText" This property holds whether there is any text selected. .PP @@ -687,12 +640,6 @@ To get range control (e.g. for an IP address) use masks together with validators See also maxLength. .PP Set this property's value with setInputMask() and get this property's value with inputMask(). -.SH "QString markedText" -\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. -.PP -This property holds the text selected by the user. Use selectedText instead. -.PP -Get this property's value with markedText(). .SH "int maxLength" This property holds the maximum permitted length of the text. .PP diff --git a/doc/porting3.doc b/doc/porting3.doc index a099d0fe..9102d49f 100644 --- a/doc/porting3.doc +++ b/doc/porting3.doc @@ -180,12 +180,26 @@ have been changed: \i \c _CC_*_ becomes \c Q_CC_* \endlist +\section1 Removed Properties + +\list +\i QLineEdit::hasMarkedText. Use TQLineEdit::hasSelectedText instead. +\i QLineEdit::markedText. Use TQLineEdit::selectedText instead. +\i QToolButton::offIconSet. Use TQToolButton::iconSet instead. +\i QToolButton::onIconSet. Use TQToolButton::iconSet instead. +\endlist + \section1 Removed Functions All these functions have been removed in TQt 3.x: \list \i QFont::charSet() \i QFont::setCharSet() +\i QLineEdit::cursorLeft(bool mark, int steps = 1). Use TQLineEdit::cursorBackward instead. +\i QLineEdit::cursorRight(bool mark, int steps = 1). Use TQLineEdit::cursorForward instead. +\i QLineEdit::hasMarkedText() const. Use TQLineEdit::hasSelectedText instead. +\i QLineEdit::markedText() const. Use TQLineEdit::selectedText instead. +\i QLineEdit::repaintArea(int, int). Use TQLineEdit::update instead. \i QMenuBar::setActItem() \i QMenuBar::setWindowsAltMode() \i QObject::initMetaObject() @@ -198,6 +212,12 @@ All these functions have been removed in TQt 3.x: \i QString::visual() \i QStyle::set...() functions \i QStyle::drawArrow() +\i QToolButton::iconSet(bool on) const +\i QToolButton::offIconSet() const +\i QToolButton::onIconSet() const +\i QToolButton::setIconSet(const QIconSet \&set, bool on) +\i QToolButton::setOffIconSet(const QIconSet \&) +\i QToolButton::setOnIconSet(const QIconSet \&) \i QWidget::setFontPropagation() \i QWidget::setPalettePropagation() \endlist @@ -261,11 +281,6 @@ new code. \i QFontDatabase::weight( const QString \& family, const QString \& style, const QString \& ) const \i QLabel::autoResize() const \i QLabel::setAutoResize( bool enable ) -\i QLineEdit::cursorLeft( bool mark, int steps = 1 ) -\i QLineEdit::cursorRight( bool mark, int steps = 1 ) -\i QLineEdit::hasMarkedText() const -\i QLineEdit::markedText() const -\i QLineEdit::repaintArea( int, int ) \i QListBox::cellHeight( int i ) const \i QListBox::cellHeight() const \i QListBox::cellWidth() const @@ -313,12 +328,6 @@ new code. \i QTabDialog::setTabEnabled( const char *name, bool enable ) \i QTextStream::QTextStream( QString \& str, int filemode ) \i QToolBar::QToolBar( const QString \& label, QMainWindow *, ToolBarDock = DockTop, bool newLine = FALSE, const char *name = 0 ) -\i QToolButton::iconSet( bool on ) const -\i QToolButton::offIconSet() const -\i QToolButton::onIconSet() const -\i QToolButton::setIconSet( const QIconSet \& set, bool on ) -\i QToolButton::setOffIconSet( const QIconSet \& ) -\i QToolButton::setOnIconSet( const QIconSet \& ) \i QToolTip::enabled() \i QToolTip::setEnabled( bool enable ) \i QTranslator::find( const char *context, const char *sourceText, const char *comment = 0 ) const diff --git a/src/widgets/ntqlineedit.h b/src/widgets/ntqlineedit.h index 18979f8f..1542acbd 100644 --- a/src/widgets/ntqlineedit.h +++ b/src/widgets/ntqlineedit.h @@ -69,9 +69,7 @@ class Q_EXPORT TQLineEdit : public TQFrame TQ_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) TQ_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false ) TQ_PROPERTY( bool modified READ isModified ) - TQ_PROPERTY( bool hasMarkedText READ hasMarkedText DESIGNABLE false ) TQ_PROPERTY( bool hasSelectedText READ hasSelectedText ) - TQ_PROPERTY( TQString markedText READ markedText DESIGNABLE false ) TQ_PROPERTY( TQString selectedText READ selectedText ) TQ_PROPERTY( bool dragEnabled READ dragEnabled WRITE setDragEnabled ) TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) @@ -109,10 +107,6 @@ public: int alignment() const; -#ifndef TQT_NO_COMPAT - void cursorLeft( bool mark, int steps = 1 ) { cursorForward( mark, -steps ); } - void cursorRight( bool mark, int steps = 1 ) { cursorForward( mark, steps ); } -#endif void cursorForward( bool mark, int steps = 1 ); void cursorBackward( bool mark, int steps = 1 ); void cursorWordForward( bool mark ); @@ -135,11 +129,6 @@ public: bool isUndoAvailable() const; bool isRedoAvailable() const; -#ifndef TQT_NO_COMPAT - bool hasMarkedText() const { return hasSelectedText(); } - TQString markedText() const { return selectedText(); } -#endif - bool dragEnabled() const; TQString inputMask() const; @@ -202,9 +191,6 @@ protected: bool sendMouseEventToInputContext( TQMouseEvent *e ); virtual TQPopupMenu *createPopupMenu(); void windowActivationChange( bool ); -#ifndef TQT_NO_COMPAT - void repaintArea( int, int ) { update(); } -#endif private slots: void clipboardChanged(); diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp index b2348683..27f5867c 100644 --- a/src/widgets/qlineedit.cpp +++ b/src/widgets/qlineedit.cpp @@ -788,23 +788,6 @@ void TQLineEdit::setAlignment( int flag ) } -/*! - \obsolete - \fn void TQLineEdit::cursorRight( bool, int ) - - Use cursorForward() instead. - - \sa cursorForward() -*/ - -/*! - \obsolete - \fn void TQLineEdit::cursorLeft( bool, int ) - For compatibilty with older applications only. Use cursorBackward() - instead. - \sa cursorBackward() -*/ - /*! Moves the cursor forward \a steps characters. If \a mark is TRUE each character moved over is added to the selection; if \a mark is @@ -979,12 +962,6 @@ void TQLineEdit::clearModified() bool TQLineEdit::edited() const { return d->modified; } void TQLineEdit::setEdited( bool on ) { d->modified = on; } -/*! - \obsolete - \property TQLineEdit::hasMarkedText - \brief whether part of the text has been selected by the user. Use hasSelectedText instead. -*/ - /*! \property TQLineEdit::hasSelectedText \brief whether there is any text selected @@ -1001,12 +978,6 @@ bool TQLineEdit::hasSelectedText() const return d->hasSelectedText(); } -/*! - \obsolete - \property TQLineEdit::markedText - \brief the text selected by the user. Use selectedText instead. -*/ - /*! \property TQLineEdit::selectedText \brief the selected text @@ -2319,15 +2290,7 @@ void TQLineEdit::setPalette( const TQPalette & p ) update(); } -/*! - \obsolete - \fn void TQLineEdit::repaintArea( int from, int to ) - Repaints all characters from \a from to \a to. If cursorPos is - between from and to, ensures that cursorPos is visible. -*/ - -/*! \reimp - */ +/*! \reimp */ void TQLineEdit::setFont( const TQFont & f ) { TQWidget::setFont( f );