summaryrefslogtreecommitdiffstats
path: root/src/kernel/qnetworkprotocol.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel/qnetworkprotocol.cpp')
-rw-r--r--src/kernel/qnetworkprotocol.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp
index 97e039a..4173584 100644
--- a/src/kernel/qnetworkprotocol.cpp
+++ b/src/kernel/qnetworkprotocol.cpp
@@ -51,9 +51,9 @@
//#define QNETWORKPROTOCOL_DEBUG
#define NETWORK_OP_DELAY 1000
-extern Q_EXPORT QNetworkProtocolDict *tqNetworkProtocolRegister;
+extern Q_EXPORT QNetworkProtocolDict *qNetworkProtocolRegister;
-QNetworkProtocolDict *tqNetworkProtocolRegister = 0;
+QNetworkProtocolDict *qNetworkProtocolRegister = 0;
class QNetworkProtocolPrivate
{
@@ -542,7 +542,7 @@ int QNetworkProtocol::supportedOperations() const
void QNetworkProtocol::addOperation( QNetworkOperation *op )
{
#ifdef QNETWORKPROTOCOL_DEBUG
- tqDebug( "QNetworkOperation: addOperation: %p %d", op, op->operation() );
+ qDebug( "QNetworkOperation: addOperation: %p %d", op, op->operation() );
#endif
d->operationQueue.enqueue( op );
if ( !d->opInProgress )
@@ -566,12 +566,12 @@ void QNetworkProtocol::addOperation( QNetworkOperation *op )
void QNetworkProtocol::registerNetworkProtocol( const QString &protocol,
QNetworkProtocolFactoryBase *protocolFactory )
{
- if ( !tqNetworkProtocolRegister ) {
- tqNetworkProtocolRegister = new QNetworkProtocolDict;
+ if ( !qNetworkProtocolRegister ) {
+ qNetworkProtocolRegister = new QNetworkProtocolDict;
QNetworkProtocol::registerNetworkProtocol( "file", new QNetworkProtocolFactory< QLocalFs > );
}
- tqNetworkProtocolRegister->insert( protocol, protocolFactory );
+ qNetworkProtocolRegister->insert( protocol, protocolFactory );
}
/*!
@@ -596,15 +596,15 @@ void QNetworkProtocol::registerNetworkProtocol( const QString &protocol,
QNetworkProtocol *QNetworkProtocol::getNetworkProtocol( const QString &protocol )
{
- if ( !tqNetworkProtocolRegister ) {
- tqNetworkProtocolRegister = new QNetworkProtocolDict;
+ if ( !qNetworkProtocolRegister ) {
+ qNetworkProtocolRegister = new QNetworkProtocolDict;
QNetworkProtocol::registerNetworkProtocol( "file", new QNetworkProtocolFactory< QLocalFs > );
}
if ( protocol.isNull() )
return 0;
- QNetworkProtocolFactoryBase *factory = tqNetworkProtocolRegister->find( protocol );
+ QNetworkProtocolFactoryBase *factory = qNetworkProtocolRegister->find( protocol );
if ( factory )
return factory->createObject();
@@ -619,10 +619,10 @@ QNetworkProtocol *QNetworkProtocol::getNetworkProtocol( const QString &protocol
bool QNetworkProtocol::hasOnlyLocalFileSystem()
{
- if ( !tqNetworkProtocolRegister )
+ if ( !qNetworkProtocolRegister )
return FALSE;
- QDictIterator< QNetworkProtocolFactoryBase > it( *tqNetworkProtocolRegister );
+ QDictIterator< QNetworkProtocolFactoryBase > it( *qNetworkProtocolRegister );
for ( ; it.current(); ++it )
if ( it.currentKey() != "file" )
return FALSE;
@@ -637,7 +637,7 @@ bool QNetworkProtocol::hasOnlyLocalFileSystem()
void QNetworkProtocol::startOps()
{
#ifdef QNETWORKPROTOCOL_DEBUG
- tqDebug( "QNetworkOperation: start processing operations" );
+ qDebug( "QNetworkOperation: start processing operations" );
#endif
processNextOperation( 0 );
}
@@ -826,7 +826,7 @@ void QNetworkProtocol::operationPutChunk( QNetworkOperation * )
void QNetworkProtocol::processNextOperation( QNetworkOperation *old )
{
#ifdef QNETWORKPROTOCOL_DEBUG
- tqDebug( "QNetworkOperation: process next operation, old: %p", old );
+ qDebug( "QNetworkOperation: process next operation, old: %p", old );
#endif
d->removeTimer->stop();
@@ -949,7 +949,7 @@ void QNetworkProtocol::removeMe()
{
if ( d->autoDelete ) {
#ifdef QNETWORKPROTOCOL_DEBUG
- tqDebug( "QNetworkOperation: autodelete of QNetworkProtocol %p", this );
+ qDebug( "QNetworkOperation: autodelete of QNetworkProtocol %p", this );
#endif
delete d->url; // destructor deletes the network protocol
}