summaryrefslogtreecommitdiffstats
path: root/kio
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 08:24:43 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 08:24:43 +0000
commit96a33d90689a46ea58f812d76fdd2eaf93edecfa (patch)
tree756ca55bffdffc115088699dd1b76c61eb6f64bf /kio
parent5783baba4a547c443e4392f51c8023d38cb9fe6a (diff)
downloadtdelibs-96a33d90689a46ea58f812d76fdd2eaf93edecfa.tar.gz
tdelibs-96a33d90689a46ea58f812d76fdd2eaf93edecfa.zip
Additional TQt for Qt4 compilation fixes
This should not affect TQt for Qt3 per usual git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1215674 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kio')
-rw-r--r--kio/kio/kfilterdev.cpp4
-rw-r--r--kio/kio/kfilterdev.h4
-rw-r--r--kio/kio/klimitediodevice.h8
-rw-r--r--kio/kio/kzip.cpp2
-rw-r--r--kio/tests/jobtest.cpp2
-rw-r--r--kio/tests/kfiltertest.cpp6
6 files changed, 13 insertions, 13 deletions
diff --git a/kio/kio/kfilterdev.cpp b/kio/kio/kfilterdev.cpp
index 187b16654..c1f4d7953 100644
--- a/kio/kio/kfilterdev.cpp
+++ b/kio/kio/kfilterdev.cpp
@@ -236,7 +236,7 @@ bool KFilterDev::atEnd() const
&& d->ungetchBuffer.isEmpty();
}
-TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen )
+TQT_TQIO_LONG KFilterDev::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen )
{
Q_ASSERT ( filter->mode() == IO_ReadOnly );
//kdDebug(7005) << "KFilterDev::readBlock maxlen=" << maxlen << endl;
@@ -355,7 +355,7 @@ TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen )
return dataReceived;
}
-TQ_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, TQ_ULONG len )
+TQT_TQIO_LONG KFilterDev::tqwriteBlock( const char *data /*0 to finish*/, TQT_TQIO_ULONG len )
{
Q_ASSERT ( filter->mode() == IO_WriteOnly );
// If we had an error, return 0.
diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h
index 7d8fe5288..edd180ad8 100644
--- a/kio/kio/kfilterdev.h
+++ b/kio/kio/kfilterdev.h
@@ -91,8 +91,8 @@ public:
virtual bool atEnd() const;
- virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
- virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len );
+ virtual TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen );
+ virtual TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len );
//int readLine( char *data, uint maxlen );
virtual int getch();
diff --git a/kio/kio/klimitediodevice.h b/kio/kio/klimitediodevice.h
index 1b82e2e49..9d59c890e 100644
--- a/kio/kio/klimitediodevice.h
+++ b/kio/kio/klimitediodevice.h
@@ -73,17 +73,17 @@ public:
virtual Offset size() const { return m_length; }
#endif // USE_QT4
- virtual TQ_LONG readBlock ( char * data, TQ_ULONG maxlen )
+ virtual TQT_TQIO_LONG tqreadBlock ( char * data, TQT_TQIO_ULONG maxlen )
{
- maxlen = QMIN( maxlen, m_length - at() ); // Apply upper limit
+ maxlen = TQMIN( maxlen, m_length - at() ); // Apply upper limit
return m_dev->readBlock( data, maxlen );
}
- virtual TQ_LONG writeBlock ( const char *, TQ_ULONG ) { return -1; } // unsupported
+ virtual TQT_TQIO_LONG tqwriteBlock ( const char *, TQT_TQIO_ULONG ) { return -1; } // unsupported
virtual int putch( int ) { return -1; } // unsupported
virtual int getch() {
char c[2];
- if ( readBlock(c, 1) == -1)
+ if ( tqreadBlock(c, 1) == -1)
return -1;
else
return c[0];
diff --git a/kio/kio/kzip.cpp b/kio/kio/kzip.cpp
index 1e1dd6241..d7b6123be 100644
--- a/kio/kio/kzip.cpp
+++ b/kio/kio/kzip.cpp
@@ -1114,7 +1114,7 @@ bool KZip::prepareWriting_impl(const TQString &name, const TQString &user,
}
// delete entries in the filelist with the same filename as the one we want
- // to save, so that we don´t have duplicate file entries when viewing the zip
+ // to save, so that we don�t have duplicate file entries when viewing the zip
// with konqi...
// CAUTION: the old file itself is still in the zip and won't be removed !!!
TQPtrListIterator<KZipFileEntry> it( d->m_fileList );
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index 93b250075..ecd351a08 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/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.writeBlock( "Hello world", 11 );
+ f.tqwriteBlock( "Hello world", 11 );
f.close();
setTimeStamp( path );
}
diff --git a/kio/tests/kfiltertest.cpp b/kio/tests/kfiltertest.cpp
index 901dec14e..e070418e4 100644
--- a/kio/tests/kfiltertest.cpp
+++ b/kio/tests/kfiltertest.cpp
@@ -35,7 +35,7 @@ void test_block( const TQString & fileName )
TQByteArray array(1024);
int n;
- while ( ( n = dev->readBlock( array.data(), array.size() ) ) )
+ while ( ( n = dev->tqreadBlock( 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->writeBlock( s, s.size()-1 );
+ int ret = dev->tqwriteBlock( s, s.size()-1 );
kdDebug() << "writeBlock ret=" << ret << endl;
- //ret = dev->writeBlock( s, s.size()-1 );
+ //ret = dev->tqwriteBlock( s, s.size()-1 );
//kdDebug() << "writeBlock ret=" << ret << endl;
dev->close();
delete dev;