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
v3.5.13-sru
tpearson 13 years ago
parent 8357774e52
commit ff7dc5f59a

@ -1262,7 +1262,7 @@ void KExtendedSocket::cancelAsyncConnect()
d->status = lookupDone; d->status = lookupDone;
} }
bool KExtendedSocket::open(OpenMode mode) bool KExtendedSocket::open(TQ_OpenMode mode)
{ {
if (mode != IO_Raw | IO_ReadWrite) if (mode != IO_Raw | IO_ReadWrite)
return false; // invalid open mode return false; // invalid open mode

@ -627,7 +627,7 @@ public:
* @return true if successful, false when an error occurred or the most was * @return true if successful, false when an error occurred or the most was
* not correct * 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 * Closes the socket. If we have data still in the write buffer yet to be

@ -37,7 +37,7 @@ KQIODeviceGZip::~KQIODeviceGZip(void)
close(); close();
} }
bool KQIODeviceGZip::open(OpenMode mode) bool KQIODeviceGZip::open(TQ_OpenMode mode)
{ {
if (m_gzfile) if (m_gzfile)
close(); // One file is already open, so close it first. close(); // One file is already open, so close it first.

@ -38,7 +38,7 @@ public:
KQIODeviceGZip(const TQString& filename); KQIODeviceGZip(const TQString& filename);
~KQIODeviceGZip(void); ~KQIODeviceGZip(void);
bool open(OpenMode mode); bool open(TQ_OpenMode mode);
void close(void); void close(void);
void flush(void); void flush(void);

@ -281,7 +281,7 @@ public:
* *
* You should not call this function; instead, use @ref connect * You should not call this function; instead, use @ref connect
*/ */
virtual inline bool open(OpenMode) virtual inline bool open(TQ_OpenMode)
{ return connect(); } { return connect(); }
/** /**

@ -171,7 +171,7 @@ bool KSocketDevice::setSocketOptions(int opts)
return true; // all went well return true; // all went well
} }
bool KSocketDevice::open(OpenMode) bool KSocketDevice::open(TQ_OpenMode)
{ {
resetError(); resetError();
return false; return false;

@ -142,7 +142,7 @@ public:
/** /**
* Reimplementation from TQIODevice. You should not call this function in sockets. * 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. * Closes the socket. Reimplemented from TQIODevice.

@ -116,7 +116,7 @@ TQIODevice * KFilterDev::device( TQIODevice* inDevice, const TQString & mimetype
return 0; return 0;
} }
bool KFilterDev::open( OpenMode mode ) bool KFilterDev::open( TQ_OpenMode mode )
{ {
//kdDebug(7005) << "KFilterDev::open " << mode << endl; //kdDebug(7005) << "KFilterDev::open " << mode << endl;
if ( mode == IO_ReadOnly ) if ( mode == IO_ReadOnly )
@ -132,7 +132,7 @@ bool KFilterDev::open( OpenMode mode )
d->bNeedHeader = !d->bSkipHeaders; d->bNeedHeader = !d->bSkipHeaders;
filter->init( mode ); filter->init( mode );
d->bOpenedUnderlyingDevice = !filter->device()->isOpen(); 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; d->result = KFilterBase::OK;
if ( !ret ) if ( !ret )

@ -53,7 +53,7 @@ public:
* Open for reading or writing. * Open for reading or writing.
* If the KFilterBase's device is not opened, it will be opened. * 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. * Close after reading or writing.
* If the KFilterBase's device was opened by open(), it will be closed. * If the KFilterBase's device was opened by open(), it will be closed.

@ -47,7 +47,7 @@ public:
} }
virtual ~KLimitedIODevice() {} virtual ~KLimitedIODevice() {}
virtual bool open( OpenMode m ) { virtual bool open( TQ_OpenMode m ) {
//kdDebug(7005) << "KLimitedIODevice::open m=" << m << endl; //kdDebug(7005) << "KLimitedIODevice::open m=" << m << endl;
if ( m & IO_ReadOnly ) { if ( m & IO_ReadOnly ) {
/*bool ok = false; /*bool ok = false;

Loading…
Cancel
Save