Commit 31dca055 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

KURL--

svn path=/trunk/KDE/kdebase/kioslave/; revision=508560
parent 981027f6
......@@ -146,11 +146,11 @@ void FilterProtocol::get( const KUrl & )
if (bError)
{
error(KIO::ERR_COULD_NOT_READ, subURL.url());
subURL = KURL(); // Clear subURL
subURL = KUrl(); // Clear subURL
return;
}
subURL = KURL(); // Clear subURL
subURL = KUrl(); // Clear subURL
finished();
}
......
......@@ -229,7 +229,7 @@ void FingerProtocol::getProgramPath()
void FingerProtocol::parseCommandLine(const KUrl& url)
{
myURL = new KURL(url);
myURL = new KUrl(url);
/*
* Generate a valid finger url
......
......@@ -927,7 +927,7 @@ void fishProtocol::manageConnection(const QString &l) {
// By default, the mimetype comes from the extension
// We'll use the file(1) result only as fallback [like the rest of KDE does]
{
KMimeType::Ptr mime = KMimeType::findByURL( KURL("fish://host/" + thisFn) );
KMimeType::Ptr mime = KMimeType::findByURL( KUrl("fish://host/" + thisFn) );
if ( mime->name() != KMimeType::defaultMimeType() )
udsMime = mime->name();
}
......
......@@ -93,8 +93,8 @@ KUrl HomeDirNotify::toHomeURL(const KUrl &url)
}
}
kDebug() << "result => KURL()" << endl;
return KURL();
kDebug() << "result => KUrl()" << endl;
return KUrl();
}
KUrl::List HomeDirNotify::toHomeURLList(const KUrl::List &list)
......
......@@ -180,7 +180,7 @@ void InfoProtocol::decodeURL( const KUrl &url )
* luis pedro
*/
if ( url == KURL( "info:/browse_by_file?special=yes" ) ) {
if ( url == KUrl( "info:/browse_by_file?special=yes" ) ) {
m_page = "#special#";
m_node = "browse_by_file";
kDebug( 7108 ) << "InfoProtocol::decodeURL - special - browse by file" << endl;
......
......@@ -70,7 +70,7 @@ bool KAutoWebSearch::filterURI( KURIFilterData &data ) const
if ( KURISearchFilterEngine::self()->verbose() )
kDebug () << "Filtered URL: " << result << endl;
setFilteredURI( data, KURL( result ) );
setFilteredURI( data, KUrl( result ) );
setURIType( data, KURIFilterData::NET_PROTOCOL );
return true;
}
......
......@@ -69,7 +69,7 @@ bool KURISearchFilter::filterURI( KURIFilterData &data ) const
if ( KURISearchFilterEngine::self()->verbose() )
kDebug() << "Filtered URL: " << result << endl;
setFilteredURI( data, KURL( result ) );
setFilteredURI( data, KUrl( result ) );
setURIType( data, KURIFilterData::NET_PROTOCOL );
return true;
}
......
......@@ -57,7 +57,7 @@ bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const
isLocalDomainHost( cmd ) )
{
cmd.prepend( QLatin1String("http://") );
setFilteredURI( data, KURL( cmd ) );
setFilteredURI( data, KUrl( cmd ) );
setURIType( data, KURIFilterData::NET_PROTOCOL );
kDebug() << "FilteredURI: " << data.uri() << endl;
......
......@@ -177,7 +177,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
const QString starthere_proto = QFL1("start-here:");
if (cmd.find(starthere_proto, 0, true) == 0 )
{
setFilteredURI( data, KURL("system:/") );
setFilteredURI( data, KUrl("system:/") );
setURIType( data, KURIFilterData::LOCAL_DIR );
return true;
}
......@@ -197,7 +197,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
else if ((cmd==info_proto) || (cmd==man_proto))
cmd+='/';
setFilteredURI( data, KURL( cmd ));
setFilteredURI( data, KUrl( cmd ));
setURIType( data, KURIFilterData::HELP );
return true;
}
......@@ -208,7 +208,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
// make sure path is unix style
cmd.replace('\\', '/');
cmd.prepend( QLatin1String( "smb:" ) );
setFilteredURI( data, KURL( cmd ));
setFilteredURI( data, KUrl( cmd ));
setURIType( data, KURIFilterData::NET_PROTOCOL );
return true;
}
......@@ -372,7 +372,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
u.setRef(ref);
u.setQuery(query);
if (!KAuthorized::authorizeURLAction( QLatin1String("open"), KURL(), u))
if (!KAuthorized::authorizeURLAction( QLatin1String("open"), KUrl(), u))
{
// No authorisation, we pretend it's a file will get
// an access denied error later on.
......@@ -415,7 +415,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
if( !KStandardDirs::findExe( exe ).isNull() && data.checkForExecutables() )
{
//kDebug() << "EXECUTABLE exe=" << exe << endl;
setFilteredURI( data, KURL( exe ));
setFilteredURI( data, KUrl( exe ));
// check if we have command line arguments
if( exe != cmd )
setArguments(data, cmd.right(cmd.length() - exe.length()));
......@@ -456,7 +456,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
{
//kDebug() << "match - prepending " << (*it).prepend << endl;
cmd.prepend( (*it).prepend );
setFilteredURI( data, KURL( cmd ) );
setFilteredURI( data, KUrl( cmd ) );
setURIType( data, (*it).type );
return true;
}
......@@ -471,7 +471,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
<< m_strDefaultProtocol << endl;
cmd.insert( 0, m_strDefaultProtocol );
setFilteredURI( data, KURL( cmd ));
setFilteredURI( data, KUrl( cmd ));
setURIType( data, KURIFilterData::NET_PROTOCOL );
return true;
}
......@@ -485,7 +485,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
u.setPath(path);
u.setRef(ref);
if (!KAuthorized::authorizeURLAction( QLatin1String("open"), KURL(), u))
if (!KAuthorized::authorizeURLAction( QLatin1String("open"), KUrl(), u))
{
// No authorisation, we pretend it exists and will get
// an access denied error later on.
......
......@@ -206,11 +206,11 @@ KUrl Medium::prettyBaseURL() const
{
if ( isMountable() )
{
return KURL( mountPoint() );
return KUrl( mountPoint() );
}
else
{
return KURL( baseURL() );
return KUrl( baseURL() );
}
}
......
......@@ -585,7 +585,7 @@ void HALBackend::setCameraProperties(Medium* medium)
QString HALBackend::generateName(const QString &devNode)
{
return KURL(devNode).fileName();
return KUrl(devNode).fileName();
}
/******************************************
......
......@@ -207,7 +207,7 @@ void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name,
kDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl;
KDirNotify_stub notifier("*", "*");
notifier.FilesAdded( KURL("media:/") );
notifier.FilesAdded( KUrl("media:/") );
emit mediumAdded(name, allowNotification);
}
......@@ -218,7 +218,7 @@ void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name,
kDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl;
KDirNotify_stub notifier("*", "*");
notifier.FilesRemoved( KURL("media:/"+name) );
notifier.FilesRemoved( KUrl("media:/"+name) );
emit mediumRemoved(name, allowNotification);
}
......@@ -231,9 +231,9 @@ void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name,
KDirNotify_stub notifier("*", "*");
if (!mounted)
{
notifier.FilesRemoved( KURL("media:/"+name) );
notifier.FilesRemoved( KUrl("media:/"+name) );
}
notifier.FilesChanged( KURL("media:/"+name) );
notifier.FilesChanged( KUrl("media:/"+name) );
emit mediumChanged(name, allowNotification);
}
......
......@@ -174,7 +174,7 @@ QString RemovableBackend::generateId(const QString &devNode)
QString RemovableBackend::generateName(const QString &devNode)
{
return KURL(devNode).fileName();
return KUrl(devNode).fileName();
}
#include "removablebackend.moc"
......@@ -49,8 +49,8 @@ KUrl RemoteDirNotify::toRemoteURL(const KUrl &url)
return result;
}
kDebug(1220) << "result => KURL()" << endl;
return KURL();
kDebug(1220) << "result => KUrl()" << endl;
return KUrl();
}
KUrl::List RemoteDirNotify::toRemoteURLList(const KUrl::List &list)
......
......@@ -144,7 +144,7 @@ KUrl RemoteImpl::findBaseURL(const QString &filename) const
return desktop.readURL();
}
return KURL();
return KUrl();
}
......@@ -199,7 +199,7 @@ bool RemoteImpl::createWizardEntry(KIO::UDSEntry &entry) const
bool RemoteImpl::isWizardURL(const KUrl &url) const
{
return url==KURL(WIZARD_URL);
return url==KUrl(WIZARD_URL);
}
......
......@@ -77,7 +77,7 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share,
QString s_password = QString::fromUtf8(password);
KIO::AuthInfo info;
info.url = KURL("smb:///");
info.url = KUrl("smb:///");
info.url.setHost(s_server);
info.url.setPath("/" + s_share);
......@@ -114,7 +114,7 @@ bool SMBSlave::checkPassword(SMBUrl &url)
kDebug(KIO_SMB) << "checkPassword for " << url << endl;
KIO::AuthInfo info;
info.url = KURL("smb:///");
info.url = KUrl("smb:///");
info.url.setHost(url.host());
QString share = url.path();
......
......@@ -176,8 +176,8 @@ KUrl SMBSlave::checkURL(const KUrl& kurl) const
if (surl.at(5) != '/') {
surl = "smb://" + surl.mid(5);
kDebug(KIO_SMB) << "checkURL return1 " << surl << " " << KURL(surl) << endl;
return KURL(surl);
kDebug(KIO_SMB) << "checkURL return1 " << surl << " " << KUrl(surl) << endl;
return KUrl(surl);
}
}
......
......@@ -49,7 +49,7 @@ SMBUrl::SMBUrl()
//-----------------------------------------------------------------------
SMBUrl::SMBUrl(const KUrl& kurl)
: KURL(kurl)
: KUrl(kurl)
//-----------------------------------------------------------------------
{
updateCache();
......
......@@ -108,8 +108,8 @@ KUrl SystemDirNotify::toSystemURL(const KUrl &url)
}
}
kDebug() << "KURL()" << endl;
return KURL();
kDebug() << "KUrl()" << endl;
return KUrl();
}
KUrl::List SystemDirNotify::toSystemURLList(const KUrl::List &list)
......@@ -141,7 +141,7 @@ ASYNC SystemDirNotify::FilesAdded(const KUrl &directory)
{
KDirNotify_stub notifier("*", "*");
notifier.FilesAdded( new_dir );
if (new_dir.upURL().upURL()==KURL("system:/"))
if (new_dir.upURL().upURL()==KUrl("system:/"))
{
notifier.FilesChanged( new_dir.upURL() );
}
......@@ -162,7 +162,7 @@ ASYNC SystemDirNotify::FilesRemoved(const KUrl::List &fileList)
for (; it!=end; ++it)
{
if ((*it).upURL().upURL()==KURL("system:/"))
if ((*it).upURL().upURL()==KUrl("system:/"))
{
notifier.FilesChanged( (*it).upURL() );
}
......
......@@ -181,7 +181,7 @@ KUrl SystemImpl::findBaseURL(const QString &filename) const
}
}
return KURL();
return KUrl();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment