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

[Zongyi Zhang]

SVN commit 1106481 by zhang:

continue kst1kde4

 M  +6 -6      kstquickstartdialog.cpp  
 M  +3 -3      kstquickstartdialog.h  
 M  +2 -2      kstsettingsdlg.cpp  
 M  +1 -1      kstsettingsdlg.h  
 M  +2 -2      quickstartdialog.ui  


--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstquickstartdialog.cpp #1106480:1106481
@@ -17,7 +17,7 @@
 
 // include files for Qt
 #include <qcheckbox.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 
 // include files for KDE
 #include <kurlcompletion.h>
@@ -29,10 +29,10 @@
 #include "kstquickstartdialog.h"
 #include "kstsettings.h"
 
-KstQuickStartDialog::KstQuickStartDialog(QWidget *parent, const char *name, bool modal, WFlags fl)
-: QDialog(parent, name, modal, fl) {
+KstQuickStartDialog::KstQuickStartDialog(QWidget *parent, const char *name, bool modal, Qt::WindowFlags fl)
+: QDialog(parent,fl) {
   setupUi(this);
-  _fileName->completionObject()->setDir(QDir::currentDirPath());
+  _fileName->completionObject()->setDir(QDir::currentPath());
   _app = KstApp::inst();
   _isRecentFile = false;
   _openFile->setEnabled(false);
@@ -96,7 +96,7 @@
   QString file;
 
   file = name;
-  file = file.stripWhiteSpace();
+  file = file.trimmed();
   if (!file.isEmpty()) {
     _openFile->setEnabled(true);
   } else {
@@ -107,7 +107,7 @@
 
 void KstQuickStartDialog::changeURL(const QString& name) {
   _fileName->blockSignals(true);
-  _fileName->setURL(name);
+  _fileName->setUrl(name);
   _fileName->blockSignals(false);
 
   fileChanged(name);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstquickstartdialog.h #1106480:1106481
@@ -21,11 +21,11 @@
 
 class KstApp;
 
-class KstQuickStartDialog : public QDialog, public KstQuickStartDialog {
+class KstQuickStartDialog : public QDialog, public Ui::KstQuickStartDialog {
   Q_OBJECT
   public:
-    KstQuickStartDialogI(QWidget *parent = 0, const char *name = 0,
-        bool modal = false, WFlags fl = 0 );
+    KstQuickStartDialog(QWidget *parent = 0, const char *name = 0,
+        bool modal = false, Qt::WindowFlags fl = 0 );
     ~KstQuickStartDialog();
 
   public slots:
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstsettingsdlg.cpp #1106480:1106481
@@ -34,8 +34,8 @@
 #include "kstsettingsdlg.h"
 #include "ksttimezones.h"
 
-KstSettingsDlg::KstSettingsDlg(QWidget* parent, const char *name, WFlags fl) 
-: QDialog(parent, name, fl)
+KstSettingsDlg::KstSettingsDlg(QWidget* parent, const char *name, Qt::WindowFlags fl) 
+: QDialog(parent, fl)
 {
   setupUi(this);
   fillAxesSettings();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstsettingsdlg.h #1106480:1106481
@@ -22,7 +22,7 @@
 class KstSettingsDlg: public QDialog, public Ui::KstSettingsDlg {
   Q_OBJECT
   public:
-    KstSettingsDlg(QWidget* parent = 0, const char *name = 0, WFlags fl = 0);
+    KstSettingsDlg(QWidget* parent = 0, const char *name = 0, Qt::WindowFlags fl = 0);
     virtual ~KstSettingsDlg();
 
   signals:
--- branches/work/kst/kst1kde4/kst/src/libkstapp/quickstartdialog.ui #1106480:1106481
@@ -95,7 +95,7 @@
      </property>
      <layout class="QGridLayout">
       <item row="3" column="0">
-       <widget class="KURLRequester" name="_fileName" native="true"/>
+       <widget class="KUrlRequester" name="_fileName" native="true"/>
       </item>
       <item row="1" column="0">
        <widget class="Q3ListBox" name="_recentFileList">
@@ -210,7 +210,7 @@
    <header>q3listbox.h</header>
   </customwidget>
   <customwidget>
-   <class>KURLRequester</class>
+   <class>KUrlRequester</class>
    <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>