From kde-commits  Mon Jan 08 16:02:42 2007
From: Andras Mantia <amantia () kde ! org>
Date: Mon, 08 Jan 2007 16:02:42 +0000
To: kde-commits
Subject: branches/KDE/3.5/kdewebdev/quanta
Message-Id: <1168272162.847778.1566.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=116827217326306

SVN commit 621313 by amantia:

Don't lose the modifications for the upload profile if this was the first profile in the list and for some reason there is no existing "default" profile. In that case the first one is taken as the default.

 M  +1 -0      project/projectupload.cpp  
 M  +26 -11    quanta.kdevelop  
 M  +4 -1      src/dtds.cpp  


--- branches/KDE/3.5/kdewebdev/quanta/project/projectupload.cpp #621312:621313
@@ -130,6 +130,7 @@
         m_defaultProfile = defaultProfile;
       QDomNodeList profileList = m_profilesNode.toElement().elementsByTagName("profile");
       QDomElement e;
+      m_currentProfileElement = profileList.item(0).toElement();
       QString s;
       int defaultIdx = 0;
       for (uint i = 0; i < profileList.count(); i++)
--- branches/KDE/3.5/kdewebdev/quanta/quanta.kdevelop #621312:621313
@@ -18,7 +18,8 @@
     <absoluteprojectpath>false</absoluteprojectpath>
     <secondaryLanguages/>
     <versioncontrol/>
-    <defaultencoding/>
+    <defaultencoding></defaultencoding>
+    <projectname>quanta</projectname>
   </general>
   <kdevautoproject>
     <general>
@@ -47,8 +48,8 @@
       <cxxflags>\s-O0 -g3 -Wall</cxxflags>
     </compiler>
     <run>
-      <mainprogram>quanta/src/quanta</mainprogram>
-      <programargs/>
+      <mainprogram>/data/development/build/kde-3.5/kdewebdev/quanta/src/quanta</mainprogram>
+      <programargs></programargs>
       <terminal>false</terminal>
       <envvars/>
       <directoryradio>build</directoryradio>
@@ -56,6 +57,18 @@
       <autocompile>true</autocompile>
       <autoinstall>false</autoinstall>
       <autokdesu>false</autokdesu>
+      <globaldebugarguments></globaldebugarguments>
+      <globalcwd>/data/development/build/kde-3.5/kdewebdev</globalcwd>
+      <useglobalprogram>true</useglobalprogram>
+      <runarguments>
+        <quanta/>
+      </runarguments>
+      <debugarguments>
+        <quanta/>
+      </debugarguments>
+      <cwd>
+        <quanta>/data/development/build/kde-3.5/kdewebdev/quanta/src</quanta>
+      </cwd>
     </run>
     <envvars/>
     <configurations>
@@ -171,7 +184,7 @@
     </groups>
     <tree>
       <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidepatterns></hidepatterns>
+      <hidepatterns/>
       <showvcsfields>true</showvcsfields>
     </tree>
   </kdevfileview>
@@ -194,16 +207,16 @@
   </kdevdoctreeview>
   <kdevdebugger>
     <general>
-      <dbgshell/>
+      <dbgshell></dbgshell>
       <programargs/>
       <gdbpath>/usr/bin/gdb</gdbpath>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
       <runappinappdirectory>true</runappinappdirectory>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
     </general>
     <display>
       <staticmembers>false</staticmembers>
@@ -246,10 +259,10 @@
   </kdevcvs>
   <kdevfilecreate>
     <filetypes>
-      <type icon="" ext="h" create="template" name="C++ header" >
+      <type icon="" ext="h" name="C++ header" create="template" >
         <descr>Quanta speicfic header</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" create="template" name="C++ source" >
+      <type icon="source_cpp" ext="cpp" name="C++ source" create="template" >
         <descr>A new empty C++ file.</descr>
       </type>
     </filetypes>
@@ -285,7 +298,7 @@
     </codecompletion>
     <references/>
     <creategettersetter>
-      <prefixGet/>
+      <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>
@@ -300,6 +313,8 @@
       <designerintegration>ExternalDesigner</designerintegration>
       <qmake>/usr/lib/qt3/bin/qmake</qmake>
       <designer>/usr/lib/qt3/bin/designer</designer>
+      <designerprefix/>
+      <designerpluginpaths/>
     </qt>
     <designerintegration>
       <qtdesigner/>
--- branches/KDE/3.5/kdewebdev/quanta/src/dtds.cpp #621312:621313
@@ -23,6 +23,7 @@
 #include <qextfileinfo.h>
 #include <qdom.h>
 #include <qcursor.h>
+#include <qtimer.h>
 
 // include files for KDE
 #include <kapplication.h>
@@ -103,13 +104,15 @@
     }
   }
 //  kdDebug(24000) << tagsDirs.count() << " folders found." << endl;
+  QTime t;
+  t.start();
   QStringList::ConstIterator tagsDirsEnd = tagsDirs.constEnd();
   for ( QStringList::ConstIterator it = tagsDirs.constBegin(); it != tagsDirsEnd; ++it )
   {
 //     kdDebug(24000) << "read:" << *it  << endl;
     readTagDir(*it, false);  // read all tags, but only short form
   }
-
+  kdDebug(24000) << "DTD reading: " << t.elapsed() << endl;
 //load the mimetypes from the insideDTDs
   QDictIterator<DTDStruct> it(*m_dict);
   for( ; it.current(); ++it )