Remove Qt4 related stuff

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

37 files changed, 11 insertions, 263 deletions

diff --git a/configure b/configure
index f021f5638..7e6f2f98d 100755
--- a/configure
+++ b/configure
@@ -3020,9 +3020,6 @@ EOF
 
 if [ "$CFG_LARGEFILE" = "yes" ]; then
     echo "#define QT_LARGEFILE_SUPPORT 64" >>$outpath/include/ntqconfig.h.new
-    if [ "$CFG_NEWABI" = "yes" ]; then
-	echo "#define QT_ABI_QT4 1" >>$outpath/include/ntqconfig.h.new
-    fi
 fi
 
 $unixtests/ptrsize.test $XQMAKESPEC $OPT_VERBOSE $relpath $outpath
diff --git a/doc/html/qfileinfo-h.html b/doc/html/qfileinfo-h.html
index 28cba3a8d..4b82fc655 100644
--- a/doc/html/qfileinfo-h.html
+++ b/doc/html/qfileinfo-h.html
@@ -155,13 +155,7 @@ public:
 
     bool	permission( int permissionSpec ) const;
 
-#if (TQT_VERSION-0 >= 0x040000)
-#error "TQFileInfo::size() should return TQIODevice::Offset instead of uint"
-#elif defined(QT_ABI_QT4)
-    TQIODevice::Offset size()	const;
-#else
     uint	size()		const;
-#endif
 
     TQDateTime	created()	const;
     TQDateTime	lastModified()	const;
diff --git a/doc/html/qiodevice-h.html b/doc/html/qiodevice-h.html
index 4cad06b64..4b505356c 100644
--- a/doc/html/qiodevice-h.html
+++ b/doc/html/qiodevice-h.html
@@ -127,11 +127,7 @@ body { background: #ffffff; color: black; }
 class Q_EXPORT TQIODevice
 {
 public:
-#if defined(QT_ABI_QT4)
-    typedef TQ_LLONG Offset;
-#else
     typedef TQ_ULONG Offset;
-#endif
 
     TQIODevice();
     virtual ~TQIODevice();
diff --git a/doc/html/qobjectlist-h.html b/doc/html/qobjectlist-h.html
index a3309c378..64d83da62 100644
--- a/doc/html/qobjectlist-h.html
+++ b/doc/html/qobjectlist-h.html
@@ -109,13 +109,6 @@ public:
 		 TQPtrListIterator<TQObject>::operator=( i ); }
 };
 
-#if (TQT_VERSION-0 >= 0x040000)
-#if defined(Q_CC_GNU)
-#warning "remove the TQObjectListIt class"
-#warning "remove the typedef too, maybe"
-#endif
-typedef TQObjectListIterator TQObjectListIt;
-#else
 class Q_EXPORT TQObjectListIt : public TQPtrListIterator<TQObject>
 {
 public:
@@ -123,7 +116,6 @@ public:
     TQObjectListIt &operator=(const TQObjectListIt &i)
 	{ return (TQObjectListIt&)TQPtrListIterator<TQObject>::operator=(i); }
 };
-#endif
 
 #endif // TQOBJECTLIST_H
 </pre>
diff --git a/doc/html/qtable-h.html b/doc/html/qtable-h.html
index fc5a000d7..a49e02bb4 100644
--- a/doc/html/qtable-h.html
+++ b/doc/html/qtable-h.html
@@ -210,9 +210,6 @@ private:
     uint enabled : 1;
     int rw, cl;
     int rowspan, colspan;
-#if (TQT_VERSION &gt;= 0x040000)
-#error "Add a setAlignment() function in 4.0 (but no d pointer)"
-#endif
 };
 
 #define Q_DEFINED_QTABLE_ITEM
diff --git a/doc/html/qtextedit-h.html b/doc/html/qtextedit-h.html
index 011cc9074..a22442917 100644
--- a/doc/html/qtextedit-h.html
+++ b/doc/html/qtextedit-h.html
@@ -491,9 +491,6 @@ protected:
 protected slots:
     virtual void doChangeInterval();
     void sliderReleased(); // ### make virtual in 4.0
-#if (TQT_VERSION &gt;= 0x040000)
-#error "Some functions need to be changed to virtual for TQt 4.0"
-#endif
 
 private slots:
     void formatMore();
diff --git a/doc/html/qtoolbutton-h.html b/doc/html/qtoolbutton-h.html
index 9519ee20e..bd585da5d 100644
--- a/doc/html/qtoolbutton-h.html
+++ b/doc/html/qtoolbutton-h.html
@@ -175,9 +175,6 @@ protected:
     // ### Make virtual in 4.0, maybe act like TQPushButton with
     // regards to setFlat() instead?  Andy
     bool uses3D() const;
-#if (TQT_VERSION &gt;= 0x040000)
-#error "Some functions need to be changed to virtual for TQt 4.0"
-#endif
 
     bool eventFilter( TQObject *o, TQEvent *e );
 
diff --git a/doc/html/qurlinfo-h.html b/doc/html/qurlinfo-h.html
index c4feddfde..316ab4849 100644
--- a/doc/html/qurlinfo-h.html
+++ b/doc/html/qurlinfo-h.html
@@ -80,9 +80,6 @@ body { background: #ffffff; color: black; }
 #ifndef QT_H
 #include "ntqdatetime.h"
 #include "ntqstring.h"
-#if defined(QT_ABI_QT4)
-#include "ntqiodevice.h"
-#endif
 #endif // QT_H
 
 class TQUrlOperator;
@@ -100,18 +97,6 @@ public:
     TQUrlInfo();
     TQUrlInfo( const TQUrlOperator &amp;path, const TQString &amp;file );
     TQUrlInfo( const TQUrlInfo &amp;ui );
-#if (TQT_VERSION-0 &gt;= 0x040000)
-#error "TQUrlInfo::TQUrlInfo() should accept TQIODevice::Offset instead of uint"
-#elif defined(QT_ABI_QT4)
-    TQUrlInfo( const TQString &amp;name, int permissions, const TQString &amp;owner,
-	      const TQString &amp;group, TQIODevice::Offset size, const TQDateTime &amp;lastModified,
-	      const TQDateTime &amp;lastRead, bool isDir, bool isFile, bool isSymLink,
-	      bool isWritable, bool isReadable, bool isExecutable );
-    TQUrlInfo( const TQUrl &amp;url, int permissions, const TQString &amp;owner,
-	      const TQString &amp;group, TQIODevice::Offset size, const TQDateTime &amp;lastModified,
-	      const TQDateTime &amp;lastRead, bool isDir, bool isFile, bool isSymLink,
-	      bool isWritable, bool isReadable, bool isExecutable );
-#else
     TQUrlInfo( const TQString &amp;name, int permissions, const TQString &amp;owner,
 	      const TQString &amp;group, uint size, const TQDateTime &amp;lastModified,
 	      const TQDateTime &amp;lastRead, bool isDir, bool isFile, bool isSymLink,
@@ -120,7 +105,6 @@ public:
 	      const TQString &amp;group, uint size, const TQDateTime &amp;lastModified,
 	      const TQDateTime &amp;lastRead, bool isDir, bool isFile, bool isSymLink,
 	      bool isWritable, bool isReadable, bool isExecutable );
-#endif
     TQUrlInfo &amp;operator=( const TQUrlInfo &amp;ui );
     virtual ~TQUrlInfo();
 
@@ -130,13 +114,7 @@ public:
     virtual void setSymLink( bool b );
     virtual void setOwner( const TQString &amp;s );
     virtual void setGroup( const TQString &amp;s );
-#if (TQT_VERSION-0 &gt;= 0x040000)
-#error "TQUrlInfo::setSize() should accept TQIODevice::Offset instead of uint"
-#elif defined(QT_ABI_QT4)
-    virtual void setSize( TQIODevice::Offset size );
-#else
     virtual void setSize( uint size );
-#endif
     virtual void setWritable( bool b );
     virtual void setReadable( bool b );
     virtual void setPermissions( int p );
@@ -148,13 +126,7 @@ public:
     int permissions() const;
     TQString owner() const;
     TQString group() const;
-#if (TQT_VERSION-0 &gt;= 0x040000)
-#error "TQUrlInfo::size() should return TQIODevice::Offset instead of uint"
-#elif defined(QT_ABI_QT4)
-    TQIODevice::Offset size() const;
-#else
     uint size() const;
-#endif
     TQDateTime lastModified() const;
     TQDateTime lastRead() const;
     bool isDir() const;
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
index f6ae6bb84..fd10891fc 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
@@ -78,9 +78,6 @@ public:
     bool isComposing() const;
     bool isPreeditRelocationEnabled();
     
-#if (TQT_VERSION-0 >= 0x040000)
-    TQPtrList<TQMenu> *qt4menus();
-#endif
     TQPtrList<TQInputContextMenu> *menus();
     TQPopupMenu *createImSelPopup();    
 
diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp
index f2c84dab7..5c282998a 100644
--- a/src/codecs/qgb18030codec.cpp
+++ b/src/codecs/qgb18030codec.cpp
@@ -117,10 +117,6 @@
 
 #include "ntqgb18030codec.h"
 
-#if (TQT_VERSION-0 >= 0x040000)
-#error "move obsolete header <ntqgbkcodec.h> into the src/compat directory"
-#endif
-
 #ifndef TQT_NO_BIG_CODECS
 
 #define InRange(c, lower, upper)  (((c) >= (lower)) && ((c) <= (upper)))
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index def6deb15..6de17f9db 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -2005,13 +2005,7 @@ TQString TQFileDialogPrivate::File::text( int column ) const
         return info.name();
     case 1:
 	if ( info.isFile() ) {
-#if (TQT_VERSION-0 >= 0x040000)
-#error "clean up Large File Support"
-#elif defined(QT_ABI_QT4)
-	    TQIODevice::Offset size = info.size();
-#else
 	    uint size = info.size();
-#endif
 #if defined(QT_LARGEFILE_SUPPORT) && defined(Q_OS_UNIX)
 	    // ### the following code should not be needed as soon
 	    // ### as TQUrlInfo::size() can return 64-bit
diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h
index bb8a4f9fd..d45657af6 100644
--- a/src/kernel/ntqinputcontext.h
+++ b/src/kernel/ntqinputcontext.h
@@ -57,10 +57,8 @@ struct TQInputContextMenu {
 	NoSeparator,
 	InsertSeparator
     };
-#if !(TQT_VERSION-0 >= 0x040000)
     TQString title;
     TQPopupMenu *popup;
-#endif
 };
 
 
@@ -89,13 +87,8 @@ public:
     virtual bool isComposing() const;
     virtual bool isPreeditRelocationEnabled();
 
-#if (TQT_VERSION-0 >= 0x040000)
-    virtual TQPtrList<TQAction *> actions();
-    void addActionsTo( TQMenu *menu, TQInputContextMenu::Action action = TQInputContextMenu::InsertSeparator );
-#else
     virtual TQPtrList<TQInputContextMenu> *menus();
     void addMenusTo( TQPopupMenu *popup, TQInputContextMenu::Action action = TQInputContextMenu::InsertSeparator );
-#endif
 
 #if defined(Q_WS_X11)
     // these functions are not recommended for ordinary use 
diff --git a/src/kernel/ntqobjectlist.h b/src/kernel/ntqobjectlist.h
index 429be7bd4..1cb73a55b 100644
--- a/src/kernel/ntqobjectlist.h
+++ b/src/kernel/ntqobjectlist.h
@@ -73,13 +73,6 @@ public:
 		 TQPtrListIterator<TQObject>::operator=( i ); }
 };
 
-#if (TQT_VERSION-0 >= 0x040000)
-#if defined(Q_CC_GNU)
-#warning "remove the TQObjectListIt class"
-#warning "remove the typedef too, maybe"
-#endif
-typedef TQObjectListIterator TQObjectListIt;
-#else
 class Q_EXPORT TQObjectListIt : public TQPtrListIterator<TQObject>
 {
 public:
@@ -87,6 +80,5 @@ public:
     TQObjectListIt &operator=(const TQObjectListIt &i)
 	{ return (TQObjectListIt&)TQPtrListIterator<TQObject>::operator=(i); }
 };
-#endif
 
 #endif // TQOBJECTLIST_H
diff --git a/src/kernel/ntqurlinfo.h b/src/kernel/ntqurlinfo.h
index c1c756dca..f726aa329 100644
--- a/src/kernel/ntqurlinfo.h
+++ b/src/kernel/ntqurlinfo.h
@@ -44,9 +44,6 @@
 #ifndef QT_H
 #include "ntqdatetime.h"
 #include "ntqstring.h"
-#if defined(QT_ABI_QT4)
-#include "ntqiodevice.h"
-#endif
 #endif // QT_H
 
 class TQUrlOperator;
@@ -64,18 +61,6 @@ public:
     TQUrlInfo();
     TQUrlInfo( const TQUrlOperator &path, const TQString &file );
     TQUrlInfo( const TQUrlInfo &ui );
-#if (TQT_VERSION-0 >= 0x040000)
-#error "TQUrlInfo::TQUrlInfo() should accept TQIODevice::Offset instead of uint"
-#elif defined(QT_ABI_QT4)
-    TQUrlInfo( const TQString &name, int permissions, const TQString &owner,
-	      const TQString &group, TQIODevice::Offset size, const TQDateTime &lastModified,
-	      const TQDateTime &lastRead, bool isDir, bool isFile, bool isSymLink,
-	      bool isWritable, bool isReadable, bool isExecutable );
-    TQUrlInfo( const TQUrl &url, int permissions, const TQString &owner,
-	      const TQString &group, TQIODevice::Offset size, const TQDateTime &lastModified,
-	      const TQDateTime &lastRead, bool isDir, bool isFile, bool isSymLink,
-	      bool isWritable, bool isReadable, bool isExecutable );
-#else
     TQUrlInfo( const TQString &name, int permissions, const TQString &owner,
 	      const TQString &group, uint size, const TQDateTime &lastModified,
 	      const TQDateTime &lastRead, bool isDir, bool isFile, bool isSymLink,
@@ -84,7 +69,6 @@ public:
 	      const TQString &group, uint size, const TQDateTime &lastModified,
 	      const TQDateTime &lastRead, bool isDir, bool isFile, bool isSymLink,
 	      bool isWritable, bool isReadable, bool isExecutable );
-#endif
     TQUrlInfo &operator=( const TQUrlInfo &ui );
     virtual ~TQUrlInfo();
 
@@ -94,13 +78,7 @@ public:
     virtual void setSymLink( bool b );
     virtual void setOwner( const TQString &s );
     virtual void setGroup( const TQString &s );
-#if (TQT_VERSION-0 >= 0x040000)
-#error "TQUrlInfo::setSize() should accept TQIODevice::Offset instead of uint"
-#elif defined(QT_ABI_QT4)
-    virtual void setSize( TQIODevice::Offset size );
-#else
     virtual void setSize( uint size );
-#endif
     virtual void setWritable( bool b );
     virtual void setReadable( bool b );
     virtual void setPermissions( int p );
@@ -112,13 +90,7 @@ public:
     int permissions() const;
     TQString owner() const;
     TQString group() const;
-#if (TQT_VERSION-0 >= 0x040000)
-#error "TQUrlInfo::size() should return TQIODevice::Offset instead of uint"
-#elif defined(QT_ABI_QT4)
-    TQIODevice::Offset size() const;
-#else
     uint size() const;
-#endif
     TQDateTime lastModified() const;
     TQDateTime lastRead() const;
     bool isDir() const;
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp
index 6523fe756..24050fe89 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/qinputcontext.cpp
@@ -802,14 +802,6 @@ TQString TQInputContext::language()
 }
 
 
-#if (TQT_VERSION-0 >= 0x040000)
-/*!
-    This is a preliminary interface for TQt4
- */
-TQPtrList<TQAction *> TQInputContext::actions()
-{
-}
-#else
 /*!
     This function can be reimplemented in a subclass to provide input
     method dependent popup menus. Return 0 if the menus are
@@ -826,7 +818,6 @@ TQPtrList<TQInputContextMenu> *TQInputContext::menus()
 {
     return 0;
 }
-#endif
 
 /*!
     Appends input method dependent submenus into \a popup. A separator
diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp
index c32689fff..a23a44a8f 100644
--- a/src/kernel/qlayout.cpp
+++ b/src/kernel/qlayout.cpp
@@ -1398,10 +1398,6 @@ void TQGridLayout::setColStretch( int col, int stretch )
     data->setColStretch( col, stretch );
 }
 
-#if TQT_VERSION >= 0x040000
-#error "Make add{Row,Col}Spacing() inline TQT_NO_COMPAT functions defined in terms of set{Row,Col}Spacing()"
-#endif
-
 /*!
     \obsolete
 
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index 82d491cb2..657965c42 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -3171,9 +3171,6 @@ void TQPainter::drawTextItem( int x,  int y, const TQTextItem &ti, int textFlags
     fe->draw( this, x,  y, engine, si, textFlags );
 }
 
-#if TQT_VERSION >= 0x040000
-#error "remove current position and associated methods"
-#endif
 /*!
   \obsolete
     Returns the current position of the  pen.
diff --git a/src/kernel/qthread.cpp b/src/kernel/qthread.cpp
index f3f416096..f09b1939b 100644
--- a/src/kernel/qthread.cpp
+++ b/src/kernel/qthread.cpp
@@ -48,10 +48,6 @@
 #  include "ntqapplication.h"
 #endif // QT_H
 
-#if TQT_VERSION >= 0x040000
-#  error "Remove TQThread::TQThread() and TQThread::start()."
-#endif
-
 
 /*!
     \class TQThread ntqthread.h
diff --git a/src/kernel/qurlinfo.cpp b/src/kernel/qurlinfo.cpp
index 67c0f52a7..30ea9738d 100644
--- a/src/kernel/qurlinfo.cpp
+++ b/src/kernel/qurlinfo.cpp
@@ -185,17 +185,10 @@ TQUrlInfo::TQUrlInfo( const TQUrlInfo &ui )
     isExecutable.
 */
 
-#if defined(QT_ABI_QT4)
-TQUrlInfo::TQUrlInfo( const TQString &name, int permissions, const TQString &owner,
-		    const TQString &group, TQIODevice::Offset size, const TQDateTime &lastModified,
-		    const TQDateTime &lastRead, bool isDir, bool isFile, bool isSymLink,
-		    bool isWritable, bool isReadable, bool isExecutable )
-#else
 TQUrlInfo::TQUrlInfo( const TQString &name, int permissions, const TQString &owner,
 		    const TQString &group, uint size, const TQDateTime &lastModified,
 		    const TQDateTime &lastRead, bool isDir, bool isFile, bool isSymLink,
 		    bool isWritable, bool isReadable, bool isExecutable )
-#endif
 {
     d = new TQUrlInfoPrivate;
     d->name = name;
@@ -226,17 +219,10 @@ TQUrlInfo::TQUrlInfo( const TQString &name, int permissions, const TQString &own
     isExecutable.
 */
 
-#if defined(QT_ABI_QT4)
-TQUrlInfo::TQUrlInfo( const TQUrl &url, int permissions, const TQString &owner,
-		    const TQString &group, TQIODevice::Offset size, const TQDateTime &lastModified,
-		    const TQDateTime &lastRead, bool isDir, bool isFile, bool isSymLink,
-		    bool isWritable, bool isReadable, bool isExecutable )
-#else
 TQUrlInfo::TQUrlInfo( const TQUrl &url, int permissions, const TQString &owner,
 		    const TQString &group, uint size, const TQDateTime &lastModified,
 		    const TQDateTime &lastRead, bool isDir, bool isFile, bool isSymLink,
 		    bool isWritable, bool isReadable, bool isExecutable )
-#endif
 {
     d = new TQUrlInfoPrivate;
     d->name = TQFileInfo( url.path() ).fileName();
@@ -407,11 +393,7 @@ void TQUrlInfo::setGroup( const TQString &s )
     \sa isValid()
 */
 
-#if defined(QT_ABI_QT4)
-void TQUrlInfo::setSize( TQIODevice::Offset size )
-#else
 void TQUrlInfo::setSize( uint size )
-#endif
 {
     if ( !d )
 	d = new TQUrlInfoPrivate;
@@ -542,15 +524,11 @@ TQString TQUrlInfo::group() const
     \sa isValid()
 */
 
-#if defined(QT_ABI_QT4)
-TQIODevice::Offset TQUrlInfo::size() const
-#else
 uint TQUrlInfo::size() const
-#endif
 {
     if ( !d )
 	return 0;
-#if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_QT4)
+#if defined(QT_LARGEFILE_SUPPORT)
     return d->size > UINT_MAX ? UINT_MAX : (uint)d->size;
 #else
     return d->size;
diff --git a/src/table/ntqtable.h b/src/table/ntqtable.h
index a74104c31..a89d8fbaf 100644
--- a/src/table/ntqtable.h
+++ b/src/table/ntqtable.h
@@ -175,9 +175,6 @@ private:
     uint enabled : 1;
     int rw, cl;
     int rowspan, colspan;
-#if (TQT_VERSION >= 0x040000)
-#error "Add a setAlignment() function in 4.0 (but no d pointer)"
-#endif
 };
 
 #define Q_DEFINED_QTABLE_ITEM
diff --git a/src/tools/ntqfileinfo.h b/src/tools/ntqfileinfo.h
index 3924a13fa..86cfe6b2e 100644
--- a/src/tools/ntqfileinfo.h
+++ b/src/tools/ntqfileinfo.h
@@ -119,13 +119,7 @@ public:
 
     bool	permission( int permissionSpec ) const;
 
-#if (TQT_VERSION-0 >= 0x040000)
-#error "TQFileInfo::size() should return TQIODevice::Offset instead of uint"
-#elif defined(QT_ABI_QT4)
-    TQIODevice::Offset size()	const;
-#else
     uint	size()		const;
-#endif
 
     TQDateTime	created()	const;
     TQDateTime	lastModified()	const;
diff --git a/src/tools/ntqiodevice.h b/src/tools/ntqiodevice.h
index d014265cd..543ab8515 100644
--- a/src/tools/ntqiodevice.h
+++ b/src/tools/ntqiodevice.h
@@ -91,11 +91,7 @@
 class Q_EXPORT TQIODevice
 {
 public:
-#if defined(QT_ABI_QT4)
-    typedef TQ_LLONG Offset;
-#else
     typedef TQ_ULONG Offset;
-#endif
 
     TQIODevice();
     virtual ~TQIODevice();
diff --git a/src/tools/qbuffer.cpp b/src/tools/qbuffer.cpp
index 0afa52aef..b1707d78d 100644
--- a/src/tools/qbuffer.cpp
+++ b/src/tools/qbuffer.cpp
@@ -268,12 +268,8 @@ bool TQBuffer::at( Offset pos )
 #endif
     if ( pos > a_len ) {
 #if defined(QT_CHECK_RANGE)
-#if defined(QT_ABI_QT4)
-        tqWarning( "TQBuffer::at: Index %lld out of range", pos );
-#else
         tqWarning( "TQBuffer::at: Index %lu out of range", pos );
 #endif
-#endif
         return FALSE;
     }
     ioIndex = pos;
diff --git a/src/tools/qfile_unix.cpp b/src/tools/qfile_unix.cpp
index e54ee6b97..f28899483 100644
--- a/src/tools/qfile_unix.cpp
+++ b/src/tools/qfile_unix.cpp
@@ -278,7 +278,7 @@ bool TQFile::open( int m )
 	    length = INT_MAX;
 	    ioIndex = 0;
 	} else {
-#if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_QT4)
+#if defined(QT_LARGEFILE_SUPPORT)
 	    length = st.st_size > UINT_MAX ? UINT_MAX : (Offset)st.st_size;
 #else
 	    length = (Offset)st.st_size;
@@ -352,13 +352,9 @@ bool TQFile::open( int m, FILE *f )
     struct stat st;
     ::fstat( fileno(fh), &st );
 #if defined(QT_LARGEFILE_SUPPORT)
-#if !defined(QT_ABI_QT4)
     off_t tmp = ftello( fh );
     ioIndex = tmp > UINT_MAX ? UINT_MAX : (Offset)tmp;
 #else
-    ioIndex = (Offset)ftello( fh );
-#endif
-#else
     ioIndex = (Offset)ftell( fh );
 #endif
     if ( (st.st_mode & S_IFMT) != S_IFREG || f == stdin ) { //stdin is non seekable
@@ -367,7 +363,7 @@ bool TQFile::open( int m, FILE *f )
 	length = INT_MAX;
 	ioIndex = 0;
     } else {
-#if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_QT4)
+#if defined(QT_LARGEFILE_SUPPORT)
 	length = st.st_size > UINT_MAX ? UINT_MAX : (Offset)st.st_size;
 #else
 	length = (Offset)st.st_size;
@@ -423,7 +419,7 @@ bool TQFile::open( int m, int f )
     ext_f = TRUE;
     struct stat st;
     ::fstat( fd, &st );
-#if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_QT4)
+#if defined(QT_LARGEFILE_SUPPORT)
     off_t tmp = ::lseek(fd, 0, SEEK_CUR);
     ioIndex = tmp > UINT_MAX ? UINT_MAX : (Offset)tmp;
 #else
@@ -435,7 +431,7 @@ bool TQFile::open( int m, int f )
 	length = INT_MAX;
 	ioIndex = 0;
     } else {
-#if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_QT4)
+#if defined(QT_LARGEFILE_SUPPORT)
 	length = st.st_size > UINT_MAX ? UINT_MAX : (Offset)st.st_size;
 #else
 	length = (Offset)st.st_size;
@@ -472,7 +468,7 @@ TQIODevice::Offset TQFile::size() const
     }
     if ( ret == -1 )
 	return 0;
-#if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_QT4)
+#if defined(QT_LARGEFILE_SUPPORT)
     return (uint)st.st_size > UINT_MAX ? UINT_MAX : (Offset)st.st_size;
 #else
     return st.st_size;
@@ -527,19 +523,15 @@ bool TQFile::at( Offset pos )
 #endif
     }
     if ( ok )
-#if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_QT4)
+#if defined(QT_LARGEFILE_SUPPORT)
 	ioIndex = pos > UINT_MAX ? UINT_MAX : (Offset)pos;
 #else
 	ioIndex = (Offset)pos;
 #endif
 #if defined(QT_CHECK_RANGE)
     else
-#if defined(QT_ABI_QT4)
-	tqWarning( "TQFile::at: Cannot set file position %lld", pos );
-#else
 	tqWarning( "TQFile::at: Cannot set file position %lu", pos );
 #endif
-#endif
     return ok;
 }
 
@@ -654,7 +646,7 @@ TQ_LONG TQFile::writeBlock( const char *p, TQ_ULONG len )
 	setErrorStringErrno( errno );
 	if ( !isSequentialAccess() ) {
 	    if ( isRaw() ) {			// recalc file position
-#if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_QT4)
+#if defined(QT_LARGEFILE_SUPPORT)
 		off_t tmp = ::lseek( fd, 0, SEEK_CUR );
 		ioIndex = tmp > UINT_MAX ? UINT_MAX : (Offset)tmp;
 #else
@@ -662,13 +654,9 @@ TQ_LONG TQFile::writeBlock( const char *p, TQ_ULONG len )
 #endif
 	    } else {
 #if defined(QT_LARGEFILE_SUPPORT)
-#if !defined(QT_ABI_QT4)
 		off_t tmp = (Offset)::fseeko( fh, 0, SEEK_CUR );
 		ioIndex = tmp > UINT_MAX ? UINT_MAX : (Offset)tmp;
 #else
-		ioIndex = (Offset)::fseeko( fh, 0, SEEK_CUR );
-#endif
-#else
 		ioIndex = (Offset)::fseek( fh, 0, SEEK_CUR );
 #endif
 	    }
diff --git a/src/tools/qfileinfo.cpp b/src/tools/qfileinfo.cpp
index 763324d15..466e62cc4 100644
--- a/src/tools/qfileinfo.cpp
+++ b/src/tools/qfileinfo.cpp
@@ -45,7 +45,7 @@
 #include "ntqdir.h"
 #include "qfiledefs_p.h"
 #include "ntqdeepcopy.h"
-#if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_QT4)
+#if defined(QT_LARGEFILE_SUPPORT)
 #include <limits.h>
 #endif
 
@@ -576,18 +576,12 @@ bool TQFileInfo::convertToAbs()
     Returns the file size in bytes, or 0 if the file does not exist or
     if the size is 0 or if the size cannot be fetched.
 */
-#if defined(QT_ABI_QT4)
-TQIODevice::Offset TQFileInfo::size() const
-#else
 uint TQFileInfo::size() const
-#endif
 {
     if ( !fic || !cache )
 	doStat();
     if ( fic )
-#if defined(QT_ABI_QT4)
-	return (TQIODevice::Offset)fic->st.st_size;
-#elif defined(QT_LARGEFILE_SUPPORT)
+#if defined(QT_LARGEFILE_SUPPORT)
 	return (uint)fic->st.st_size > UINT_MAX ? UINT_MAX : (uint)fic->st.st_size;
 #else
 	return (uint)fic->st.st_size;
diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp
index ed8805291..8c8c82ac6 100644
--- a/src/tools/qglobal.cpp
+++ b/src/tools/qglobal.cpp
@@ -723,12 +723,6 @@ void tqSystemWarning( const char* msg, int code )
 //
 // The TQ_CHECK_PTR macro calls this function to check if an allocation went ok.
 //
-#if (TQT_VERSION-0 >= 0x040000)
-#if defined(Q_CC_GNU)
-#warning "Change TQ_CHECK_PTR to '{if ((p)==0) tqt_check_pointer(__FILE__,__LINE__);}'"
-#warning "No need for tqt_check_pointer() to return a value - make it void!"
-#endif
-#endif
 bool tqt_check_pointer( bool c, const char *n, int l )
 {
     if ( c )
diff --git a/src/tools/qiodevice.cpp b/src/tools/qiodevice.cpp
index 4f89ddea1..cf069aa22 100644
--- a/src/tools/qiodevice.cpp
+++ b/src/tools/qiodevice.cpp
@@ -568,11 +568,7 @@ bool TQIODevice::at( Offset pos )
 {
 #if defined(QT_CHECK_RANGE)
     if ( pos > size() ) {
-#if defined(QT_ABI_QT4)
-	tqWarning( "TQIODevice::at: Index %lld out of range", pos );
-#else
 	tqWarning( "TQIODevice::at: Index %lu out of range", pos );
-#endif
 	return FALSE;
     }
 #endif
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index 27bdf31d8..9c205e950 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -2081,13 +2081,10 @@ static ArgEscapeData findArgEscapes(const TQString &s)
 	    d.locale_occurrences = 0;
 	}
 
-#if TQT_VERSION < 0x040000
-    	// ### remove preprocessor in TQt 4.0
-	/* Since in TQt < 4.0 only the first instance is replaced,
+	/* Only the first instance is replaced,
 	   escape_len should hold the length of only the first escape
 	   sequence */
     	if (d.occurrences == 0)
-#endif
     	{
 	    ++d.occurrences;
     	    if (locale_arg) {
diff --git a/src/tools/qtextstream.cpp b/src/tools/qtextstream.cpp
index 37937e6d0..85059dafc 100644
--- a/src/tools/qtextstream.cpp
+++ b/src/tools/qtextstream.cpp
@@ -384,12 +384,8 @@ bool TQStringBuffer::at( Offset pos )
 #endif
     if ( pos >= s->length()*2 ) {
 #if defined(QT_CHECK_RANGE)
-#if defined(QT_ABI_QT4)
-	tqWarning( "TQStringBuffer::at: Index %lld out of range", pos );
-#else
 	tqWarning( "TQStringBuffer::at: Index %lu out of range", pos );
 #endif
-#endif
 	return FALSE;
     }
     ioIndex = pos;
diff --git a/src/widgets/ntqtextedit.h b/src/widgets/ntqtextedit.h
index 6e9a3861f..b103cc29d 100644
--- a/src/widgets/ntqtextedit.h
+++ b/src/widgets/ntqtextedit.h
@@ -458,9 +458,6 @@ protected:
 protected slots:
     virtual void doChangeInterval();
     void sliderReleased(); // ### make virtual in 4.0
-#if (TQT_VERSION >= 0x040000)
-#error "Some functions need to be changed to virtual for TQt 4.0"
-#endif
 
 private slots:
     void formatMore();
diff --git a/src/widgets/ntqtoolbutton.h b/src/widgets/ntqtoolbutton.h
index 0ece3a9fc..48d222f94 100644
--- a/src/widgets/ntqtoolbutton.h
+++ b/src/widgets/ntqtoolbutton.h
@@ -139,9 +139,6 @@ protected:
     // ### Make virtual in 4.0, maybe act like TQPushButton with
     // regards to setFlat() instead?  Andy
     bool uses3D() const;
-#if (TQT_VERSION >= 0x040000)
-#error "Some functions need to be changed to virtual for TQt 4.0"
-#endif
 
     bool eventFilter( TQObject *o, TQEvent *e );
 
diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp
index 7498b4730..14bb57433 100644
--- a/src/widgets/qaction.cpp
+++ b/src/widgets/qaction.cpp
@@ -958,9 +958,6 @@ void TQAction::setVisible( bool visible )
 	return;
     d->visible = visible;
     d->update( TQActionPrivate::Visibility );
-#if (TQT_VERSION-0 >= 0x040000)
-#error "TQAction::setVisible function wants to be virtual. Also add virtual change() function"
-#endif
     if ( d->d_group ) //### this function wants to be virtual in 4.0
 	d->d_group->update( (TQActionGroup*) this );
 }
diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp
index e5d172f32..00d90fc94 100644
--- a/src/widgets/qbutton.cpp
+++ b/src/widgets/qbutton.cpp
@@ -675,9 +675,6 @@ bool TQButton::hitButton( const TQPoint &pos ) const
 
     \sa drawButtonLabel(), paintEvent()
 */
-#if (TQT_VERSION-0 >= 0x040000)
-#error "TQButton. Make pure virtual"
-#endif
 void TQButton::drawButton( TQPainter * )
 {
     return;
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index 61f144f6e..051ef6d0b 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -502,22 +502,6 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
 	return;
 #endif
 
-#if (TQT_VERSION-0 >= 0x040000)
-#error "Fix this now"
-    // #### should move to TQWidget - anything might need this functionality,
-    // #### since anything can have WType_Popup window flag.
-    // #### This includes stuff in TQPushButton and some stuff for setting
-    // #### the geometry of TQDialog.
-    // TQPopupMenu
-    // ::exec()
-    // ::popup()
-    // TQPushButton (shouldn't require TQMenuPopup)
-    // ::popupPressed
-    // Some stuff in qwidget.cpp for dialogs... can't remember exactly.
-    // Also the code here indicatets the parameter should be a rect, not a
-    // point.
-#endif
-
     TQRect screen = screenRect( geometry().center());
     TQRect screen2 = screenRect( TQApplication::reverseLayout()
         ? pos+TQPoint(width(),0) : pos );
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index c759a9952..67bf56fea 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -2097,13 +2097,6 @@ void TQScrollView::moveContents(int x, int y)
     d->hideOrShowAll(this, TRUE );
 }
 
-#if (TQT_VERSION-0 >= 0x040000)
-#if defined(Q_CC_GNU)
-#warning "Should rename contents{X,Y,Width,Height} to viewport{...}"
-#endif
-// Because it's the viewport rectangle that is "moving", not the contents.
-#endif
-
 /*!
     \property TQScrollView::contentsX
     \brief the X coordinate of the contents that are at the left edge of
diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp
index 598093fbc..fac5ca2b9 100644
--- a/src/widgets/qtextedit.cpp
+++ b/src/widgets/qtextedit.cpp
@@ -5014,10 +5014,6 @@ void TQTextEdit::scrollToAnchor( const TQString& name )
     }
 }
 
-#if (TQT_VERSION-0 >= 0x040000)
-#error "function anchorAt(const TQPoint& pos) should be merged into function anchorAt(const TQPoint& pos, AnchorAttribute attr)"
-#endif
-
 /*!
     \overload
 
diff --git a/src/widgets/qwidgetstack.cpp b/src/widgets/qwidgetstack.cpp
index 8024901f1..457376191 100644
--- a/src/widgets/qwidgetstack.cpp
+++ b/src/widgets/qwidgetstack.cpp
@@ -67,11 +67,6 @@ public:
 };
 
 
-#if (TQT_VERSION-0 >= 0x040000)
-#if defined(Q_CC_GNU)
-#warning "Remove TQWidgetStackEventFilter"
-#endif
-#endif
 class TQWidgetStackEventFilter : public TQObject
 {
     /* For binary compatibility, since we cannot implement virtual