TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

kexi: replace includehints with includes in .ui files.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/18/head
Michele Calgaro 3 years ago
parent 4b35f65319
commit 07ad9d5a17
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File

20
kexi/formeditor/formIO.cpp
Unescape View File

@ -1105,9 +1105,9 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
void void
FormIO::cleanClipboard(TQDomElement &uiElement) FormIO::cleanClipboard(TQDomElement &uiElement)
{ {
// remove includehints element not needed // remove includes element not needed
if(!uiElement.namedItem("includehints").isNull()) if(!uiElement.namedItem("includes").isNull())
uiElement.removeChild(uiElement.namedItem("includehints")); uiElement.removeChild(uiElement.namedItem("includes"));
// and ensure images and connection are at the end // and ensure images and connection are at the end
if(!uiElement.namedItem("connections").isNull()) if(!uiElement.namedItem("connections").isNull())
uiElement.insertAfter(uiElement.namedItem("connections"), TQDomNode()); uiElement.insertAfter(uiElement.namedItem("connections"), TQDomNode());
@ -1484,13 +1484,13 @@ FormIO::addIncludeFileName(const TQString &include, TQDomDocument &domDoc)
TQDomElement includes; TQDomElement includes;
TQDomElement uiEl = domDoc.namedItem("UI").toElement(); TQDomElement uiEl = domDoc.namedItem("UI").toElement();
if(uiEl.namedItem("includehints").isNull()) if(uiEl.namedItem("includes").isNull())
{ {
includes = domDoc.createElement("includehints"); includes = domDoc.createElement("includes");
uiEl.appendChild(includes); uiEl.appendChild(includes);
} }
else else
includes = uiEl.namedItem("includehints").toElement(); includes = uiEl.namedItem("includes").toElement();
// Check if this include has already been saved, and return if it is the case // Check if this include has already been saved, and return if it is the case
for(TQDomNode n = includes.firstChild(); !n.isNull(); n = n.nextSibling()) for(TQDomNode n = includes.firstChild(); !n.isNull(); n = n.nextSibling())
@ -1499,10 +1499,12 @@ FormIO::addIncludeFileName(const TQString &include, TQDomDocument &domDoc)
return; return;
} }
TQDomElement includeHint = domDoc.createElement("includehint"); TQDomElement includeElement = domDoc.createElement("include");
includes.appendChild(includeHint); includes.appendChild(includeElement);
includeElement.setAttribute("location", "global");
includeElement.setAttribute("impldecl", "in implementation");
TQDomText includeText = domDoc.createTextNode(include); TQDomText includeText = domDoc.createTextNode(include);
includeHint.appendChild(includeText); includeElement.appendChild(includeText);
} }
//////// TQt Designer code: these two functions were copied (and adapted) from TQt Designer for compatibility //////// //////// TQt Designer code: these two functions were copied (and adapted) from TQt Designer for compatibility ////////

2
kexi/formeditor/formIO.h
Unescape View File

@ -204,7 +204,7 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
static void readChildNodes(ObjectTreeItem *tree, Container *container, static void readChildNodes(ObjectTreeItem *tree, Container *container,
const TQDomElement &el, TQWidget *w); const TQDomElement &el, TQWidget *w);
/*! Adds an include file name to be saved in the "includehints" part of .ui file, /*! Adds an include file name to be saved in the "includes" part of .ui file,
which is needed by uic. */ which is needed by uic. */
static void addIncludeFileName(const TQString &include, TQDomDocument &domDoc); static void addIncludeFileName(const TQString &include, TQDomDocument &domDoc);

Write Preview
Loading…
Cancel
Save