[Kst] branches/work/kst/portto4/kst/src/libkstapp
Adam Treat
treat at kde.org
Fri Mar 2 00:01:26 CET 2007
SVN commit 638432 by treat:
* Various bits
M +2 -2 datawizard.cpp
M +1 -1 extensiondlg.h
M +1 -1 extensionmgr.h
M +1 -1 kst.cpp
M +2 -2 kstdatacollection-gui.cpp
M +2 -2 kstgraphfiledialog.h
M +3 -2 kstiface.h
M +2 -2 kstmatrixdialog.cpp
M +2 -2 kstvectordialog.cpp
M +4 -4 pluginmanager.cpp
M +4 -4 vectorsavedialog.cpp
--- branches/work/kst/portto4/kst/src/libkstapp/datawizard.cpp #638431:638432
@@ -260,12 +260,12 @@
_configureSource->setEnabled(false);
_file = QString::null;
if (!text.isEmpty() && text != "stdin" && text != "-") {
- KURL url;
+ KUrl url;
QString txt = _url->completionObject()->replacedPath(text);
if (QFile::exists(txt) && QFileInfo(txt).isRelative()) {
url.setPath(txt);
} else {
- url = KURL::fromPathOrURL(txt);
+ url = KUrl::fromPathOrUrl(txt);
}
if (!_inTest && !url.isLocalFile() && url.protocol() != "file" && !url.protocol().isEmpty()) {
--- branches/work/kst/portto4/kst/src/libkstapp/extensiondlg.h #638431:638432
@@ -19,7 +19,7 @@
#define EXTENSIONDIALOG_H
#include <QWidget>
-#include "ui_extensiondialog4.h"
+#include "ui_extensiondlg4.h"
class ExtensionDialog : public QWidget, public Ui::ExtensionDialog {
Q_OBJECT
--- branches/work/kst/portto4/kst/src/libkstapp/extensionmgr.h #638431:638432
@@ -18,7 +18,7 @@
#ifndef EXTENSIONMGR_H
#define EXTENSIONMGR_H
-
+#include <kservice.h>
#include <kstaticdeleter.h>
#include "kstextension.h"
--- branches/work/kst/portto4/kst/src/libkstapp/kst.cpp #638431:638432
@@ -36,7 +36,7 @@
#include <kfiledialog.h>
#include <kkeydialog.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <kmenu.h>
#include <kprinter.h>
#include <kprogress.h>
#include <kstandarddirs.h>
--- branches/work/kst/portto4/kst/src/libkstapp/kstdatacollection-gui.cpp #638431:638432
@@ -160,7 +160,7 @@
maxlen = 0;
for (KstVectorList::ConstIterator v = vl.begin(); v != vl.end(); ++v) {
(*v)->readLock();
- maxlen = KMAX(maxlen, (*v)->length());
+ maxlen = kMax(maxlen, (*v)->length());
}
} else {
for (KstVectorList::ConstIterator v = vl.begin(); v != vl.end(); ++v) {
@@ -168,7 +168,7 @@
if (maxlen == -1) {
maxlen = (*v)->length();
} else {
- maxlen = KMIN(maxlen, (*v)->length());
+ maxlen = qMin(maxlen, (*v)->length());
}
}
}
--- branches/work/kst/portto4/kst/src/libkstapp/kstgraphfiledialog.h #638431:638432
@@ -35,8 +35,8 @@
void setAutoSaveTimer(int time) {_savePeriod = time;}
int autoSaveTimer() const {return _savePeriod;}
- KURL url() const {return _url;}
- void setURL(const QString&);
+ KUrl url() const {return _url;}
+ void setUrl(const QString&);
void setFormat(const QString& format) {_format = format;}
QString format() const {return _format;}
--- branches/work/kst/portto4/kst/src/libkstapp/kstiface.h #638431:638432
@@ -17,8 +17,9 @@
#ifndef KSTIFACE_H
#define KSTIFACE_H
-#include <dcopobject.h>
-#include <dcopref.h>
+//FIXME Need to port to dbus
+// #include <dcopobject.h>
+// #include <dcopref.h>
#include <qcolor.h>
#include <qstringlist.h> //Qt 3.1.2 KDE 3.1.4
--- branches/work/kst/portto4/kst/src/libkstapp/kstmatrixdialog.cpp #638431:638432
@@ -820,11 +820,11 @@
QString type;
bool complete = false;
QString u = _w->_fileName->url();
- KURL url;
+ KUrl url;
if (QFile::exists(u) && QFileInfo(u).isRelative()) {
url.setPath(u);
} else {
- url = KURL::fromPathOrURL(u);
+ url = KUrl::fromPathOrUrl(u);
}
if (!_inTest && !url.isLocalFile() && url.protocol() != "file" && !url.protocol().isEmpty()) {
--- branches/work/kst/portto4/kst/src/libkstapp/kstvectordialog.cpp #638431:638432
@@ -146,11 +146,11 @@
QString type;
bool complete = false;
QString u = _w->FileName->url();
- KURL url;
+ KUrl url;
if (QFile::exists(u) && QFileInfo(u).isRelative()) {
url.setPath(u);
} else {
- url = KURL::fromPathOrURL(u);
+ url = KUrl::fromPathOrUrl(u);
}
if (!_inTest && !url.isLocalFile() && url.protocol() != "file" && !url.protocol().isEmpty()) {
--- branches/work/kst/portto4/kst/src/libkstapp/pluginmanager.cpp #638431:638432
@@ -63,7 +63,7 @@
void PluginManager::install() {
- KURL xmlfile = KFileDialog::getOpenURL(QString::null, "*.xml", this, i18n("Select Plugin to Install"));
+ KUrl xmlfile = KFileDialog::getOpenUrl(QString::null, "*.xml", this, i18n("Select Plugin to Install"));
if (xmlfile.isEmpty()) {
return;
@@ -89,11 +89,11 @@
}
QString path = KGlobal::dirs()->saveLocation("kstplugins");
- KURL pathURL;
+ KUrl pathURL;
pathURL.setPath(path);
// First try copying the .so file in
- KURL sofile = xmlfile;
+ KUrl sofile = xmlfile;
QString tmpSoFile = sofile.path();
tmpSoFile.replace(QRegExp(".xml$"), ".so");
sofile.setPath(tmpSoFile);
@@ -109,7 +109,7 @@
return;
}
- KURL tmpFileURL;
+ KUrl tmpFileURL;
tmpFileURL.setPath(tmpFile);
pathURL.setFileName(xmlfile.fileName());
--- branches/work/kst/portto4/kst/src/libkstapp/vectorsavedialog.cpp #638431:638432
@@ -60,7 +60,7 @@
}
KST::vectorList.lock().unlock();
- KURL url = KFileDialog::getSaveURL(QString::null, QString::null, this, i18n("Save Vector As"));
+ KUrl url = KFileDialog::getSaveUrl(QString::null, QString::null, this, i18n("Save Vector As"));
if (!url.isEmpty()) {
bool interpolate = true;
switch (_multiOptions->currentItem()) {
@@ -92,7 +92,7 @@
}
}
#if KDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
- KIO::NetAccess::file_copy(KURL(tf.name()), url, -1, true, false, this);
+ KIO::NetAccess::file_copy(KUrl(tf.name()), url, -1, true, false, this);
#else
KIO::NetAccess::upload(tf.name(), url);
@@ -103,7 +103,7 @@
case 2: {
unsigned n = 0;
for (KstVectorList::Iterator i = toSave.begin(); i != toSave.end(); ++i) {
- KURL url2 = url;
+ KUrl url2 = url;
if (toSave.count() > 1) {
url2.setFileName(url.fileName() + QString(".%1").arg(++n));
} else {
@@ -134,7 +134,7 @@
}
}
#if KDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
- KIO::NetAccess::file_copy(KURL(tf.name()), url2, -1, true, false, this);
+ KIO::NetAccess::file_copy(KUrl(tf.name()), url2, -1, true, false, this);
#else
KIO::NetAccess::upload(tf.name(), url2);
More information about the Kst
mailing list