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

List:       kde-commits
Subject:    branches/kdevelop/3.4/src
From:       Jens Dagerbo <jens.dagerbo () swipnet ! se>
Date:       2006-12-30 4:47:08
Message-ID: 1167454028.321318.13220.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 617742 by dagerbo:

would you believe it, designer launch logic was _still_ wrong.. what are the odds I \
get it right this time? :)

 M  +7 -15     partcontroller.cpp  


--- branches/kdevelop/3.4/src/partcontroller.cpp #617741:617742
@@ -393,29 +393,21 @@
 		QDomDocument* dom = API::getInstance()->projectDom();
 		if ( dom != 0 )
 		{
-
-			// Short explanation for the following:
 			// The global option specifies a fallback if the project
 			// has no setting or no project is open. However for Qt4
 			// projects we want to use ExternalDesigner in any case.
-
+			DesignerSetting = DomUtil::readEntry(*dom, \
"/kdevcppsupport/qt/designerintegration", DesignerSetting  );  if ( \
DomUtil::readIntEntry( *dom, "/kdevcppsupport/qt/version", 3 ) == 4 )  \
DesignerSetting = "ExternalDesigner";  
-			QString DesignerSetting = DomUtil::readEntry(*dom, \
                "/kdevcppsupport/qt/designerintegration", DesignerSetting  );
-
-
-			if ( DesignerSetting == "ExternalKDevDesigner" )
-			{
-				designerExec = "kdevdesigner";
-			}
-			else if ( DesignerSetting == "ExternalDesigner" )
-			{
-				designerExec = DomUtil::readEntry(*dom, "/kdevcppsupport/qt/designer");;
-			}
+			designerExec = DomUtil::readEntry(*dom, "/kdevcppsupport/qt/designer", \
designerExec );  }
-		if ( DesignerSetting == "EmbeddedKDevDesigner" )
+		if ( DesignerSetting == "ExternalKDevDesigner" )
 		{
+			designerExec = "kdevdesigner";
+		}
+		else if ( DesignerSetting == "EmbeddedKDevDesigner" )
+		{
 			if ( KParts::ReadOnlyPart *designerPart = qtDesignerPart() )
 			{
 				addHistoryEntry();


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