13 files changed, 37 insertions, 24 deletions
diff --git a/kdevdesigner/designer/createtemplate.ui b/kdevdesigner/designer/createtemplate.ui
index e03340b1..b79e7eb4 100644
--- a/kdevdesigner/designer/createtemplate.ui
+++ b/kdevdesigner/designer/createtemplate.ui
@@ -189,7 +189,7 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui
index 76abc453..057015be 100644
--- a/kdevdesigner/designer/customwidgeteditor.ui
+++ b/kdevdesigner/designer/customwidgeteditor.ui
@@ -1375,4 +1375,7 @@
     <tabstop>editProperty</tabstop>
     <tabstop>comboType</tabstop>
 </tabstops>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kdevdesigner/designer/dbconnection.ui b/kdevdesigner/designer/dbconnection.ui
index 75b7d5cb..1510629b 100644
--- a/kdevdesigner/designer/dbconnection.ui
+++ b/kdevdesigner/designer/dbconnection.ui
@@ -219,4 +219,7 @@
     <slot access="protected">destroy()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kdevdesigner/designer/editfunctions.ui b/kdevdesigner/designer/editfunctions.ui
index ea59e46a..a5075250 100644
--- a/kdevdesigner/designer/editfunctions.ui
+++ b/kdevdesigner/designer/editfunctions.ui
@@ -711,4 +711,7 @@
     <slot access="protected">displaySlots( bool )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kdevdesigner/designer/formsettings.ui b/kdevdesigner/designer/formsettings.ui
index 6337e8cf..812f30a0 100644
--- a/kdevdesigner/designer/formsettings.ui
+++ b/kdevdesigner/designer/formsettings.ui
@@ -546,4 +546,7 @@
     <slot>okClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kdevdesigner/designer/listboxeditor.ui b/kdevdesigner/designer/listboxeditor.ui
index df584ddf..6c5a8408 100644
--- a/kdevdesigner/designer/listboxeditor.ui
+++ b/kdevdesigner/designer/listboxeditor.ui
@@ -449,9 +449,10 @@
     <slot access="protected">moveItemUp()</slot>
     <slot access="protected">moveItemDown()</slot>
 </Q_SLOTS>
+<pixmapfunction>BarIcon2</pixmapfunction>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
-<pixmapfunction>BarIcon2</pixmapfunction>
-<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/listeditor.ui b/kdevdesigner/designer/listeditor.ui
index c477ff1a..addab137 100644
--- a/kdevdesigner/designer/listeditor.ui
+++ b/kdevdesigner/designer/listeditor.ui
@@ -155,9 +155,6 @@
         <slot>renameItem()</slot>
     </connection>
 </connections>
-<includes>
-    <include location="local" impldecl="in implementation">listeditor.ui.h</include>
-</includes>
 <forwards>
     <forward>class TQStringList;</forward>
 </forwards>
@@ -170,10 +167,10 @@
     <slot returnType="TQStringList">items()</slot>
     <slot>renameItem()</slot>
 </Q_SLOTS>
+<pixmapfunction>BarIcon2</pixmapfunction>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
+    <include location="local" impldecl="in implementation">listeditor.ui.h</include>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
-<pixmapfunction>BarIcon2</pixmapfunction>
-
-<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/pixmapfunction.ui b/kdevdesigner/designer/pixmapfunction.ui
index 760abe56..5e54de71 100644
--- a/kdevdesigner/designer/pixmapfunction.ui
+++ b/kdevdesigner/designer/pixmapfunction.ui
@@ -970,7 +970,7 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kdevdesigner/designer/preferences.ui b/kdevdesigner/designer/preferences.ui
index 363164ed..c00cf82a 100644
--- a/kdevdesigner/designer/preferences.ui
+++ b/kdevdesigner/designer/preferences.ui
@@ -641,8 +641,4 @@
     <slot access="protected">destroy()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>styledbutton.h</includehint>
-    <includehint>styledbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kdevdesigner/designer/previewwidget.ui b/kdevdesigner/designer/previewwidget.ui
index 3b792253..76fb7f51 100644
--- a/kdevdesigner/designer/previewwidget.ui
+++ b/kdevdesigner/designer/previewwidget.ui
@@ -301,4 +301,7 @@
     <slot access="protected" language="C++" returnType="void">init()</slot>
     <slot access="protected" language="C++" returnType="void">destroy()</slot>
 </connections>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kdevdesigner/designer/projectsettings.ui b/kdevdesigner/designer/projectsettings.ui
index d606a521..2e03d928 100644
--- a/kdevdesigner/designer/projectsettings.ui
+++ b/kdevdesigner/designer/projectsettings.ui
@@ -298,4 +298,7 @@
     <slot access="protected">okClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kdevdesigner/designer/tableeditor.ui b/kdevdesigner/designer/tableeditor.ui
index deacf5d4..21874754 100644
--- a/kdevdesigner/designer/tableeditor.ui
+++ b/kdevdesigner/designer/tableeditor.ui
@@ -793,9 +793,6 @@
     <tabstop>buttonRowDown</tabstop>
     <tabstop>buttonHelp</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">tqtable.h</include>
-</includes>
 <Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
@@ -819,10 +816,11 @@
     <slot access="protected">rowUpClicked()</slot>
     <slot access="protected">columnDownClicked()</slot>
 </Q_SLOTS>
+<pixmapfunction>BarIcon2</pixmapfunction>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">tqtable.h</include>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
-<pixmapfunction>BarIcon2</pixmapfunction>
-
-<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/variabledialog.ui b/kdevdesigner/designer/variabledialog.ui
index b5971ce9..d9cdc7ef 100644
--- a/kdevdesigner/designer/variabledialog.ui
+++ b/kdevdesigner/designer/variabledialog.ui
@@ -291,4 +291,7 @@
     <slot>currentItemChanged( TQListViewItem * i )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>