diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/html/qfileinfo-h.html | 6 | ||||
| -rw-r--r-- | doc/html/qiodevice-h.html | 4 | ||||
| -rw-r--r-- | doc/html/qobjectlist-h.html | 8 | ||||
| -rw-r--r-- | doc/html/qtable-h.html | 3 | ||||
| -rw-r--r-- | doc/html/qtextedit-h.html | 3 | ||||
| -rw-r--r-- | doc/html/qtoolbutton-h.html | 3 | ||||
| -rw-r--r-- | doc/html/qurlinfo-h.html | 28 |
7 files changed, 0 insertions, 55 deletions
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 >= 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 >= 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 >= 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 &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, @@ -120,7 +105,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(); @@ -130,13 +114,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 ); @@ -148,13 +126,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; |