summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/kbufferedio.cpp2
-rw-r--r--tdecore/kentities.c12
-rw-r--r--tdecore/kextsock.cpp2
-rw-r--r--tdecore/kmdcodec.cpp2
-rw-r--r--tdecore/kstringhandler.cpp2
-rw-r--r--tdecore/tdeconfigbackend.cpp10
-rw-r--r--tdecore/tdehw/tdehardwaredevices.cpp2
-rw-r--r--tdecore/tdelocale.cpp6
-rw-r--r--tdecore/tdesycocadict.cpp12
9 files changed, 25 insertions, 25 deletions
diff --git a/tdecore/kbufferedio.cpp b/tdecore/kbufferedio.cpp
index 2424c95e9..7a080ec68 100644
--- a/tdecore/kbufferedio.cpp
+++ b/tdecore/kbufferedio.cpp
@@ -174,7 +174,7 @@ int TDEBufferedIO::unreadBlock(const char *data, uint len)
unsigned TDEBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool discard)
{
{
- register unsigned u = readBufferSize();
+ unsigned u = readBufferSize();
if (nbytes > u)
nbytes = u; // we can't consume more than there is
}
diff --git a/tdecore/kentities.c b/tdecore/kentities.c
index 141ed9db0..070ee7689 100644
--- a/tdecore/kentities.c
+++ b/tdecore/kentities.c
@@ -73,7 +73,7 @@ inline
#endif
#endif
static unsigned int
-hash_Entity (register const char *str, register unsigned int len)
+hash_Entity (register const char *str, unsigned int len)
{
static const unsigned short asso_values[] =
{
@@ -104,7 +104,7 @@ hash_Entity (register const char *str, register unsigned int len)
932, 932, 932, 932, 932, 932, 932, 932, 932, 932,
932, 932, 932, 932, 932, 932, 932
};
- register int hval = len;
+ int hval = len;
switch (hval)
{
@@ -140,7 +140,7 @@ hash_Entity (register const char *str, register unsigned int len)
__inline
#endif
const struct entity *
-kde_findEntity (register const char *str, register unsigned int len)
+kde_findEntity (register const char *str, unsigned int len)
{
enum
{
@@ -815,15 +815,15 @@ kde_findEntity (register const char *str, register unsigned int len)
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
- register int key = hash_Entity (str, len);
+ int key = hash_Entity (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
{
- register int index = lookup[key];
+ int index = lookup[key];
if (index >= 0)
{
- register const char *s = wordlist_Entity[index].name;
+ const char *s = wordlist_Entity[index].name;
if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
return &wordlist_Entity[index];
diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp
index de1735382..b9a6efb10 100644
--- a/tdecore/kextsock.cpp
+++ b/tdecore/kextsock.cpp
@@ -1509,7 +1509,7 @@ TQT_TQIO_LONG KExtendedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len
// LOCK BUFFER MUTEX
- register unsigned wsize = writeBufferSize();
+ unsigned wsize = writeBufferSize();
if (d->outMaxSize == (int)wsize) // (int) to get rid of annoying warning
{
// buffer is full!
diff --git a/tdecore/kmdcodec.cpp b/tdecore/kmdcodec.cpp
index 48afddb09..9b74c53b0 100644
--- a/tdecore/kmdcodec.cpp
+++ b/tdecore/kmdcodec.cpp
@@ -139,7 +139,7 @@ const unsigned int KCodecs::maxQPLineLength = 70;
// strchr(3) for broken systems.
static int rikFindChar(register const char * _s, const char c)
{
- register const char * s = _s;
+ const char * s = _s;
while (true)
{
diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp
index b19c5b875..5f73c6f7e 100644
--- a/tdecore/kstringhandler.cpp
+++ b/tdecore/kstringhandler.cpp
@@ -567,7 +567,7 @@ TQString KStringHandler::obscure( const TQString &str )
bool KStringHandler::isUtf8(const char *buf)
{
int i, n;
- register unsigned char c;
+ unsigned char c;
bool gotone = false;
if (!buf)
diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp
index 06939551a..3dd450061 100644
--- a/tdecore/tdeconfigbackend.cpp
+++ b/tdecore/tdeconfigbackend.cpp
@@ -114,8 +114,8 @@ static TQCString printableToString(const char *str, int l)
static TQCString stringToPrintable(const TQCString& str){
TQCString result(str.length()*2); // Maximum 2x as long as source string
- register char *r = const_cast<TQCString&>(result).data();
- register char *s = const_cast<TQCString&>(str).data();
+ char *r = const_cast<TQCString&>(result).data();
+ char *s = const_cast<TQCString&>(str).data();
if (!s) return TQCString("");
@@ -166,7 +166,7 @@ static TQCString stringToPrintable(const TQCString& str){
static TQCString decodeGroup(const char*s, int l)
{
TQCString result(l);
- register char *r = result.data();
+ char *r = result.data();
l--; // Correct for trailing \0
while(l)
@@ -198,8 +198,8 @@ static TQCString encodeGroup(const TQCString &str)
{
int l = str.length();
TQCString result(l*2+1);
- register char *r = const_cast<TQCString&>(result).data();
- register char *s = const_cast<TQCString&>(str).data();
+ char *r = const_cast<TQCString&>(result).data();
+ char *s = const_cast<TQCString&>(str).data();
while(l)
{
if ((*s == '[') || (*s == ']'))
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index e90fee144..81c9e1fae 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -106,7 +106,7 @@ timespec diff(timespec start, timespec end)
// This routine is courtsey of an answer on "Stack Overflow"
// It takes an LSB-first int and makes it an MSB-first int (or vice versa)
-unsigned int reverse_bits(register unsigned int x)
+unsigned int reverse_bits(unsigned int x)
{
x = (((x & 0xaaaaaaaa) >> 1) | ((x & 0x55555555) << 1));
x = (((x & 0xcccccccc) >> 2) | ((x & 0x33333333) << 2));
diff --git a/tdecore/tdelocale.cpp b/tdecore/tdelocale.cpp
index f841d7375..2229418a1 100644
--- a/tdecore/tdelocale.cpp
+++ b/tdecore/tdelocale.cpp
@@ -1976,7 +1976,7 @@ TQString TDELocale::formatDateTime(const TQDateTime &pDateTime,
TQString i18n(const char* text)
{
- register TDELocale *instance = TDEGlobal::locale();
+ TDELocale *instance = TDEGlobal::locale();
if (instance)
return instance->translate(text);
return TQString::fromUtf8(text);
@@ -1984,7 +1984,7 @@ TQString i18n(const char* text)
TQString i18n(const char* index, const char *text)
{
- register TDELocale *instance = TDEGlobal::locale();
+ TDELocale *instance = TDEGlobal::locale();
if (instance)
return instance->translate(index, text);
return TQString::fromUtf8(text);
@@ -1992,7 +1992,7 @@ TQString i18n(const char* index, const char *text)
TQString i18n(const char* singular, const char* plural, unsigned long n)
{
- register TDELocale *instance = TDEGlobal::locale();
+ TDELocale *instance = TDEGlobal::locale();
if (instance)
return instance->translate(singular, plural, n);
if (n == 1)
diff --git a/tdecore/tdesycocadict.cpp b/tdecore/tdesycocadict.cpp
index 702c163a7..908ce8170 100644
--- a/tdecore/tdesycocadict.cpp
+++ b/tdecore/tdesycocadict.cpp
@@ -182,7 +182,7 @@ uint
KSycocaDict::hashKey( const TQString &key)
{
int l = key.length();
- register uint h = 0;
+ uint h = 0;
for(uint i = 0; i < mHashList.count(); i++)
{
@@ -217,10 +217,10 @@ calcDiversity(KSycocaDictStringList *d, int pos, int sz)
pos = -pos-1;
for(string_entry *entry=d->first(); entry; entry = d->next())
{
- register int l = entry->length;
+ int l = entry->length;
if (pos < l && pos != 0)
{
- register uint hash = ((entry->hash * 13) + (entry->key[l-pos].cell() % 29)) & 0x3ffffff;
+ uint hash = ((entry->hash * 13) + (entry->key[l-pos].cell() % 29)) & 0x3ffffff;
matrix[ hash % usz ] = true;
}
}
@@ -232,7 +232,7 @@ calcDiversity(KSycocaDictStringList *d, int pos, int sz)
{
if (pos < entry->length)
{
- register uint hash = ((entry->hash * 13) + (entry->key[pos].cell() % 29)) & 0x3ffffff;
+ uint hash = ((entry->hash * 13) + (entry->key[pos].cell() % 29)) & 0x3ffffff;
matrix[ hash % usz ] = true;
}
}
@@ -257,7 +257,7 @@ addDiversity(KSycocaDictStringList *d, int pos)
pos = -pos-1;
for(string_entry *entry=d->first(); entry; entry = d->next())
{
- register int l = entry->length;
+ int l = entry->length;
if (pos < l)
entry->hash = ((entry->hash * 13) + (entry->key[l-pos].cell() % 29)) & 0x3fffffff;
}
@@ -306,7 +306,7 @@ KSycocaDict::save(TQDataStream &str)
// use "almost prime" number for sz (to calculate diversity) and later
// for the table size of big tables
// int sz = d->count()*5-1;
- register unsigned int sz = count()*4 + 1;
+ unsigned int sz = count()*4 + 1;
while(!(((sz % 3) && (sz % 5) && (sz % 7) && (sz % 11) && (sz % 13)))) sz+=2;
int maxDiv = 0;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 16:39:25 +0000