1 files changed, 28 insertions, 28 deletions

diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index 3f8c7c29f..d6e463b02 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -144,7 +144,7 @@ void CachedObject::deref(CachedObjectClient *c)
     assert( c );
     assert( m_clients.count() );
     assert( !canDelete() );
-    assert( m_clients.tqfind( c ) );
+    assert( m_clients.find( c ) );
 
     Cache::flush();
 
@@ -213,7 +213,7 @@ CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KI
     : CachedObject(url, CSSStyleSheet, _cachePolicy, 0)
 {
     // Set the type we want (probably css or xml)
-    TQString ah = TQString::tqfromLatin1( accept );
+    TQString ah = TQString::fromLatin1( accept );
     if ( !ah.isEmpty() )
         ah += ",";
     ah += "*/*;q=0.1";
@@ -327,7 +327,7 @@ CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheContro
     // It's javascript we want.
     // But some websites think their scripts are <some wrong mimetype here>
     // and refuse to serve them if we only accept application/x-javascript.
-    setAccept( TQString::tqfromLatin1("*/*") );
+    setAccept( TQString::fromLatin1("*/*") );
     // load the file
     Cache::loader()->load(dl, this, false);
     m_loading = true;
@@ -476,7 +476,7 @@ CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl
     pixPart = 0;
     bg = 0;
     scaled = 0;
-    bgColor = tqRgba( 0, 0, 0, 0xFF );
+    bgColor = qRgba( 0, 0, 0, 0xFF );
     typeChecked = false;
     isFullyTransparent = false;
     monochrome = false;
@@ -526,7 +526,7 @@ void CachedImage::deref( CachedObjectClient *c )
 
 const TQPixmap &CachedImage::tiled_pixmap(const TQColor& newc, int xWidth, int xHeight)
 {
-    static QRgb bgTransparent = tqRgba( 0, 0, 0, 0xFF );
+    static QRgb bgTransparent = qRgba( 0, 0, 0, 0xFF );
 
     TQSize s(pixmap_size());
     int w = xWidth;
@@ -564,7 +564,7 @@ const TQPixmap &CachedImage::tiled_pixmap(const TQColor& newc, int xWidth, int x
     bgSize = TQSize(xWidth, xHeight);
 
     //See whether we can - and should - pre-blend
-    if (isvalid && (r.hasAlphaChannel() || r.tqmask() )) {
+    if (isvalid && (r.hasAlphaChannel() || r.mask() )) {
         bg = new TQPixmap(xWidth, xHeight, r.depth());
         bg->fill(newc);
         bitBlt(bg, 0, 0, src);
@@ -692,10 +692,10 @@ void CachedImage::movieUpdated( const TQRect& r )
     do_notify(m->framePixmap(), r);
 }
 
-void CachedImage::movietqStatus(int status)
+void CachedImage::movieStatus(int status)
 {
 #ifdef LOADER_DEBUG
-    qDebug("movietqStatus(%d)", status);
+    qDebug("movieStatus(%d)", status);
 #endif
 
     // ### the html image objects are supposed to send the load event after every frame (according to
@@ -709,8 +709,8 @@ void CachedImage::movietqStatus(int status)
         const TQImage& im = m->frameImage();
         monochrome = ( ( im.depth() <= 8 ) && ( im.numColors() - int( im.hasAlphaBuffer() ) <= 2 ) );
         for (int i = 0; monochrome && i < im.numColors(); ++i)
-            if (im.colorTable()[i] != tqRgb(0xff, 0xff, 0xff) &&
-                im.colorTable()[i] != tqRgb(0x00, 0x00, 0x00))
+            if (im.colorTable()[i] != qRgb(0xff, 0xff, 0xff) &&
+                im.colorTable()[i] != qRgb(0x00, 0x00, 0x00))
                 monochrome = false;
         if( (im.width() < 5 || im.height() < 5) && im.hasAlphaBuffer()) // only evaluate for small images
         {
@@ -743,14 +743,14 @@ void CachedImage::movietqStatus(int status)
         {
             setShowAnimations( KHTMLSettings::KAnimationDisabled );
 
-            // monochrome alphatqmasked images are usually about 10000 times
+            // monochrome alphamasked images are usually about 10000 times
             // faster to draw, so this is worth the hack
             if (p && monochrome && p->depth() > 1)
             {
                 TQPixmap* pix = new TQPixmap;
                 pix->convertFromImage( p->convertToImage().convertDepth( 1 ), MonoOnly|AvoidDither );
-                if ( p->tqmask() )
-                    pix->setMask( *p->tqmask() );
+                if ( p->mask() )
+                    pix->setMask( *p->mask() );
                 delete p;
                 p = pix;
                 monochrome = false;
@@ -766,7 +766,7 @@ void CachedImage::movietqStatus(int status)
     {
 #ifdef LOADER_DEBUG
         TQRect r(valid_rect());
-        qDebug("movie tqStatus frame update %d/%d/%d/%d, pixmap size %d/%d", r.x(), r.y(), r.right(), r.bottom(),
+        qDebug("movie Status frame update %d/%d/%d/%d, pixmap size %d/%d", r.x(), r.y(), r.right(), r.bottom(),
                pixmap().size().width(), pixmap().size().height());
 #endif
         do_notify(pixmap(), valid_rect());
@@ -787,7 +787,7 @@ void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimati
         delete p;
         p = new TQPixmap(m->framePixmap());
         m->disconnectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) ));
-        m->disconnecttqStatus( this, TQT_SLOT( movietqStatus( int ) ));
+        m->disconnectStatus( this, TQT_SLOT( movieStatus( int ) ));
         m->disconnectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
         TQTimer::singleShot(0, this, TQT_SLOT( deleteMovie()));
         imgSource = 0;
@@ -816,7 +816,7 @@ void CachedImage::clear()
     delete p;   p = 0;
     delete bg;  bg = 0;
     delete scaled;  scaled = 0;
-    bgColor = tqRgba( 0, 0, 0, 0xff );
+    bgColor = qRgba( 0, 0, 0, 0xff );
     bgSize = TQSize(-1,-1);
     delete pixPart; pixPart = 0;
 
@@ -850,7 +850,7 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof )
             imgSource = new ImageSource( _buffer.buffer());
             m = new TQMovie( imgSource, 8192 );
             m->connectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) ));
-            m->connecttqStatus( this, TQT_SLOT( movietqStatus(int)));
+            m->connectStatus( this, TQT_SLOT( movieStatus(int)));
             m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
         }
     }
@@ -902,9 +902,9 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof )
 
 void CachedImage::finish()
 {
-    tqStatus oldtqStatus = m_status;
+    Status oldStatus = m_status;
     CachedObject::finish();
-    if ( oldtqStatus != m_status ) {
+    if ( oldStatus != m_status ) {
 	const TQPixmap &pm = pixmap();
 	do_notify( pm, pm.rect() );
     }
@@ -981,7 +981,7 @@ void DocLoader::setExpireDate(time_t _expireDate, bool relative)
 
 void DocLoader::insertCachedObject( CachedObject* o ) const
 {
-    if ( m_docObjects.tqfind(o) )
+    if ( m_docObjects.find(o) )
         return;
     m_docObjects.insert( o, o );
     if ( m_docObjects.count() > 3 * m_docObjects.size() )
@@ -993,7 +993,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
     bool reload = false;
     if (m_cachePolicy == KIO::CC_Verify)
     {
-       if (!m_reloadedURLs.tqcontains(fullURL))
+       if (!m_reloadedURLs.contains(fullURL))
        {
           if (existing && existing->isExpired())
           {
@@ -1005,7 +1005,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
     }
     else if ((m_cachePolicy == KIO::CC_Reload) || (m_cachePolicy == KIO::CC_Refresh))
     {
-       if (!m_reloadedURLs.tqcontains(fullURL))
+       if (!m_reloadedURLs.contains(fullURL))
        {
           if (existing)
           {
@@ -1078,7 +1078,7 @@ void DocLoader::setAutoloadImages( bool enable )
         {
             CachedImage *img = const_cast<CachedImage*>( static_cast<const CachedImage *>( it.current()) );
 
-            CachedObject::tqStatus status = img->status();
+            CachedObject::Status status = img->status();
             if ( status != CachedObject::Unknown )
                 continue;
 
@@ -1167,7 +1167,7 @@ void Loader::servePendingRequests()
             {
                 job->addMetaData( "cross-domain", part->toplevelURL().url() );
                 if (part->widget())
-                    job->setWindow (part->widget()->tqtopLevelWidget());
+                    job->setWindow (part->widget()->topLevelWidget());
             }
         }
 
@@ -1427,7 +1427,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c
     KIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : KIO::CC_Verify;
 
     TQString url = kurl.url();
-    CachedObject* o = cache->tqfind(url);
+    CachedObject* o = cache->find(url);
 
     if ( o && o->type() != CachedType ) {
         removeCacheEntry( o );
@@ -1436,7 +1436,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c
 
     if ( o && dl->needReload( o, url ) ) {
         o = 0;
-        assert( cache->tqfind( url ) == 0 );
+        assert( cache->find( url ) == 0 );
     }
 
     if(!o)
@@ -1464,7 +1464,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c
 
 void Cache::preloadStyleSheet( const TQString &url, const TQString &stylesheet_data)
 {
-    CachedObject *o = cache->tqfind(url);
+    CachedObject *o = cache->find(url);
     if(o)
         removeCacheEntry(o);
 
@@ -1474,7 +1474,7 @@ void Cache::preloadStyleSheet( const TQString &url, const TQString &stylesheet_d
 
 void Cache::preloadScript( const TQString &url, const TQString &script_data)
 {
-    CachedObject *o = cache->tqfind(url);
+    CachedObject *o = cache->find(url);
     if(o)
         removeCacheEntry(o);