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

[Zongyi Zhang]

SVN commit 1107152 by zhang:

replace obsolete QDir members

 M  +1 -1      kst.cpp  
 M  +1 -1      kstchangefiledialog.cpp  
 M  +1 -1      kstdatawizard.cpp  
 M  +1 -1      kstdoc.cpp  
 M  +3 -3      kstgraphfiledialog.cpp  
 M  +1 -1      kstmatrixdialog.cpp  
 M  +1 -1      kstvectordialog.cpp  


--- branches/work/kst/kst1kde4/kst/src/libkstapp/kst.cpp #1107151:1107152
@@ -1266,7 +1266,7 @@
     QString folder;
 
     if (doc->lastFilePath().isEmpty()) {
-      folder = QDir::currentDirPath();
+      folder = QDir::currentPath();
     } else {
       folder = doc->lastFilePath();
     }
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstchangefiledialog.cpp #1107151:1107152
@@ -60,7 +60,7 @@
   connect(_dataFile, SIGNAL(textChanged(const QString&)), this, SLOT(sourceChanged(const QString&)));
   connect(_configureSource, SIGNAL(clicked()), this, SLOT(configureSource()));
 
-  _dataFile->completionObject()->setDir(QDir::currentDirPath());
+  _dataFile->completionObject()->setDir(QDir::currentPath());
   _dataFile->setMode(KFile::File | KFile::Directory | KFile::ExistingOnly);
 
   _clearFilter->setPixmap(BarIcon("locationbar_erase"));
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstdatawizard.cpp #1107151:1107152
@@ -131,7 +131,7 @@
   _newFilter->hide(); // FIXME: implement this
   _testURL->hide();
   _url->setURL(default_source);
-  _url->completionObject()->setDir(QDir::currentDirPath());
+  _url->completionObject()->setDir(QDir::currentPath());
   _url->setFocus();
 
   // x vector selection
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstdoc.cpp #1107151:1107152
@@ -171,7 +171,7 @@
   //if (QMessageBox::Yes == QMessageBox::warningYesNo(KstApp::inst(), i18n("Are you sure you wish to erase all your data and plots?"))) {
     deleteContents();
     _modified = false;
-    _absFilePath = QDir::homeDirPath();
+    _absFilePath = QDir::homePath();
     _title = "Untitled";
     KstApp::inst()->newWindow(i18n("default name of first window", "W1"));
     createScalars();
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstgraphfiledialog.cpp #1107151:1107152
@@ -123,7 +123,7 @@
   QString path;
 
   if (url.isEmpty()) {
-    path = QDir::currentDirPath();
+    path = QDir::currentPath();
   } else {
     path = url;
   }
@@ -163,7 +163,7 @@
     _url = cfg.readEntry("Location", "");
   }
   if (_url.isEmpty()) {
-    _url = QDir::currentDirPath();
+    _url = QDir::currentPath();
     if (_url.length() > 0) {
       if (_url.endsWith("/", FALSE)) {
         _url += QString("export");
@@ -220,7 +220,7 @@
 
 void KstGraphFileDialog::updateDialog() {
   if (_url.isEmpty()) {
-    _url = QDir::currentDirPath();
+    _url = QDir::currentPath();
   }
   _saveLocation->setURL(_url);
   _saveLocation->completionObject()->setDir(_url);
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstmatrixdialog.cpp #1107151:1107152
@@ -55,7 +55,7 @@
 
   setMultiple(true);
   _inTest = false;
-  _w->_fileName->completionObject()->setDir(QDir::currentDirPath());
+  _w->_fileName->completionObject()->setDir(QDir::currentPath());
 
   connect(_w->_readFromSource, SIGNAL(clicked()), this, SLOT(updateEnables()));
   connect(_w->_generateGradient, SIGNAL(clicked()), this, SLOT(updateEnables()));
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kstvectordialog.cpp #1107151:1107152
@@ -69,7 +69,7 @@
 
   setMultiple(true);
   _inTest = false;
-  _w->FileName->completionObject()->setDir(QDir::currentDirPath());
+  _w->FileName->completionObject()->setDir(QDir::currentPath());
 
   _w->FileName->setMode(KFile::File | KFile::Directory | KFile::ExistingOnly);
   connect(_w->FileName, SIGNAL(openFileDialog(KURLRequester *)), this, SLOT(selectFolder()));