diff options
author | Michele Calgaro <[email protected]> | 2020-01-30 20:17:32 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2020-01-30 20:17:32 +0900 |
commit | 99e56ba8db70324cc5c7ab416a3b48171613bd59 (patch) | |
tree | 52fe52817fe45a81a7e03254b614b67587d83e37 /src/kernel | |
parent | 630dcedfb398b350522742f0ab4d1255ac84da85 (diff) | |
download | tqt3-99e56ba8db70324cc5c7ab416a3b48171613bd59.tar.gz tqt3-99e56ba8db70324cc5c7ab416a3b48171613bd59.zip |
Removed explicit usage of the 'register' keyword.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'src/kernel')
-rw-r--r-- | src/kernel/qaccel.cpp | 4 | ||||
-rw-r--r-- | src/kernel/qapplication.cpp | 12 | ||||
-rw-r--r-- | src/kernel/qapplication_x11.cpp | 6 | ||||
-rw-r--r-- | src/kernel/qcursor_x11.cpp | 2 | ||||
-rw-r--r-- | src/kernel/qeventloop_unix.cpp | 8 | ||||
-rw-r--r-- | src/kernel/qeventloop_unix_glib.cpp | 8 | ||||
-rw-r--r-- | src/kernel/qimage.cpp | 54 | ||||
-rw-r--r-- | src/kernel/qobject.cpp | 12 | ||||
-rw-r--r-- | src/kernel/qpainter_x11.cpp | 6 | ||||
-rw-r--r-- | src/kernel/qpixmap_x11.cpp | 4 | ||||
-rw-r--r-- | src/kernel/qpointarray.cpp | 12 | ||||
-rw-r--r-- | src/kernel/qpolygonscanner.cpp | 40 | ||||
-rw-r--r-- | src/kernel/qregion_x11.cpp | 152 | ||||
-rw-r--r-- | src/kernel/qrichtext.cpp | 2 | ||||
-rw-r--r-- | src/kernel/qwidget.cpp | 6 | ||||
-rw-r--r-- | src/kernel/qwidget_x11.cpp | 4 | ||||
-rw-r--r-- | src/kernel/qwmatrix.cpp | 4 |
17 files changed, 168 insertions, 168 deletions
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp index a5c344ed4..db717f7b7 100644 --- a/src/kernel/qaccel.cpp +++ b/src/kernel/qaccel.cpp @@ -549,7 +549,7 @@ TQAccelPrivate::~TQAccelPrivate() static TQAccelItem *find_id( TQAccelList &list, int id ) { - register TQAccelItem *item = list.first(); + TQAccelItem *item = list.first(); while ( item && item->id != id ) item = list.next(); return item; @@ -557,7 +557,7 @@ static TQAccelItem *find_id( TQAccelList &list, int id ) static TQAccelItem *find_key( TQAccelList &list, const TQKeySequence &key ) { - register TQAccelItem *item = list.first(); + TQAccelItem *item = list.first(); while ( item && !( item->key == key ) ) item = list.next(); return item; diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index 36c2ddea5..9b04e1d20 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -1421,7 +1421,7 @@ TQStyle& TQApplication::style() if ( is_app_running && !is_app_closing && (*app_pal != app_pal_copy) ) { TQEvent e( TQEvent::ApplicationPaletteChange ); TQWidgetIntDictIt it( *((TQWidgetIntDict*)TQWidget::mapper) ); - register TQWidget *w; + TQWidget *w; while ( (w=it.current()) ) { // for all widgets... ++it; sendEvent( w, &e ); @@ -1467,7 +1467,7 @@ void TQApplication::setStyle( TQStyle *style ) if (old) { if ( is_app_running && !is_app_closing ) { TQWidgetIntDictIt it( *((TQWidgetIntDict*)TQWidget::mapper) ); - register TQWidget *w; + TQWidget *w; while ( (w=it.current()) ) { // for all widgets... ++it; if ( !w->testWFlags(WType_Desktop) && // except desktop @@ -1494,7 +1494,7 @@ void TQApplication::setStyle( TQStyle *style ) if (old) { if ( is_app_running && !is_app_closing ) { TQWidgetIntDictIt it( *((TQWidgetIntDict*)TQWidget::mapper) ); - register TQWidget *w; + TQWidget *w; while ( (w=it.current()) ) { // for all widgets... ++it; if ( !w->testWFlags(WType_Desktop) ) { // except desktop @@ -2080,7 +2080,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets, if ( !oldpal || ( *oldpal != pal ) ) { TQEvent e( TQEvent::ApplicationPaletteChange ); TQWidgetIntDictIt it( *((TQWidgetIntDict*)TQWidget::mapper) ); - register TQWidget *w; + TQWidget *w; while ( (w=it.current()) ) { // for all widgets... ++it; if ( all || (!className && w->isTopLevel() ) || w->inherits(className) ) // matching class @@ -2170,7 +2170,7 @@ void TQApplication::setFont( const TQFont &font, bool informWidgets, if ( informWidgets && is_app_running && !is_app_closing ) { TQEvent e( TQEvent::ApplicationFontChange ); TQWidgetIntDictIt it( *((TQWidgetIntDict*)TQWidget::mapper) ); - register TQWidget *w; + TQWidget *w; while ( (w=it.current()) ) { // for all widgets... ++it; if ( all || (!className && w->isTopLevel() ) || w->inherits(className) ) // matching class @@ -2780,7 +2780,7 @@ bool TQApplication::internalNotify( TQObject *receiver, TQEvent * e) { if ( eventFilters ) { TQObjectListIt it( *eventFilters ); - register TQObject *obj; + TQObject *obj; while ( (obj=it.current()) != 0 ) { // send to all filters ++it; // until one returns TRUE if ( obj->eventFilter(receiver,e) ) diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index 401230f74..c53ef91ad 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -2894,7 +2894,7 @@ void TQApplication::setOverrideCursor( const TQCursor &cursor, bool replace ) cursorStack->append( app_cursor ); TQWidgetIntDictIt it( *((TQWidgetIntDict*)TQWidget::mapper) ); - register TQWidget *w; + TQWidget *w; while ( (w=it.current()) ) { // for all widgets that have if ( w->testWState( WState_OwnCursor ) ) tqt_x11_enforce_cursor( w ); @@ -2922,7 +2922,7 @@ void TQApplication::restoreOverrideCursor() app_cursor = cursorStack->last(); if ( TQWidget::mapper != 0 && !closingDown() ) { TQWidgetIntDictIt it( *((TQWidgetIntDict*)TQWidget::mapper) ); - register TQWidget *w; + TQWidget *w; while ( (w=it.current()) ) { // set back to original cursors if ( w->testWState( WState_OwnCursor ) ) tqt_x11_enforce_cursor( w ); @@ -2986,7 +2986,7 @@ void TQApplication::setGlobalMouseTracking( bool enable ) } if ( tellAllWidgets ) { TQWidgetIntDictIt it( *((TQWidgetIntDict*)TQWidget::mapper) ); - register TQWidget *w; + TQWidget *w; while ( (w=it.current()) ) { if ( app_tracking > 0 ) { // switch on if ( !w->testWState(WState_MouseTracking) ) { diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp index cea5646ce..9fd666397 100644 --- a/src/kernel/qcursor_x11.cpp +++ b/src/kernel/qcursor_x11.cpp @@ -502,7 +502,7 @@ void TQCursor::update() const { if ( !initialized ) initialize(); - register TQCursorData *d = data; // cheat const! + TQCursorData *d = data; // cheat const! if ( d->hcurs ) // already loaded return; diff --git a/src/kernel/qeventloop_unix.cpp b/src/kernel/qeventloop_unix.cpp index 1c391f413..132279314 100644 --- a/src/kernel/qeventloop_unix.cpp +++ b/src/kernel/qeventloop_unix.cpp @@ -211,7 +211,7 @@ static inline void getTime( timeval &t ) // get time of day static void repairTimer( const timeval &time ) // repair broken timer { timeval diff = watchtime - time; - register TimerInfo *t = timerList->first(); + TimerInfo *t = timerList->first(); while ( t ) { // repair all timers t->timeout = t->timeout - diff; t = timerList->next(); @@ -308,7 +308,7 @@ int qStartTimer( int interval, TQObject *obj ) bool qKillTimer( int id ) { - register TimerInfo *t; + TimerInfo *t; if ( !timerList || id <= 0 || id > (int)timerBitVec->size() || !timerBitVec->testBit( id-1 ) ) return FALSE; // not init'd or invalid timer @@ -325,7 +325,7 @@ bool qKillTimer( int id ) bool qKillTimer( TQObject *obj ) { - register TimerInfo *t; + TimerInfo *t; if ( !timerList ) // not initialized return FALSE; t = timerList->first(); @@ -530,7 +530,7 @@ int TQEventLoop::activateTimers() timeval currentTime; int n_act = 0, maxCount = timerList->count(); TimerInfo *begin = 0; - register TimerInfo *t; + TimerInfo *t; for ( ;; ) { if ( ! maxCount-- ) diff --git a/src/kernel/qeventloop_unix_glib.cpp b/src/kernel/qeventloop_unix_glib.cpp index 51c560a72..d1e6c3adf 100644 --- a/src/kernel/qeventloop_unix_glib.cpp +++ b/src/kernel/qeventloop_unix_glib.cpp @@ -239,7 +239,7 @@ static void repairTimer( const timeval &time ) // repair broken timer tqt_timerListMutex->lock(); #endif timeval diff = watchtime - time; - register TimerInfo *t = timerList->first(); + TimerInfo *t = timerList->first(); while ( t ) { // repair all timers t->timeout = t->timeout - diff; t = timerList->next(); @@ -374,7 +374,7 @@ bool qKillTimer( int id ) #if defined(TQT_THREAD_SUPPORT) if (tqt_timerListMutex) tqt_timerListMutex->lock(); #endif - register TimerInfo *t; + TimerInfo *t; if ( (!timerList) || (id <= 0) || (id > (int)timerBitVec->size()) || (!timerBitVec->testBit( id-1 )) ) { #if defined(TQT_THREAD_SUPPORT) if (tqt_timerListMutex) tqt_timerListMutex->unlock(); @@ -407,7 +407,7 @@ bool qKillTimer( TQObject *obj ) #if defined(TQT_THREAD_SUPPORT) if (tqt_timerListMutex) tqt_timerListMutex->lock(); #endif - register TimerInfo *t; + TimerInfo *t; if ( !timerList ) { // not initialized #if defined(TQT_THREAD_SUPPORT) if (tqt_timerListMutex) tqt_timerListMutex->unlock(); @@ -645,7 +645,7 @@ int TQEventLoop::activateTimers() timeval currentTime; int n_act = 0, maxCount = timerList->count(); TimerInfo *begin = 0; - register TimerInfo *t; + TimerInfo *t; for ( ;; ) { if ( ! maxCount-- ) { diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp index 692f982ad..1a31d3acc 100644 --- a/src/kernel/qimage.cpp +++ b/src/kernel/qimage.cpp @@ -1392,7 +1392,7 @@ struct TQRgbMap { static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_flags, TQRgb* palette=0, int palette_count=0 ) { - register TQRgb *p; + TQRgb *p; uchar *b; bool do_quant = FALSE; int y, x; @@ -1702,7 +1702,7 @@ static bool convert_8_to_32( const TQImage *src, TQImage *dst ) return FALSE; // create failed dst->setAlphaBuffer( src->hasAlphaBuffer() ); for ( int y=0; y<dst->height(); y++ ) { // for each scan line... - register uint *p = (uint *)dst->scanLine(y); + uint *p = (uint *)dst->scanLine(y); uchar *b = src->scanLine(y); uint *end = p + dst->width(); while ( p < end ) @@ -1718,7 +1718,7 @@ static bool convert_1_to_32( const TQImage *src, TQImage *dst ) return FALSE; // could not create dst->setAlphaBuffer( src->hasAlphaBuffer() ); for ( int y=0; y<dst->height(); y++ ) { // for each scan line... - register uint *p = (uint *)dst->scanLine(y); + uint *p = (uint *)dst->scanLine(y); uchar *b = src->scanLine(y); int x; if ( src->bitOrder() == TQImage::BigEndian ) { @@ -1756,7 +1756,7 @@ static bool convert_1_to_8( const TQImage *src, TQImage *dst ) dst->setColor( 1, 0xff000000 ); } for ( int y=0; y<dst->height(); y++ ) { // for each scan line... - register uchar *p = dst->scanLine(y); + uchar *p = dst->scanLine(y); uchar *b = src->scanLine(y); int x; if ( src->bitOrder() == TQImage::BigEndian ) { @@ -1833,7 +1833,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst, int bmwidth = (w+7)/8; if ( !(line1 && line2) ) return FALSE; - register uchar *p; + uchar *p; uchar *end; int *b1, *b2; int wbytes = w * (d/8); @@ -2083,7 +2083,7 @@ static bool convert_16_to_32( const TQImage *src, TQImage *dst ) return FALSE; // create failed dst->setAlphaBuffer( src->hasAlphaBuffer() ); for ( int y=0; y<dst->height(); y++ ) { // for each scan line... - register uint *p = (uint *)dst->scanLine(y); + uint *p = (uint *)dst->scanLine(y); ushort *s = (ushort*)src->scanLine(y); uint *end = p + dst->width(); while ( p < end ) @@ -2099,7 +2099,7 @@ static bool convert_32_to_16( const TQImage *src, TQImage *dst ) return FALSE; // create failed dst->setAlphaBuffer( src->hasAlphaBuffer() ); for ( int y=0; y<dst->height(); y++ ) { // for each scan line... - register ushort *p = (ushort *)dst->scanLine(y); + ushort *p = (ushort *)dst->scanLine(y); uint *s = (uint*)src->scanLine(y); ushort *end = p + dst->width(); while ( p < end ) @@ -2363,7 +2363,7 @@ TQImage TQImage::convertBitOrder( Endian bitOrder ) const int bpl = (width() + 7) / 8; for ( int y = 0; y < data->h; y++ ) { - register uchar *p = jumpTable()[y]; + uchar *p = jumpTable()[y]; uchar *end = p + bpl; uchar *b = image.jumpTable()[y]; while ( p < end ) @@ -2454,14 +2454,14 @@ void pnmscale(const TQImage& src, TQImage& dst) { TQRgb* xelrow = 0; TQRgb* tempxelrow = 0; - register TQRgb* xP; - register TQRgb* nxP; + TQRgb* xP; + TQRgb* nxP; int rows, cols, rowsread, newrows, newcols; - register int row, col, needtoreadrow; + int row, col, needtoreadrow; const uchar maxval = 255; double xscale, yscale; long sxscale, syscale; - register long fracrowtofill, fracrowleft; + long fracrowtofill, fracrowleft; long* as; long* rs; long* gs; @@ -2551,11 +2551,11 @@ void pnmscale(const TQImage& src, TQImage& dst) xelrow = (TQRgb*)src.scanLine(rowsread++); needtoreadrow = 0; } - register long a=0; + long a=0; for ( col = 0, xP = xelrow, nxP = tempxelrow; col < cols; ++col, ++xP, ++nxP ) { - register long r, g, b; + long r, g, b; if ( as ) { r = rs[col] + fracrowtofill * tqRed( *xP ) * tqAlpha( *xP ) / 255; @@ -2601,9 +2601,9 @@ void pnmscale(const TQImage& src, TQImage& dst) /* shortcut X scaling if possible */ memcpy(dst.scanLine(rowswritten++), tempxelrow, newcols*4); } else { - register long a, r, g, b; - register long fraccoltofill, fraccolleft = 0; - register int needcol; + long a, r, g, b; + long fraccoltofill, fraccolleft = 0; + int needcol; nxP = (TQRgb*)dst.scanLine(rowswritten++); fraccoltofill = SCALE; @@ -3692,7 +3692,7 @@ static void swapPixel01( TQImage *image ) // 1-bpp: swap 0 and 1 pixels { int i; if ( image->depth() == 1 && image->numColors() == 2 ) { - register uint *p = (uint *)image->bits(); + uint *p = (uint *)image->bits(); int nbytes = image->numBytes(); for ( i=0; i<nbytes/4; i++ ) { *p = ~*p; @@ -3942,7 +3942,7 @@ static TQImageHandler *get_image_handler( const char *format ) { // get pointer to handler tqt_init_image_handlers(); tqt_init_image_plugins(); - register TQImageHandler *p = imageHandlers->first(); + TQImageHandler *p = imageHandlers->first(); while ( p ) { // traverse list if ( p->format == format ) return p; @@ -4776,7 +4776,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image ) TQ_CHECK_PTR( buf ); if ( comp == BMP_RLE4 ) { // run length compression int x=0, y=0, b, c, i; - register uchar *p = line[h-1]; + uchar *p = line[h-1]; uchar *endp = line[h-1]+w; while ( y < h ) { if ( (b=d->getch()) == EOF ) @@ -4841,7 +4841,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image ) while ( --h >= 0 ) { if ( d->readBlock((char*)buf,buflen) != buflen ) break; - register uchar *p = line[h]; + uchar *p = line[h]; uchar *b = buf; for ( int i=0; i<w/2; i++ ) { // convert nibbles to bytes *p++ = *b >> 4; @@ -4857,7 +4857,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image ) else if ( nbits == 8 ) { // 8 bit BMP image if ( comp == BMP_RLE8 ) { // run length compression int x=0, y=0, b; - register uchar *p = line[h-1]; + uchar *p = line[h-1]; const uchar *endp = line[h-1]+w; while ( y < h ) { if ( (b=d->getch()) == EOF ) @@ -4920,7 +4920,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image ) } else if ( nbits == 16 || nbits == 24 || nbits == 32 ) { // 16,24,32 bit BMP image - register TQRgb *p; + TQRgb *p; TQRgb *end; uchar *buf24 = new uchar[bpl]; int bpl24 = ((w*nbits+31)/32)*4; @@ -5051,7 +5051,7 @@ bool qt_write_dib( TQDataStream& s, TQImage image ) uchar *buf = new uchar[bpl_bmp]; uchar *b, *end; - register uchar *p; + uchar *p; memset( buf, 0, bpl_bmp ); for ( y=image.height()-1; y>=0; y-- ) { // write the image bits @@ -5237,7 +5237,7 @@ static void read_pbm_image( TQImageIO *iio ) // read PBM image data } } } else { // read ascii data - register uchar *p; + uchar *p; int n; for ( y=0; y<h; y++ ) { p = image.scanLine( y ); @@ -5503,7 +5503,7 @@ static void read_async_image( TQImageIO *iio ) X bitmap image read/write functions *****************************************************************************/ -static inline int hex2byte( register char *p ) +static inline int hex2byte( char *p ) { return ( (isdigit((uchar) *p) ? *p - '0' : toupper((uchar) *p) - 'A' + 10) << 4 ) | ( isdigit((uchar) *(p+1)) ? *(p+1) - '0' : toupper((uchar) *(p+1)) - 'A' + 10 ); @@ -5621,7 +5621,7 @@ static void write_xbm_image( TQImageIO *iio ) } } int bcnt = 0; - register char *p = buf; + char *p = buf; int bpl = (w+7)/8; for (int y = 0; y < h; ++y) { uchar *b = image.scanLine(y); diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp index 2ba77326d..4f04d37df 100644 --- a/src/kernel/qobject.cpp +++ b/src/kernel/qobject.cpp @@ -736,7 +736,7 @@ TQObject::~TQObject() } if ( parentObj ) // remove it from parent object parentObj->removeChild( this ); - register TQObject *obj; + TQObject *obj; if ( senderObjects ) { // disconnect from senders TQSenderObjectList *tmp = senderObjects; senderObjects = 0; @@ -753,7 +753,7 @@ TQObject::~TQObject() TQConnectionList* clist = (*connections)[i]; // for each signal... if ( !clist ) continue; - register TQConnection *c; + TQConnection *c; TQConnectionListIt cit(*clist); while( (c=cit.current()) ) { // for each connected slot... ++cit; @@ -879,7 +879,7 @@ void *tqt_inheritedBy( TQMetaObject *superClass, const TQObject *object ) { if (!object) return 0; - register TQMetaObject *mo = object->metaObject(); + TQMetaObject *mo = object->metaObject(); while (mo) { if (mo == superClass) return (void*)object; @@ -1266,7 +1266,7 @@ bool TQObject::activate_filters( TQEvent *e ) if ( !eventFilters ) // no event filter return FALSE; TQObjectListIt it( *eventFilters ); - register TQObject *obj = it.current(); + TQObject *obj = it.current(); while ( obj ) { // send to all filters ++it; // until one returns TRUE if ( obj->eventFilter(this,e) ) { @@ -2466,7 +2466,7 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index, bool success = FALSE; TQConnectionList *clist; - register TQConnection *c; + TQConnection *c; if ( signal_index == -1 ) { for ( int i = 0; i < (int) s->connections->size(); i++ ) { clist = (*s->connections)[i]; // for all signals... @@ -3060,7 +3060,7 @@ void TQObject::dumpObjectInfo() if ( ( clist = connections->at( i ) ) ) { tqDebug( "\t%s", metaObject()->signal( i, TRUE )->name ); n++; - register TQConnection *c; + TQConnection *c; TQConnectionListIt cit(*clist); while ( (c=cit.current()) ) { ++cit; diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp index 697dc784d..82d491cb2 100644 --- a/src/kernel/qpainter_x11.cpp +++ b/src/kernel/qpainter_x11.cpp @@ -303,7 +303,7 @@ static void init_gc_array() static void cleanup_gc_array( Display *dpy ) { - register TQGC *p = gc_array; + TQGC *p = gc_array; int i = gc_array_size; if ( gc_array_init ) { while ( i-- ) { @@ -328,7 +328,7 @@ static GC alloc_gc( Display *dpy, int scrn, Drawable hd, bool monochrome=FALSE, XSetGraphicsExposures( dpy, gc, False ); return gc; } - register TQGC *p = gc_array; + TQGC *p = gc_array; int i = gc_array_size; if ( !gc_array_init ) // not initialized init_gc_array(); @@ -364,7 +364,7 @@ static void free_gc( Display *dpy, GC gc, bool privateGC = FALSE ) XFreeGC( dpy, gc ); return; } - register TQGC *p = gc_array; + TQGC *p = gc_array; int i = gc_array_size; if ( gc_array_init ) { while ( i-- ) { diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp index 1acdf16a2..897dd4cfd 100644 --- a/src/kernel/qpixmap_x11.cpp +++ b/src/kernel/qpixmap_x11.cpp @@ -290,7 +290,7 @@ extern const uchar *qt_get_bitflip_array(); // defined in qimage.cpp static uchar *flip_bits( const uchar *bits, int len ) { - register const uchar *p = bits; + const uchar *p = bits; const uchar *end = p + len; uchar *newdata = new uchar[len]; uchar *b = newdata; @@ -958,7 +958,7 @@ TQImage TQPixmap::convertToImage() const image.setColor( 0, tqRgb(255,255,255) ); image.setColor( 1, tqRgb(0,0,0) ); } else if ( !trucol ) { // pixmap with colormap - register uchar *p; + uchar *p; uchar *end; uchar use[256]; // pixel-in-use table uchar pix[256]; // pixel translation table diff --git a/src/kernel/qpointarray.cpp b/src/kernel/qpointarray.cpp index dcca3278e..09be31380 100644 --- a/src/kernel/qpointarray.cpp +++ b/src/kernel/qpointarray.cpp @@ -190,8 +190,8 @@ TQPointArray::TQPointArray( int nPoints, const TQCOORD *points ) void TQPointArray::translate( int dx, int dy ) { - register TQPoint *p = data(); - register int i = size(); + TQPoint *p = data(); + int i = size(); TQPoint pt( dx, dy ); while ( i-- ) { *p += pt; @@ -440,7 +440,7 @@ TQRect TQPointArray::boundingRect() const { if ( isEmpty() ) return TQRect( 0, 0, 0, 0 ); // null rectangle - register TQPoint *pd = data(); + TQPoint *pd = data(); int minx, maxx, miny, maxy; minx = maxx = pd->x(); miny = maxy = pd->y(); @@ -937,7 +937,7 @@ TQPointArray TQPointArray::cubicBezier() const if ( m < 2 ) // at least two points m = 2; TQPointArray p( m ); // p = Bezier point array - register TQPointData *pd = p.data(); + TQPointData *pd = p.data(); float x0 = xvec[0], y0 = yvec[0]; float dt = 1.0F/m; @@ -1018,7 +1018,7 @@ TQPointArray TQPointArray::cubicBezier() const TQDataStream &operator<<( TQDataStream &s, const TQPointArray &a ) { - register uint i; + uint i; uint len = a.size(); s << len; // write size of array for ( i=0; i<len; i++ ) // write each point @@ -1037,7 +1037,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQPointArray &a ) TQDataStream &operator>>( TQDataStream &s, TQPointArray &a ) { - register uint i; + uint i; uint len; s >> len; // read size of array if ( !a.resize( len ) ) // no memory diff --git a/src/kernel/qpolygonscanner.cpp b/src/kernel/qpolygonscanner.cpp index ef772bc1b..95ebcff71 100644 --- a/src/kernel/qpolygonscanner.cpp +++ b/src/kernel/qpolygonscanner.cpp @@ -407,8 +407,8 @@ static bool miInsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE, int scanline, ScanLineListBlock **SLLBlock, int *iSLLBlock) { - register EdgeTableEntry *start, *prev; - register ScanLineList *pSLL, *pPrevSLL; + EdgeTableEntry *start, *prev; + ScanLineList *pSLL, *pPrevSLL; ScanLineListBlock *tmpSLLBlock; /* @@ -505,7 +505,7 @@ typedef struct { static void miFreeStorage(ScanLineListBlock *pSLLBlock) { - register ScanLineListBlock *tmpSLLBlock; + ScanLineListBlock *tmpSLLBlock; while (pSLLBlock) { @@ -519,8 +519,8 @@ static bool miCreateETandAET(int count, DDXPointPtr pts, EdgeTable *ET, EdgeTableEntry *AET, EdgeTableEntry *pETEs, ScanLineListBlock *pSLLBlock) { - register DDXPointPtr top, bottom; - register DDXPointPtr PrevPt, CurrPt; + DDXPointPtr top, bottom; + DDXPointPtr PrevPt, CurrPt; int iSLLBlock = 0; int dy; @@ -609,8 +609,8 @@ miCreateETandAET(int count, DDXPointPtr pts, EdgeTable *ET, static void miloadAET(EdgeTableEntry *AET, EdgeTableEntry *ETEs) { - register EdgeTableEntry *pPrevAET; - register EdgeTableEntry *tmp; + EdgeTableEntry *pPrevAET; + EdgeTableEntry *tmp; pPrevAET = AET; AET = AET->next; @@ -656,9 +656,9 @@ miloadAET(EdgeTableEntry *AET, EdgeTableEntry *ETEs) static void micomputeWAET(EdgeTableEntry *AET) { - register EdgeTableEntry *pWETE; - register int inside = 1; - register int isInside = 0; + EdgeTableEntry *pWETE; + int inside = 1; + int isInside = 0; AET->nextWETE = 0; pWETE = AET; @@ -694,10 +694,10 @@ micomputeWAET(EdgeTableEntry *AET) static int miInsertionSort(EdgeTableEntry *AET) { - register EdgeTableEntry *pETEchase; - register EdgeTableEntry *pETEinsert; - register EdgeTableEntry *pETEchaseBackTMP; - register int changed = 0; + EdgeTableEntry *pETEchase; + EdgeTableEntry *pETEinsert; + EdgeTableEntry *pETEchaseBackTMP; + int changed = 0; AET = AET->next; while (AET) @@ -769,12 +769,12 @@ void TQPolygonScanner::scan( const TQPointArray& pa, bool winding, int index, in DDXPointPtr ptsIn = (DDXPointPtr)pa.data(); ptsIn += index; - register EdgeTableEntry *pAET; /* the Active Edge Table */ - register int y; /* the current scanline */ - register int nPts = 0; /* number of pts in buffer */ - register EdgeTableEntry *pWETE; /* Winding Edge Table */ - register ScanLineList *pSLL; /* Current ScanLineList */ - register DDXPointPtr ptsOut; /* ptr to output buffers */ + EdgeTableEntry *pAET; /* the Active Edge Table */ + int y; /* the current scanline */ + int nPts = 0; /* number of pts in buffer */ + EdgeTableEntry *pWETE; /* Winding Edge Table */ + ScanLineList *pSLL; /* Current ScanLineList */ + DDXPointPtr ptsOut; /* ptr to output buffers */ int *width; DDXPointRec FirstPoint[NUMPTSTOBUFFER]; /* the output buffers */ int FirstWidth[NUMPTSTOBUFFER]; diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp index 51ef757a3..b5417a40a 100644 --- a/src/kernel/qregion_x11.cpp +++ b/src/kernel/qregion_x11.cpp @@ -89,8 +89,8 @@ struct TQRegionPrivate { static void UnionRegion(TQRegionPrivate *reg1, TQRegionPrivate *reg2, TQRegionPrivate *newReg); -static void IntersectRegion(TQRegionPrivate *reg1, TQRegionPrivate *reg2, register TQRegionPrivate *newReg); -static void miRegionOp(register TQRegionPrivate *newReg, TQRegionPrivate *reg1, TQRegionPrivate *reg2, +static void IntersectRegion(TQRegionPrivate *reg1, TQRegionPrivate *reg2, TQRegionPrivate *newReg); +static void miRegionOp(TQRegionPrivate *newReg, TQRegionPrivate *reg1, TQRegionPrivate *reg2, void (*overlapFunc)(...), void (*nonOverlap1Func)(...), void (*nonOverlap2Func)(...)); @@ -300,7 +300,7 @@ typedef void (*voidProcp)(...); static -void UnionRectWithRegion(register const TQRect *rect, TQRegionPrivate *source, TQRegionPrivate *dest) +void UnionRectWithRegion(const TQRect *rect, TQRegionPrivate *source, TQRegionPrivate *dest) { TQRegionPrivate region; @@ -333,7 +333,7 @@ void UnionRectWithRegion(register const TQRect *rect, TQRegionPrivate *source, T static void miSetExtents (TQRegionPrivate *pReg) { - register TQRect *pBox, + TQRect *pBox, *pBoxEnd, *pExtents; @@ -383,10 +383,10 @@ miSetExtents (TQRegionPrivate *pReg) static int -OffsetRegion(register TQRegionPrivate *pRegion, register int x, register int y) +OffsetRegion(TQRegionPrivate *pRegion, int x, int y) { - register int nbox; - register TQRect *pbox; + int nbox; + TQRect *pbox; pbox = pRegion->rects.data(); nbox = pRegion->numRects; @@ -419,12 +419,12 @@ OffsetRegion(register TQRegionPrivate *pRegion, register int x, register int y) /* static void*/ static int -miIntersectO (register TQRegionPrivate *pReg, register TQRect *r1, TQRect *r1End, - register TQRect *r2, TQRect *r2End, int y1, int y2) +miIntersectO (TQRegionPrivate *pReg, TQRect *r1, TQRect *r1End, + TQRect *r2, TQRect *r2End, int y1, int y2) { - register int x1; - register int x2; - register TQRect *pNextRect; + int x1; + int x2; + TQRect *pNextRect; pNextRect = pReg->rects.data() + pReg->numRects; @@ -474,7 +474,7 @@ miIntersectO (register TQRegionPrivate *pReg, register TQRect *r1, TQRect *r1End static void -IntersectRegion(TQRegionPrivate *reg1, TQRegionPrivate *reg2, register TQRegionPrivate *newReg) +IntersectRegion(TQRegionPrivate *reg1, TQRegionPrivate *reg2, TQRegionPrivate *newReg) { /* check for trivial reject */ if ( (!(reg1->numRects)) || (!(reg2->numRects)) || @@ -519,14 +519,14 @@ IntersectRegion(TQRegionPrivate *reg1, TQRegionPrivate *reg2, register TQRegionP /* static int*/ static int -miCoalesce (register TQRegionPrivate *pReg, int prevStart, int curStart) +miCoalesce (TQRegionPrivate *pReg, int prevStart, int curStart) //Region pReg; /* Region to coalesce */ //prevStart; /* Index of start of previous band */ //curStart; /* Index of start of current band */ { - register TQRect *pPrevBox; /* Current box in previous band */ - register TQRect *pCurBox; /* Current box in current band */ - register TQRect *pRegEnd; /* End of region */ + TQRect *pPrevBox; /* Current box in previous band */ + TQRect *pCurBox; /* Current box in current band */ + TQRect *pRegEnd; /* End of region */ int curNumRects; /* Number of rectangles in current * band */ int prevNumRects; /* Number of rectangles in previous @@ -670,11 +670,11 @@ miCoalesce (register TQRegionPrivate *pReg, int prevStart, int curStart) */ /* static void*/ static void -miRegionOp(register TQRegionPrivate *newReg, TQRegionPrivate *reg1, TQRegionPrivate *reg2, +miRegionOp(TQRegionPrivate *newReg, TQRegionPrivate *reg1, TQRegionPrivate *reg2, void (*overlapFunc)(...), void (*nonOverlap1Func)(...), void (*nonOverlap2Func)(...)) - //register Region newReg; /* Place to store result */ + //Region newReg; /* Place to store result */ //Region reg1; /* First region in operation */ //Region reg2; /* 2d region in operation */ //void (*overlapFunc)(); /* Function to call for over- @@ -686,18 +686,18 @@ miRegionOp(register TQRegionPrivate *newReg, TQRegionPrivate *reg1, TQRegionPriv //* overlapping bands in region //* 2 */ { - register TQRect *r1; /* Pointer into first region */ - register TQRect *r2; /* Pointer into 2d region */ + TQRect *r1; /* Pointer into first region */ + TQRect *r2; /* Pointer into 2d region */ TQRect *r1End; /* End of 1st region */ TQRect *r2End; /* End of 2d region */ - register int ybot; /* Bottom of intersection */ - register int ytop; /* Top of intersection */ + int ybot; /* Bottom of intersection */ + int ytop; /* Top of intersection */ int prevBand; /* Index of start of * previous band in newReg */ int curBand; /* Index of start of current * band in newReg */ - register TQRect *r1BandEnd; /* End of current band in r1 */ - register TQRect *r2BandEnd; /* End of current band in r2 */ + TQRect *r1BandEnd; /* End of current band in r1 */ + TQRect *r2BandEnd; /* End of current band in r2 */ int top; /* Top of non-overlapping * band */ int bot; /* Bottom of non-overlapping @@ -951,10 +951,10 @@ miRegionOp(register TQRegionPrivate *newReg, TQRegionPrivate *reg1, TQRegionPriv /* static void*/ static int -miUnionNonO (register TQRegionPrivate *pReg, register TQRect * r, - TQRect * rEnd, register int y1, register int y2) +miUnionNonO (TQRegionPrivate *pReg, TQRect * r, + TQRect * rEnd, int y1, int y2) { - register TQRect * pNextRect; + TQRect * pNextRect; pNextRect = pReg->rects.data() + pReg->numRects; @@ -993,10 +993,10 @@ miUnionNonO (register TQRegionPrivate *pReg, register TQRect * r, /* static void*/ static int -miUnionO (register TQRegionPrivate *pReg, register TQRect *r1, TQRect *r1End, - register TQRect *r2, TQRect *r2End, register int y1, register int y2) +miUnionO (TQRegionPrivate *pReg, TQRect *r1, TQRect *r1End, + TQRect *r2, TQRect *r2End, int y1, int y2) { - register TQRect *pNextRect; + TQRect *pNextRect; pNextRect = pReg->rects.data() + pReg->numRects; @@ -1121,10 +1121,10 @@ static void UnionRegion(TQRegionPrivate *reg1, TQRegionPrivate *reg2, TQRegionPr /* static void*/ static int -miSubtractNonO1 (register TQRegionPrivate *pReg, register TQRect *r, - TQRect *rEnd, register int y1, register int y2) +miSubtractNonO1 (TQRegionPrivate *pReg, TQRect *r, + TQRect *rEnd, int y1, int y2) { - register TQRect *pNextRect; + TQRect *pNextRect; pNextRect = pReg->rects.data() + pReg->numRects; @@ -1160,11 +1160,11 @@ miSubtractNonO1 (register TQRegionPrivate *pReg, register TQRect *r, /* static void*/ static int -miSubtractO (register TQRegionPrivate *pReg, register TQRect *r1, TQRect *r1End, - register TQRect *r2, TQRect *r2End, register int y1, register int y2) +miSubtractO (TQRegionPrivate *pReg, TQRect *r1, TQRect *r1End, + TQRect *r2, TQRect *r2End, int y1, int y2) { - register TQRect *pNextRect; - register int x1; + TQRect *pNextRect; + int x1; x1 = r1->left(); @@ -1285,7 +1285,7 @@ miSubtractO (register TQRegionPrivate *pReg, register TQRect *r1, TQRect *r1End, *----------------------------------------------------------------------- */ -static void SubtractRegion(TQRegionPrivate *regM, TQRegionPrivate *regS, register TQRegionPrivate *regD) +static void SubtractRegion(TQRegionPrivate *regM, TQRegionPrivate *regS, TQRegionPrivate *regD) { /* check for trivial reject */ if ( (!(regM->numRects)) || (!(regS->numRects)) || @@ -1361,13 +1361,13 @@ static bool PointInRegion( TQRegionPrivate *pRegion, int x, int y ) return FALSE; } -static bool RectInRegion(register TQRegionPrivate *region, +static bool RectInRegion(TQRegionPrivate *region, int rx, int ry, unsigned int rwidth, unsigned int rheight) { - register TQRect *pbox; - register TQRect *pboxEnd; + TQRect *pbox; + TQRect *pboxEnd; TQRect rect(rx, ry, rwidth, rheight); - register TQRect *prect = ▭ + TQRect *prect = ▭ int partIn, partOut; /* this is (just) a useful optimization */ @@ -1800,8 +1800,8 @@ static void InsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE, int scanline, ScanLineListBlock **SLLBlock, int *iSLLBlock) { - register EdgeTableEntry *start, *prev; - register ScanLineList *pSLL, *pPrevSLL; + EdgeTableEntry *start, *prev; + ScanLineList *pSLL, *pPrevSLL; ScanLineListBlock *tmpSLLBlock; /* @@ -1881,12 +1881,12 @@ InsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE, int scanline, */ static void -CreateETandAET(register int count, register TQPoint *pts, - EdgeTable *ET, EdgeTableEntry *AET, register EdgeTableEntry *pETEs, +CreateETandAET(int count, TQPoint *pts, + EdgeTable *ET, EdgeTableEntry *AET, EdgeTableEntry *pETEs, ScanLineListBlock *pSLLBlock) { - register TQPoint *top, *bottom; - register TQPoint *PrevPt, *CurrPt; + TQPoint *top, *bottom; + TQPoint *PrevPt, *CurrPt; int iSLLBlock = 0; int dy; @@ -1969,10 +1969,10 @@ CreateETandAET(register int count, register TQPoint *pts, */ static void -loadAET(register EdgeTableEntry *AET, register EdgeTableEntry *ETEs) +loadAET(EdgeTableEntry *AET, EdgeTableEntry *ETEs) { - register EdgeTableEntry *pPrevAET; - register EdgeTableEntry *tmp; + EdgeTableEntry *pPrevAET; + EdgeTableEntry *tmp; pPrevAET = AET; AET = AET->next; @@ -2016,11 +2016,11 @@ loadAET(register EdgeTableEntry *AET, register EdgeTableEntry *ETEs) * */ static void -computeWAET(register EdgeTableEntry *AET) +computeWAET(EdgeTableEntry *AET) { - register EdgeTableEntry *pWETE; - register int inside = 1; - register int isInside = 0; + EdgeTableEntry *pWETE; + int inside = 1; + int isInside = 0; AET->nextWETE = (EdgeTableEntry *)NULL; pWETE = AET; @@ -2054,12 +2054,12 @@ computeWAET(register EdgeTableEntry *AET) */ static int -InsertionSort(register EdgeTableEntry *AET) +InsertionSort(EdgeTableEntry *AET) { - register EdgeTableEntry *pETEchase; - register EdgeTableEntry *pETEinsert; - register EdgeTableEntry *pETEchaseBackTMP; - register int changed = 0; + EdgeTableEntry *pETEchase; + EdgeTableEntry *pETEinsert; + EdgeTableEntry *pETEchaseBackTMP; + int changed = 0; AET = AET->next; while (AET) @@ -2090,9 +2090,9 @@ InsertionSort(register EdgeTableEntry *AET) * Clean up our act. */ static void -FreeStorage(register ScanLineListBlock *pSLLBlock) +FreeStorage(ScanLineListBlock *pSLLBlock) { - register ScanLineListBlock *tmpSLLBlock; + ScanLineListBlock *tmpSLLBlock; while (pSLLBlock) { @@ -2110,15 +2110,15 @@ FreeStorage(register ScanLineListBlock *pSLLBlock) * stack by the calling procedure. * */ -static int PtsToRegion(register int numFullPtBlocks, register int iCurPtBlock, +static int PtsToRegion(int numFullPtBlocks, int iCurPtBlock, POINTBLOCK *FirstPtBlock, TQRegionPrivate *reg) { - register TQRect *rects; - register TQPoint *pts; - register POINTBLOCK *CurPtBlock; - register int i; - register TQRect *extents; - register int numRects; + TQRect *rects; + TQPoint *pts; + POINTBLOCK *CurPtBlock; + int i; + TQRect *extents; + int numRects; extents = ®->extents; @@ -2182,12 +2182,12 @@ static TQRegionPrivate *PolygonRegion(TQPoint *Pts, int Count, int rule) //int rule; /* winding rule */ { TQRegionPrivate *region; - register EdgeTableEntry *pAET; /* Active Edge Table */ - register int y; /* current scanline */ - register int iPts = 0; /* number of pts in buffer */ - register EdgeTableEntry *pWETE; /* Winding Edge Table Entry*/ - register ScanLineList *pSLL; /* current scanLineList */ - register TQPoint *pts; /* output buffer */ + EdgeTableEntry *pAET; /* Active Edge Table */ + int y; /* current scanline */ + int iPts = 0; /* number of pts in buffer */ + EdgeTableEntry *pWETE; /* Winding Edge Table Entry*/ + ScanLineList *pSLL; /* current scanLineList */ + TQPoint *pts; /* output buffer */ EdgeTableEntry *pPrevAET; /* ptr to previous AET */ EdgeTable ET; /* header node for ET */ EdgeTableEntry AET; /* header node for AET */ diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp index 1790eb18d..b6ca87207 100644 --- a/src/kernel/qrichtext.cpp +++ b/src/kernel/qrichtext.cpp @@ -4093,7 +4093,7 @@ TQTextParagraph::~TQTextParagraph() { delete str; if ( hasdoc ) { - register TQTextDocument *doc = document(); + TQTextDocument *doc = document(); if ( this == doc->minwParag ) { doc->minwParag = 0; doc->minw = 0; diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp index 091958520..4885346d7 100644 --- a/src/kernel/qwidget.cpp +++ b/src/kernel/qwidget.cpp @@ -1044,7 +1044,7 @@ void TQWidget::destroyMapper() TQWidgetIntDictIt it( *((TQWidgetIntDict*)mapper) ); TQWidgetMapper * myMapper = mapper; mapper = 0; - register TQWidget *w; + TQWidget *w; while ( (w=it.current()) ) { // remove parents widgets ++it; if ( !w->parentObj ) // widget is a parent @@ -4172,7 +4172,7 @@ void TQWidget::showChildren( bool spontaneous ) { if ( children() ) { TQObjectListIt it(*children()); - register TQObject *object; + TQObject *object; TQWidget *widget; while ( it ) { object = it.current(); @@ -4197,7 +4197,7 @@ void TQWidget::hideChildren( bool spontaneous ) { if ( children() ) { TQObjectListIt it(*children()); - register TQObject *object; + TQObject *object; TQWidget *widget; while ( it ) { object = it.current(); diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp index 71268a6ab..f842595d5 100644 --- a/src/kernel/qwidget_x11.cpp +++ b/src/kernel/qwidget_x11.cpp @@ -794,7 +794,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows ) clearWState( WState_Created ); if ( children() ) { TQObjectListIt it(*children()); - register TQObject *obj; + TQObject *obj; while ( (obj=it.current()) ) { // destroy all widget children ++it; if ( obj->isWidgetType() ) @@ -2476,7 +2476,7 @@ void TQWidget::scroll( int dx, int dy, const TQRect& r ) if ( !valid_rect && children() ) { // scroll children TQPoint pd( dx, dy ); TQObjectListIt it(*children()); - register TQObject *object; + TQObject *object; while ( it ) { // move all children object = it.current(); if ( object->isWidgetType() ) { diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp index 06104b0b0..eb8324f37 100644 --- a/src/kernel/qwmatrix.cpp +++ b/src/kernel/qwmatrix.cpp @@ -724,8 +724,8 @@ TQRegion TQWMatrix::operator * (const TQRegion &r ) const return r; TQMemArray<TQRect> rects = r.rects(); TQRegion result; - register TQRect *rect = rects.data(); - register int i = rects.size(); + TQRect *rect = rects.data(); + int i = rects.size(); if ( _m12 == 0.0F && _m21 == 0.0F && _m11 > 1.0F && _m22 > 1.0F ) { // simple case, no rotation while ( i ) { |