diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-23 11:24:09 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-23 11:49:35 +0900 |
commit | 89c8032171eb722341972a56d0a0c8a003042511 (patch) | |
tree | fcc02c37f4280c91fffd3fe2dd7537846f78221a /tdeio | |
parent | e84b6d8935842fb8dcee9dc42f8f35f36ee72748 (diff) | |
download | tdelibs-89c8032171eb722341972a56d0a0c8a003042511.tar.gz tdelibs-89c8032171eb722341972a56d0a0c8a003042511.zip |
Replaced various '#define' with actual strings - part 2
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit d42f9ae842840a825c4ad4f7341f82003127c8f6)
Diffstat (limited to 'tdeio')
-rw-r--r-- | tdeio/tdeio/kfilterdev.cpp | 4 | ||||
-rw-r--r-- | tdeio/tdeio/kfilterdev.h | 4 | ||||
-rw-r--r-- | tdeio/tdeio/klimitediodevice.h | 6 | ||||
-rw-r--r-- | tdeio/tests/jobtest.cpp | 2 | ||||
-rw-r--r-- | tdeio/tests/kfiltertest.cpp | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/tdeio/tdeio/kfilterdev.cpp b/tdeio/tdeio/kfilterdev.cpp index 22ad620d2..bb9e90af1 100644 --- a/tdeio/tdeio/kfilterdev.cpp +++ b/tdeio/tdeio/kfilterdev.cpp @@ -232,7 +232,7 @@ bool KFilterDev::atEnd() const && d->ungetchBuffer.isEmpty(); } -TQT_TQIO_LONG KFilterDev::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ) +TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen ) { Q_ASSERT ( filter->mode() == IO_ReadOnly ); //kdDebug(7005) << "KFilterDev::readBlock maxlen=" << maxlen << endl; @@ -351,7 +351,7 @@ TQT_TQIO_LONG KFilterDev::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ) return dataReceived; } -TQT_TQIO_LONG KFilterDev::tqwriteBlock( const char *data /*0 to finish*/, TQT_TQIO_ULONG len ) +TQ_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, TQ_ULONG len ) { Q_ASSERT ( filter->mode() == IO_WriteOnly ); // If we had an error, return 0. diff --git a/tdeio/tdeio/kfilterdev.h b/tdeio/tdeio/kfilterdev.h index 8db390110..1783eccdf 100644 --- a/tdeio/tdeio/kfilterdev.h +++ b/tdeio/tdeio/kfilterdev.h @@ -95,8 +95,8 @@ public: #ifdef qdoc #else - virtual TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ); - virtual TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len ); + virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen ); + virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len ); #endif //int readLine( char *data, uint maxlen ); diff --git a/tdeio/tdeio/klimitediodevice.h b/tdeio/tdeio/klimitediodevice.h index c1008d079..4337215ff 100644 --- a/tdeio/tdeio/klimitediodevice.h +++ b/tdeio/tdeio/klimitediodevice.h @@ -69,17 +69,17 @@ public: virtual Offset size() const { return m_length; } - virtual TQT_TQIO_LONG tqreadBlock ( char * data, TQT_TQIO_ULONG maxlen ) + virtual TQ_LONG readBlock ( char * data, TQ_ULONG maxlen ) { maxlen = TQMIN( maxlen, m_length - at() ); // Apply upper limit return m_dev->readBlock( data, maxlen ); } - virtual TQT_TQIO_LONG tqwriteBlock ( const char *, TQT_TQIO_ULONG ) { return -1; } // unsupported + virtual TQ_LONG writeBlock ( const char *, TQ_ULONG ) { return -1; } // unsupported virtual int putch( int ) { return -1; } // unsupported virtual int getch() { char c[2]; - if ( tqreadBlock(c, 1) == -1) + if ( readBlock(c, 1) == -1) return -1; else return c[0]; diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp index 7df3ff3f0..95cb96d53 100644 --- a/tdeio/tests/jobtest.cpp +++ b/tdeio/tests/jobtest.cpp @@ -160,7 +160,7 @@ static void createTestFile( const TQString& path ) TQFile f( path ); if ( !f.open( IO_WriteOnly ) ) kdFatal() << "Can't create " << path << endl; - f.tqwriteBlock( "Hello world", 11 ); + f.writeBlock( "Hello world", 11 ); f.close(); setTimeStamp( path ); } diff --git a/tdeio/tests/kfiltertest.cpp b/tdeio/tests/kfiltertest.cpp index f16b957ab..ed73d6782 100644 --- a/tdeio/tests/kfiltertest.cpp +++ b/tdeio/tests/kfiltertest.cpp @@ -35,7 +35,7 @@ void test_block( const TQString & fileName ) TQByteArray array(1024); int n; - while ( ( n = dev->tqreadBlock( array.data(), array.size() ) ) ) + while ( ( n = dev->readBlock( array.data(), array.size() ) ) ) { kdDebug() << "readBlock returned " << n << endl << endl; // TQCString s(array,n+1); // Terminate with 0 before printing @@ -55,9 +55,9 @@ void test_block_write( const TQString & fileName ) if ( !dev->open( IO_WriteOnly ) ) { kdWarning() << "open failed " << endl; return; } TQCString s("hello\n"); - int ret = dev->tqwriteBlock( s, s.size()-1 ); + int ret = dev->writeBlock( s, s.size()-1 ); kdDebug() << "writeBlock ret=" << ret << endl; - //ret = dev->tqwriteBlock( s, s.size()-1 ); + //ret = dev->writeBlock( s, s.size()-1 ); //kdDebug() << "writeBlock ret=" << ret << endl; dev->close(); delete dev; |