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

[Zongyi Zhang]

SVN commit 1106774 by zhang:

continue kst1kde4

 M  +4 -4      changefiledialog.ui  
 M  +4 -4      curvedialogwidget.ui  
 M  +2 -2      kstchangefiledialog.cpp  
 M  +3 -3      kstsettingsdlg.ui  
 M  +1 -1      kstviewlabel.cpp  
 M  +1 -1      kstviewlegend.cpp  
 M  +2 -2      ktimezonecombo.h  
 M  +4 -4      matrixdialogwidget.ui  
 M  +4 -4      vectorsavedialog.ui  
 M  +5 -5      vectorviewdialogwidget.ui  
 M  +3 -3      view2dplotwidget.ui  


--- branches/work/kst/kst1kde4/kst/src/libkstapp/changefiledialog.ui #1106773:1106774
@@ -226,7 +226,7 @@
          </widget>
         </item>
         <item>
-         <widget class="KComboBox" name="_files">
+         <widget class="QComboBox" name="_files">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -346,9 +346,9 @@
    <header>q3listbox.h</header>
   </customwidget>
   <customwidget>
-   <class>KComboBox</class>
+   <class>QComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>qcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KURLRequester</class>
@@ -375,7 +375,7 @@
   <include location="local">kurlrequester.h</include>
   <include location="local">klineedit.h</include>
   <include location="local">kpushbutton.h</include>
-  <include location="local">kcombobox.h</include>
+  <include location="local">qcombobox.h</include>
  </includes>
  <resources/>
  <connections>
--- branches/work/kst/kst1kde4/kst/src/libkstapp/curvedialogwidget.ui #1106773:1106774
@@ -250,7 +250,7 @@
          </widget>
         </item>
         <item>
-         <widget class="KComboBox" name="_interp">
+         <widget class="QComboBox" name="_interp">
           <property name="whatsThis">
            <string>Kst assumes that the first and last samples of the X &amp; Y axis vectors 
 are pairs.  Consequently, if the X &amp; Y axis vectors have different numbers
@@ -332,9 +332,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>KComboBox</class>
+   <class>QComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>qcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>CurveAppearanceWidget</class>
@@ -378,7 +378,7 @@
   <include location="local">curveplacementwidget.h</include>
   <include location="local">vectorselector.h</include>
   <include location="local">kstcombobox.h</include>
-  <include location="local">kcombobox.h</include>
+  <include location="local">qcombobox.h</include>
   <include location="local">scalarselector.h</include>
  </includes>
  <resources/>
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstchangefiledialog.cpp #1106773:1106774
@@ -18,8 +18,8 @@
 #include <qcheckbox.h> 
 #include <qradiobutton.h>
 #include <QMessageBox>
-  
-#include <kcombobox.h>
+#include <qcombobox.h>
+
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kurlcompletion.h>
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstsettingsdlg.ui #1106773:1106774
@@ -802,7 +802,7 @@
         </widget>
        </item>
        <item row="0" column="1">
-        <widget class="KComboBox" name="_source">
+        <widget class="QComboBox" name="_source">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
            <horstretch>1</horstretch>
@@ -1115,9 +1115,9 @@
    <header>knuminput.h</header>
   </customwidget>
   <customwidget>
-   <class>KComboBox</class>
+   <class>QComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>qcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KColorButton</class>
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewlabel.cpp #1106773:1106774
@@ -31,7 +31,7 @@
 #include "labelrenderer.h"
 /* xxx
 #include <kcolorbutton.h>
-#include <kcombobox.h>
+#include <qcombobox.h>
 #include <kdatastream.h>
 #include <kdualcolorbutton.h>
 #include <kfontcombo.h>
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewlegend.cpp #1106773:1106774
@@ -27,11 +27,11 @@
 #include <qradiobutton.h>
 #include <QTextDocument>
 #include <QSpinBox>
+#include <qcombobox.h>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kcolorbutton.h>
-#include <kcombobox.h>
 
 #include "kstviewlegend.h"
 
--- branches/work/kst/kst1kde4/kst/src/libkstapp/ktimezonecombo.h #1106773:1106774
@@ -21,12 +21,12 @@
 #ifndef KTIMEZONECOMBO_H
 #define KTIMEZONECOMBO_H
 
-#include <kcombobox.h>
+#include <qcombobox.h>
 #include <qstring.h>
 
 class KstTimezones;
 
-class KTimezoneCombo : public KComboBox {
+class KTimezoneCombo : public QComboBox {
   Q_OBJECT
   public:
     KTimezoneCombo(QWidget *parent = 0L, const char *name = 0L, KstTimezones *db = 0L);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/matrixdialogwidget.ui #1106773:1106774
@@ -676,7 +676,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="KComboBox" name="_field">
+       <widget class="QComboBox" name="_field">
         <property name="editable">
          <bool>true</bool>
         </property>
@@ -740,9 +740,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>KComboBox</class>
+   <class>QComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>qcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
@@ -782,7 +782,7 @@
   <include location="local">kurlrequester.h</include>
   <include location="local">klineedit.h</include>
   <include location="local">kpushbutton.h</include>
-  <include location="local">kcombobox.h</include>
+  <include location="local">qcombobox.h</include>
   <include location="local">klineedit.h</include>
   <include location="global">kst_export.h</include>
  </includes>
--- branches/work/kst/kst1kde4/kst/src/libkstapp/vectorsavedialog.ui #1106773:1106774
@@ -80,7 +80,7 @@
     </widget>
    </item>
    <item row="2" column="0" colspan="3">
-    <widget class="KComboBox" name="_multiOptions">
+    <widget class="QComboBox" name="_multiOptions">
      <property name="enabled">
       <bool>false</bool>
      </property>
@@ -118,9 +118,9 @@
    <header>q3listbox.h</header>
   </customwidget>
   <customwidget>
-   <class>KComboBox</class>
+   <class>QComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>qcombobox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
@@ -130,7 +130,7 @@
   <tabstop>pushButton2</tabstop>
  </tabstops>
  <includes>
-  <include location="local">kcombobox.h</include>
+  <include location="local">qcombobox.h</include>
  </includes>
  <resources/>
  <connections/>
--- branches/work/kst/kst1kde4/kst/src/libkstapp/vectorviewdialogwidget.ui #1106773:1106774
@@ -105,7 +105,7 @@
          </widget>
         </item>
         <item>
-         <widget class="KComboBox" name="_interp">
+         <widget class="QComboBox" name="_interp">
           <property name="focusPolicy">
            <enum>Qt::TabFocus</enum>
           </property>
@@ -294,7 +294,7 @@
          </widget>
         </item>
         <item>
-         <widget class="KComboBox" name="_plotAxes">
+         <widget class="QComboBox" name="_plotAxes">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>1</horstretch>
@@ -344,7 +344,7 @@
          </widget>
         </item>
         <item>
-         <widget class="KComboBox" name="_plotList">
+         <widget class="QComboBox" name="_plotList">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
             <horstretch>1</horstretch>
@@ -448,9 +448,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>KComboBox</class>
+   <class>QComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>qcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>VectorSelector</class>
--- branches/work/kst/kst1kde4/kst/src/libkstapp/view2dplotwidget.ui #1106773:1106774
@@ -736,7 +736,7 @@
              </widget>
             </item>
             <item>
-             <widget class="KComboBox" name="ScalarList">
+             <widget class="QComboBox" name="ScalarList">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
@@ -2587,9 +2587,9 @@
    <header>q3listbox.h</header>
   </customwidget>
   <customwidget>
-   <class>KComboBox</class>
+   <class>QComboBox</class>
    <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <header>qcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KColorButton</class>