Drop compatibility code for TQLineEdit

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

10 files changed, 45 insertions, 213 deletions

diff --git a/doc/html/ntqlineedit.html b/doc/html/ntqlineedit.html
index 923c3de0c..1fbd6ad74 100644
--- a/doc/html/ntqlineedit.html
+++ b/doc/html/ntqlineedit.html
@@ -55,8 +55,6 @@ body { background: #ffffff; color: black; }
 <li class=fn>int <a href="#cursorPosition"><b>cursorPosition</b></a> () const</li>
 <li class=fn>bool validateAndSet ( const&nbsp;TQString&nbsp;&amp;&nbsp;newText, int&nbsp;newPos, int&nbsp;newMarkAnchor, int&nbsp;newMarkDrag ) &nbsp;<em>(obsolete)</em></li>
 <li class=fn>int <a href="#alignment"><b>alignment</b></a> () const</li>
-<li class=fn>void cursorLeft ( bool&nbsp;mark, int&nbsp;steps = 1 ) &nbsp;<em>(obsolete)</em></li>
-<li class=fn>void cursorRight ( bool&nbsp;mark, int&nbsp;steps = 1 ) &nbsp;<em>(obsolete)</em></li>
 <li class=fn>void <a href="#cursorForward"><b>cursorForward</b></a> ( bool&nbsp;mark, int&nbsp;steps = 1 )</li>
 <li class=fn>void <a href="#cursorBackward"><b>cursorBackward</b></a> ( bool&nbsp;mark, int&nbsp;steps = 1 )</li>
 <li class=fn>void <a href="#cursorWordForward"><b>cursorWordForward</b></a> ( bool&nbsp;mark )</li>
@@ -74,8 +72,6 @@ body { background: #ffffff; color: black; }
 <li class=fn>int <a href="#selectionStart"><b>selectionStart</b></a> () const</li>
 <li class=fn>bool <a href="#isUndoAvailable"><b>isUndoAvailable</b></a> () const</li>
 <li class=fn>bool <a href="#isRedoAvailable"><b>isRedoAvailable</b></a> () const</li>
-<li class=fn>bool hasMarkedText () const &nbsp;<em>(obsolete)</em></li>
-<li class=fn>TQString markedText () const &nbsp;<em>(obsolete)</em></li>
 <li class=fn>bool <a href="#dragEnabled"><b>dragEnabled</b></a> () const</li>
 <li class=fn>TQString <a href="#inputMask"><b>inputMask</b></a> () const</li>
 <li class=fn>void <a href="#setInputMask"><b>setInputMask</b></a> ( const&nbsp;TQString&nbsp;&amp;&nbsp;inputMask )</li>
@@ -123,10 +119,8 @@ body { background: #ffffff; color: black; }
 <li class=fn>EchoMode <a href="#echoMode-prop"><b>echoMode</b></a>&nbsp;- the line edit's echo mode</li>
 <li class=fn>bool edited&nbsp;- whether the line edit has been edited. Use modified instead &nbsp;<em>(obsolete)</em></li>
 <li class=fn>bool <a href="#frame-prop"><b>frame</b></a>&nbsp;- whether the line edit draws itself with a frame</li>
-<li class=fn>bool hasMarkedText&nbsp;- whether part of the text has been selected by the user. Use hasSelectedText instead &nbsp;<em>(read only)</em> &nbsp;<em>(obsolete)</em></li>
 <li class=fn>bool <a href="#hasSelectedText-prop"><b>hasSelectedText</b></a>&nbsp;- whether there is any text selected &nbsp;<em>(read only)</em></li>
 <li class=fn>TQString <a href="#inputMask-prop"><b>inputMask</b></a>&nbsp;- the validation input mask</li>
-<li class=fn>TQString markedText&nbsp;- the text selected by the user. Use selectedText instead &nbsp;<em>(read only)</em> &nbsp;<em>(obsolete)</em></li>
 <li class=fn>int <a href="#maxLength-prop"><b>maxLength</b></a>&nbsp;- the maximum permitted length of the text</li>
 <li class=fn>bool <a href="#modified-prop"><b>modified</b></a>&nbsp;- whether the line edit's contents has been modified by the user &nbsp;<em>(read only)</em></li>
 <li class=fn>bool <a href="#readOnly-prop"><b>readOnly</b></a>&nbsp;- whether the line edit is read only</li>
@@ -139,7 +133,6 @@ body { background: #ffffff; color: black; }
 <ul>
 <li class=fn>virtual void <a href="#keyPressEvent"><b>keyPressEvent</b></a> ( TQKeyEvent&nbsp;*&nbsp;e )</li>
 <li class=fn>virtual TQPopupMenu * <a href="#createPopupMenu"><b>createPopupMenu</b></a> ()</li>
-<li class=fn>void repaintArea ( int&nbsp;from, int&nbsp;to ) &nbsp;<em>(obsolete)</em></li>
 </ul>
 <hr><a name="details"></a><h2>Detailed Description</h2>
 
@@ -309,24 +302,9 @@ each character moved over is added to the selection; if <em>mark</em> is
 FALSE the selection is cleared.
 <p> <p>See also <a href="#cursorBackward">cursorBackward</a>().
 
-<h3 class=fn>void <a name="cursorLeft"></a>TQLineEdit::cursorLeft ( bool&nbsp;mark, int&nbsp;steps = 1 )
-</h3>
-<b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code.
-<p> 
-For compatibilty with older applications only. Use <a href="#cursorBackward">cursorBackward</a>()
-instead.
-<p>See also <a href="#cursorBackward">cursorBackward</a>().
-
 <h3 class=fn>int <a name="cursorPosition"></a>TQLineEdit::cursorPosition () const
 </h3><p>Returns the current cursor position for this line edit.
 See the <a href="ntqlineedit.html#cursorPosition-prop">"cursorPosition"</a> property for details.
-<h3 class=fn>void <a name="cursorRight"></a>TQLineEdit::cursorRight ( bool&nbsp;mark, int&nbsp;steps = 1 )
-</h3>
-<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> Use <a href="#cursorForward">cursorForward</a>() instead.
-<p> <p>See also <a href="#cursorForward">cursorForward</a>().
-
 <h3 class=fn>void <a name="cursorWordBackward"></a>TQLineEdit::cursorWordBackward ( bool&nbsp;mark )
 </h3>
 Moves the cursor one word backward. If <em>mark</em> is TRUE, the word
@@ -388,9 +366,6 @@ use <a href="#selectedText">selectedText</a>(), <a href="#selectionStart">select
 <h3 class=fn>bool <a name="hasAcceptableInput"></a>TQLineEdit::hasAcceptableInput () const
 </h3><p>Returns TRUE if the input satisfies the inputMask and the validator; otherwise returns FALSE.
 See the <a href="ntqlineedit.html#acceptableInput-prop">"acceptableInput"</a> property for details.
-<h3 class=fn>bool <a name="hasMarkedText"></a>TQLineEdit::hasMarkedText () const
-</h3><p>Returns TRUE if part of the text has been selected by the user. Use hasSelectedText instead; otherwise returns FALSE.
-See the <a href="ntqlineedit.html#hasMarkedText-prop">"hasMarkedText"</a> property for details.
 <h3 class=fn>bool <a name="hasSelectedText"></a>TQLineEdit::hasSelectedText () const
 </h3><p>Returns TRUE if there is any text selected; otherwise returns FALSE.
 See the <a href="ntqlineedit.html#hasSelectedText-prop">"hasSelectedText"</a> property for details.
@@ -439,9 +414,6 @@ validator), the signal <a href="#returnPressed">returnPressed</a>() is emitted.
 <p> This signal is emitted when the line edit has lost focus.
 <p> <p>See also <a href="ntqwidget.html#focus-prop">focus</a>, <a href="ntqwidget.html#focusInEvent">TQWidget::focusInEvent</a>(), and <a href="ntqwidget.html#focusOutEvent">TQWidget::focusOutEvent</a>().
 
-<h3 class=fn><a href="ntqstring.html">TQString</a> <a name="markedText"></a>TQLineEdit::markedText () const
-</h3><p>Returns the text selected by the user. Use selectedText instead.
-See the <a href="ntqlineedit.html#markedText-prop">"markedText"</a> property for details.
 <h3 class=fn>int <a name="maxLength"></a>TQLineEdit::maxLength () const
 </h3><p>Returns the maximum permitted length of the text.
 See the <a href="ntqlineedit.html#maxLength-prop">"maxLength"</a> property for details.
@@ -463,13 +435,6 @@ selected text, providing the line edit is not <a href="#readOnly-prop">read-only
 </h3>
 Redoes the last operation if redo is <a href="#redoAvailable-prop">available</a>.
 
-<h3 class=fn>void <a name="repaintArea"></a>TQLineEdit::repaintArea ( int&nbsp;from, int&nbsp;to )<tt> [protected]</tt>
-</h3>
-<b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code.
-<p> 
-Repaints all characters from <em>from</em> to <em>to</em>. If cursorPos is
-between from and to, ensures that cursorPos is visible.
-
 <h3 class=fn>void <a name="returnPressed"></a>TQLineEdit::returnPressed ()<tt> [signal]</tt>
 </h3>
 
@@ -636,11 +601,6 @@ two-pixel frame, otherwise the line edit draws itself without any
 frame.
 
 <p>Set this property's value with <a href="#setFrame">setFrame</a>() and get this property's value with <a href="#frame">frame</a>().
-<h3 class=fn>bool <a name="hasMarkedText-prop"></a>hasMarkedText</h3>
-<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="#hasMarkedText">hasMarkedText</a>().
 <h3 class=fn>bool <a name="hasSelectedText-prop"></a>hasSelectedText</h3>
 <p>This property holds whether there is any text selected.
 <p>hasSelectedText() returns TRUE if some or all of the text has been
@@ -695,11 +655,6 @@ with <a href="#setValidator">validators</a>.
 <p> <p>See also <a href="#maxLength-prop">maxLength</a>.
 
 <p>Set this property's value with <a href="#setInputMask">setInputMask</a>() and get this property's value with <a href="#inputMask">inputMask</a>().
-<h3 class=fn><a href="ntqstring.html">TQString</a> <a name="markedText-prop"></a>markedText</h3>
-<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="#markedText">markedText</a>().
 <h3 class=fn>int <a name="maxLength-prop"></a>maxLength</h3>
 <p>This property holds the maximum permitted length of the text.
 <p>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 50f7fb040..44202c104 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -64,7 +64,9 @@ you're a registered licensee.
 </a>
 <li><a href="#3"> Namespace
 </a>
-<li><a href="#4"> Removed Functions
+<li><a href="#4-1"> Removed Properties
+</a>
+<li><a href="#4-2"> Removed Functions
 </a>
 <li><a href="#5"> Obsoleted Functions
 </a>
@@ -228,12 +230,26 @@ have been changed:
 <li> <tt>_WS_*_</tt> becomes <tt>Q_WS_*</tt>
 <li> <tt>_CC_*_</tt> becomes <tt>Q_CC_*</tt>
 </ul>
+<p> <h2> Removed Properties
+</h2>
+<a name="4-1"></a><p> All these properties have been removed in TQt 3.x:
+<ul>
+<li> TQLineEdit::hasMarkedText. Use TQLineEdit::hasSelectedText instead.
+<li> TQLineEdit::markedText. Use TQLineEdit::selectedText instead.
+<li> TQToolButton::offIconSet. Use TQToolButton::iconSet instead.
+<li> TQToolButton::onIconSet. Use TQToolButton::iconSet instead.
+</ul>
 <p> <h2> Removed Functions
 </h2>
-<a name="4"></a><p> All these functions have been removed in TQt 3.x:
+<a name="4-2"></a><p> All these functions have been removed in TQt 3.x:
 <ul>
 <li> TQFont::charSet()
 <li> TQFont::setCharSet()
+<li> TQLineEdit::cursorLeft(bool mark, int steps = 1). Use TQLineEdit::cursorBackward instead.
+<li> TQLineEdit::cursorRight(bool mark, int steps = 1). Use TQLineEdit::cursorForward instead.
+<li> TQLineEdit::hasMarkedText() const. Use TQLineEdit::hasSelectedText instead.
+<li> TQLineEdit::markedText() const. Use TQLineEdit::selectedText instead.
+<li> TQLineEdit::repaintArea(int, int). Use TQLineEdit::update instead.
 <li> TQMenuBar::setActItem()
 <li> TQMenuBar::setWindowsAltMode()
 <li> TQObject::initMetaObject()
@@ -246,6 +262,12 @@ have been changed:
 <li> TQString::visual()
 <li> TQStyle::set...() functions
 <li> TQStyle::drawArrow()
+<li> TQToolButton::iconSet(bool on) const
+<li> TQToolButton::offIconSet() const
+<li> TQToolButton::onIconSet() const
+<li> TQToolButton::setIconSet(const &amp; set, bool on)
+<li> TQToolButton::setOffIconSet(const TQIconSet &amp;)
+<li> TQToolButton::setOnIconSet(const TQIconSet &amp;)
 <li> TQWidget::setFontPropagation()
 <li> TQWidget::setPalettePropagation()
 </ul>
@@ -305,11 +327,6 @@ new code.
 <li> <a href="ntqfontdatabase.html#weight">TQFontDatabase::weight</a>( const TQString &amp; family, const TQString &amp; style, const TQString &amp; ) const
 <li> <a href="ntqlabel.html#autoResize">TQLabel::autoResize</a>() const
 <li> <a href="ntqlabel.html#setAutoResize">TQLabel::setAutoResize</a>( bool enable )
-<li> <a href="ntqlineedit.html#cursorLeft">TQLineEdit::cursorLeft</a>( bool mark, int steps = 1 )
-<li> <a href="ntqlineedit.html#cursorRight">TQLineEdit::cursorRight</a>( bool mark, int steps = 1 )
-<li> <a href="ntqlineedit.html#hasMarkedText">TQLineEdit::hasMarkedText</a>() const
-<li> <a href="ntqlineedit.html#markedText">TQLineEdit::markedText</a>() const
-<li> <a href="ntqlineedit.html#repaintArea">TQLineEdit::repaintArea</a>( int, int )
 <li> <a href="ntqlistbox.html#cellHeight">TQListBox::cellHeight</a>( int i ) const
 <li> TQListBox::cellHeight() const
 <li> <a href="ntqlistbox.html#cellWidth">TQListBox::cellWidth</a>() const
@@ -357,12 +374,6 @@ new code.
 <li> <a href="ntqtabdialog.html#setTabEnabled">TQTabDialog::setTabEnabled</a>( const char *name, bool enable )
 <li> <a href="ntqtextstream.html#TQTextStream">TQTextStream::TQTextStream</a>( TQString &amp; str, int filemode )
 <li> <a href="ntqtoolbar.html#TQToolBar">TQToolBar::TQToolBar</a>( const TQString &amp; label, <a href="ntqmainwindow.html">TQMainWindow</a> *, ToolBarDock = DockTop, bool newLine = FALSE, const char *name = 0 )
-<li> TQToolButton::iconSet( bool on ) const
-<li> TQToolButton::offIconSet() const
-<li> TQToolButton::onIconSet() const
-<li> TQToolButton::setIconSet( const <a href="ntqiconset.html">TQIconSet</a> &amp; set, bool on )
-<li> TQToolButton::setOffIconSet( const TQIconSet &amp; )
-<li> TQToolButton::setOnIconSet( const TQIconSet &amp; )
 <li> <a href="ntqtooltip.html#enabled">TQToolTip::enabled</a>()
 <li> <a href="ntqtooltip.html#setEnabled">TQToolTip::setEnabled</a>( bool enable )
 <li> <a href="ntqtranslator.html#find">TQTranslator::find</a>( const char *context, const char *sourceText, const char *comment = 0 ) const
diff --git a/doc/html/propertydocs b/doc/html/propertydocs
index ea60364bd..8f33f3e3f 100644
--- a/doc/html/propertydocs
+++ b/doc/html/propertydocs
@@ -2113,15 +2113,6 @@ frame.
 </doc>
 </property>
 <property>
-    <name>QLineEdit::hasMarkedText</name>
-    <doc href="ntqlineedit.html#hasMarkedText-prop">
-&lt;b&gt;This function is obsolete.&lt;/b&gt; It is provided to keep old source working. We strongly advise against using it in new code.
-&lt;p&gt; &lt;p&gt;This property holds whether part of the text has been selected by the user. Use hasSelectedText instead.
-&lt;p&gt;
-&lt;p&gt;Get this property's value with &lt;a href="ntqlineedit.html#hasMarkedText"&gt;hasMarkedText&lt;/a&gt;().
-</doc>
-</property>
-<property>
     <name>QLineEdit::hasSelectedText</name>
     <doc href="ntqlineedit.html#hasSelectedText-prop">
 &lt;p&gt;This property holds whether there is any text selected.
@@ -2184,15 +2175,6 @@ with &lt;a href="ntqlineedit.html#setValidator"&gt;validators&lt;/a&gt;.
 </doc>
 </property>
 <property>
-    <name>QLineEdit::markedText</name>
-    <doc href="ntqlineedit.html#markedText-prop">
-&lt;b&gt;This function is obsolete.&lt;/b&gt; It is provided to keep old source working. We strongly advise against using it in new code.
-&lt;p&gt; &lt;p&gt;This property holds the text selected by the user. Use selectedText instead.
-&lt;p&gt;
-&lt;p&gt;Get this property's value with &lt;a href="ntqlineedit.html#markedText"&gt;markedText&lt;/a&gt;().
-</doc>
-</property>
-<property>
     <name>QLineEdit::maxLength</name>
     <doc href="ntqlineedit.html#maxLength-prop">
 &lt;p&gt;This property holds the maximum permitted length of the text.
diff --git a/doc/html/propertyindex b/doc/html/propertyindex
index a5bd9514b..8c57d45f3 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 db6bbda57..996e4f299 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 934673a97..30bf4f68c 100644
--- a/doc/html/qlineedit-members.html
+++ b/doc/html/qlineedit-members.html
@@ -81,9 +81,7 @@ body { background: #ffffff; color: black; }
 <li><a href="ntqwidget.html#cursor">cursor</a>()
 <li><a href="ntqlineedit.html#cursorBackward">cursorBackward</a>()
 <li><a href="ntqlineedit.html#cursorForward">cursorForward</a>()
-<li><a href="ntqlineedit.html#cursorLeft">cursorLeft</a>()
 <li><a href="ntqlineedit.html#cursorPosition">cursorPosition</a>()
-<li><a href="ntqlineedit.html#cursorRight">cursorRight</a>()
 <li><a href="ntqlineedit.html#cursorWordBackward">cursorWordBackward</a>()
 <li><a href="ntqlineedit.html#cursorWordForward">cursorWordForward</a>()
 <li><a href="ntqobject.html#customEvent">customEvent</a>()
@@ -147,7 +145,6 @@ body { background: #ffffff; color: black; }
 <li><a href="ntqpaintdevice.html#handle">handle</a>()
 <li><a href="ntqlineedit.html#hasAcceptableInput">hasAcceptableInput</a>()
 <li><a href="ntqwidget.html#hasFocus">hasFocus</a>()
-<li><a href="ntqlineedit.html#hasMarkedText">hasMarkedText</a>()
 <li><a href="ntqwidget.html#hasMouse">hasMouse</a>()
 <li><a href="ntqwidget.html#hasMouseTracking">hasMouseTracking</a>()
 <li><a href="ntqlineedit.html#hasSelectedText">hasSelectedText</a>()
@@ -213,7 +210,6 @@ body { background: #ffffff; color: black; }
 <li><a href="ntqwidget.html#mapToGlobal">mapToGlobal</a>()
 <li><a href="ntqwidget.html#mapToParent">mapToParent</a>()
 <li><a href="ntqframe.html#margin">margin</a>()
-<li><a href="ntqlineedit.html#markedText">markedText</a>()
 <li><a href="ntqlineedit.html#maxLength">maxLength</a>()
 <li><a href="ntqwidget.html#maximumHeight">maximumHeight</a>()
 <li><a href="ntqwidget.html#maximumSize">maximumSize</a>()
@@ -263,7 +259,6 @@ body { background: #ffffff; color: black; }
 <li><a href="ntqobject.html#removeChild">removeChild</a>()
 <li><a href="ntqobject.html#removeEventFilter">removeEventFilter</a>()
 <li><a href="ntqwidget.html#repaint">repaint</a>()
-<li><a href="ntqlineedit.html#repaintArea">repaintArea</a>()
 <li><a href="ntqwidget.html#reparent">reparent</a>()
 <li><a href="ntqwidget.html#resetInputContext">resetInputContext</a>()
 <li><a href="ntqwidget.html#resize">resize</a>()
diff --git a/doc/man/man3/tqlineedit.3qt b/doc/man/man3/tqlineedit.3qt
index 0e4f64b3d..6c7e2320e 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 a099d0fef..9102d49f7 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 18979f8f6..1542acbdd 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 b23486831..27f5867c0 100644
--- a/src/widgets/qlineedit.cpp
+++ b/src/widgets/qlineedit.cpp
@@ -789,23 +789,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
     FALSE the selection is cleared.
@@ -980,12 +963,6 @@ 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
 
@@ -1002,12 +979,6 @@ bool TQLineEdit::hasSelectedText() const
 }
 
 /*!
-  \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 );