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

[Adam Treat]

SVN commit 637736 by treat:

* Convert all ui.h files using qt3to4


 M  +21 -20    CMakeLists.txt  
 M  +2 -0      colorpalettewidget.ui.h  
 M  +3 -0      curveappearancewidget.ui.h  
 A             portinglog.txt  
 M  +1 -1      scalarselector.ui.h  
 M  +1 -1      stringselector.ui.h  
 M  +1 -1      vectorselector.ui.h  


--- branches/work/kst/portto4/kst/src/widgets/CMakeLists.txt #637735:637736
@@ -1,35 +1,36 @@
 
-include_directories(${CMAKE_SOURCE_DIR}/src/extdate ${CMAKE_SOURCE_DIR}/src/libkst ${CMAKE_SOURCE_DIR}/src/libkstmath ${KDE4_INCLUDE_DIR} ${QT_INCLUDES})
+include_directories( ${CMAKE_BINARY_DIR}/kst ${CMAKE_SOURCE_DIR}/kst/src/extdate ${CMAKE_SOURCE_DIR}/kst/src/libkst ${CMAKE_BINARY_DIR}/kst/src/libkst ${CMAKE_SOURCE_DIR}/kst/src/libkstmath ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
 
 
 ########### next target ###############
 
 set(kstwidgets_LIB_SRCS 
    kstbackbuffer.cpp 
-   comboboxselection_i.cpp 
-   draggablelistbox.cpp 
-   draggablelistview.cpp 
-   plotlistbox.cpp 
-   vectorlistview.cpp 
-   kstcombobox.cpp 
-   kstwidgets.cpp)
+#    comboboxselection_i.cpp 
+#    draggablelistbox.cpp 
+#    draggablelistview.cpp 
+#    plotlistbox.cpp 
+#    vectorlistview.cpp 
+#    kstcombobox.cpp 
+#    kstwidgets.cpp
+   )
 
 kde4_automoc(${kstwidgets_LIB_SRCS})
 
 kde4_add_ui_files(kstwidgets_LIB_SRCS 
-   comboboxselection4.ui 
-   stringeditor4.ui 
-   scalareditor4.ui 
-   scalarselector4.ui 
-   matrixselector4.ui 
-   vectorselector4.ui 
-   stringselector4.ui 
-   editmultiplewidget4.ui 
-   curveplacementwidget4.ui 
+#    comboboxselection4.ui 
+#    stringeditor4.ui 
+#    scalareditor4.ui 
+#    scalarselector4.ui 
+#    matrixselector4.ui 
+#    vectorselector4.ui 
+#    stringselector4.ui 
+#    editmultiplewidget4.ui 
+#    curveplacementwidget4.ui 
    curveappearancewidget4.ui 
-   fftoptionswidget4.ui 
-   datarangewidget4.ui 
-   colorpalettewidget4.ui
+#    fftoptionswidget4.ui 
+#    datarangewidget4.ui 
+#    colorpalettewidget4.ui
    )
 
 kde4_add_library(kstwidgets SHARED ${kstwidgets_LIB_SRCS})
--- branches/work/kst/portto4/kst/src/widgets/colorpalettewidget.ui.h #637735:637736
@@ -1,3 +1,5 @@
+//Added by qt3to4:
+#include <QPixmap>
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
--- branches/work/kst/portto4/kst/src/widgets/curveappearancewidget.ui.h #637735:637736
@@ -1,3 +1,6 @@
+//Added by qt3to4:
+#include <QPixmap>
+#include <QResizeEvent>
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
--- branches/work/kst/portto4/kst/src/widgets/scalarselector.ui.h #637735:637736
@@ -54,7 +54,7 @@
     }
 	KST::scalarList.lock().unlock();
     
-    qHeapSort(scalars);
+    qSort(scalars);
     _scalar->insertStringList(scalars);
     if (found) {
         _scalar->setCurrentText(prev);
--- branches/work/kst/portto4/kst/src/widgets/stringselector.ui.h #637735:637736
@@ -53,7 +53,7 @@
     }
 	KST::stringList.lock().unlock();
     
-    qHeapSort(strings);
+    qSort(strings);
     _string->insertStringList(strings);
     if (found) {
         _string->setCurrentText(prev);
--- branches/work/kst/portto4/kst/src/widgets/vectorselector.ui.h #637735:637736
@@ -63,7 +63,7 @@
 	(*i)->unlock();
     }
     KST::vectorList.lock().unlock();
-    qHeapSort(vectors);
+    qSort(vectors);
     _vector->insertStringList(vectors);
     if (found) {
 	_vector->setCurrentText(prev);