From da6bd0768e4304e6c2853d012c7d0686a205addb Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 30 Jan 2020 20:17:42 +0900 Subject: Removed explicit usage of the 'register' keyword. Signed-off-by: Michele Calgaro --- buildtools/lib/parsers/autotools/autotools_lex.cpp | 40 ++++++++++---------- .../lib/parsers/autotools/autotools_yacc.cpp | 16 ++++---- buildtools/lib/parsers/qmake/qmake_lex.cpp | 40 ++++++++++---------- kdevdesigner/designer/mainwindow.cpp | 2 +- .../cpp/app_templates/noatunvisual/plugin_impl.cpp | 14 +++---- languages/cpp/app_templates/prc-tool/callback.h | 2 +- lib/widgets/kdevhtmlpart.cpp | 2 +- parts/documentation/protocols/chm/decompress.cpp | 14 +++---- parts/doxygen/config.cpp | 44 +++++++++++----------- 9 files changed, 87 insertions(+), 87 deletions(-) diff --git a/buildtools/lib/parsers/autotools/autotools_lex.cpp b/buildtools/lib/parsers/autotools/autotools_lex.cpp index d20bbdb6..79434517 100644 --- a/buildtools/lib/parsers/autotools/autotools_lex.cpp +++ b/buildtools/lib/parsers/autotools/autotools_lex.cpp @@ -705,9 +705,9 @@ extern int yylex (void); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; #line 73 "autotools.ll" @@ -756,7 +756,7 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1063,9 +1063,9 @@ case YY_STATE_EOF(conditional): */ static int yy_get_next_buffer (void) { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -1189,14 +1189,14 @@ static int yy_get_next_buffer (void) static yy_state_type yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = (yy_start); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1221,10 +1221,10 @@ static int yy_get_next_buffer (void) */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1242,9 +1242,9 @@ static int yy_get_next_buffer (void) return yy_is_jam ? 0 : yy_current_state; } - static void yyunput (int c, register char * yy_bp ) + static void yyunput (int c, char * yy_bp ) { - register char *yy_cp; + char *yy_cp; yy_cp = (yy_c_buf_p); @@ -1254,10 +1254,10 @@ static int yy_get_next_buffer (void) if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = (yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + int number_to_move = (yy_n_chars) + 2; + char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; - register char *source = + char *source = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) @@ -1834,7 +1834,7 @@ int yylex_destroy (void) #ifndef yytext_ptr static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) { - register int i; + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@ -1843,7 +1843,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) #ifdef YY_NEED_STRLEN static int yy_flex_strlen (yyconst char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; diff --git a/buildtools/lib/parsers/autotools/autotools_yacc.cpp b/buildtools/lib/parsers/autotools/autotools_yacc.cpp index 93cdb733..1b2c1b75 100644 --- a/buildtools/lib/parsers/autotools/autotools_yacc.cpp +++ b/buildtools/lib/parsers/autotools/autotools_yacc.cpp @@ -320,7 +320,7 @@ union yyalloc # define YYCOPY(To, From, Count) \ do \ { \ - register YYSIZE_T yyi; \ + YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ @@ -768,7 +768,7 @@ yystrlen (yystr) const char *yystr; # endif { - register const char *yys = yystr; + const char *yys = yystr; while (*yys++ != '\0') continue; @@ -793,8 +793,8 @@ yystpcpy (yydest, yysrc) const char *yysrc; # endif { - register char *yyd = yydest; - register const char *yys = yysrc; + char *yyd = yydest; + const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -924,8 +924,8 @@ yyparse () #endif { - register int yystate; - register int yyn; + int yystate; + int yyn; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; @@ -943,12 +943,12 @@ yyparse () /* The state stack. */ short int yyssa[YYINITDEPTH]; short int *yyss = yyssa; - register short int *yyssp; + short int *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs = yyvsa; - register YYSTYPE *yyvsp; + YYSTYPE *yyvsp; diff --git a/buildtools/lib/parsers/qmake/qmake_lex.cpp b/buildtools/lib/parsers/qmake/qmake_lex.cpp index 4997f217..711abfee 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.cpp +++ b/buildtools/lib/parsers/qmake/qmake_lex.cpp @@ -807,9 +807,9 @@ static int yy_flex_strlen (yyconst char * ); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; /* %% [7.0] user's declarations go here */ #line 76 "qmake.ll" @@ -868,7 +868,7 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1371,9 +1371,9 @@ void yyFlexLexer::LexerOutput( const char* buf, int size ) int yyFlexLexer::yy_get_next_buffer() /* %endif */ { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -1503,8 +1503,8 @@ int yyFlexLexer::yy_get_next_buffer() yy_state_type yyFlexLexer::yy_get_previous_state() /* %endif */ { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; /* %% [15.0] code to get the start state into yy_current_state goes here */ yy_current_state = (yy_start); @@ -1512,7 +1512,7 @@ int yyFlexLexer::yy_get_next_buffer() for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { /* %% [16.0] code to find the next state goes here */ - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1541,11 +1541,11 @@ int yyFlexLexer::yy_get_next_buffer() yy_state_type yyFlexLexer::yy_try_NUL_trans( yy_state_type yy_current_state ) /* %endif */ { - register int yy_is_jam; + int yy_is_jam; /* %% [17.0] code to find the next state, and perhaps do backing up, goes here */ - register char *yy_cp = (yy_c_buf_p); + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1566,10 +1566,10 @@ int yyFlexLexer::yy_get_next_buffer() /* %if-c-only */ /* %endif */ /* %if-c++-only */ - void yyFlexLexer::yyunput( int c, register char* yy_bp) + void yyFlexLexer::yyunput( int c, char* yy_bp) /* %endif */ { - register char *yy_cp; + char *yy_cp; yy_cp = (yy_c_buf_p); @@ -1579,10 +1579,10 @@ int yyFlexLexer::yy_get_next_buffer() if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = (yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + int number_to_move = (yy_n_chars) + 2; + char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; - register char *source = + char *source = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) @@ -2153,7 +2153,7 @@ yyFlexLexer::~yyFlexLexer() #ifndef yytext_ptr static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) { - register int i; + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@ -2162,7 +2162,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) #ifdef YY_NEED_STRLEN static int yy_flex_strlen (yyconst char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index 4caaab41..5d64f8bf 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -877,7 +877,7 @@ void MainWindow::helpRegister() TQProcess process( command + " www.trolltech.com/products/download/eval/evaluation.html" ); if ( !process.start() ) TQMessageBox::information( this, "Register TQt", "Launching your web browser failed.\n" - "To register TQt, point your browser to www.trolltech.com/products/download/eval/evaluation.html" ); + "To TQt, point your browser to www.trolltech.com/products/download/eval/evaluation.html" ); #endif } diff --git a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp index a25f1fd2..839206ad 100644 --- a/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunvisual/plugin_impl.cpp @@ -23,7 +23,7 @@ inline void Bitmap::addPixel(int x, int y, int br1, int br2) { if (x < 0 || x >= width || y < 0 || y >= height) return; - register unsigned char *p = output+x*2+y*width*2; + unsigned char *p = output+x*2+y*width*2; if (p[0] < 255-br1) p[0] += br1; else p[0] = 255; if (p[1] < 255-br2) p[1] += br2; else p[1] = 255; } @@ -50,7 +50,7 @@ void Bitmap::addVertLine(int x, int y1, int y2, int br1, int br2) template void Bitmap::fadeStar() { - register unsigned long *ptr = (unsigned long*)output; + unsigned long *ptr = (unsigned long*)output; int i = width*height*2/4; do { @@ -225,7 +225,7 @@ void %{APPNAME}View::repaint() SDL_LockSurface(surface); TEST(); - register unsigned long *ptr2 = (unsigned long*)output2; + unsigned long *ptr2 = (unsigned long*)output2; unsigned long *ptr1 = (unsigned long*)( surface->pixels ); int i = width*height/4; TEST(); @@ -233,12 +233,12 @@ void %{APPNAME}View::repaint() 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) @@ -249,7 +249,7 @@ void %{APPNAME}View::repaint() | ((r2 & 0x00f00000ul) << 4) | ((r2 & 0xf0000000ul))); #else - register unsigned int const v = + unsigned int const v = ((r2 & 0x000000f0ul) >> 4) | ((r2 & 0x0000f000ul) >> 8) | ((r2 & 0x00f00000ul) >> 12) diff --git a/languages/cpp/app_templates/prc-tool/callback.h b/languages/cpp/app_templates/prc-tool/callback.h index bf0ead45..2585219f 100644 --- a/languages/cpp/app_templates/prc-tool/callback.h +++ b/languages/cpp/app_templates/prc-tool/callback.h @@ -14,7 +14,7 @@ - Ian */ -register void *reg_a4 asm("%a4"); +void *reg_a4 asm("%a4"); #define CALLBACK_PROLOGUE \ void *save_a4 = reg_a4; asm("move.l %%a5,%%a4; sub.l #edata,%%a4" : :); diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index 7c699301..35b2216f 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -172,7 +172,7 @@ TQString KDevHTMLPart::context() const // Note: this function is a copy of code in tdecore/tdeconfigbase.cpp ;) static bool isUtf8(const char *buf) { int i, n; - register unsigned char c; + unsigned char c; bool gotone = false; #define F 0 /* character never appears in text */ diff --git a/parts/documentation/protocols/chm/decompress.cpp b/parts/documentation/protocols/chm/decompress.cpp index b8f45ae2..e10bab45 100644 --- a/parts/documentation/protocols/chm/decompress.cpp +++ b/parts/documentation/protocols/chm/decompress.cpp @@ -323,9 +323,9 @@ int LZXinit(int window) { */ int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) { - register UWORD sym; - register ULONG leaf; - register UBYTE bit_num = 1; + UWORD sym; + ULONG leaf; + UBYTE bit_num = 1; ULONG fill; ULONG pos = 0; /* the current position in the decode table */ ULONG table_mask = 1 << nbits; @@ -405,8 +405,8 @@ int lzx_read_lens(UBYTE *lens, ULONG first, ULONG last, lzx_bits *lb) { ULONG i,j, x,y; int z; - register ULONG bitbuf = lb->bb; - register int bitsleft = lb->bl; + ULONG bitbuf = lb->bb; + int bitsleft = lb->bl; UBYTE *inpos = lb->ip; UWORD *hufftbl; @@ -462,8 +462,8 @@ int LZXdecompress(UBYTE* inpos, int inlen, UBYTE* outpos, int outlen) { ULONG R1 = LZX(R1); ULONG R2 = LZX(R2); - register ULONG bitbuf; - register int bitsleft; + ULONG bitbuf; + int bitsleft; ULONG match_offset, i,j,k; /* ijk used in READ_HUFFSYM macro */ lzx_bits lb; /* used in READ_LENGTHS macro */ diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp index f702aaa0..4299c300 100644 --- a/parts/doxygen/config.cpp +++ b/parts/doxygen/config.cpp @@ -1115,9 +1115,9 @@ YY_MALLOC_DECL YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; #line 425 "config.l" @@ -1163,7 +1163,7 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; if ( yy_accept[yy_current_state] ) { yy_last_accepting_state = yy_current_state; @@ -1639,9 +1639,9 @@ ECHO; static int yy_get_next_buffer() { - register char *dest = yy_current_buffer->yy_ch_buf; - register char *source = yytext_ptr; - register int number_to_move, i; + char *dest = yy_current_buffer->yy_ch_buf; + char *source = yytext_ptr; + int number_to_move, i; int ret_val; if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) @@ -1771,14 +1771,14 @@ static int yy_get_next_buffer() static yy_state_type yy_get_previous_state() { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = yy_start; for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 28); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 28); if ( yy_accept[yy_current_state] ) { yy_last_accepting_state = yy_current_state; @@ -1810,10 +1810,10 @@ static yy_state_type yy_try_NUL_trans( yy_current_state ) yy_state_type yy_current_state; #endif { - register int yy_is_jam; - register char *yy_cp = yy_c_buf_p; + int yy_is_jam; + char *yy_cp = yy_c_buf_p; - register YY_CHAR yy_c = 28; + YY_CHAR yy_c = 28; if ( yy_accept[yy_current_state] ) { yy_last_accepting_state = yy_current_state; @@ -1834,14 +1834,14 @@ yy_state_type yy_current_state; #ifndef YY_NO_UNPUT #ifdef YY_USE_PROTOS -static void yyunput( int c, register char *yy_bp ) +static void yyunput( int c, char *yy_bp ) #else static void yyunput( c, yy_bp ) int c; -register char *yy_bp; +char *yy_bp; #endif { - register char *yy_cp = yy_c_buf_p; + char *yy_cp = yy_c_buf_p; /* undo effects of setting up yytext */ *yy_cp = yy_hold_char; @@ -1849,10 +1849,10 @@ register char *yy_bp; if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = yy_n_chars + 2; - register char *dest = &yy_current_buffer->yy_ch_buf[ + int number_to_move = yy_n_chars + 2; + char *dest = &yy_current_buffer->yy_ch_buf[ yy_current_buffer->yy_buf_size + 2]; - register char *source = + char *source = &yy_current_buffer->yy_ch_buf[number_to_move]; while ( source > yy_current_buffer->yy_ch_buf ) @@ -2313,7 +2313,7 @@ yyconst char *s2; int n; #endif { - register int i; + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@ -2327,7 +2327,7 @@ static int yy_flex_strlen( s ) yyconst char *s; #endif { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -2610,7 +2610,7 @@ static void cleanUpPaths(TQStrList &str) char *sfp = str.first(); while (sfp) { - register char *p = sfp; + char *p = sfp; if (p) { char c; -- cgit v1.2.3