[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kde4/kdesdk
From:       Laurent Montel <montel () kde ! org>
Date:       2005-07-14 12:07:09
Message-ID: 1121342829.576049.2201.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 434503 by mlaurent:

Warning--


 M  +1 -1      cervisia/misc.cpp  
 M  +1 -1      kbabel/catalogmanager/Makefile.am  
 M  +4 -3      kbabel/kbabel/kbhighlighting.cpp  
 M  +1 -2      kspy/propsview.cpp  


--- branches/work/kde4/kdesdk/cervisia/misc.cpp #434502:434503
@@ -121,7 +121,7 @@
     if( !isalpha(tag[0].latin1()) )
         return false;
 
-    for( uint i = 1; i < tag.length(); ++i )
+    for( int i = 1; i < tag.length(); ++i )
     {
         if( !isgraph(tag[i].latin1()) || prohibitedChars.contains(tag[i]) )
                 return false;
--- branches/work/kde4/kdesdk/kbabel/catalogmanager/Makefile.am #434502:434503
@@ -22,7 +22,7 @@
 			validateprogress.cpp markpatternwidget.ui markpatterndialog.cpp
 
 
-libcatalogmanager_la_LIBADD =  ../commonui/libkbabelcommonui.la \
../kbabeldict/libkbabeldict.la $(LIB_KIO) ./libcvs/libcatalogmanagercvs.la \
+libcatalogmanager_la_LIBADD =  #../commonui/libkbabelcommonui.la \
../kbabeldict/libkbabeldict.la $(LIB_KIO) ./libcvs/libcatalogmanagercvs.la  \
libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined  
 
--- branches/work/kde4/kdesdk/kbabel/kbabel/kbhighlighting.cpp #434502:434503
@@ -105,7 +105,7 @@
   
   if (syntaxHighlighting)
   {
-    for ( uint i = 0; i < regexps.count( ); ++i ) {
+    for ( int i = 0; i < regexps.count( ); ++i ) {
       rx.setPattern( regexps[i] );
       pos = text.find( rx );
       while ( pos >= 0 ) {
@@ -166,8 +166,9 @@
 
 void KBabelHighlighter::doHighlighting( HighlightType type, int pos, int length )
 {
-  uint startPara = 0, endPara = 0, startIndex = pos, endIndex = pos+length;
-
+  uint startPara = 0, endPara = 0;
+	int startIndex = pos;
+  	int endIndex = pos+length;
   // transform the one-dimensional indexes into two-dimensional ones
   while ( startIndex > _edit->text( startPara ).length( ) )
     startIndex -= _edit->text( startPara++ ).length( ) - 1;
--- branches/work/kde4/kdesdk/kspy/propsview.cpp #434502:434503
@@ -88,8 +88,7 @@
          break;
        case QVariant::Color:
        {
-         QColor c = v.toColor();
-         val = c.name();
+         val = v.toString();
          break;
        }
        case QVariant::Cursor:


[prev in list] [next in list] [prev in thread] [next in thread]