SVN commit 479119 by mlaurent: qt3support-- M +1 -1 mac/kio_mac.cpp M +7 -7 tar/ktartest.cpp M +1 -1 tar/tar.cc M +6 -6 trash/testtrash.cpp --- trunk/KDE/kdebase/kioslave/mac/kio_mac.cpp #479118:479119 @@ -49,7 +49,7 @@ MacProtocol::MacProtocol(const QByteArray &pool, const QByteArray &app) : QObject(), SlaveBase("mac", pool, app) { /* logFile = new QFile("/home/jr/logfile"); - logFile->open(IO_ReadWrite | IO_Append); + logFile->open(QIODevice::ReadWrite | QIODevice::Append); logStream = new QTextStream(logFile); *logStream << "Start Macprotocol()" << endl; */ --- trunk/KDE/kdebase/kioslave/tar/ktartest.cpp #479118:479119 @@ -43,7 +43,7 @@ { KTarGz tar( argv[2] ); - if ( !tar.open( IO_ReadOnly ) ) + if ( !tar.open( QIODevice::ReadOnly ) ) { printf("Could not open %s for reading\n", argv[1] ); return 1; @@ -69,7 +69,7 @@ KTarGz tar( argv[2] ); - if ( !tar.open( IO_ReadOnly ) ) + if ( !tar.open( QIODevice::ReadOnly ) ) { printf("Could not open %s for reading\n", argv[1] ); return 1; @@ -107,7 +107,7 @@ kdDebug() << " --- readwrite --- " << endl; KTarGz tar( argv[2] ); - if ( !tar.open( IO_WriteOnly ) ) + if ( !tar.open( QIODevice::WriteOnly ) ) { printf("Could not open %s for writing\n", argv[1]); return 1; @@ -138,7 +138,7 @@ printf("-----------------------\n"); - if ( !tar.open( IO_ReadOnly ) ) + if ( !tar.open( QIODevice::ReadOnly ) ) { printf("Could not open %s for reading\n", argv[1] ); return 1; @@ -164,7 +164,7 @@ { KTarGz tar( argv[2] ); - if ( !tar.open( IO_WriteOnly ) ) + if ( !tar.open( QIODevice::WriteOnly ) ) { printf("Could not open %s for writing\n", argv[1]); return 1; @@ -187,10 +187,10 @@ else if ( command == "bytearray" ) { QFile file( argv[2] ); - if ( !file.open( IO_ReadOnly ) ) + if ( !file.open( QIODevice::ReadOnly ) ) return 1; KTarGz tar( &file ); - tar.open( IO_ReadOnly ); + tar.open( QIODevice::ReadOnly ); const KTarDirectory* dir = tar.directory(); recursive_print( dir, "" ); return 0; --- trunk/KDE/kdebase/kioslave/tar/tar.cc #479118:479119 @@ -435,7 +435,7 @@ return; } - if ( !io->open( IO_ReadOnly ) ) + if ( !io->open( QIODevice::ReadOnly ) ) { error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL() ); return; --- trunk/KDE/kdebase/kioslave/trash/testtrash.cpp #479118:479119 @@ -376,7 +376,7 @@ static void createTestFile( const QString& path ) { QFile f( path ); - if ( !f.open( IO_WriteOnly ) ) + if ( !f.open( QIODevice::WriteOnly ) ) kdFatal() << "Can't create " << path << endl; f.writeBlock( "Hello world\n", 12 ); f.close(); @@ -959,7 +959,7 @@ bool ok = KIO::NetAccess::download( url, tmpFile, 0 ); assert( ok ); QFile file( tmpFile ); - ok = file.open( IO_ReadOnly ); + ok = file.open( QIODevice::ReadOnly ); assert( ok ); QByteArray str = file.readAll(); if ( str != "Hello world\n" ) @@ -980,7 +980,7 @@ assert( QFile::exists( filesItem ) ); QByteArray packedArgs; - QDataStream stream( &packedArgs, IO_WriteOnly ); + QDataStream stream( &packedArgs, QIODevice::WriteOnly ); stream << (int)3 << url; KIO::Job* job = KIO::special( url, packedArgs ); bool ok = KIO::NetAccess::synchronousRun( job, 0 ); @@ -1007,7 +1007,7 @@ assert( QFile::exists( filesItem ) ); QByteArray packedArgs; - QDataStream stream( &packedArgs, IO_WriteOnly ); + QDataStream stream( &packedArgs, QIODevice::WriteOnly ); stream << (int)3 << url; KIO::Job* job = KIO::special( url, packedArgs ); bool ok = KIO::NetAccess::synchronousRun( job, 0 ); @@ -1041,7 +1041,7 @@ assert( QFile::exists( filesItem ) ); QByteArray packedArgs; - QDataStream stream( &packedArgs, IO_WriteOnly ); + QDataStream stream( &packedArgs, QIODevice::WriteOnly ); stream << (int)3 << url; KIO::Job* job = KIO::special( url, packedArgs ); bool ok = KIO::NetAccess::synchronousRun( job, 0 ); @@ -1132,7 +1132,7 @@ #if 0 kdDebug() << k_funcinfo << endl; QByteArray packedArgs; - QDataStream stream( packedArgs, IO_WriteOnly ); + QDataStream stream( packedArgs, QIODevice::WriteOnly ); stream << (int)1; KIO::Job* job = KIO::special( "trash:/", packedArgs ); bool ok = KIO::NetAccess::synchronousRun( job, 0 );