From kde-commits  Sat Jun 12 13:23:36 2004
From: Christoph Cullmann <crossfire () babylon2k ! de>
Date: Sat, 12 Jun 2004 13:23:36 +0000
To: kde-commits
Subject: kate_super_branch: kdelibs/kate/part
Message-Id: <20040612132336.4BEFE126F5 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=108704662315235

CVS commit by cullmann: 

compile


  M +4 -6      katecodecompletionbar.ui   1.1.2.2
  M +5 -5      katedocument.cpp   1.725.2.4


--- kdelibs/kate/part/katecodecompletionbar.ui  #1.1.2.1:1.1.2.2
@@ -173,9 +173,7 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>

--- kdelibs/kate/part/katedocument.cpp  #1.725.2.3:1.725.2.4
@@ -1294,5 +1294,5 @@ bool KateDocument::editWrapLine ( uint l
     KateTextLine::Ptr tl = new KateTextLine();
 
-    tl->insertText (0, pos, l->text()+col, l->attributes()+col);
+    tl->insertText (0, pos, l->text()+col);
     l->truncate(col);
 
@@ -1328,5 +1328,5 @@ bool KateDocument::editWrapLine ( uint l
   else
   {
-    nl->insertText (0, pos, l->text()+col, l->attributes()+col);
+    nl->insertText (0, pos, l->text()+col);
     l->truncate(col);
 
@@ -1369,5 +1369,5 @@ bool KateDocument::editUnWrapLine ( uint
   if (removeLine)
   {
-    l->insertText (col, tl->length(), tl->text(), tl->attributes());
+    l->insertText (col, tl->length(), tl->text());
 
     m_buffer->changeLine(line);
@@ -1376,5 +1376,5 @@ bool KateDocument::editUnWrapLine ( uint
   else
   {
-    l->insertText (col, (tl->length() < length) ? tl->length() : length, tl->text(), tl->attributes());
+    l->insertText (col, (tl->length() < length) ? tl->length() : length, tl->text());
     tl->removeText (0, (tl->length() < length) ? tl->length() : length);