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

List:       kde-commits
Subject:    KDE_3_4_BRANCH: kdewebdev/quanta
From:       Andras Mantia <amantia () kde ! org>
Date:       2005-03-01 17:41:01
Message-ID: 20050301174101.E089716EF1 () office ! kde ! org
[Download RAW message or body]

CVS commit by amantia: 

Backport: Don't delete the line after <!DOCTYPE ...> when changing the DTD.


  M +14 -14    quanta.kdevelop   1.318.2.1
  M +5 -3      src/document.cpp   1.367.2.1


--- kdewebdev/quanta/quanta.kdevelop  #1.318:1.318.2.1
@@ -54,17 +54,17 @@
       <default>
         <configargs>--enable-debug=full --prefix=/opt/kde3 \
                --enable-editors</configargs>
-        <builddir>/home/andris/development/build/kde-head/kdewebdev</builddir>
+        <builddir>/home/andris/development/build/kde-head/kdewebdev-3.4</builddir>
         <ccompiler>kdevgccoptions</ccompiler>
         <cxxcompiler>kdevgppoptions</cxxcompiler>
         <f77compiler>kdevpgf77options</f77compiler>
-        <ccompilerbinary/>
-        <cxxcompilerbinary/>
-        <f77compilerbinary/>
+        <ccompilerbinary></ccompilerbinary>
+        <cxxcompilerbinary></cxxcompilerbinary>
+        <f77compilerbinary></f77compilerbinary>
         <cflags>-DKDE_NO_COMPAT -DQT_NO_COMPAT</cflags>
         <cxxflags>-DKDE_NO_COMPAT -DQT_NO_COMPAT -DDEBUG_PARSER</cxxflags>
-        <f77flags/>
-        <topsourcedir>/home/andris/development/sources/kde-head/kdewebdev</topsourcedir>
                
-        <cppflags/>
-        <ldflags/>
+        <f77flags></f77flags>
+        <topsourcedir>/home/andris/development/sources/kde-branch/kdewebdev</topsourcedir>
 +        <cppflags></cppflags>
+        <ldflags></ldflags>
         <envvars>
           <envvar value="kommander klinkstatus kfilereplace kxsldbg kimagemapeditor" \
name="DO_NOT_COMPILE_2" /> @@ -187,6 +187,6 @@
   <kdevdebugger>
     <general>
-      <dbgshell/>
-      <programargs/>
+      <dbgshell></dbgshell>
+      <programargs></programargs>
       <gdbpath>/usr/bin/</gdbpath>
       <breakonloadinglibs>true</breakonloadinglibs>
@@ -194,7 +194,7 @@
       <floatingtoolbar>false</floatingtoolbar>
       <runappinappdirectory>true</runappinappdirectory>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
     </general>
     <display>
@@ -266,5 +266,5 @@
     </references>
     <creategettersetter>
-      <prefixGet/>
+      <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>

--- kdewebdev/quanta/src/document.cpp  #1.367:1.367.2.1
@@ -1515,5 +1515,7 @@ QString Document::findDTDName(Tag **tag)
    if (pos != -1) //parse the found !DOCTYPE tag
    {
+     int bl, bc, el, ec;
      line = i;
+     bl = line;
      startPos = text.findRev('<',pos);
      while (startPos == -1 && line >=0)
@@ -1521,4 +1523,5 @@ QString Document::findDTDName(Tag **tag)
        text = editIf->textLine(line);
        startPos = text.findRev('<');
+       bl = line;
        line--;
      }
@@ -1528,14 +1531,14 @@ QString Document::findDTDName(Tag **tag)
         continue;
      }
-     int bl, bc, el, ec;
-     bl = line++;
      bc = startPos;
      line = i;
      text = editIf->textLine(i);
      startPos = text.find('>',pos);
+     el = line;
      while (startPos == -1 && line < endLine)
      {
        text = editIf->textLine(line);
        startPos = text.find('>');
+       el = line;
        line++;
      }
@@ -1545,5 +1548,4 @@ QString Document::findDTDName(Tag **tag)
         continue;
      }
-     el = line--;
      ec = startPos + 1;
      *tag = new Tag();


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