diff options
Diffstat (limited to 'khtml/misc')
| -rw-r--r-- | khtml/misc/arena.cpp | 4 | ||||
| -rw-r--r-- | khtml/misc/htmlattrs.c | 4 | ||||
| -rw-r--r-- | khtml/misc/khtmllayout.h | 2 | ||||
| -rw-r--r-- | khtml/misc/loader.cpp | 6 | ||||
| -rw-r--r-- | khtml/misc/multimap.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/khtml/misc/arena.cpp b/khtml/misc/arena.cpp index 58d531384..5efcaf98d 100644 --- a/khtml/misc/arena.cpp +++ b/khtml/misc/arena.cpp @@ -143,7 +143,7 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb) assert((nb & pool->mask) == 0); #endif - nb = (uword)ARENA_ALIGN(pool, nb); /* force tqalignment */ + nb = (uword)ARENA_ALIGN(pool, nb); /* force alignment */ /* attempt to allocate from arenas at pool->current */ { @@ -197,7 +197,7 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb) } else #endif sz = pool->arenasize > nb ? pool->arenasize : nb; - sz += sizeof *a + pool->mask; /* header and tqalignment slop */ + sz += sizeof *a + pool->mask; /* header and alignment slop */ pool->cumul += sz; #ifdef DEBUG_ARENA_MALLOC i++; diff --git a/khtml/misc/htmlattrs.c b/khtml/misc/htmlattrs.c index 6f420e3b3..779792e71 100644 --- a/khtml/misc/htmlattrs.c +++ b/khtml/misc/htmlattrs.c @@ -188,7 +188,7 @@ struct spool_attr_t char spool_attr_str42[sizeof("rules")]; char spool_attr_str43[sizeof("compact")]; char spool_attr_str44[sizeof("rev")]; - char spool_attr_str45[sizeof("tqshape")]; + char spool_attr_str45[sizeof("shape")]; char spool_attr_str46[sizeof("charset")]; char spool_attr_str47[sizeof("charoff")]; char spool_attr_str48[sizeof("lang")]; @@ -343,7 +343,7 @@ static const struct spool_attr_t spool_attr_contents = "rules", "compact", "rev", - "tqshape", + "shape", "charset", "charoff", "lang", diff --git a/khtml/misc/khtmllayout.h b/khtml/misc/khtmllayout.h index b0c8dc613..1049d10c4 100644 --- a/khtml/misc/khtmllayout.h +++ b/khtml/misc/khtmllayout.h @@ -33,7 +33,7 @@ namespace khtml const int UNDEFINED = -1; - // tqalignment + // alignment enum VAlign { VNone=0, Bottom, VCenter, Top, Baseline }; enum HAlign { HDefault, Left, HCenter, Right, HNone = 0 }; diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp index 8320a51c3..c04f13e37 100644 --- a/khtml/misc/loader.cpp +++ b/khtml/misc/loader.cpp @@ -397,7 +397,7 @@ public: void sendTo(TQDataSink* sink, int n) { - sink->receive((const uchar*)&buffer.tqat(pos), n); + sink->receive((const uchar*)&buffer.at(pos), n); pos += n; @@ -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->disconnecStatus( this, TQT_SLOT( movieStatus( 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; @@ -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->connecStatus( this, TQT_SLOT( movieStatus(int))); + m->connectStatus( this, TQT_SLOT( movieStatus(int))); m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); } } diff --git a/khtml/misc/multimap.h b/khtml/misc/multimap.h index 8f60dcf02..125e8e07d 100644 --- a/khtml/misc/multimap.h +++ b/khtml/misc/multimap.h @@ -70,7 +70,7 @@ private: static inline unsigned int stupidHash(void* ptr) { unsigned long val = (unsigned long)ptr; - // remove tqalignment and multiply by a prime unlikely to be a factor of size + // remove alignment and multiply by a prime unlikely to be a factor of size val = (val >> 4) * 1237; return val; } |