diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-15 20:08:54 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-15 20:08:54 +0000 |
commit | ff7dc5f59ad2d77bcac5084782ba4e4f515efe9d (patch) | |
tree | 5a7b4f0a63359b6651c23865e47b41e46896df49 | |
parent | 8357774e526d1dbaea12521ddc99f5ab0c40d820 (diff) | |
download | tdelibs-ff7dc5f59ad2d77bcac5084782ba4e4f515efe9d.tar.gz tdelibs-ff7dc5f59ad2d77bcac5084782ba4e4f515efe9d.zip |
Honor TQ_OpenMode change made in TQt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1232119 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r-- | kdecore/kextsock.cpp | 2 | ||||
-rw-r--r-- | kdecore/kextsock.h | 2 | ||||
-rw-r--r-- | kdecore/kqiodevicegzip_p.cpp | 2 | ||||
-rw-r--r-- | kdecore/kqiodevicegzip_p.h | 2 | ||||
-rw-r--r-- | kdecore/network/kclientsocketbase.h | 2 | ||||
-rw-r--r-- | kdecore/network/ksocketdevice.cpp | 2 | ||||
-rw-r--r-- | kdecore/network/ksocketdevice.h | 2 | ||||
-rw-r--r-- | kio/kio/kfilterdev.cpp | 4 | ||||
-rw-r--r-- | kio/kio/kfilterdev.h | 2 | ||||
-rw-r--r-- | kio/kio/klimitediodevice.h | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/kdecore/kextsock.cpp b/kdecore/kextsock.cpp index 7517bb8e0..5aad239bd 100644 --- a/kdecore/kextsock.cpp +++ b/kdecore/kextsock.cpp @@ -1262,7 +1262,7 @@ void KExtendedSocket::cancelAsyncConnect() d->status = lookupDone; } -bool KExtendedSocket::open(OpenMode mode) +bool KExtendedSocket::open(TQ_OpenMode mode) { if (mode != IO_Raw | IO_ReadWrite) return false; // invalid open mode diff --git a/kdecore/kextsock.h b/kdecore/kextsock.h index 7783b319b..24957dd47 100644 --- a/kdecore/kextsock.h +++ b/kdecore/kextsock.h @@ -627,7 +627,7 @@ public: * @return true if successful, false when an error occurred or the most was * not correct */ - virtual bool open(OpenMode mode = (OpenMode)(IO_Raw | IO_ReadWrite)); + virtual bool open(TQ_OpenMode mode = (TQ_OpenMode)(IO_Raw | IO_ReadWrite)); /** * Closes the socket. If we have data still in the write buffer yet to be diff --git a/kdecore/kqiodevicegzip_p.cpp b/kdecore/kqiodevicegzip_p.cpp index 84409ddb0..0dcabed74 100644 --- a/kdecore/kqiodevicegzip_p.cpp +++ b/kdecore/kqiodevicegzip_p.cpp @@ -37,7 +37,7 @@ KQIODeviceGZip::~KQIODeviceGZip(void) close(); } -bool KQIODeviceGZip::open(OpenMode mode) +bool KQIODeviceGZip::open(TQ_OpenMode mode) { if (m_gzfile) close(); // One file is already open, so close it first. diff --git a/kdecore/kqiodevicegzip_p.h b/kdecore/kqiodevicegzip_p.h index 8ac0d3a0f..0581602c1 100644 --- a/kdecore/kqiodevicegzip_p.h +++ b/kdecore/kqiodevicegzip_p.h @@ -38,7 +38,7 @@ public: KQIODeviceGZip(const TQString& filename); ~KQIODeviceGZip(void); - bool open(OpenMode mode); + bool open(TQ_OpenMode mode); void close(void); void flush(void); diff --git a/kdecore/network/kclientsocketbase.h b/kdecore/network/kclientsocketbase.h index 7ec934483..75e796ffc 100644 --- a/kdecore/network/kclientsocketbase.h +++ b/kdecore/network/kclientsocketbase.h @@ -281,7 +281,7 @@ public: * * You should not call this function; instead, use @ref connect */ - virtual inline bool open(OpenMode) + virtual inline bool open(TQ_OpenMode) { return connect(); } /** diff --git a/kdecore/network/ksocketdevice.cpp b/kdecore/network/ksocketdevice.cpp index 54c15b156..36e0a5c7b 100644 --- a/kdecore/network/ksocketdevice.cpp +++ b/kdecore/network/ksocketdevice.cpp @@ -171,7 +171,7 @@ bool KSocketDevice::setSocketOptions(int opts) return true; // all went well } -bool KSocketDevice::open(OpenMode) +bool KSocketDevice::open(TQ_OpenMode) { resetError(); return false; diff --git a/kdecore/network/ksocketdevice.h b/kdecore/network/ksocketdevice.h index 4e7c6353d..7c288b722 100644 --- a/kdecore/network/ksocketdevice.h +++ b/kdecore/network/ksocketdevice.h @@ -142,7 +142,7 @@ public: /** * Reimplementation from TQIODevice. You should not call this function in sockets. */ - virtual bool open(OpenMode mode); + virtual bool open(TQ_OpenMode mode); /** * Closes the socket. Reimplemented from TQIODevice. diff --git a/kio/kio/kfilterdev.cpp b/kio/kio/kfilterdev.cpp index f6af06ae2..87d54f5e3 100644 --- a/kio/kio/kfilterdev.cpp +++ b/kio/kio/kfilterdev.cpp @@ -116,7 +116,7 @@ TQIODevice * KFilterDev::device( TQIODevice* inDevice, const TQString & mimetype return 0; } -bool KFilterDev::open( OpenMode mode ) +bool KFilterDev::open( TQ_OpenMode mode ) { //kdDebug(7005) << "KFilterDev::open " << mode << endl; if ( mode == IO_ReadOnly ) @@ -132,7 +132,7 @@ bool KFilterDev::open( OpenMode mode ) d->bNeedHeader = !d->bSkipHeaders; filter->init( mode ); d->bOpenedUnderlyingDevice = !filter->device()->isOpen(); - bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (OpenMode)mode ) : true; + bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (TQ_OpenMode)mode ) : true; d->result = KFilterBase::OK; if ( !ret ) diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h index cf730636a..027d1eb4a 100644 --- a/kio/kio/kfilterdev.h +++ b/kio/kio/kfilterdev.h @@ -53,7 +53,7 @@ public: * Open for reading or writing. * If the KFilterBase's device is not opened, it will be opened. */ - virtual bool open( OpenMode mode ); + virtual bool open( TQ_OpenMode mode ); /** * Close after reading or writing. * If the KFilterBase's device was opened by open(), it will be closed. diff --git a/kio/kio/klimitediodevice.h b/kio/kio/klimitediodevice.h index 666021fa1..0c5a76b79 100644 --- a/kio/kio/klimitediodevice.h +++ b/kio/kio/klimitediodevice.h @@ -47,7 +47,7 @@ public: } virtual ~KLimitedIODevice() {} - virtual bool open( OpenMode m ) { + virtual bool open( TQ_OpenMode m ) { //kdDebug(7005) << "KLimitedIODevice::open m=" << m << endl; if ( m & IO_ReadOnly ) { /*bool ok = false; |