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

[Zongyi Zhang]

SVN commit 1108874 by zhang:

remove q3

 M  +2 -2      kstviewlabel.cpp  
 M  +2 -2      kstviewlabelwidget.cpp  
 M  +6 -23     viewlabelwidget.ui  


--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewlabel.cpp #1108873:1108874
@@ -655,8 +655,8 @@
     return false;
   }
 
-  if (!editMultipleMode || widget->_text->text().compare(QString(" ")) != 0) {
-    _txt = widget->_text->text();
+  if (!editMultipleMode || widget->_text->toPlainText().compare(QString(" ")) != 0) {
+    _txt = widget->_text->toPlainText();
   }
 
   if (!editMultipleMode || widget->_precision->value() != widget->_precision->minimum()) {
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstviewlabelwidget.cpp #1108873:1108874
@@ -53,13 +53,13 @@
 
 void KstViewLabelWidget::insertScalarInText(const QString &str)
 {
-  _text->insert("["+str+"]");
+  _text->insertPlainText("["+str+"]");
 }
 
 
 void KstViewLabelWidget::insertStringInText(const QString &str)
 {
-  _text->insert("["+str+"]");
+  _text->insertPlainText("["+str+"]");
 }
 
 
--- branches/work/kst/kst1kde4/kst/src/libkstapp/viewlabelwidget.ui #1108873:1108874
@@ -61,17 +61,17 @@
    <item>
     <layout class="QVBoxLayout">
      <item>
-      <widget class="Q3TextEdit" name="_text">
+      <widget class="QTextEdit" name="_text">
        <property name="acceptDrops">
         <bool>true</bool>
        </property>
-       <property name="wordWrap">
-        <enum>Q3TextEdit::NoWrap</enum>
+       <property name="LineWrapMode">
+        <enum>QTextEdit::NoWrap</enum>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="Q3GroupBox" name="groupBox2">
+      <widget class="QGroupBox" name="groupBox2">
        <property name="title">
         <string>Format</string>
        </property>
@@ -197,7 +197,7 @@
       </widget>
      </item>
      <item>
-      <widget class="Q3GroupBox" name="groupBox1">
+      <widget class="QGroupBox" name="groupBox1">
        <property name="title">
         <string>Box</string>
        </property>
@@ -297,24 +297,7 @@
  <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
-  <customwidget>
-   <class>Q3GroupBox</class>
-   <extends>QGroupBox</extends>
-   <header>Qt3Support/Q3GroupBox</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>Q3Frame</class>
-   <extends>QFrame</extends>
-   <header>Qt3Support/Q3Frame</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>Q3TextEdit</class>
-   <extends>Q3Frame</extends>
-   <header>q3textedit.h</header>
-  </customwidget>
-  <customwidget>
+   <customwidget>
    <class>ScalarSelector</class>
    <extends>QWidget</extends>
    <header>scalarselector.h</header>