kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

KURL--

Browse source 
svn path=/trunk/KDE/kdebase/konqueror/; revision=508560
This commit is contained in:
Laurent Montel 2006-02-12 09:33:38 +00:00
parent f9e547644a
commit 8740f39626
37 changed files with 88 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kdepasswd/kcm/chfacedlg.cpp
View file

@ -141,7 +141,7 @@ void ChFaceDlg::addCustomPixmap( QString imPath, bool saveCopy )
userfaces.mkdir( userfaces.absolutePath() );
pix.save( userfaces.absolutePath() + "/.userinfo-tmp" , "PNG" );
KonqOperations::copy( this, KonqOperations::COPY, KUrl::List( KURL( userfaces.absolutePath() + "/.userinfo-tmp" ) ), KURL( userfaces.absPath() + "/" + QFileInfo(imPath).fileName().section(".",0,0) ) );
KonqOperations::copy( this, KonqOperations::COPY, KUrl::List( KUrl( userfaces.absolutePath() + "/.userinfo-tmp" ) ), KUrl( userfaces.absPath() + "/" + QFileInfo(imPath).fileName().section(".",0,0) ) );
#if 0
if ( !pix.save( userfaces.absolutePath() + "/" + imPath , "PNG" ) )
KMessageBox::sorry(this, i18n("There was an error saving the image:\n%1").arg( userfaces.absolutePath() ) );

2
kdepasswd/kcm/main.cpp
View file

@ -326,7 +326,7 @@ inline KUrl *KCMUserAccount::decodeImgDrop(QDropEvent *e, QWidget *wdg)
if (K3URLDrag::decode(e, uris) && (uris.count() > 0))
{
KUrl *url = new KURL(uris.first());
KUrl *url = new KUrl(uris.first());
KMimeType::Ptr mime = KMimeType::findByURL( *url );
if ( mime && KImageIO::isSupported( mime->name(), KImageIO::Reading ) )

6
keditbookmarks/actionsimpl.cpp
View file

@ -370,7 +370,7 @@ void ActionsImpl::slotNewBookmark()
// TODO - make a setCurrentItem(Command *) which uses finaladdress interface
CreateCommand * cmd = new CreateCommand(
KEBApp::self()->insertAddress(),
QString(), "www", KURL("http://"));
QString(), "www", KUrl("http://"));
CmdHistory::self()->addCommand(cmd);
}
@ -425,7 +425,7 @@ void ActionsImpl::slotPrint() {
s_part->setProperty("javaScriptEnabled", QVariant(false, 1));
s_part->setProperty("javaEnabled", QVariant(false, 1));
// doc->openStream( "text/html", KURL() );
// doc->openStream( "text/html", KUrl() );
// doc->writeStream( QCString( "<HTML><BODY>FOO</BODY></HTML>" ) );
// doc->closeStream();
@ -440,7 +440,7 @@ void ActionsImpl::slotPrint() {
s_objId = s_part->property("dcopObjectId").toString().toLatin1();
connect(s_part, SIGNAL(completed()), this, SLOT(slotDelayedPrint()));
s_part->openURL(KURL( tmpf.name() ));
s_part->openURL(KUrl( tmpf.name() ));
}
void ActionsImpl::slotDelayedPrint() {

2
kfind/kfindpart.cpp
View file

@ -197,7 +197,7 @@ void KFindPart::restoreState( QDataStream& stream )
slotStarted();
for(int i=0;i<nbitems;i++)
{
KFileItem* item = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, KURL() );
KFileItem* item = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, KUrl() );
stream >> *item;
m_lstFileItems.append(item);
}

4
kfind/kftabdlg.cpp
View file

@ -578,7 +578,7 @@ void KfindTabWidget::setQuery(KQuery *query)
// only start if we have valid dates
if (!isDateValid()) return;
query->setPath(KURL(dirBox->currentText().trimmed()));
query->setPath(KUrl(dirBox->currentText().trimmed()));
for (int idx=0; idx<dirBox->count(); idx++)
if (dirBox->text(idx)==dirBox->currentText())
@ -753,7 +753,7 @@ void KfindTabWidget::getDirectory()
void KfindTabWidget::beginSearch()
{
/// dirlister->openURL(KURL(dirBox->currentText().trimmed()));
/// dirlister->openURL(KUrl(dirBox->currentText().trimmed()));
saveHistory();
setEnabled( false );

2
kfind/kquery.cpp
View file

@ -162,7 +162,7 @@ void KQuery::slotListEntries( QStringList list )
for (; it != end; ++it)
{
file = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, KURL(*it));
file = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, KUrl(*it));
processQuery(file);
delete file;
}

8
konqueror/KonquerorIface.cc
View file

@ -55,7 +55,7 @@ KonquerorIface::~KonquerorIface()
DCOPRef KonquerorIface::openBrowserWindow( const QString &url )
{
QX11Info::setAppUserTime( 0 );
KonqMainWindow *res = KonqMisc::createSimpleWindow( KURL(url) );
KonqMainWindow *res = KonqMisc::createSimpleWindow( KUrl(url) );
if ( !res )
return DCOPRef();
return res->dcopObject();
@ -81,7 +81,7 @@ DCOPRef KonquerorIface::createNewWindowASN( const QString &url, const DCOPCStrin
DCOPRef KonquerorIface::createNewWindowWithSelection( const QString &url, QStringList filesToSelect )
{
QX11Info::setAppUserTime( 0 );
KonqMainWindow *res = KonqMisc::createNewWindow( KURL(url), KParts::URLArgs(), false, filesToSelect );
KonqMainWindow *res = KonqMisc::createNewWindow( KUrl(url), KParts::URLArgs(), false, filesToSelect );
if ( !res )
return DCOPRef();
return res->dcopObject();
@ -151,7 +151,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const QString &path,
DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const QString & path, const QString &filename, const QString &url )
{
QX11Info::setAppUserTime( 0 );
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url) );
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KUrl(url) );
if ( !res )
return DCOPRef();
return res->dcopObject();
@ -169,7 +169,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const QString &pat
QX11Info::setAppUserTime( 0 );
KParts::URLArgs args;
args.serviceType = mimetype;
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url), args );
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KUrl(url), args );
if ( !res )
return DCOPRef();
return res->dcopObject();

2
konqueror/about/konq_aboutpage.cc
View file

@ -452,7 +452,7 @@ void KonqAboutPage::restoreState( QDataStream &stream )
void KonqAboutPage::serve( const QString& html, const QString& what )
{
m_what = what;
begin( KURL( QString("about:%1").arg(what) ) );
begin( KUrl( QString("about:%1").arg(what) ) );
write( html );
end();
m_htmlDoc = html;

2
konqueror/client/kfmclient.cc
View file

@ -233,7 +233,7 @@ static bool startNewKonqueror( QString url, QString mimetype, const QString& pro
mimetype = QLatin1String( "" );
}
if( mimetype.isEmpty())
mimetype = KMimeType::findByURL( KURL( url ) )->name();
mimetype = KMimeType::findByURL( KUrl( url ) )->name();
KTrader::OfferList offers = KTrader::self()->query( mimetype, QLatin1String( "KParts/ReadOnlyPart" ),
QString(), QString() );
KService::Ptr serv;

4
konqueror/iconview/konq_iconview.cc
View file

@ -782,7 +782,7 @@ void KonqKfmIconView::slotContextMenuRequested(Q3IconViewItem* _item, const QPoi
const KFileItemList::const_iterator kend = items.end();
for ( ; kit != kend; ++kit )
if ( (*kit)->url().directory( 1 ) != rootItem->url().path() )
parentDirURL = KURL();
parentDirURL = KUrl();
// If rootItem is the parent of the selected items, then we can use isWritable() on it.
if ( !parentDirURL.isEmpty() && !rootItem->isWritable() )
popupFlags |= KParts::BrowserExtension::NoDeletion;
@ -1513,7 +1513,7 @@ void SpringLoadingManager::finished()
kDebug() << "SpringLoadManager::finished()" << endl;
KUrl url = m_startURL;
m_startURL = KURL();
m_startURL = KUrl();
KParts::ReadOnlyPart *part = m_startPart;
m_startPart = 0L;

6
konqueror/konq_main.cc
View file

@ -76,7 +76,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
{
QString className = KMainWindow::classNameOfToplevel( n );
if( className == QLatin1String( "KonqMainWindow" ))
(new KonqMainWindow( KURL(), false ) )->restore( n );
(new KonqMainWindow( KUrl(), false ) )->restore( n );
else
kWarning() << "Unknown class " << className << " in session saved data!" << endl;
n++;
@ -135,7 +135,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
if( !ref.callExt( "registerPreloadedKonqy", DCOPRef::NoEventLoop, 5000,
app.dcopClient()->appId(), info.screen()))
return 0; // too many preloaded or failed
KonqMainWindow* win = new KonqMainWindow( KURL(), false ); // prepare an empty window too
KonqMainWindow* win = new KonqMainWindow( KUrl(), false ); // prepare an empty window too
// KonqMainWindow ctor sets always the preloaded flag to false, so create the window before this
KonqMainWindow::setPreloadedFlag( true );
KonqMainWindow::setPreloadedWindow( win );
@ -174,7 +174,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
if (url.isLocalFile() && QFile::exists(url.path())) // "konqueror index.html"
urlToOpen = url;
else
urlToOpen = KURL( KonqMisc::konqFilteredURL(0L, QString::fromLocal8Bit(args->arg(i))) ); // "konqueror slashdot.org"
urlToOpen = KUrl( KonqMisc::konqFilteredURL(0L, QString::fromLocal8Bit(args->arg(i))) ); // "konqueror slashdot.org"
if ( !mainwin ) {
KParts::URLArgs urlargs;

38
konqueror/konq_mainwindow.cc
View file

@ -652,7 +652,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KUrl &_url,
bool KonqMainWindow::openView( QString serviceType, const KUrl &_url, KonqView *childView, KonqOpenURLRequest& req )
{
// Second argument is referring URL
if ( !KAuthorized::authorizeURLAction("open", childView ? childView->url() : KURL(), _url) )
if ( !KAuthorized::authorizeURLAction("open", childView ? childView->url() : KUrl(), _url) )
{
QString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, _url.prettyURL());
KMessageBox::queuedMessageBox( this, KMessageBox::Error, msg );
@ -779,7 +779,7 @@ bool KonqMainWindow::openView( QString serviceType, const KUrl &_url, KonqView *
( ( indexFile = findIndexFile( url.path() ) ) != QString() ) )
{
serviceType = "text/html";
url = KURL();
url = KUrl();
url.setPath( indexFile );
serviceName.clear(); // cancel what we just set, this is not a dir finally
}
@ -1137,14 +1137,14 @@ void KonqMainWindow::slotCreateNewWindow( const KUrl &url, const KParts::URLArgs
if (newtabsinfront)
m_pViewManager->showTab( newView );
openURL( newView, url.isEmpty() ? KURL("about:blank") : url, QString());
openURL( newView, url.isEmpty() ? KUrl("about:blank") : url, QString());
newView->setViewName( args.frameName );
part=newView->part();
return;
}
mainWindow = new KonqMainWindow( KURL(), false );
mainWindow = new KonqMainWindow( KUrl(), false );
mainWindow->setInitialFrameName( args.frameName );
mainWindow->resetAutoSaveSettings(); // Don't autosave
@ -1294,7 +1294,7 @@ void KonqMainWindow::slotDuplicateWindow()
config.setGroup( "View Profile" );
m_pViewManager->saveViewProfile( config, true, true );
KonqMainWindow *mainWindow = new KonqMainWindow( KURL(), false, 0, xmlFile());
KonqMainWindow *mainWindow = new KonqMainWindow( KUrl(), false, 0, xmlFile());
mainWindow->viewManager()->loadViewProfile( config, m_pViewManager->currentProfile() );
if (mainWindow->currentView())
{
@ -1661,7 +1661,7 @@ void KonqMainWindow::showHTML( KonqView * _view, bool b, bool _activateView )
// This has to be done before calling openView since it relies on it
if ( m_bSaveViewPropertiesLocally )
{
KUrl u ( b ? _view->url() : KURL( _view->url().directory() ) );
KUrl u ( b ? _view->url() : KUrl( _view->url().directory() ) );
u.addPath(".directory");
if ( u.isLocalFile() )
{
@ -1822,27 +1822,27 @@ void KonqMainWindow::slotHome()
void KonqMainWindow::slotGoSystem()
{
openURL( 0L, KURL( "system:/" ) );
openURL( 0L, KUrl( "system:/" ) );
}
void KonqMainWindow::slotGoApplications()
{
openURL( 0L, KURL( "programs:/" ) );
openURL( 0L, KUrl( "programs:/" ) );
}
void KonqMainWindow::slotGoMedia()
{
openURL( 0L, KURL( "media:/" ) );
openURL( 0L, KUrl( "media:/" ) );
}
void KonqMainWindow::slotGoNetworkFolders()
{
openURL( 0L, KURL( "remote:/" ) );
openURL( 0L, KUrl( "remote:/" ) );
}
void KonqMainWindow::slotGoSettings()
{
openURL( 0L, KURL( "settings:/" ) );
openURL( 0L, KUrl( "settings:/" ) );
}
void KonqMainWindow::slotGoDirTree()
@ -1854,7 +1854,7 @@ void KonqMainWindow::slotGoDirTree()
void KonqMainWindow::slotGoTrash()
{
openURL( 0L, KURL( "trash:/" ) );
openURL( 0L, KUrl( "trash:/" ) );
}
void KonqMainWindow::slotGoAutostart()
@ -2538,7 +2538,7 @@ void KonqMainWindow::slotFileNewAboutToShow()
// As requested by KNewMenu :
m_pMenuNew->slotCheckUpToDate();
// And set the files that the menu apply on :
m_pMenuNew->setPopupFiles( KURL( m_currentView->url().url() ) );
m_pMenuNew->setPopupFiles( KUrl( m_currentView->url().url() ) );
}
void KonqMainWindow::slotSplitViewHorizontal()
@ -2562,7 +2562,7 @@ void KonqMainWindow::slotAddTab()
false,
KonqSettings::openAfterCurrentPage());
if (newView == 0L) return;
openURL( newView, KURL("about:blank"),QString());
openURL( newView, KUrl("about:blank"),QString());
m_pViewManager->showTab( newView );
focusLocationBar();
m_pWorkingTab = 0L;
@ -4073,7 +4073,7 @@ void KonqMainWindow::updateToolBarActions( bool pendingAction /*=false*/)
m_ptaUseHTML->setEnabled( true );
else if ( m_currentView->serviceTypes().contains( "text/html" ) ) {
// Currently viewing an index.html file via this feature (i.e. url points to a dir)
QString locPath = KURL( m_currentView->locationBarURL() ).path();
QString locPath = KUrl( m_currentView->locationBarURL() ).path();
m_ptaUseHTML->setEnabled( QFileInfo( locPath ).isDir() );
} else
m_ptaUseHTML->setEnabled( false );
@ -4349,7 +4349,7 @@ void KonqMainWindow::enableAllActions( bool enable )
// So the code below is where actions that should initially be disabled are disabled.
if (enable)
{
setUpEnabled( m_currentView ? m_currentView->url() : KURL() );
setUpEnabled( m_currentView ? m_currentView->url() : KUrl() );
// we surely don't have any history buffers at this time
m_paBack->setEnabled( false );
m_paForward->setEnabled( false );
@ -4608,7 +4608,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
}
else
{
m_popupURL = KURL();
m_popupURL = KUrl();
m_popupServiceType.clear();
}
@ -4633,7 +4633,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
// (This is a bit of a hack for the directory tree....)
// ## should use the new currentView->isHierarchicalView() instead?
// Would this be correct for the konqlistview tree view?
KUrl viewURL = currentView->isToggleView() ? KURL() : currentView->url();
KUrl viewURL = currentView->isToggleView() ? KUrl() : currentView->url();
bool openedForViewURL = false;
//bool dirsSelected = false;
@ -5241,7 +5241,7 @@ void KonqMainWindow::setIcon( const QPixmap& pix )
void KonqMainWindow::slotIntro()
{
openURL( 0L, KURL("about:konqueror") );
openURL( 0L, KUrl("about:konqueror") );
}
void KonqMainWindow::goURL()

2
konqueror/konq_mainwindow.h
View file

@ -108,7 +108,7 @@ public:
enum ComboAction { ComboClear, ComboAdd, ComboRemove };
enum PageSecurity { NotCrypted, Encrypted, Mixed };
KonqMainWindow( const KUrl &initialURL = KURL(), bool openInitialURL = true, const char *name = 0, const QString& xmluiFile="konqueror.rc");
KonqMainWindow( const KUrl &initialURL = KUrl(), bool openInitialURL = true, const char *name = 0, const QString& xmluiFile="konqueror.rc");
~KonqMainWindow();

6
konqueror/konq_misc.cc
View file

@ -79,7 +79,7 @@ KonqMainWindow * KonqMisc::createSimpleWindow( const KUrl & _url, const QString
else
url = _url;
KonqMainWindow *win = new KonqMainWindow( KURL(), false );
KonqMainWindow *win = new KonqMainWindow( KUrl(), false );
win->setInitialFrameName( frameName );
win->openURL( 0L, url );
win->show();
@ -94,7 +94,7 @@ KonqMainWindow * KonqMisc::createSimpleWindow( const KUrl & url, const KParts::U
KonqOpenURLRequest req;
req.args = args;
req.tempFile = tempFile;
KonqMainWindow *win = new KonqMainWindow( KURL(), false );
KonqMainWindow *win = new KonqMainWindow( KUrl(), false );
win->openURL( 0L, url, QString(), req );
win->show();
@ -153,7 +153,7 @@ KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const QString &path,
cfg.setGroup( "Profile" );
QString xmluiFile=cfg.readEntry("XMLUIFile","konqueror.rc");
mainWindow = new KonqMainWindow( KURL(), false, 0, xmluiFile );
mainWindow = new KonqMainWindow( KUrl(), false, 0, xmluiFile );
if ( forbidUseHTML )
mainWindow->setShowHTML( false );
KonqOpenURLRequest req;

2
konqueror/konq_misc.h
View file

@ -86,7 +86,7 @@ public:
*/
static KonqMainWindow * createBrowserWindowFromProfile( const QString &path,
const QString &filename,
const KUrl &url = KURL(),
const KUrl &url = KUrl(),
const KParts::URLArgs &args = KParts::URLArgs(),
bool forbidUseHTML = false,
const QStringList& filesToSelect = QStringList(),

2
konqueror/konq_view.cc
View file

@ -662,7 +662,7 @@ void KonqView::setIconURL( const KUrl & iconURL )
{
if ( KonqSettings::enableFavicon() )
{
KonqPixmapProvider::setIconForURL( KURL( m_sLocationBarURL ), iconURL );
KonqPixmapProvider::setIconForURL( KUrl( m_sLocationBarURL ), iconURL );
m_bGotIconURL = true;
}
}

4
konqueror/konq_viewmgr.cc
View file

@ -436,7 +436,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag
// from profile loading (e.g. in switchView)
m_bLoadingProfile = true;
loadItem( config, tabContainer, rootItem, KURL(""), true, openAfterCurrentPage );
loadItem( config, tabContainer, rootItem, KUrl(""), true, openAfterCurrentPage );
m_bLoadingProfile = false;
@ -499,7 +499,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab )
config.writeEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), true );
currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1);
KonqMainWindow *mainWindow = new KonqMainWindow( KURL(), false );
KonqMainWindow *mainWindow = new KonqMainWindow( KUrl(), false );
if (mainWindow == 0L) return;
mainWindow->viewManager()->loadViewProfile( config, "" );

4
konqueror/konq_viewmgr.h
View file

@ -201,7 +201,7 @@ public:
* settings, they will be reset to the defaults
*/
void loadViewProfile( KConfig &cfg, const QString & filename,
const KUrl & forcedURL = KURL(),
const KUrl & forcedURL = KUrl(),
const KonqOpenURLRequest &req = KonqOpenURLRequest(),
bool resetWindow = false, bool openURL = true );
@ -216,7 +216,7 @@ public:
* settings, they will be reset to the defaults
*/
void loadViewProfile( const QString & path, const QString & filename,
const KUrl & forcedURL = KURL(),
const KUrl & forcedURL = KUrl(),
const KonqOpenURLRequest &req = KonqOpenURLRequest(),
bool resetWindow = false, bool openURL = true );
/**

2
konqueror/settings/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
View file

@ -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;
}

2
konqueror/settings/ebrowsing/plugins/ikws/kurisearchfilter.cpp
View file

@ -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;
}

2
konqueror/settings/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
View file

@ -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;

16
konqueror/settings/ebrowsing/plugins/shorturi/kshorturifilter.cpp
View file

@ -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.

6
konqueror/settings/konq/rootopts.cpp
View file

@ -195,11 +195,11 @@ void DesktopPathConfig::save()
if ( newAutostartURL.equals( futureAutostartURL, true ) )
autostartMoved = true;
else
autostartMoved = moveDir( KURL( KGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
autostartMoved = moveDir( KUrl( KGlobalSettings::autostartPath() ), KUrl( urAutostart->url() ), i18n("Autostart") );
}
}
if ( moveDir( KURL( KGlobalSettings::desktopPath() ), KURL( urlDesktop ), i18n("Desktop") ) )
if ( moveDir( KUrl( KGlobalSettings::desktopPath() ), KUrl( urlDesktop ), i18n("Desktop") ) )
{
configGroup.writePathEntry( "Desktop", urlDesktop, KConfigBase::Normal | KConfigBase::Global );
pathChanged = true;
@ -209,7 +209,7 @@ void DesktopPathConfig::save()
if ( !newAutostartURL.equals( autostartURL, true ) )
{
if (!autostartMoved)
autostartMoved = moveDir( KURL( KGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
autostartMoved = moveDir( KUrl( KGlobalSettings::autostartPath() ), KUrl( urAutostart->url() ), i18n("Autostart") );
if (autostartMoved)
{
// configGroup.writeEntry( "Autostart", Autostart->url());

6
konqueror/sidebar/sidebar_widget.cpp
View file

@ -115,7 +115,7 @@ void addBackEnd::doRollBack()
dirEntries.remove("..");
for ( QStringList::Iterator it = dirEntries.begin(); it != dirEntries.end(); ++it ) {
if ((*it)!="add")
KIO::NetAccess::del(KURL( loc+(*it) ), m_parent);
KIO::NetAccess::del(KUrl( loc+(*it) ), m_parent);
}
emit initialCopyNeeded();
}
@ -1057,7 +1057,7 @@ KParts::URLArgs args;
args.postData = formData;
args.setDoPost(QByteArray(action).toLower() == "post");
// boundary?
emit getExtension()->openURLRequest(KURL( url ), args);
emit getExtension()->openURLRequest(KUrl( url ), args);
}
void Sidebar_Widget::openURLRequest( const KUrl &url, const KParts::URLArgs &args)
@ -1223,7 +1223,7 @@ void Sidebar_Widget::customEvent(QCustomEvent* ev)
emit fileSelection(static_cast<KonqFileSelectionEvent*>(ev)->selection());
} else if (KonqFileMouseOverEvent::test(ev)) {
if (!(static_cast<KonqFileMouseOverEvent*>(ev)->item())) {
emit fileMouseOver(KFileItem(KURL(),QString(),KFileItem::Unknown));
emit fileMouseOver(KFileItem(KUrl(),QString(),KFileItem::Unknown));
} else {
emit fileMouseOver(*static_cast<KonqFileMouseOverEvent*>(ev)->item());
}

2
konqueror/sidebar/trees/bookmark_module/bookmark_item.cpp
View file

@ -58,7 +58,7 @@ void KonqSidebarBookmarkItem::del()
KUrl KonqSidebarBookmarkItem::externalURL() const
{
return m_bk.isGroup() ? KURL() : m_bk.url();
return m_bk.isGroup() ? KUrl() : m_bk.url();
}
QString KonqSidebarBookmarkItem::toolTipText() const

2
konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
View file

@ -593,7 +593,7 @@ void KonqSidebarDirTreeModule::slotListingStopped( const KUrl & url )
if ( !m_selectAfterOpening.isEmpty() && url.isParentOf( m_selectAfterOpening ) )
{
KUrl theURL( m_selectAfterOpening );
m_selectAfterOpening = KURL();
m_selectAfterOpening = KUrl();
followURL( theURL );
}
}

2
konqueror/sidebar/trees/history_module/history_item.h
View file

@ -98,7 +98,7 @@ public:
// we don't support the following of KonqSidebarTreeItem
bool acceptsDrops( const QStrList& ) { return false; }
virtual void drop( QDropEvent * ) {}
virtual KUrl externalURL() const { return KURL(); }
virtual KUrl externalURL() const { return KUrl(); }
private:
bool m_hasFavIcon;

4
konqueror/sidebar/web_module/web_module.cpp
View file

@ -121,13 +121,13 @@ void KonqSideBarWebModule::handleURL(const KUrl &) {
void KonqSideBarWebModule::urlNewWindow(const QString& url, KParts::URLArgs args)
{
emit createNewWindow(KURL(url), args);
emit createNewWindow(KUrl(url), args);
}
void KonqSideBarWebModule::urlClicked(const QString& url, KParts::URLArgs args)
{
emit openURLRequest(KURL(url), args);
emit openURLRequest(KUrl(url), args);
}

4
lib/konq/favicons/favicons.cpp
View file

@ -102,7 +102,7 @@ QString FaviconsModule::iconForURL(const KUrl &url)
icon = d->config->readEntry( removeSlash(simplifiedURL), QString() );
if (!icon.isEmpty())
icon = iconNameFromURL(KURL( icon ));
icon = iconNameFromURL(KUrl( icon ));
else
icon = url.host();
@ -174,7 +174,7 @@ void FaviconsModule::downloadHostIcon(const KUrl &url)
if (!isIconOld(iconFile))
return;
startDownload(url.host(), true, KURL(url, "/favicon.ico"));
startDownload(url.host(), true, KUrl(url, "/favicon.ico"));
}
void FaviconsModule::startDownload(const QString &hostOrURL, bool isHost, const KUrl &iconURL)

6
lib/konq/knewmenu.cc
View file

@ -159,7 +159,7 @@ void KNewMenu::parseFiles()
if ( templatePath[0] != '/' )
{
if ( templatePath.startsWith("file:/") )
templatePath = KURL(templatePath).path();
templatePath = KUrl(templatePath).path();
else
{
// A relative path, then (that's the default in the files we ship)
@ -182,7 +182,7 @@ void KNewMenu::parseFiles()
}
if (text.isEmpty())
{
text = KURL(filePath).fileName();
text = KUrl(filePath).fileName();
if ( text.endsWith(".desktop") )
text.truncate( text.length() - 8 );
else if ( text.endsWith(".kdelnk") )
@ -507,7 +507,7 @@ void KNewMenu::slotResult( KIO::Job * job )
// But in case of a renaming (due to a conflict), the real path is in m_destPath
kDebug(1203) << " destURL=" << destURL.path() << " " << " d->m_destPath=" << d->m_destPath << endl;
KDesktopFile df( d->m_destPath );
df.writeEntry( "Icon", KProtocolInfo::icon( KURL(m_linkURL).protocol() ) );
df.writeEntry( "Icon", KProtocolInfo::icon( KUrl(m_linkURL).protocol() ) );
df.writePathEntry( "URL", m_linkURL );
df.sync();
}

2
lib/konq/konq_bgnddlg.cc
View file

@ -145,7 +145,7 @@ void KonqBgndDialog::initPictures()
for ( it = list.begin(); it != list.end(); it++ )
m_comboPicture->comboBox()->insertItem(
( (*it).at(0) == '/' ) ? // if absolute path
KURL( *it ).fileName() : // then only fileName
KUrl( *it ).fileName() : // then only fileName
*it );
}
}

2
lib/konq/konq_dirpart.cc
View file

@ -312,7 +312,7 @@ void KonqDirPart::lmbClicked( KFileItem * fileItem )
args.trustedSource = true;
if ( fileItem->isLink() && fileItem->isLocalFile() ) // see KFileItem::run
url = KURL( url, KUrl::encode_string( fileItem->linkDest() ) );
url = KUrl( url, KUrl::encode_string( fileItem->linkDest() ) );
if (KonqFMSettings::settings()->alwaysNewWin() && fileItem->isDir()) {
//args.frameName = "_blank"; // open new window

2
lib/konq/konq_faviconmgr.cc
View file

@ -36,7 +36,7 @@ KonqFavIconMgr::KonqFavIconMgr(QObject *parent, const char *name)
QString KonqFavIconMgr::iconForURL(const QString &url)
{
return KMimeType::favIconForURL( KURL(url) );
return KMimeType::favIconForURL( KUrl(url) );
}
void KonqFavIconMgr::setIconForURL(const KUrl &url, const KUrl &iconURL)

4
lib/konq/konq_operations.cc
View file

@ -107,7 +107,7 @@ void KonqOperations::del( QWidget * parent, int method, const KUrl::List & selec
void KonqOperations::emptyTrash()
{
KonqOperations *op = new KonqOperations( 0L );
op->_del( EMPTYTRASH, KURL("trash:/"), SKIP_CONFIRMATION );
op->_del( EMPTYTRASH, KUrl("trash:/"), SKIP_CONFIRMATION );
}
void KonqOperations::restoreTrashedItems( const KUrl::List& urls )
@ -121,7 +121,7 @@ void KonqOperations::mkdir( QWidget *parent, const KUrl & url )
KIO::Job * job = KIO::mkdir( url );
KonqOperations * op = new KonqOperations( parent );
op->setOperation( job, MKDIR, KUrl::List(), url );
(void) new KonqCommandRecorder( KonqCommand::MKDIR, KURL(), url, job ); // no support yet, apparently
(void) new KonqCommandRecorder( KonqCommand::MKDIR, KUrl(), url, job ); // no support yet, apparently
}
void KonqOperations::doPaste( QWidget * parent, const KUrl & destURL )

2
nsplugins/plugin_part.cpp
View file

@ -401,7 +401,7 @@ void PluginPart::pluginResized(int w, int h)
void PluginPart::changeSrc(const QString& url) {
closeURL();
openURL(KURL( url ));
openURL(KUrl( url ));
}

2
nsplugins/pluginscan.cpp
View file

@ -517,7 +517,7 @@ void removeExistingExtensions( QString &extension )
if ( ext == "*" ) // some plugins have that, but we don't want to associate a mimetype with *.*!
continue;
KMimeType::Ptr mime = KMimeType::findByURL( KURL("file:///foo."+ext ),
KMimeType::Ptr mime = KMimeType::findByURL( KUrl("file:///foo."+ext ),
0, true, true );
if( mime->name()=="application/octet-stream" ||
mime->comment().left(8)=="Netscape" ) {

10
nsplugins/viewer/nsplugin.cpp
View file

@ -769,7 +769,7 @@ void NSPluginInstance::timer()
KUrl bu( _baseURL );
KUrl absUrl( bu, req.url );
url = absUrl.url();
} else if ( req.url[0]=='/' && KURL(_baseURL).hasHost() ) {
} else if ( req.url[0]=='/' && KUrl(_baseURL).hasHost() ) {
KUrl absUrl( _baseURL );
absUrl.setPath( req.url );
url = absUrl.url();
@ -1542,10 +1542,10 @@ void NSPluginStreamBase::inform()
if ( _streamType==NP_ASFILE || _streamType==NP_ASFILEONLY ) {
_onlyAsFile = _streamType==NP_ASFILEONLY;
if ( KURL(_url).isLocalFile() ) {
if ( KUrl(_url).isLocalFile() ) {
kDebug(1431) << "local file" << endl;
// local file can be passed directly
_fileURL = KURL(_url).path();
_fileURL = KUrl(_url).path();
// without streaming stream is finished already
if ( _onlyAsFile ) {
@ -1805,7 +1805,7 @@ bool NSPluginStream::get( const QString& url, const QString& mimeType,
// create new stream
if ( create( url, mimeType, notify ) ) {
// start the kio job
_job = KIO::get(KURL( url ), false, false);
_job = KIO::get(KUrl( url ), false, false);
_job->addMetaData("errorPage", "false");
_job->addMetaData("AllowCompressedPage", "false");
if (reload) {
@ -1830,7 +1830,7 @@ bool NSPluginStream::post( const QString& url, const QByteArray& data,
// create new stream
if ( create( url, mimeType, notify ) ) {
// start the kio job
_job = KIO::http_post(KURL( url ), data, false);
_job = KIO::http_post(KUrl( url ), data, false);
_job->addMetaData("content-type", args.contentType());
_job->addMetaData("errorPage", "false");
_job->addMetaData("AllowCompressedPage", "false");