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

[Zongyi Zhang]

SVN commit 1108842 by zhang:

continue kst1kde4

 M  +7 -24     changefiledialog.ui  
 M  +1 -1      kst2dplot.cpp  
 M  +1 -1      kst2dplotwidget.cpp  
 M  +2 -2      updatethread-multicore.cpp  
 M  +2 -2      updatethread.cpp  


--- branches/work/kst/kst1kde4/kst/src/libkstapp/changefiledialog.ui #1108841:1108842
@@ -21,7 +21,7 @@
     <number>6</number>
    </property>
    <item row="1" column="0">
-    <widget class="Q3ButtonGroup" name="buttonGroup2">
+    <widget class="QButtonGroup" name="buttonGroup2">
      <property name="title">
       <string>New Data File</string>
      </property>
@@ -211,7 +211,7 @@
     </layout>
    </item>
    <item row="0" column="0">
-    <widget class="Q3ButtonGroup" name="buttonGroup1">
+    <widget class="QButtonGroup" name="buttonGroup1">
      <property name="title">
       <string>Vector and Matrix Selection</string>
      </property>
@@ -240,7 +240,7 @@
       <item row="2" column="0">
        <layout class="QGridLayout">
         <item row="0" column="0" rowspan="5">
-         <widget class="Q3ListBox" name="ChangeFileCurveList">
+         <widget class="QListBox" name="ChangeFileCurveList">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
             <horstretch>1</horstretch>
@@ -251,7 +251,7 @@
            <string>The source file for the vectors selected in this list will be changed.</string>
           </property>
           <property name="selectionMode">
-           <enum>Q3ListBox::Extended</enum>
+           <enum>QListBox::Extended</enum>
           </property>
          </widget>
         </item>
@@ -323,30 +323,13 @@
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
-   <class>Q3GroupBox</class>
+   <class>QButtonGroup</class>
    <extends>QGroupBox</extends>
-   <header>Qt3Support/Q3GroupBox</header>
+   <header>QButtonGroup</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>Q3Frame</class>
-   <extends>QFrame</extends>
-   <header>Qt3Support/Q3Frame</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>Q3ButtonGroup</class>
-   <extends>Q3GroupBox</extends>
-   <header>Qt3Support/Q3ButtonGroup</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>Q3ListBox</class>
-   <extends>Q3Frame</extends>
-   <header>q3listbox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>KURLRequester</class>
+   <class>KUrlRequester</class>
    <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kst2dplot.cpp #1108841:1108842
@@ -1167,7 +1167,7 @@
 
       {
         KstBaseCurveList cl = _curves;
-// xxx        qHeapSort(cl);
+// xxx        qSort(cl);
         for (it = cl.begin(); it != cl.end(); ++it) {
           KstBaseCurvePtr c;
 
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kst2dplotwidget.cpp #1108841:1108842
@@ -445,7 +445,7 @@
   KST::scalarList.lock().readLock();
   KstScalarList sl = KST::scalarList.list();
   KST::scalarList.lock().unlock();
-// xxx  qHeapSort(sl);
+// xxx  qSort(sl);
 
   for (i = sl.begin(); i != sl.end(); ++i) {
     (*i)->readLock();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/updatethread-multicore.cpp #1108841:1108842
@@ -227,8 +227,8 @@
     KstBaseCurveList cl;
     KstDataObjectList dol;
     kstObjectSplitList<KstDataObject, KstBaseCurve>(KST::dataObjectList, cl, dol);
-    qHeapSort(cl); 
-    qHeapSort(dol); 
+    qSort(cl); 
+    qSort(dol); 
 
     // Update all curves
     for (uint i = 0; i < cl.count(); ++i) {
--- branches/work/kst/kst1kde4/kst/src/libkstapp/updatethread.cpp #1108841:1108842
@@ -158,8 +158,8 @@
     KstBaseCurveList cl;
     KstDataObjectList dol;
     kstObjectSplitList<KstDataObject, KstBaseCurve>(KST::dataObjectList, cl, dol);
-    qHeapSort(cl);
-    qHeapSort(dol);
+    qSort(cl);
+    qSort(dol);
 
     //
     // update all curves