Remove Qt4 related stuff

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

8 files changed, 1 insertions, 86 deletions

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;