[Kst] branches/work/kst/kst1kde4/kst/src/widgets

[Andrew Walker]

SVN commit 1102182 by arwalker:

continue kst1kde4

 M  +4 -0      CMakeLists.txt  
 A             colorpalettewidget.cpp   [License: GPL (v2+)]
 A             colorpalettewidget.h   [License: GPL (v2+)]
 M  +0 -1      colorpalettewidget.ui  
 D             colorpalettewidget.ui.h  
 A             curveappearancewidget.cpp   [License: GPL (v2+)]
 A             curveappearancewidget.h   [License: GPL (v2+)]
 D             curveappearancewidget.ui.h  
 A             curveplacementwidget.cpp   [License: GPL (v2+)]
 A             curveplacementwidget.h   [License: GPL (v2+)]
 M  +1 -9      curveplacementwidget.ui  
 D             curveplacementwidget.ui.h  
 A             datarangewidget.cpp   [License: GPL (v2+)]
 A             datarangewidget.h   [License: GPL (v2+)]
 D             datarangewidget.ui.h  


--- branches/work/kst/kst1kde4/kst/src/widgets/CMakeLists.txt #1102181:1102182
@@ -4,7 +4,11 @@
 
 set(kstwidgets_LIB_SRCS
     kstbackbuffer.cpp
+    colorpalettewidget.cpp
     comboboxselection_i.cpp
+    curveappearancewidget.cpp
+    curveplacementwidget.cpp
+    datarangewidget.cpp
     draggablelistbox.cpp
     draggablelistview.cpp
     editmultiplewidget.cpp
--- branches/work/kst/kst1kde4/kst/src/widgets/colorpalettewidget.ui #1102181:1102182
@@ -74,7 +74,6 @@
   <layoutdefault spacing="6" margin="11"/>
   <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
   <includes>
-    <include location="global">kpalette.h</include>
     <include location="global">kst_export.h</include>
   </includes>
   <connections>
--- branches/work/kst/kst1kde4/kst/src/widgets/curveplacementwidget.ui #1102181:1102182
@@ -48,7 +48,7 @@
               </widget>
             </item>
             <item row="0" column="1" rowspan="1" colspan="3">
-              <widget class="KComboBox" name="_plotWindow">
+              <widget class="QComboBox" name="_plotWindow">
                 <property name="sizePolicy">
                   <sizepolicy>
                     <hsizetype>1</hsizetype>
@@ -161,13 +161,6 @@
   </widget>
   <layoutdefault spacing="6" margin="11"/>
   <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
-  <customwidgets>
-    <customwidget>
-      <class>KComboBox</class>
-      <extends>QComboBox</extends>
-      <header location="global">kcombobox.h</header>
-    </customwidget>
-  </customwidgets>
   <tabstops>
     <tabstop>_plotWindow</tabstop>
     <tabstop>_newWindow</tabstop>
@@ -180,7 +173,6 @@
   </tabstops>
   <includes>
     <include location="global">kst_export.h</include>
-    <include location="local">kcombobox.h</include>
   </includes>
   <connections>
     <connection>