summaryrefslogtreecommitdiffstats
path: root/src/kernel/qurl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel/qurl.cpp')
-rw-r--r--src/kernel/qurl.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/kernel/qurl.cpp b/src/kernel/qurl.cpp
index 0a680e0d9..bf960f336 100644
--- a/src/kernel/qurl.cpp
+++ b/src/kernel/qurl.cpp
@@ -849,15 +849,15 @@ bool TQUrl::parse( const TQString& url )
d->cleanPathDirty = TRUE;
#if 0
- qDebug( "URL: %s", url.latin1() );
- qDebug( "protocol: %s", d->protocol.latin1() );
- qDebug( "user: %s", d->user.latin1() );
- qDebug( "pass: %s", d->pass.latin1() );
- qDebug( "host: %s", d->host.latin1() );
- qDebug( "path: %s", path().latin1() );
- qDebug( "ref: %s", d->refEncoded.latin1() );
- qDebug( "query: %s", d->queryEncoded.latin1() );
- qDebug( "port: %d\n\n----------------------------\n\n", d->port );
+ tqDebug( "URL: %s", url.latin1() );
+ tqDebug( "protocol: %s", d->protocol.latin1() );
+ tqDebug( "user: %s", d->user.latin1() );
+ tqDebug( "pass: %s", d->pass.latin1() );
+ tqDebug( "host: %s", d->host.latin1() );
+ tqDebug( "path: %s", path().latin1() );
+ tqDebug( "ref: %s", d->refEncoded.latin1() );
+ tqDebug( "query: %s", d->queryEncoded.latin1() );
+ tqDebug( "port: %d\n\n----------------------------\n\n", d->port );
#endif
return TRUE;
@@ -1010,7 +1010,7 @@ void TQUrl::setEncodedPathAndQuery( const TQString& pathAndQuery )
d->cleanPathDirty = TRUE;
}
-extern bool qt_resolve_symlinks; // defined in qapplication.cpp
+extern bool tqt_resolve_symlinks; // defined in qapplication.cpp
/*!
Returns the path of the URL. If \a correct is TRUE, the path is
@@ -1053,7 +1053,7 @@ TQString TQUrl::path( bool correct ) const
else if ( fi.isDir() ) {
TQString canPath = TQDir( d->path ).canonicalPath();
TQString dir;
- if ( qt_resolve_symlinks && !canPath.isNull() )
+ if ( tqt_resolve_symlinks && !canPath.isNull() )
dir = TQDir::cleanDirPath( canPath );
else
dir = TQDir::cleanDirPath( TQDir( d->path ).absPath() );
@@ -1064,7 +1064,7 @@ TQString TQUrl::path( bool correct ) const
d->cleanPath = dir;
} else {
TQString p =
- TQDir::cleanDirPath( (qt_resolve_symlinks ?
+ TQDir::cleanDirPath( (tqt_resolve_symlinks ?
fi.dir().canonicalPath() :
fi.dir().absPath()) );
d->cleanPath = p + "/" + fi.fileName();