Removed explicit usage of the 'register' keyword.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 6db8697910)

kmix/ksmallslider.cpp

@@ -165,7 +165,7 @@ void gradient( TQPainter &p, bool hor, const TQRect &rect, const TQColor &ca, co
    int rDiff, gDiff, bDiff;
    int rca, gca, bca, rcb, gcb, bcb;
 
-   register int x, y;
+   int x, y;
 
    if ((rect.width()<=0) || (rect.height()<=0)) return;
 
@@ -173,9 +173,9 @@ void gradient( TQPainter &p, bool hor, const TQRect &rect, const TQColor &ca, co
    gDiff = (gcb = cb.green()) - (gca = ca.green());
    bDiff = (bcb = cb.blue())  - (bca = ca.blue());
 
-   register int rl = rca << 16;
-   register int gl = gca << 16;
-   register int bl = bca << 16;
+   int rl = rca << 16;
+   int gl = gca << 16;
+   int bl = bca << 16;
 
    int rcdelta = ((1<<16) / ((!hor) ? rect.height() : rect.width())) * rDiff;
    int gcdelta = ((1<<16) / ((!hor) ? rect.height() : rect.width())) * gDiff;

kscd/cddaslave.c

@@ -258,8 +258,8 @@ wmcdda_transform(unsigned char *rawbuf, long buflen, struct cdda_block *block)
 {
 	long		i;
 	long		*buf32 = (long *)rawbuf;
-	register short	*buf16 = (short *)rawbuf;
-	register int	aval;
+	short	*buf16 = (short *)rawbuf;
+	int	aval;
 
 	/*
 	 * Loudness transformation.  Basically this is a self-adjusting

kscd/kscdmagic/core.cpp

@@ -116,7 +116,7 @@ inline void addPixelFast(unsigned char *p,int br1,int br2) {
 }
 
 void fadeFade() {
-  register unsigned long *ptr = (unsigned long*)ucoutput;
+  unsigned long *ptr = (unsigned long*)ucoutput;
   int i = outWidth*outHeight*2/4;
   do {
     //Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4;
@@ -322,7 +322,7 @@ int coreGo() {
    
   // Asger Alstrupt's optimized 32 bit fade
   // (alstrup@diku.dk)
-  /*register unsigned long *ptr = (unsigned long*)output;
+  /*unsigned long *ptr = (unsigned long*)output;
   i = outWidth*outHeight*2/4;
   do {
     //Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4;

kscd/kscdmagic/xlib.c

@@ -141,7 +141,7 @@ void draw_screen(xdisplay * d)
 #ifdef MITSHM
 int alloc_shm_image(xdisplay * new)
 {
-    register char *ptr;
+    char *ptr;
     int temp, size = 0, i;
     ptr = DisplayString(new->display);
     if (!ptr || (*ptr == ':') || !strncmp(ptr, "localhost:", 10) ||

kscd/kscdmagic/xlibwrap.cpp

@@ -138,24 +138,24 @@ void inputUpdate(int &mouseX,int &mouseY,int &mouseButtons,char &keyHit) {
 }
  
 void screenShow(void) { 
-  register unsigned long *ptr2 = (unsigned long*)ucoutput;
+  unsigned long *ptr2 = (unsigned long*)ucoutput;
   unsigned long *ptr1 = (unsigned long*)d->back;
   int i = outWidth*outHeight/4;
   if (lowColor)
     do {
-      register unsigned int const r1 = *(ptr2++);
-      register unsigned int const r2 = *(ptr2++);
+      unsigned int const r1 = *(ptr2++);
+      unsigned int const r2 = *(ptr2++);
     
       //if (r1 || r2) {
 #ifdef LITTLEENDIAN
-        register unsigned int const v = 
+        unsigned int const v = 
              mapping[((r1&0xe0ul)>>5)|((r1&0xe000ul)>>10)]
             |mapping[((r1&0xe00000ul)>>21)|((r1&0xe0000000ul)>>26)]*256U; 
         *(ptr1++) = v | 
              mapping[((r2&0xe0ul)>>5)|((r2&0xe000ul)>>10)]*65536U
             |mapping[((r2&0xe00000ul)>>21)|((r2&0xe0000000ul)>>26)]*16777216U; 
 #else
-        register unsigned int const v = 
+        unsigned int const v = 
              mapping[((r2&0xe0ul)>>5)|((r2&0xe000ul)>>10)]
             |mapping[((r2&0xe00000ul)>>21)|((r2&0xe0000000ul)>>26)]*256U; 
         *(ptr1++) = v | 
@@ -168,12 +168,12 @@ void screenShow(void) {
     do {
       // Asger Alstrup Nielsen's (alstrup@diku.dk)
       // optimized 32 bit screen loop
-      register unsigned int const r1 = *(ptr2++);
-      register unsigned int const r2 = *(ptr2++);
+      unsigned int const r1 = *(ptr2++);
+      unsigned int const r2 = *(ptr2++);
     
       //if (r1 || r2) {
 #ifdef LITTLEENDIAN
-        register unsigned int const v = 
+        unsigned int const v = 
             ((r1 & 0x000000f0ul) >> 4)
           | ((r1 & 0x0000f000ul) >> 8)
           | ((r1 & 0x00f00000ul) >> 12)
@@ -184,7 +184,7 @@ void screenShow(void) {
           | ((r2 & 0x00f00000ul) << 16 -12)
           | ((r2 & 0xf0000000ul) << 16 -16);
 #else
-        register unsigned int const v = 
+        unsigned int const v = 
             ((r2 & 0x000000f0ul) >> 4)
           | ((r2 & 0x0000f000ul) >> 8)
           | ((r2 & 0x00f00000ul) >> 12)

kscd/libwm/cddaslave.c

@@ -307,8 +307,8 @@ wmcdda_transform(unsigned char *rawbuf, long buflen, struct cdda_block *block)
 {
 	long		i;
 	long		*buf32 = (long *)rawbuf;
-	register short	*buf16 = (short *)rawbuf;
-	register int	aval;
+	short	*buf16 = (short *)rawbuf;
+	int	aval;
 
 	/*
 	 * Loudness transformation.  Basically this is a self-adjusting

kscd/libwm/plat_sun.c

@@ -807,7 +807,7 @@ int internal_audio = 1;
 
 codec_init( void )
 {
-  register int i;
+  int i;
   char* ctlname;
   audio_info_t foo;
   audio_device_t aud_dev;

mpeglib/lib/decoder/tplayPlugin.cpp

@@ -169,7 +169,7 @@ void TplayPlugin::config(const char* key,const char* value,void* user_data) {
 
 
 void TplayPlugin::swap_block(char * buffer, int blocksize) {
-  register int i;
+  int i;
   char c, *p;
 
   p = buffer;

mpeglib/lib/mpegplay/jrevdct.cpp

@@ -320,8 +320,8 @@ void init_pre_idct() {
 
 void j_rev_dct_sparse (DCTBLOCK data, int pos) {
   short int val;
-  register int *dp;
-  register int v;
+  int *dp;
+  int v;
   int quant;
 
   //  cout << "j_rev_dct_sparse"<<endl;
@@ -462,7 +462,7 @@ void j_rev_dct (DCTBLOCK data) {
   INT32 tmp10, tmp11, tmp12, tmp13;
   INT32 z1, z2, z3, z4, z5;
   INT32 d0, d1, d2, d3, d4, d5, d6, d7;
-  register DCTELEM *dataptr;
+  DCTELEM *dataptr;
   int rowctr;
   SHIFT_TEMPS
 
@@ -483,7 +483,7 @@ void j_rev_dct (DCTBLOCK data) {
      * row DCT calculations can be simplified this way.
      */
 
-    register int *idataptr = (int*)dataptr;
+    int *idataptr = (int*)dataptr;
     d0 = dataptr[0];
     d1 = dataptr[1];
     if ((d1 == 0) && (idataptr[1] + idataptr[2] + idataptr[3]) == 0) {
@@ -491,7 +491,7 @@ void j_rev_dct (DCTBLOCK data) {
       if (d0) {
 	  /* Compute a 32 bit value to assign. */
 	  DCTELEM dcval = (DCTELEM) (d0 << PASS1_BITS);
-	  register int v = (dcval & 0xffff) + (dcval << 16);
+	  int v = (dcval & 0xffff) + (dcval << 16);
 	  
 	  idataptr[0] = v;
 	  idataptr[1] = v;
@@ -1475,7 +1475,7 @@ void j_rev_dct (DCTBLOCK data)
   INT32 tmp0, tmp1, tmp2, tmp3;
   INT32 tmp10, tmp11, tmp12, tmp13;
   INT32 z1, z2, z3, z4, z5;
-  register DCTELEM *dataptr;
+  DCTELEM *dataptr;
   int rowctr;
   SHIFT_TEMPS
 

mpeglib/lib/splay/dct36_12.cpp

@@ -185,7 +185,7 @@ inline void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) {
 
   {
     REAL in0,in1,in2,in3,in4,in5;
-    register REAL *pb1=prevblk1;
+    REAL *pb1=prevblk1;
     out[SBLIMIT*0]=pb1[0];out[SBLIMIT*1]=pb1[1];out[SBLIMIT*2]=pb1[2];
     out[SBLIMIT*3]=pb1[3];out[SBLIMIT*4]=pb1[4];out[SBLIMIT*5]=pb1[5];
  
@@ -194,7 +194,7 @@ inline void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) {
     {
       REAL tmp0,tmp1=(in0-in4);
       {
-	register REAL tmp2=(in1-in5)*hsec_12[1];
+	REAL tmp2=(in1-in5)*hsec_12[1];
 	tmp0=tmp1+tmp2;
 	tmp1-=tmp2;
       }
@@ -219,7 +219,7 @@ inline void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) {
   in++;
   {
     REAL in0,in1,in2,in3,in4,in5;
-    register REAL *pb2 = prevblk2;
+    REAL *pb2 = prevblk2;
  
     DCT12_PART1;
 
@@ -252,7 +252,7 @@ inline void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) {
   in++; 
   {
     REAL in0,in1,in2,in3,in4,in5;
-    register REAL *pb2 = prevblk2;
+    REAL *pb2 = prevblk2;
     pb2[12]=pb2[13]=pb2[14]=pb2[15]=pb2[16]=pb2[17]=0.0;
 
     DCT12_PART1;

mpeglib/lib/splay/dct64.cpp

@@ -67,7 +67,7 @@ inline void dct64(REAL* out1,REAL* out2,REAL *fraction) {
   // compute new values via a fast cosine transform:
   {
     // put to buffer 0..15
-    register REAL* x=fraction;
+    REAL* x=fraction;
 
     p0=x[ 0]+x[31];p1=x[ 1]+x[30];p2=x[ 2]+x[29];p3=x[ 3]+x[28];
     p4=x[ 4]+x[27];p5=x[ 5]+x[26];p6=x[ 6]+x[25];p7=x[ 7]+x[24];
@@ -102,7 +102,7 @@ inline void dct64(REAL* out1,REAL* out2,REAL *fraction) {
   pc=qc+qd;pd=hcos_4*(qc-qd);pe=qe+qf;pf=hcos_4*(qe-qf);
 
   {
-    register REAL tmp;
+    REAL tmp;
 
     tmp=p6+p7;
     OUT2(36)=-(p5+tmp);
@@ -128,7 +128,7 @@ inline void dct64(REAL* out1,REAL* out2,REAL *fraction) {
 
   {
     // put to buffer 16..31
-    register REAL *x=fraction;
+    REAL *x=fraction;
 
     p0=hcos_64[ 0]*(x[ 0]-x[31]);p1=hcos_64[ 1]*(x[ 1]-x[30]);
     p2=hcos_64[ 2]*(x[ 2]-x[29]);p3=hcos_64[ 3]*(x[ 3]-x[28]);

mpeglib/lib/splay/dct64_down.cpp

@@ -64,7 +64,7 @@ inline void dct64_downsample(REAL* out1,REAL* out2,REAL *fraction) {
 
   // compute new values via a fast cosine transform:
   /*  {
-    register REAL *x=fraction;
+    REAL *x=fraction;
 
     p0=x[ 0]+x[31];p1=x[ 1]+x[30];p2=x[ 2]+x[29];p3=x[ 3]+x[28];
     p4=x[ 4]+x[27];p5=x[ 5]+x[26];p6=x[ 6]+x[25];p7=x[ 7]+x[24];
@@ -81,7 +81,7 @@ inline void dct64_downsample(REAL* out1,REAL* out2,REAL *fraction) {
 
   {
 
-    register REAL *x=fraction;
+    REAL *x=fraction;
 
     q0=x[ 0]+x[15];q1=x[ 1]+x[14];q2=x[ 2]+x[13];q3=x[ 3]+x[12];
     q4=x[ 4]+x[11];q5=x[ 5]+x[10];q6=x[ 6]+x[ 9];q7=x[ 7]+x[ 8];
@@ -110,7 +110,7 @@ inline void dct64_downsample(REAL* out1,REAL* out2,REAL *fraction) {
   pc=qc+qd;pd=hcos_4_down*(qc-qd);pe=qe+qf;pf=hcos_4_down*(qe-qf);
 
   {
-    register REAL tmp;
+    REAL tmp;
 
     tmp=p6+p7;
     OUT2(36)=-(p5+tmp);
@@ -135,7 +135,7 @@ inline void dct64_downsample(REAL* out1,REAL* out2,REAL *fraction) {
   }
 
   {
-    register REAL *x=fraction;
+    REAL *x=fraction;
 
     /*    p0=hcos_64_down[ 0]*(x[ 0]-x[31]);p1=hcos_64_down[ 1]*(x[ 1]-x[30]);
     p2=hcos_64_down[ 2]*(x[ 2]-x[29]);p3=hcos_64_down[ 3]*(x[ 3]-x[28]);

mpeglib/lib/splay/huffmanlookup.cpp

@@ -100,7 +100,7 @@ void HuffmanLookup::huffmandecoder_1(const HUFFMANCODETABLE *h, int *x, int *y)
     level>>=1;
     if(!(level || ((unsigned)point<Mpegtoraw::ht->treelen)))
     {
-      register int xx,yy;
+      int xx,yy;
 
       xx=(h->xlen<<1);// set x and y to a medium value as a simple concealment
       yy=(h->ylen<<1);

mpeglib/lib/splay/mpegAudioBitWindow.cpp

@@ -34,7 +34,7 @@ void MpegAudioBitWindow::wrap(void) {
   point&=(WINDOWSIZE-1);
 
   if(p>=point) {
-    for(register int i=4;i<point;i++)
+    for(int i=4;i<point;i++)
       buffer[WINDOWSIZE+i]=buffer[i];
   }
   *((int *)(buffer+WINDOWSIZE))=*((int *)buffer);

mpeglib/lib/splay/mpegAudioBitWindow.h

@@ -99,15 +99,15 @@ class MpegAudioBitWindow {
 
 
   int getbit(void) {
-    register int r=(buffer[(bitindex>>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1;
-    //register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
+    int r=(buffer[(bitindex>>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1;
+    //int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
     bitindex++;
     return r;
   }
 
   // no range check version
   inline int getbits9_f(int bits) {
-    register unsigned short a;
+    unsigned short a;
     {
       int offset=bitindex>>3;
       a=(((unsigned char)buffer[offset])<<8)|((unsigned char)buffer[offset+1]);
@@ -119,7 +119,7 @@ class MpegAudioBitWindow {
 
   // range check version
   int getbits9(int bits) {
-    register unsigned short a;
+    unsigned short a;
     {
       int offset=(bitindex>>3)&(WINDOWSIZE-1);
       a=(((unsigned char)buffer[offset])<<8)|((unsigned char)buffer[offset+1]);

mpeglib/lib/splay/mpegAudioStream.h

@@ -59,7 +59,7 @@ class MpegAudioStream {
   }
 
   inline int getbits9(int bits) {
-    register unsigned short a;
+    unsigned short a;
     {
       int offset=bitindex>>3;
       
@@ -73,7 +73,7 @@ class MpegAudioStream {
   }
 
   inline int getbits8() {
-    register unsigned short a;
+    unsigned short a;
     
     {
       int offset=bitindex>>3;
@@ -88,7 +88,7 @@ class MpegAudioStream {
   }
 
   inline int getbit() {
-     register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
+     int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
 
      bitindex++;
      return r;

mpeglib/lib/splay/mpeglayer1.cpp

@@ -46,7 +46,7 @@ void Mpegtoraw::extractlayer1(void)
   int bitalloc[MAXCHANNEL][MAXSUBBAND],
       sample[MAXCHANNEL][MAXSUBBAND];
 
-  register int i,j;
+  int i,j;
   int s=stereobound,l;
 
 

mpeglib/lib/splay/mpeglayer2.cpp

@@ -86,8 +86,8 @@ void Mpegtoraw::extractlayer2(void) {
 
   // Bitalloc
   {
-    register int i;
-    register const int *t=bitalloclengthtable[tableindex];
+    int i;
+    const int *t=bitalloclengthtable[tableindex];
     for(i=0;i<s;i++,t++)
     {
       bitalloc[LS][i]=getbits(*t);
@@ -102,18 +102,18 @@ void Mpegtoraw::extractlayer2(void) {
 
   // Scale selector
   if(inputstereo)
-    for(register int i=0;i<n;i++)
+    for(int i=0;i<n;i++)
     {
       if(bitalloc[LS][i])scaleselector[LS][i]=getbits(2);
       if(bitalloc[RS][i])scaleselector[RS][i]=getbits(2);
     }
   else
-    for(register int i=0;i<n;i++)
+    for(int i=0;i<n;i++)
       if(bitalloc[LS][i])scaleselector[LS][i]=getbits(2);
 
   // Scale index
   {
-    register int i,j;
+    int i,j;
 
 
     for(i=0;i<n;i++)
@@ -271,7 +271,7 @@ void Mpegtoraw::extractlayer2(void) {
 
 // Read Sample
   {
-    register int i;
+    int i;
 
     for(int l=0;l<SCALEBLOCK;l++)
     {
@@ -282,7 +282,7 @@ void Mpegtoraw::extractlayer2(void) {
 	{
 	  if(group[LS][i])
 	  {
-	    register const REAL *s;
+	    const REAL *s;
 	    int code=getbits(codelength[LS][i]);
 
 
@@ -351,7 +351,7 @@ void Mpegtoraw::extractlayer2(void) {
 	{
 	  if(group[LS][i])
 	  {
-	    register const REAL *s;
+	    const REAL *s;
 	    int code=getbits(codelength[LS][i]);
 
 	    code+=code<<1;
@@ -396,7 +396,7 @@ void Mpegtoraw::extractlayer2(void) {
 	      fraction[LS][2][i]=(fraction[LS][2][i]+d[LS][i])*c[LS][i];
 	    }
 
-	    register REAL t=scalefactor[LS][l>>2][i];
+	    REAL t=scalefactor[LS][l>>2][i];
 	    fraction[LS][0][i]*=t;
 	    fraction[LS][1][i]*=t;
 	    fraction[LS][2][i]*=t;
@@ -411,7 +411,7 @@ void Mpegtoraw::extractlayer2(void) {
 	      fraction[RS][2][i]=(fraction[RS][2][i]+d[RS][i])*c[LS][i];
 	    }
 
-	    register REAL t=scalefactor[RS][l>>2][i];
+	    REAL t=scalefactor[RS][l>>2][i];
 	    fraction[RS][0][i]*=t;
 	    fraction[RS][1][i]*=t;
 	    fraction[RS][2][i]*=t;
@@ -428,7 +428,7 @@ void Mpegtoraw::extractlayer2(void) {
 	      fraction[LS][2][i]=(fraction[LS][2][i]+d[LS][i])*c[LS][i];
 	    }
 
-	    register REAL t=scalefactor[LS][l>>2][i];
+	    REAL t=scalefactor[LS][l>>2][i];
 	    fraction[LS][0][i]*=t;
 	    fraction[LS][1][i]*=t;
 	    fraction[LS][2][i]*=t;

mpeglib/lib/splay/mpeglayer3.cpp

@@ -337,7 +337,7 @@ void Mpegtoraw::layer3getscalefactors(int ch,int gr)
 			  {0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3}};
 
   layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]);
-  register layer3scalefactor *sf=(&scalefactors[ch]);
+  layer3scalefactor *sf=(&scalefactors[ch]);
   int l0,l1;
 
   {
@@ -479,7 +479,7 @@ void Mpegtoraw::layer3getscalefactors_2(int ch)
   int sb[54];
   int extendedmode=mpegAudioHeader->getExtendedmode();
   layer3grinfo *gi=&(sideinfo.ch[ch].gr[0]);
-  register layer3scalefactor *sf=(&scalefactors[ch]);
+  layer3scalefactor *sf=(&scalefactors[ch]);
 
   {
     int blocktypenumber,sc;
@@ -641,7 +641,7 @@ inline void Mpegtoraw::huffmandecoder_1(const HUFFMANCODETABLE *h,int *x,int *y)
     level>>=1;
     if(!(level || ((unsigned)point<ht->treelen)))
     {
-      register int xx,yy;
+      int xx,yy;
 
       xx=(h->xlen<<1);// set x and y to a medium value as a simple concealment
       yy=(h->ylen<<1);
@@ -670,7 +670,7 @@ inline void Mpegtoraw::huffmandecoder_2(const HUFFMANCODETABLE *h,
   {
     if(h->val[point][0]==0)
     {   /*end of tree*/
-      register int t=h->val[point][1];
+      int t=h->val[point][1];
 
       if(t&8)*v=1-(wgetbit()<<1); else *v=0;
       if(t&4)*w=1-(wgetbit()<<1); else *w=0;
@@ -754,7 +754,7 @@ void Mpegtoraw::layer3huffmandecode(int ch,int gr,int out[SBLIMIT][SSLIMIT])
   for(i=0;i<e;)
   {
     const HUFFMANCODETABLE *h;
-    register int end;
+    int end;
       
     if     (i<region1Start)
     {
@@ -890,10 +890,10 @@ void Mpegtoraw::layer3dequantizesample(int ch,int gr,
     {
       cb_width=(sfBandIndex->s[cb+1]-sfBandIndex->s[cb])>>1;
 
-      for(register int k=0;k<3;k++)
+      for(int k=0;k<3;k++)
       {
-	register REAL factor;
-	register int count=cb_width;
+	REAL factor;
+	int count=cb_width;
 	// maplay12 opt.
 	if(index+(count<<1) > arrayEnd) {
 	  if (index >= arrayEnd) break;
@@ -1328,7 +1328,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT])
       do{
 	if(is_pos[i]==7)
 	{
-	  register REAL t=in[LS][0][i];
+	  REAL t=in[LS][0][i];
 	  in[LS][0][i]=(t+in[RS][0][i])*0.7071068f;
 	  in[RS][0][i]=(t-in[RS][0][i])*0.7071068f;
 	}
@@ -1358,7 +1358,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT])
     {
       int i=maxArray-1;
       do{
-	register REAL t=in[LS][0][i];
+	REAL t=in[LS][0][i];
 
 	in[LS][0][i]=(t+in[RS][0][i])*0.7071068f;
 	in[RS][0][i]=(t-in[RS][0][i])*0.7071068f;
@@ -1488,7 +1488,7 @@ void Mpegtoraw::layer3reorderandantialias(int ch,int gr,
   int version=mpegAudioHeader->getVersion();
   int frequency=mpegAudioHeader->getFrequency();
   int mpeg25=mpegAudioHeader->getLayer25();
-  register layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]);
+  layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]);
 
   if(gi->generalflag) {
     if(gi->mixed_block_flag) {
@@ -1591,12 +1591,12 @@ void Mpegtoraw::extractlayer3(void) {
     }
     // read main data.
     if(issync()) {
-      for(register int i=layer3slots;i>0;i--) {
+      for(int i=layer3slots;i>0;i--) {
 	bitwindow.putbyte(getbyte());
       }
     } else {
       // read main data.
-      for(register int i=layer3slots;i>0;i--) {
+      for(int i=layer3slots;i>0;i--) {
 	bitwindow.putbyte(getbits8());
       }
     }
@@ -1681,13 +1681,13 @@ void Mpegtoraw::extractlayer3_2(void) {
     }
     // read main data.
     if(issync()) {
-      for(register int i=layer3slots;i>0;i--) {
+      for(int i=layer3slots;i>0;i--) {
 	bitwindow.putbyte(getbyte());
       }
     }
     else {
       // read main data.
-      for(register int i=layer3slots;i>0;i--) {
+      for(int i=layer3slots;i>0;i--) {
 	bitwindow.putbyte(getbits8());
       }
     }

mpeglib/lib/splay/synth_Down.cpp

@@ -39,8 +39,8 @@ void Synthesis::computebuffer_Down(REAL *fraction,
 inline void Synthesis::generatesingle_Down(void)
 {
   int i;
-  register REAL r, *vp;
-  register const REAL *dp;
+  REAL r, *vp;
+  const REAL *dp;
 
   i=32/2;
   dp=filter;
@@ -121,8 +121,8 @@ inline void Synthesis::generate_Down(void)
 {
   int i;
   REAL r1,r2;
-  register REAL *vp1,*vp2;
-  register const REAL *dp;
+  REAL *vp1,*vp2;
+  const REAL *dp;
 
   dp=filter;
   vp1=calcbuffer[LS][currentcalcbuffer]+calcbufferoffset;

mpeglib/lib/splay/synth_Std.cpp

@@ -39,8 +39,8 @@ inline void Synthesis::computebuffer_Std(REAL *fraction,
 
 inline void Synthesis::generatesingle_Std(void) {
   int i;
-  register REAL r, *vp;
-  register const REAL *dp;
+  REAL r, *vp;
+  const REAL *dp;
 
   i=32;
   dp=filter;
@@ -120,8 +120,8 @@ inline void Synthesis::generate_old(void)
 {
   int i;
   REAL r1,r2;
-  register REAL *vp1,*vp2;
-  register const REAL *dp;
+  REAL *vp1,*vp2;
+  const REAL *dp;
 
   dp=filter;
   vp1=calcbuffer[LS][currentcalcbuffer]+calcbufferoffset;
@@ -195,14 +195,14 @@ inline void Synthesis::generate_Std(void)
   int i;
   REAL r1,r2;
 
-  register REAL *vp1;
-  register const REAL *dp;
+  REAL *vp1;
+  const REAL *dp;
 
   dp=filter;
   vp1=calcbuffer[LS][currentcalcbuffer]+calcbufferoffset;
   // we calculate cp2 from vp1 because they are both
   // in the same array. code was:
-  // register REAL* vp2
+  // REAL* vp2
   //vp2=calcbuffer[RS][currentcalcbuffer]+calcbufferoffset;
 
   i=32;

mpeglib/lib/util/audio/audioIO_BeOS.cpp

@@ -126,7 +126,7 @@ int audioRead(char *buffer, int count)
 {
     //printf("acquiring ok_to_read (%d bytes)\n", count);
     if (acquire_sem(ok_to_read)==B_NO_ERROR) {
-		for (register int i=0; i < count;i++) {
+		for (int i=0; i < count;i++) {
            *(buffer++)+=*(readbase++);
     	}  
         bytes_in_streambuf-=count;

mpeglib/lib/util/render/dither/colorTable8Bit.cpp

@@ -59,7 +59,7 @@ void ColorTable8Bit::init8BitColor() {
 
   
   for (i=0; i<CR_RANGE; i++) {
-    register double tmp;
+    double tmp;
     if (chromaCorrectFlag) {
       tmp = ((i * 256) / (CR_RANGE)) + (256/(CR_RANGE*2));
       Cr_r_tab[i]=(TABTYPE) ((0.419/0.299)*CHROMA_CORRECTION128D(tmp-128.0));
@@ -75,7 +75,7 @@ void ColorTable8Bit::init8BitColor() {
 
   
   for (i=0; i<CB_RANGE; i++) {
-    register double tmp;
+    double tmp;
     if (chromaCorrectFlag) {
       tmp = ((i * 256) / (CB_RANGE)) + (256/(CB_RANGE*2));
       Cb_g_tab[i]=(TABTYPE) (-(0.114/0.331)*CHROMA_CORRECTION128D(tmp-128.0));

mpg123_artsplugin/mpg123/dct64.c

@@ -18,8 +18,8 @@ void dct64(real *out0,real *out1,real *samples)
   real bufs[64];
 
  {
-  register int i,j;
-  register real *b1,*b2,*bs,*costab;
+  int i,j;
+  real *b1,*b2,*bs,*costab;
 
   b1 = samples;
   bs = bufs;
@@ -102,8 +102,8 @@ void dct64(real *out0,real *out1,real *samples)
 
 
  {
-  register real *b1;
-  register int i;
+  real *b1;
+  int i;
 
   for(b1=bufs,i=8;i;i--,b1+=4)
     b1[2] += b1[3];

mpg123_artsplugin/mpg123/dct64_i386.c

@@ -12,7 +12,7 @@
 static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples)
 {
  {
-  register real *costab = pnts[0];
+  real *costab = pnts[0];
 
   b1[0x00] = samples[0x00] + samples[0x1F];
   b1[0x01] = samples[0x01] + samples[0x1E];
@@ -58,7 +58,7 @@ static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples)
 
 
  {
-  register real *costab = pnts[1];
+  real *costab = pnts[1];
 
   b2[0x00] = b1[0x00] + b1[0x0F]; 
   b2[0x01] = b1[0x01] + b1[0x0E]; 
@@ -104,7 +104,7 @@ static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples)
  }
 
  {
-  register real *costab = pnts[2];
+  real *costab = pnts[2];
 
   b1[0x00] = b2[0x00] + b2[0x07];
   b1[0x07] = (b2[0x00] - b2[0x07]) * costab[0];
@@ -144,8 +144,8 @@ static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples)
  }
 
  {
-  register real const cos0 = pnts[3][0];
-  register real const cos1 = pnts[3][1];
+  real const cos0 = pnts[3][0];
+  real const cos1 = pnts[3][1];
 
   b2[0x00] = b1[0x00] + b1[0x03];
   b2[0x03] = (b1[0x00] - b1[0x03]) * cos0;
@@ -189,7 +189,7 @@ static void dct64_1(real *out0,real *out1,real *b1,real *b2,real *samples)
  }
 
  {
-  register real const cos0 = pnts[4][0];
+  real const cos0 = pnts[4][0];
 
   b1[0x00] = b2[0x00] + b2[0x01];
   b1[0x01] = (b2[0x00] - b2[0x01]) * cos0;

mpg123_artsplugin/mpg123/decode.c

@@ -152,7 +152,7 @@ int synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt)
 
 
   {
-    register int j;
+    int j;
     real *window = decwin + 16 - bo1;
  
     for (j=16;j;j--,window+=0x10,samples+=step)

mpg123_artsplugin/mpg123/decode_2to1.c

@@ -151,7 +151,7 @@ int synth_2to1(real *bandPtr,int channel,unsigned char *out,int *pnt)
   }
 
   {
-    register int j;
+    int j;
     real *window = decwin + 16 - bo1;
 
     for (j=8;j;j--,b0+=0x10,window+=0x30)

mpg123_artsplugin/mpg123/decode_4to1.c

@@ -152,7 +152,7 @@ int synth_4to1(real *bandPtr,int channel,unsigned char *out,int *pnt)
   }
 
   {
-    register int j;
+    int j;
     real *window = decwin + 16 - bo1;
 
     for (j=4;j;j--,b0+=0x30,window+=0x70)

mpg123_artsplugin/mpg123/decode_i386.c

@@ -170,7 +170,7 @@ int synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt)
   }
   
   {
-    register int j;
+    int j;
     real *window = decwin + 16 - bo1;
 
     for (j=16;j;j--,b0+=0x10,window+=0x20,samples+=step)

mpg123_artsplugin/mpg123/decode_ntom.c

@@ -184,7 +184,7 @@ int synth_ntom(real *bandPtr,int channel,unsigned char *out,int *pnt)
 
 
   {
-    register int j;
+    int j;
     real *window = decwin + 16 - bo1;
  
     for (j=16;j;j--,window+=0x10)

mpg123_artsplugin/mpg123/layer1.c

@@ -58,13 +58,13 @@ void I_step_two(real fraction[2][SBLIMIT],unsigned int balloc[2*SBLIMIT],
   int i,n;
   int smpb[2*SBLIMIT]; /* values: 0-65535 */
   int *sample;
-  register unsigned int *ba;
-  register unsigned int *sca = (unsigned int *) scale_index;
+  unsigned int *ba;
+  unsigned int *sca = (unsigned int *) scale_index;
 
   if(fr->stereo) {
     int jsbound = fr->jsbound;
-    register real *f0 = fraction[0];
-    register real *f1 = fraction[1];
+    real *f0 = fraction[0];
+    real *f1 = fraction[1];
     ba = balloc;
     for (sample=smpb,i=0;i<jsbound;i++)  {
       if ((n = *ba++))
@@ -100,7 +100,7 @@ void I_step_two(real fraction[2][SBLIMIT],unsigned int balloc[2*SBLIMIT],
       fraction[0][i] = fraction[1][i] = 0.0;
   }
   else {
-    register real *f0 = fraction[0];
+    real *f0 = fraction[0];
     ba = balloc;
     for (sample=smpb,i=0;i<SBLIMIT;i++)
       if ((n = *ba++))

mpg123_artsplugin/mpg123/layer3.c

@@ -387,7 +387,7 @@ static int III_get_side_info(struct III_sideinfo *si,int stereo,
 
    for (gr=0; gr<tab[0]; gr++) {
      for (ch=0; ch<stereo; ch++) {
-       register struct gr_info_s *gr_info = &(si->ch[ch].gr[gr]);
+       struct gr_info_s *gr_info = &(si->ch[ch].gr[gr]);
 
        gr_info->part2_3_length = getbits(&bsi,12);
        gr_info->big_values = getbits(&bsi,9);
@@ -662,8 +662,8 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
      */
     int i,max[4];
     int step=0,lwin=3,cb=0;
-    register real v = 0.0;
-    register int *m,mc;
+    real v = 0.0;
+    int *m,mc;
 
     if(gr_info->mixed_block_flag) {
       max[3] = -1;
@@ -683,7 +683,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
       int lp = l[i];
       struct newhuff *h = ht+gr_info->table_select[i];
       for(;lp;lp--,mc--) {
-        register int x,y;
+        int x,y;
         if( (!mc) ) {
           mc    = *m++;
           xrpnt = ((real *) xr) + (*m++);
@@ -699,7 +699,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
           }
         }
         {
-          register short *val = h->table;
+          short *val = h->table;
           REFRESH_MASK;
           while((y=*val++)<0) {
             if (mask < 0)
@@ -763,7 +763,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
 
     for(;l3 && (part2remain+num > 0);l3--) {
       struct newhuff *h = htc+gr_info->count1table_select;
-      register short *val = h->table,a;
+      short *val = h->table,a;
 
       REFRESH_MASK;
       while((a=*val++)<0) {
@@ -849,7 +849,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
     int i,max = -1;
     int cb = 0;
     int *m = map[sfreq][2];
-    register real v = 0.0;
+    real v = 0.0;
     int mc = 0;
 
     /*
@@ -876,7 +876,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
 
         }
         {
-          register short *val = h->table;
+          short *val = h->table;
           REFRESH_MASK;
           while((y=*val++)<0) {
             if (mask < 0)
@@ -943,7 +943,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
      */
     for(;l3 && (part2remain+num > 0);l3--) {
       struct newhuff *h = htc+gr_info->count1table_select;
-      register short *val = h->table,a;
+      short *val = h->table,a;
 
       REFRESH_MASK;
       while((a=*val++)<0) {
@@ -1191,7 +1191,7 @@ static void III_antialias(real xr[SBLIMIT][SSLIMIT],struct gr_info_s *gr_info) {
 
        for(ss=7;ss>=0;ss--)
        {       /* upper and lower butterfly inputs */
-         register real bu = *--xr2,bd = *xr1;
+         real bu = *--xr2,bd = *xr1;
 	 *xr2   = REAL_MUL(bu, *cs) - REAL_MUL(bd, *ca);
 	 *xr1++ = REAL_MUL(bd, *cs++) + REAL_MUL(bu, *ca++);
        }
@@ -1247,7 +1247,7 @@ void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf)
 #endif
 
   {
-    register real *in = inbuf;
+    real *in = inbuf;
 
     in[17]+=in[16]; in[16]+=in[15]; in[15]+=in[14];
     in[14]+=in[13]; in[13]+=in[12]; in[12]+=in[11];
@@ -1415,10 +1415,10 @@ void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf)
     ts[SBLIMIT*(9+(v))] = out1[9+(v)] + REAL_MUL(tmpval, w[9+(v)]); }
 
 {
-   register real *out2 = o2;
-   register real *w = wintab;
-   register real *out1 = o1;
-   register real *ts = tsbuf;
+   real *out2 = o2;
+   real *w = wintab;
+   real *out1 = o1;
+   real *ts = tsbuf;
 
    MACRO(0);
    MACRO(1);
@@ -1453,11 +1453,11 @@ void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf)
     sum1 = REAL_MUL((tmp2b - tmp1b), tfcos36[(v)]); \
 	MACRO0(v); }
 
-    register const real *c = COS9;
-    register real *out2 = o2;
-	register real *w = wintab;
-	register real *out1 = o1;
-	register real *ts = tsbuf;
+    const real *c = COS9;
+    real *out2 = o2;
+	real *w = wintab;
+	real *out1 = o1;
+	real *ts = tsbuf;
 
     real ta33,ta66,tb33,tb66;
 
@@ -1525,7 +1525,7 @@ void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf)
 /*
  * new DCT12
  */
-static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,register real *ts)
+static void dct12(real *in,real *rawout1,real *rawout2,real *wi,real *ts)
 {
 #define DCT12_PART1 \
              in5 = in[5*3];  \
@@ -1560,7 +1560,7 @@ static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,registe
 
    {
      real in0,in1,in2,in3,in4,in5;
-     register real *out1 = rawout1;
+     real *out1 = rawout1;
      ts[SBLIMIT*0] = out1[0]; ts[SBLIMIT*1] = out1[1]; ts[SBLIMIT*2] = out1[2];
      ts[SBLIMIT*3] = out1[3]; ts[SBLIMIT*4] = out1[4]; ts[SBLIMIT*5] = out1[5];
  
@@ -1596,7 +1596,7 @@ static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,registe
 
   {
      real in0,in1,in2,in3,in4,in5;
-     register real *out2 = rawout2;
+     real *out2 = rawout2;
  
      DCT12_PART1
 
@@ -1630,7 +1630,7 @@ static void dct12(real *in,real *rawout1,real *rawout2,register real *wi,registe
 
   {
      real in0,in1,in2,in3,in4,in5;
-     register real *out2 = rawout2;
+     real *out2 = rawout2;
      out2[12]=out2[13]=out2[14]=out2[15]=out2[16]=out2[17]=0.0;
 
      DCT12_PART1
@@ -1816,16 +1816,16 @@ int do_layer3(struct mpstr *mp,struct frame *fr,int outmode,struct audio_info_st
       switch(single) {
         case 3:
           {
-            register int i;
-            register real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1];
+            int i;
+            real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1];
             for(i=0;i<SSLIMIT*gr_info->maxb;i++,in0++)
               *in0 = (*in0 + *in1++); /* *0.5 done by pow-scale */ 
           }
           break;
         case 1:
           {
-            register int i;
-            register real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1];
+            int i;
+            real *in0 = (real *) hybridIn[0],*in1 = (real *) hybridIn[1];
             for(i=0;i<SSLIMIT*gr_info->maxb;i++)
               *in0++ = *in1++;
           }

noatun/library/conversion.cpp

@@ -136,7 +136,7 @@ void swapEndian(unsigned long length, char *buffer)
 #else
 	while (length--)
 	{
-		register char c=*(buffer+1);
+		char c=*(buffer+1);
 		*(buffer+1)=*buffer;
 		*(buffer)=c;
 		buffer++; buffer++;

noatun/library/noatunarts/Equalizer_impl.cpp

@@ -209,11 +209,11 @@ public:
 				mBufferLength = samples;
 			}
 			
-			register float *buffer=mBuffer;
-			register float *bufferEnd=buffer+samples;
+			float *buffer=mBuffer;
+			float *bufferEnd=buffer+samples;
 			while (level<end)
 			{
-				register float *buffIter, *outIter;
+				float *buffIter, *outIter;
 				float levelAndIntensity=*level * intensity;
 				
 				BandPass(leftBand, outleft, buffer, samples);
@@ -415,11 +415,11 @@ public:
 			float *end=&mLevels.back();
 			float intensity=1.0/(float)mLevels.size();
 
-			register float *buffer=new float[samples];
-			register float *bufferEnd=buffer+samples;
+			float *buffer=new float[samples];
+			float *bufferEnd=buffer+samples;
 			while (level<end)
 			{
-				register float *buffIter, *outIter;
+				float *buffIter, *outIter;
 				float levelAndIntensity=*level * intensity;
 				
 				BandPassSSE(leftBand, outleft, buffer, samples);

noatun/library/noatunarts/StereoVolumeControl_impl.cpp

@@ -28,16 +28,16 @@ public:
 
 	void calculateBlock(unsigned long samples)
 	{
-		register float *left=inleft;
-		register float *right=inright;
-		register float *oleft=outleft;
-		register float *oright=outright;
+		float *left=inleft;
+		float *right=inright;
+		float *oleft=outleft;
+		float *oright=outright;
 
 		level = *right + *left;
 		
-		register float p=mPercent;
+		float p=mPercent;
 
-		register float *end=left+samples;
+		float *end=left+samples;
 
 		while (left<end)
 		{

noatun/modules/kjofol-skin/kjwidget.cpp

@@ -18,7 +18,7 @@ KJWidget::KJWidget(KJLoader *p) : mParent(p)
 {
 }
 
-TQBitmap KJWidget::getMask(const TQImage &_rect, register TQRgb transparent)
+TQBitmap KJWidget::getMask(const TQImage &_rect, TQRgb transparent)
 {
 	TQImage result(_rect.width(), _rect.height(), 1,2, TQImage::LittleEndian);
 	result.setColor(1, tqRgb(0,0,0));

noatun/modules/kjofol-skin/kjwidget.h

@@ -31,7 +31,7 @@ public:
 	virtual TQString tip() { return 0; }
 
 public:
-	static TQBitmap getMask(const TQImage &color, register TQRgb=tqRgb(255,0,255));
+	static TQBitmap getMask(const TQImage &color, TQRgb=tqRgb(255,0,255));
 
 protected:
 	const TQString &backgroundPressed(const TQString &bmp) const;

noatun/modules/winskin/vis/realFFT.cpp

@@ -51,7 +51,7 @@ RealFFT::RealFFT(int fftlen) {
 
    for(i=0;i<Points/2;i++)
 	{
-      register double s,c;
+      double s,c;
       s=floor(-32768.0*sin(2*M_PI*i/(Points))+0.5);
       c=floor(-32768.0*cos(2*M_PI*i/(Points))+0.5);
       if(s>32767.5) s=32767;
@@ -102,8 +102,8 @@ void RealFFT::fft(short* buffer) {
 
       while(A<endptr1)
       {
-         register short sin=*sptr;
-         register short cos=*(sptr+1);
+         short sin=*sptr;
+         short cos=*(sptr+1);
          endptr2=B;
          while(A<endptr2)
          {
@@ -128,7 +128,7 @@ void RealFFT::fft(short* buffer) {
 
    while(br1<=br2)
    {
-      register long temp1,temp2;
+      long temp1,temp2;
       short sin=SinTable[*br1];
       short cos=SinTable[*br1+1];
       A=buffer+*br1;