[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] kio/kio: Port job.h to QUrl.
From:       David Faure <faure () kde ! org>
Date:       2012-04-30 20:00:24
Message-ID: 20120430200024.EA9CCA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit bb37fef6083ff9f5efd621f7174249e97361b3c3 by David Faure.
Committed on 30/04/2012 at 22:01.
Pushed by dfaure into branch 'frameworks'.

Port job.h to QUrl.

M  +1    -1    kio/kio/filejob.cpp
M  +28   -28   kio/kio/job.cpp
M  +32   -32   kio/kio/job.h
M  +1    -1    kio/kio/mkdirjob.cpp

http://commits.kde.org/kdelibs/bb37fef6083ff9f5efd621f7174249e97361b3c3

diff --git a/kio/kio/filejob.cpp b/kio/kio/filejob.cpp
index bab45ab..ece6530 100644
--- a/kio/kio/filejob.cpp
+++ b/kio/kio/filejob.cpp
@@ -208,7 +208,7 @@ void FileJobPrivate::start(Slave *slave)
     SimpleJobPrivate::start(slave);
 }
 
-FileJob *KIO::open(const KUrl &url, QIODevice::OpenMode mode)
+FileJob *KIO::open(const QUrl &url, QIODevice::OpenMode mode)
 {
     // Send decoded path and encoded query
     KIO_ARGS << url << mode;
diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp
index d4281ea..3f3bfe6 100644
--- a/kio/kio/job.cpp
+++ b/kio/kio/job.cpp
@@ -583,48 +583,48 @@ void SimpleJob::storeSSLSessionFromJob(const KUrl \
&redirectionURL)  
 
 //////////
-SimpleJob *KIO::rmdir( const KUrl& url )
+SimpleJob *KIO::rmdir( const QUrl& url )
 {
     //kDebug(7007) << "rmdir " << url;
     KIO_ARGS << url << qint8(false); // isFile is false
     return SimpleJobPrivate::newJob(url, CMD_DEL, packedArgs);
 }
 
-SimpleJob *KIO::chmod( const KUrl& url, int permissions )
+SimpleJob *KIO::chmod( const QUrl& url, int permissions )
 {
     //kDebug(7007) << "chmod " << url;
     KIO_ARGS << url << permissions;
     return SimpleJobPrivate::newJob(url, CMD_CHMOD, packedArgs);
 }
 
-SimpleJob *KIO::chown( const KUrl& url, const QString& owner, const QString& group )
+SimpleJob *KIO::chown( const QUrl& url, const QString& owner, const QString& group )
 {
     KIO_ARGS << url << owner << group;
     return SimpleJobPrivate::newJob(url, CMD_CHOWN, packedArgs);
 }
 
-SimpleJob *KIO::setModificationTime( const KUrl& url, const QDateTime& mtime )
+SimpleJob *KIO::setModificationTime( const QUrl& url, const QDateTime& mtime )
 {
     //kDebug(7007) << "setModificationTime " << url << " " << mtime;
     KIO_ARGS << url << mtime;
     return SimpleJobPrivate::newJobNoUi(url, CMD_SETMODIFICATIONTIME, packedArgs);
 }
 
-SimpleJob *KIO::rename( const KUrl& src, const KUrl & dest, JobFlags flags )
+SimpleJob *KIO::rename( const QUrl& src, const QUrl & dest, JobFlags flags )
 {
     //kDebug(7007) << "rename " << src << " " << dest;
     KIO_ARGS << src << dest << (qint8) (flags & Overwrite);
     return SimpleJobPrivate::newJob(src, CMD_RENAME, packedArgs);
 }
 
-SimpleJob *KIO::symlink( const QString& target, const KUrl & dest, JobFlags flags )
+SimpleJob *KIO::symlink( const QString& target, const QUrl & dest, JobFlags flags )
 {
     //kDebug(7007) << "symlink target=" << target << " " << dest;
     KIO_ARGS << target << dest << (qint8) (flags & Overwrite);
     return SimpleJobPrivate::newJob(dest, CMD_SYMLINK, packedArgs, flags);
 }
 
-SimpleJob *KIO::special(const KUrl& url, const QByteArray & data, JobFlags flags)
+SimpleJob *KIO::special(const QUrl& url, const QByteArray & data, JobFlags flags)
 {
     //kDebug(7007) << "special " << url;
     return SimpleJobPrivate::newJob(url, CMD_SPECIAL, data, flags);
@@ -807,13 +807,13 @@ void StatJob::slotMetaData( const KIO::MetaData &_metaData)
     storeSSLSessionFromJob(d->m_redirectionURL);
 }
 
-StatJob *KIO::stat(const KUrl& url, JobFlags flags)
+StatJob *KIO::stat(const QUrl& url, JobFlags flags)
 {
     // Assume sideIsSource. Gets are more common than puts.
     return stat( url, StatJob::SourceSide, 2, flags );
 }
 
-StatJob *KIO::mostLocalUrl(const KUrl& url, JobFlags flags)
+StatJob *KIO::mostLocalUrl(const QUrl& url, JobFlags flags)
 {
     StatJob* job = stat( url, StatJob::SourceSide, 2, flags );
     if (url.isLocalFile()) {
@@ -824,7 +824,7 @@ StatJob *KIO::mostLocalUrl(const KUrl& url, JobFlags flags)
 }
 
 #ifndef KDE_NO_DEPRECATED
-StatJob *KIO::stat(const KUrl& url, bool sideIsSource, short int details, JobFlags \
flags ) +StatJob *KIO::stat(const QUrl& url, bool sideIsSource, short int details, \
JobFlags flags )  {
     //kDebug(7007) << "stat" << url;
     KIO_ARGS << url;
@@ -835,7 +835,7 @@ StatJob *KIO::stat(const KUrl& url, bool sideIsSource, short int \
details, JobFla  }
 #endif
 
-StatJob *KIO::stat(const KUrl& url, KIO::StatJob::StatSide side, short int details, \
JobFlags flags ) +StatJob *KIO::stat(const QUrl& url, KIO::StatJob::StatSide side, \
short int details, JobFlags flags )  {
     //kDebug(7007) << "stat" << url;
     KIO_ARGS << url;
@@ -845,7 +845,7 @@ StatJob *KIO::stat(const KUrl& url, KIO::StatJob::StatSide side, \
short int detai  return job;
 }
 
-SimpleJob *KIO::http_update_cache( const KUrl& url, bool no_cache, time_t \
expireDate) +SimpleJob *KIO::http_update_cache( const QUrl& url, bool no_cache, \
time_t expireDate)  {
     Q_ASSERT(url.scheme() == "http" || url.scheme() == "https");
     // Send http update_cache command (2)
@@ -1241,7 +1241,7 @@ void TransferJob::setModificationTime( const QDateTime& mtime )
     addMetaData( "modified", mtime.toString( Qt::ISODate ) );
 }
 
-TransferJob *KIO::get( const KUrl& url, LoadType reload, JobFlags flags )
+TransferJob *KIO::get( const QUrl& url, LoadType reload, JobFlags flags )
 {
     // Send decoded path and encoded query
     KIO_ARGS << url;
@@ -1469,7 +1469,7 @@ static KIO::PostErrorJob* precheckHttpPost(const QUrl& url, \
const QByteArray& po  return 0;
 }
 
-TransferJob *KIO::http_post( const KUrl& url, const QByteArray &postData, JobFlags \
flags ) +TransferJob *KIO::http_post( const QUrl& url, const QByteArray &postData, \
JobFlags flags )  {
     bool redirection = false;
     KUrl _url(url);
@@ -1493,7 +1493,7 @@ TransferJob *KIO::http_post( const KUrl& url, const QByteArray \
&postData, JobFla  return job;
 }
 
-TransferJob *KIO::http_post( const KUrl& url, QIODevice* ioDevice, qint64 size, \
JobFlags flags ) +TransferJob *KIO::http_post( const QUrl& url, QIODevice* ioDevice, \
qint64 size, JobFlags flags )  {
     bool redirection = false;
     KUrl _url(url);
@@ -1523,7 +1523,7 @@ TransferJob *KIO::http_post( const KUrl& url, QIODevice* \
ioDevice, qint64 size,  return job;
 }
 
-TransferJob* KIO::http_delete(const KUrl& url, JobFlags flags)
+TransferJob* KIO::http_delete(const QUrl& url, JobFlags flags)
 {
     // Send decoded path and encoded query
     KIO_ARGS << url;
@@ -1532,7 +1532,7 @@ TransferJob* KIO::http_delete(const KUrl& url, JobFlags flags)
     return job;
 }
 
-StoredTransferJob *KIO::storedHttpPost( const QByteArray& postData, const KUrl& url, \
JobFlags flags ) +StoredTransferJob *KIO::storedHttpPost( const QByteArray& postData, \
const QUrl& url, JobFlags flags )  {
     KUrl _url(url);
     if (_url.path().isEmpty())
@@ -1550,7 +1550,7 @@ StoredTransferJob *KIO::storedHttpPost( const QByteArray& \
postData, const KUrl&  return job;
 }
 
-StoredTransferJob *KIO::storedHttpPost( QIODevice* ioDevice, const KUrl& url, qint64 \
size, JobFlags flags ) +StoredTransferJob *KIO::storedHttpPost( QIODevice* ioDevice, \
const QUrl& url, qint64 size, JobFlags flags )  {
     KUrl _url(url);
     if (_url.path().isEmpty())
@@ -1586,7 +1586,7 @@ void TransferJobPrivate::slotPostRedirection()
 }
 
 
-TransferJob *KIO::put( const KUrl& url, int permissions, JobFlags flags )
+TransferJob *KIO::put( const QUrl& url, int permissions, JobFlags flags )
 {
     KIO_ARGS << url << qint8( (flags & Overwrite) ? 1 : 0 ) << qint8( (flags & \
                Resume) ? 1 : 0 ) << permissions;
     return TransferJobPrivate::newJob(url, CMD_PUT, packedArgs, QByteArray(), \
flags); @@ -1652,7 +1652,7 @@ void StoredTransferJobPrivate::slotStoredDataReq( \
KIO::Job *, QByteArray &data )  }
 }
 
-StoredTransferJob *KIO::storedGet( const KUrl& url, LoadType reload, JobFlags flags \
) +StoredTransferJob *KIO::storedGet( const QUrl& url, LoadType reload, JobFlags \
flags )  {
     // Send decoded path and encoded query
     KIO_ARGS << url;
@@ -1662,7 +1662,7 @@ StoredTransferJob *KIO::storedGet( const KUrl& url, LoadType \
reload, JobFlags fl  return job;
 }
 
-StoredTransferJob *KIO::storedPut( const QByteArray& arr, const KUrl& url, int \
permissions, +StoredTransferJob *KIO::storedPut( const QByteArray& arr, const QUrl& \
url, int permissions,  JobFlags flags )
 {
     KIO_ARGS << url << qint8( (flags & Overwrite) ? 1 : 0 ) << qint8( (flags & \
Resume) ? 1 : 0 ) << permissions; @@ -1742,7 +1742,7 @@ void \
MimetypeJob::slotFinished( )  TransferJob::slotFinished();
 }
 
-MimetypeJob *KIO::mimetype(const KUrl& url, JobFlags flags)
+MimetypeJob *KIO::mimetype(const QUrl& url, JobFlags flags)
 {
     KIO_ARGS << url;
     return MimetypeJobPrivate::newJob(url, CMD_MIMETYPE, packedArgs, flags);
@@ -2353,19 +2353,19 @@ void FileCopyJob::slotResult( KJob *job)
        emitResult();
 }
 
-FileCopyJob *KIO::file_copy( const KUrl& src, const KUrl& dest, int permissions,
+FileCopyJob *KIO::file_copy( const QUrl& src, const QUrl& dest, int permissions,
                              JobFlags flags )
 {
     return FileCopyJobPrivate::newJob(src, dest, permissions, false, flags);
 }
 
-FileCopyJob *KIO::file_move( const KUrl& src, const KUrl& dest, int permissions,
+FileCopyJob *KIO::file_move( const QUrl& src, const QUrl& dest, int permissions,
                              JobFlags flags )
 {
     return FileCopyJobPrivate::newJob(src, dest, permissions, true, flags);
 }
 
-SimpleJob *KIO::file_delete( const KUrl& src, JobFlags flags )
+SimpleJob *KIO::file_delete( const QUrl& src, JobFlags flags )
 {
     KIO_ARGS << src << qint8(true); // isFile
     return SimpleJobPrivate::newJob(src, CMD_DEL, packedArgs, flags);
@@ -2584,12 +2584,12 @@ void ListJob::slotMetaData( const KIO::MetaData &_metaData)
     storeSSLSessionFromJob(d->m_redirectionURL);
 }
 
-ListJob *KIO::listDir( const KUrl& url, JobFlags flags, bool includeHidden )
+ListJob *KIO::listDir( const QUrl& url, JobFlags flags, bool includeHidden )
 {
     return ListJobPrivate::newJob(url, false, QString(), includeHidden, flags);
 }
 
-ListJob *KIO::listRecursive( const KUrl& url, JobFlags flags, bool includeHidden )
+ListJob *KIO::listRecursive( const QUrl& url, JobFlags flags, bool includeHidden )
 {
     return ListJobPrivate::newJob(url, true, QString(), includeHidden, flags);
 }
@@ -2854,7 +2854,7 @@ void MultiGetJob::slotMimetype( const QString &_mimetype )
   emit mimetype(d->m_currentEntry.id, _mimetype);
 }
 
-MultiGetJob *KIO::multi_get(long id, const KUrl &url, const MetaData &metaData)
+MultiGetJob *KIO::multi_get(long id, const QUrl &url, const MetaData &metaData)
 {
     MultiGetJob * job = MultiGetJobPrivate::newJob(url);
     job->get(id, url, metaData);
diff --git a/kio/kio/job.h b/kio/kio/job.h
index d25083f..b76e4ff 100644
--- a/kio/kio/job.h
+++ b/kio/kio/job.h
@@ -42,7 +42,7 @@ namespace KIO {
      *                    directory (unix-style), -1 for default permissions.
      * @return A pointer to the job handling the operation.
      */
-    KIO_EXPORT MkdirJob * mkdir(const KUrl& url, int permissions = -1);
+    KIO_EXPORT MkdirJob * mkdir(const QUrl& url, int permissions = -1);
 
     /**
      * Removes a single directory.
@@ -54,7 +54,7 @@ namespace KIO {
      * @param url The URL of the directory to remove.
      * @return A pointer to the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * rmdir( const KUrl& url );
+    KIO_EXPORT SimpleJob * rmdir( const QUrl& url );
 
     /**
      * Changes permissions on a file or directory.
@@ -65,7 +65,7 @@ namespace KIO {
      * @param permissions The permissions to set.
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * chmod( const KUrl& url, int permissions );
+    KIO_EXPORT SimpleJob * chmod( const QUrl& url, int permissions );
 
     /**
      * Changes ownership and group of a file or directory.
@@ -75,7 +75,7 @@ namespace KIO {
      * @param group the new group
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * chown( const KUrl& url, const QString& owner, const \
QString& group ); +    KIO_EXPORT SimpleJob * chown( const QUrl& url, const QString& \
owner, const QString& group );  
     /**
      * Changes the modification time on a file or directory.
@@ -84,7 +84,7 @@ namespace KIO {
      * @param permissions The permissions to set.
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob *setModificationTime( const KUrl& url, const QDateTime& \
mtime ); +    KIO_EXPORT SimpleJob *setModificationTime( const QUrl& url, const \
QDateTime& mtime );  
 
     /**
@@ -98,7 +98,7 @@ namespace KIO {
      * @param flags Can be Overwrite here
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * rename( const KUrl& src, const KUrl & dest, JobFlags \
flags = DefaultFlags ); +    KIO_EXPORT SimpleJob * rename( const QUrl& src, const \
QUrl & dest, JobFlags flags = DefaultFlags );  
     /**
      * Create or move a symlink.
@@ -110,7 +110,7 @@ namespace KIO {
      * @param flags Can be Overwrite and HideProgressInfo
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * symlink( const QString & target, const KUrl& dest, \
JobFlags flags = DefaultFlags ); +    KIO_EXPORT SimpleJob * symlink( const QString & \
target, const QUrl& dest, JobFlags flags = DefaultFlags );  
     /**
      * Execute any command that is specific to one slave (protocol).
@@ -124,7 +124,7 @@ namespace KIO {
      * @param flags Can be HideProgressInfo here
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * special( const KUrl& url, const QByteArray & data, \
JobFlags flags = DefaultFlags ); +    KIO_EXPORT SimpleJob * special( const QUrl& \
url, const QByteArray & data, JobFlags flags = DefaultFlags );  
     /**
      * Mount filesystem.
@@ -160,7 +160,7 @@ namespace KIO {
      * supposed to expire.
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob *http_update_cache( const KUrl& url, bool no_cache, time_t \
expireDate); +    KIO_EXPORT SimpleJob *http_update_cache( const QUrl& url, bool \
no_cache, time_t expireDate);  
     /**
      * Find all details for one file or directory.
@@ -169,7 +169,7 @@ namespace KIO {
      * @param flags Can be HideProgressInfo here
      * @return the job handling the operation.
      */
-    KIO_EXPORT StatJob * stat( const KUrl& url, JobFlags flags = DefaultFlags );
+    KIO_EXPORT StatJob * stat( const QUrl& url, JobFlags flags = DefaultFlags );
     /**
      * Find all details for one file or directory.
      * This version of the call includes two additional booleans, @p sideIsSource \
and @p details. @@ -197,7 +197,7 @@ namespace KIO {
      * @param flags Can be HideProgressInfo here
      * @return the job handling the operation.
      */
-    KIO_EXPORT StatJob * stat( const KUrl& url, KIO::StatJob::StatSide side,
+    KIO_EXPORT StatJob * stat( const QUrl& url, KIO::StatJob::StatSide side,
                                short int details, JobFlags flags = DefaultFlags );
     /**
      * Find all details for one file or directory.
@@ -227,7 +227,7 @@ namespace KIO {
      * @return the job handling the operation.
      */
 #ifndef KDE_NO_DEPRECATED
-    KIO_DEPRECATED_EXPORT StatJob * stat( const KUrl& url, bool sideIsSource,
+    KIO_DEPRECATED_EXPORT StatJob * stat( const QUrl& url, bool sideIsSource,
                                           short int details, JobFlags flags = \
DefaultFlags );  #endif
 
@@ -253,7 +253,7 @@ namespace KIO {
      * @param flags Can be HideProgressInfo here
      * @return the job handling the operation.
      */
-    KIO_EXPORT TransferJob *get( const KUrl& url, LoadType reload = NoReload, \
JobFlags flags = DefaultFlags ); +    KIO_EXPORT TransferJob *get( const QUrl& url, \
LoadType reload = NoReload, JobFlags flags = DefaultFlags );  
     /**
      * Open ( random access I/O )
@@ -265,7 +265,7 @@ namespace KIO {
      * @return The file-handling job. It will never return 0. Errors are handled \
                asynchronously
      * (emitted as signals).
      */
-    KIO_EXPORT FileJob *open(const KUrl &url, QIODevice::OpenMode mode);
+    KIO_EXPORT FileJob *open(const QUrl &url, QIODevice::OpenMode mode);
 
     /**
      * Put (a.k.a. write)
@@ -277,7 +277,7 @@ namespace KIO {
      * @return the job handling the operation.
      * @see multi_get()
      */
-    KIO_EXPORT TransferJob *put( const KUrl& url, int permissions,
+    KIO_EXPORT TransferJob *put( const QUrl& url, int permissions,
                                  JobFlags flags = DefaultFlags );
 
     /**
@@ -308,7 +308,7 @@ namespace KIO {
      * @param flags Can be HideProgressInfo here
      * @return the job handling the operation.
      */
-    KIO_EXPORT TransferJob *http_post( const KUrl& url, const QByteArray &postData,
+    KIO_EXPORT TransferJob *http_post( const QUrl& url, const QByteArray &postData,
                                        JobFlags flags = DefaultFlags );
 
     /**
@@ -327,7 +327,7 @@ namespace KIO {
      *
      * @since 4.7
      */
-    KIO_EXPORT TransferJob *http_post( const KUrl& url, QIODevice* device,
+    KIO_EXPORT TransferJob *http_post( const QUrl& url, QIODevice* device,
                                        qint64 size = -1, JobFlags flags = \
DefaultFlags );  
     /**
@@ -342,7 +342,7 @@ namespace KIO {
      *
      * @since 4.7.3
      */
-    KIO_EXPORT TransferJob *http_delete( const KUrl& url, JobFlags flags = \
DefaultFlags ); +    KIO_EXPORT TransferJob *http_delete( const QUrl& url, JobFlags \
flags = DefaultFlags );  
     /**
      * Get (a.k.a. read), into a single QByteArray.
@@ -353,7 +353,7 @@ namespace KIO {
      * @param flags Can be HideProgressInfo here
      * @return the job handling the operation.
      */
-    KIO_EXPORT StoredTransferJob *storedGet( const KUrl& url, LoadType reload = \
NoReload, JobFlags flags = DefaultFlags ); +    KIO_EXPORT StoredTransferJob \
*storedGet( const QUrl& url, LoadType reload = NoReload, JobFlags flags = \
DefaultFlags );  
     /**
      * Put (a.k.a. write) data from a single QByteArray.
@@ -366,7 +366,7 @@ namespace KIO {
      * Setting Resume means that the data will be appended to @p dest if @p dest \
                exists.
      * @return the job handling the operation.
      */
-    KIO_EXPORT StoredTransferJob *storedPut( const QByteArray& arr, const KUrl& url, \
int permissions, +    KIO_EXPORT StoredTransferJob *storedPut( const QByteArray& arr, \
                const QUrl& url, int permissions,
                                              JobFlags flags = DefaultFlags );
 
     /**
@@ -379,7 +379,7 @@ namespace KIO {
      * @return the job handling the operation.
      * @since 4.2
      */
-    KIO_EXPORT StoredTransferJob *storedHttpPost( const QByteArray& arr, const KUrl& \
url, +    KIO_EXPORT StoredTransferJob *storedHttpPost( const QByteArray& arr, const \
                QUrl& url,
                                                   JobFlags flags = DefaultFlags );
     /**
      * HTTP POST (a.k.a. write) data from the given IO device.
@@ -393,7 +393,7 @@ namespace KIO {
      *
      * @since 4.7
      */
-    KIO_EXPORT StoredTransferJob *storedHttpPost( QIODevice* device, const KUrl& \
url, +    KIO_EXPORT StoredTransferJob *storedHttpPost( QIODevice* device, const \
                QUrl& url,
                                                   qint64 size = -1, JobFlags flags = \
DefaultFlags );  
     /**
@@ -406,7 +406,7 @@ namespace KIO {
      * @return the job handling the operation.
      * @see get()
      */
-    KIO_EXPORT MultiGetJob *multi_get( long id, const KUrl &url, const MetaData \
&metaData); +    KIO_EXPORT MultiGetJob *multi_get( long id, const QUrl &url, const \
MetaData &metaData);  
     /**
      * Find mimetype for one file or directory.
@@ -419,7 +419,7 @@ namespace KIO {
      * @param flags Can be HideProgressInfo here
      * @return the job handling the operation.
      */
-    KIO_EXPORT MimetypeJob * mimetype( const KUrl& url,
+    KIO_EXPORT MimetypeJob * mimetype( const QUrl& url,
                                        JobFlags flags = DefaultFlags );
 
     /**
@@ -434,7 +434,7 @@ namespace KIO {
      * Setting Resume means that the data will be appended to @p dest if @p dest \
                exists.
      * @return the job handling the operation.
      */
-    KIO_EXPORT FileCopyJob *file_copy( const KUrl& src, const KUrl& dest, int \
permissions=-1, +    KIO_EXPORT FileCopyJob *file_copy( const QUrl& src, const QUrl& \
dest, int permissions=-1,  JobFlags flags = DefaultFlags );
 
     /**
@@ -442,7 +442,7 @@ namespace KIO {
      * insert a value for permissions (-1 by default) before the JobFlags.
      * @since 4.5
      */
-    FileCopyJob *file_copy( const KUrl& src, const KUrl& dest, JobFlags flags ); // \
not implemented - on purpose. +    FileCopyJob *file_copy( const QUrl& src, const \
QUrl& dest, JobFlags flags ); // not implemented - on purpose.  
     /**
      * Move a single file.
@@ -456,7 +456,7 @@ namespace KIO {
      * Setting Resume means that the data will be appended to @p dest if @p dest \
                exists.
      * @return the job handling the operation.
      */
-    KIO_EXPORT FileCopyJob *file_move( const KUrl& src, const KUrl& dest, int \
permissions=-1, +    KIO_EXPORT FileCopyJob *file_move( const QUrl& src, const QUrl& \
dest, int permissions=-1,  JobFlags flags = DefaultFlags );
 
     /**
@@ -464,7 +464,7 @@ namespace KIO {
      * insert a value for permissions (-1 by default) before the JobFlags.
      * @since 4.3
      */
-    FileCopyJob *file_move( const KUrl& src, const KUrl& dest, JobFlags flags ); // \
not implemented - on purpose. +    FileCopyJob *file_move( const QUrl& src, const \
QUrl& dest, JobFlags flags ); // not implemented - on purpose.  
 
     /**
@@ -474,7 +474,7 @@ namespace KIO {
      * @param flags Can be HideProgressInfo here
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob *file_delete( const KUrl& src, JobFlags flags = \
DefaultFlags ); +    KIO_EXPORT SimpleJob *file_delete( const QUrl& src, JobFlags \
flags = DefaultFlags );  
     /**
      * List the contents of @p url, which is assumed to be a directory.
@@ -488,7 +488,7 @@ namespace KIO {
      *                      files/dirs (whose names start with dot)
      * @return the job handling the operation.
      */
-    KIO_EXPORT ListJob *listDir( const KUrl& url, JobFlags flags = DefaultFlags,
+    KIO_EXPORT ListJob *listDir( const QUrl& url, JobFlags flags = DefaultFlags,
                                  bool includeHidden = true );
 
     /**
@@ -504,7 +504,7 @@ namespace KIO {
      *                      files/dirs (whose names start with dot)
      * @return the job handling the operation.
      */
-    KIO_EXPORT ListJob *listRecursive( const KUrl& url, JobFlags flags = \
DefaultFlags, +    KIO_EXPORT ListJob *listRecursive( const QUrl& url, JobFlags flags \
= DefaultFlags,  bool includeHidden = true );
 
     /**
@@ -515,7 +515,7 @@ namespace KIO {
      * @param url The URL we are testing.
      * \since 4.4
      */
-    KIO_EXPORT StatJob* mostLocalUrl(const KUrl& url, JobFlags flags = \
DefaultFlags); +    KIO_EXPORT StatJob* mostLocalUrl(const QUrl& url, JobFlags flags \
= DefaultFlags);  
 }
 
diff --git a/kio/kio/mkdirjob.cpp b/kio/kio/mkdirjob.cpp
index d41217e..bbdf3b7 100644
--- a/kio/kio/mkdirjob.cpp
+++ b/kio/kio/mkdirjob.cpp
@@ -123,7 +123,7 @@ void MkdirJob::slotFinished()
     SimpleJob::slotFinished();
 }
 
-KIO::MkdirJob *KIO::mkdir(const KUrl& url, int permissions)
+KIO::MkdirJob *KIO::mkdir(const QUrl& url, int permissions)
 {
     //kDebug(7007) << "mkdir " << url;
     KIO_ARGS << url << permissions;


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic