diff options
| -rw-r--r-- | kate/part/katebuffer.cpp | 4 | ||||
| -rwxr-xr-x | kjs/create_hash_table | 4 | ||||
| -rw-r--r-- | tdehtml/misc/decoder.cpp | 2 | ||||
| -rw-r--r-- | tdersync/tdersync.cpp | 2 | ||||
| -rw-r--r-- | tdeui/kdialogbase.cpp | 8 |
5 files changed, 11 insertions, 9 deletions
diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp index 61f81fadf..66c21696b 100644 --- a/kate/part/katebuffer.cpp +++ b/kate/part/katebuffer.cpp @@ -122,7 +122,7 @@ class KateFileLoader if ((c >= 2) && (m_codec->mibEnum() == 1000) && (m_buffer[1] == 0x00)) { // utf16LE, we need to put the decoder in LE mode - char reverseUtf16[3] = {0xFF, 0xFE, 0x00}; + char reverseUtf16[3] = {'\xFF', '\xFE', '\x00'}; m_decoder->toUnicode(reverseUtf16, 2); } @@ -917,7 +917,7 @@ void KateBuffer::updatePreviousNotEmptyLine(KateBufBlock *blk,uint current_line, } while (textLine->firstChar()==-1); kdDebug(13020)<<"updatePreviousNotEmptyLine: updating line:"<<(blk->startLine()+current_line)<<endl; TQMemArray<uint> foldingList=textLine->foldingListArray(); - while ( (foldingList.size()>0) && ( abs(foldingList[foldingList.size()-2])==1)) { + while ( (foldingList.size()>0) && ( labs(foldingList[foldingList.size()-2])==1)) { foldingList.resize(foldingList.size()-2,TQGArray::SpeedOptim); } addIndentBasedFoldingInformation(foldingList,addindent,deindent); diff --git a/kjs/create_hash_table b/kjs/create_hash_table index a7df5eddf..e8103fb99 100755 --- a/kjs/create_hash_table +++ b/kjs/create_hash_table @@ -69,7 +69,9 @@ while (<IN>) { my $att = $3; my $param = $4; push(@keys, $key); - push(@values, $val); + # values in HashEntry are short but can be unsigned in C++ code + # therefore it is necessary to force the cast in the generated files + push(@values, "(short)".$val); printf STDERR "WARNING: Number of arguments missing for $key/$val\n" if ( $att =~ m/Function/ && length($param) == 0); push(@attrs, length($att) > 0 ? $att : "0"); diff --git a/tdehtml/misc/decoder.cpp b/tdehtml/misc/decoder.cpp index 28c8a5e9d..419b4a2f0 100644 --- a/tdehtml/misc/decoder.cpp +++ b/tdehtml/misc/decoder.cpp @@ -265,7 +265,7 @@ TQString Decoder::decode(const char *data, int len) if (m_codec->mibEnum() == 1000 && c2 == 0x00) { // utf16LE, we need to put the decoder in LE mode - char reverseUtf16[3] = {0xFF, 0xFE, 0x00}; + char reverseUtf16[3] = {'\xFF', '\xFE', '\x00'}; m_decoder->toUnicode(reverseUtf16, 2); } } diff --git a/tdersync/tdersync.cpp b/tdersync/tdersync.cpp index d940fd7a3..df4fe3250 100644 --- a/tdersync/tdersync.cpp +++ b/tdersync/tdersync.cpp @@ -61,7 +61,7 @@ #define CONFIGURATION_FILE_SEPARATOR ';' KDE_EXPORT KRsync::KRsync (TQObject* parent, const char* name) - : TQObject (parent, name), m_progressDialog(false), m_progressDialogExists(false), m_bSettingsLoaded(false), m_bInSpecialSync(false) + : TQObject (parent, name), m_progressDialog(0), m_progressDialogExists(false), m_bSettingsLoaded(false), m_bInSpecialSync(false) { loadSettings(); diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp index e426df1a4..1f7fbd5e3 100644 --- a/tdeui/kdialogbase.cpp +++ b/tdeui/kdialogbase.cpp @@ -671,11 +671,11 @@ void KDialogBase::setButtonStyle( int style ) if( style < 0 || style >= ActionStyleMAX ) { style = ActionStyle0; } d->mButton.style = style; - const int *layout; + const unsigned int *layout; int layoutMax = 0; if (mMessageBoxMode) { - static const int layoutRule[5][6] = + static const unsigned int layoutRule[5][6] = { {Details,Stretch,User2|Stretch,User1|Stretch,Cancel|Stretch, Details|Filler}, {Details,Stretch,User2|Stretch,User1|Stretch,Cancel|Stretch, Details|Filler}, @@ -688,7 +688,7 @@ void KDialogBase::setButtonStyle( int style ) } else if (mButtonOrientation == Qt::Horizontal) { - static const int layoutRule[5][10] = + static const unsigned int layoutRule[5][10] = { {Details,Help,Default,Stretch,User3,User2,User1,Ok,Apply|Try,Cancel|Close}, {Details,Help,Default,Stretch,User3,User2,User1,Cancel|Close,Apply|Try,Ok}, @@ -701,7 +701,7 @@ void KDialogBase::setButtonStyle( int style ) } else { - static const int layoutRule[5][10] = + static const unsigned int layoutRule[5][10] = { {Ok,Apply|Try,User1,User2,User3,Stretch,Default,Cancel|Close,Help, Details}, //{Ok,Apply|Try,Cancel|Close,User1,User2,User3,Stretch, Default,Help, Details}, |