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

replaced several URLs with Url and URI with Uri - the patch

Browse source 
became a bit larger than expected, so I couldn't have the time
to check if it still compiles with the changes done in between

svn path=/trunk/KDE/kdebase/kdepasswd/; revision=578269
This commit is contained in:
Stephan Kulow 2006-08-28 19:59:39 +00:00
parent 4148c9164f
commit dc7710ecfa
37 changed files with 120 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
kdepasswd/kcm/main.cpp
View file

@ -53,7 +53,7 @@
#include "pass.h"
#include "chfnprocess.h"
#include "chfacedlg.h"
#include "main.h"
#include "main.h"
typedef KGenericFactory<KCMUserAccount, QWidget> Factory;
K_EXPORT_COMPONENT_FACTORY( kcm_useraccount, Factory("useraccount") )
@ -68,7 +68,7 @@ KCMUserAccount::KCMUserAccount( QWidget *parent, const QStringList &)
connect( _mw->btnChangeFace, SIGNAL(clicked()), SLOT(slotFaceButtonClicked()));
connect( _mw->btnChangePassword, SIGNAL(clicked()), SLOT(slotChangePassword()));
_mw->btnChangePassword->setGuiItem( KGuiItem( i18n("Change &Password..."), "password" ));
connect( _mw->leRealname, SIGNAL(textChanged(const QString&)), SLOT(changed()));
connect( _mw->leOrganization, SIGNAL(textChanged(const QString&)), SLOT(changed()));
connect( _mw->leEmail, SIGNAL(textChanged(const QString&)), SLOT(changed()));
@ -80,7 +80,7 @@ KCMUserAccount::KCMUserAccount( QWidget *parent, const QStringList &)
_mw->lblUsername->setText( _ku->loginName() );
_mw->lblUID->setText( QString().number(_ku->uid()) );
KAboutData *about = new KAboutData(I18N_NOOP("kcm_useraccount"),
KAboutData *about = new KAboutData(I18N_NOOP("kcm_useraccount"),
I18N_NOOP("Password & User Information"), 0, 0,
KAboutData::License_GPL,
I18N_NOOP("(C) 2002, Braden MacDonald, "
@ -91,7 +91,7 @@ KCMUserAccount::KCMUserAccount( QWidget *parent, const QStringList &)
about->addAuthor("Michael H\303\244ckel", "haeckel@kde.org" );
about->addAuthor("Braden MacDonald", I18N_NOOP("Face editor"), "bradenm_k@shaw.ca");
about->addAuthor("Geert Jansen", I18N_NOOP("Password changer"), "jansen@kde.org",
about->addAuthor("Geert Jansen", I18N_NOOP("Password changer"), "jansen@kde.org",
"http://www.stack.nl/~geertj/");
about->addAuthor("Daniel Molkentin");
about->addAuthor("Alex Zepeda");
@ -147,7 +147,7 @@ void KCMUserAccount::load()
_mw->leOrganization->setText( _kes->getSetting( KEMailSettings::Organization ));
_mw->leSMTP->setText( _kes->getSetting( KEMailSettings::OutServer ));
QString _userPicsDir = KCFGUserAccount::faceDir() +
QString _userPicsDir = KCFGUserAccount::faceDir() +
KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/";
QString fs = KCFGUserAccount::faceSource();
@ -214,7 +214,7 @@ void KCMUserAccount::save()
int ret = KPasswordDialog::getPassword( _mw, password, i18n("Please enter "
"your password in order to save your settings:"));
if ( !ret )
if ( !ret )
{
KMessageBox::sorry( this, i18n("You must enter "
"your password in order to change your information."));
@ -228,22 +228,22 @@ void KCMUserAccount::save()
if ( ret == ChfnProcess::PasswordError )
KMessageBox::sorry( this, i18n("You must enter a correct password."));
else
else
{
KMessageBox::sorry( this, i18n("An error occurred and your password has "
"probably not been changed. The error "
"message was:\n%1", QString::fromLocal8Bit(proc->error())));
kDebug() << "ChfnProcess->exec() failed. Error code: " << ret
kDebug() << "ChfnProcess->exec() failed. Error code: " << ret
<< "\nOutput:" << proc->error() << endl;
}
}
}
}
delete proc;
}
}
/* Save the image */
if( !_facePixmap.save( KCFGUserAccount::faceFile(), "PNG" ))
KMessageBox::error( this, i18n("There was an error saving the image: %1" ,
KMessageBox::error( this, i18n("There was an error saving the image: %1" ,
KCFGUserAccount::faceFile()) );
}
@ -282,7 +282,7 @@ void KCMUserAccount::slotFaceButtonClicked()
/**
* I merged faceButtonDropEvent into this /Frans
* The function was called after checking event type and
* The function was called after checking event type and
* the code is now below that if statement
*/
bool KCMUserAccount::eventFilter(QObject *, QEvent *e)
@ -328,7 +328,7 @@ inline KUrl *KCMUserAccount::decodeImgDrop(QDropEvent *e, QWidget *wdg)
{
KUrl *url = new KUrl(uris.first());
KMimeType::Ptr mime = KMimeType::findByURL( *url );
KMimeType::Ptr mime = KMimeType::findByUrl( *url );
if ( mime && KImageIO::isSupported( mime->name(), KImageIO::Reading ) )
return url;

2
keditbookmarks/actionsimpl.cpp
View file

@ -448,7 +448,7 @@ void ActionsImpl::slotPrint() {
#endif
connect(s_part, SIGNAL(completed()), this, SLOT(slotDelayedPrint()));
s_part->openURL(KUrl( tmpf.name() ));
s_part->openUrl(KUrl( tmpf.name() ));
}
void ActionsImpl::slotDelayedPrint() {

6
keditbookmarks/updater.cpp
View file

@ -49,7 +49,7 @@ void FavIconUpdater::slotCompleted() {
}
void FavIconUpdater::downloadIcon(const KBookmark &bk) {
QString favicon = KMimeType::favIconForURL(bk.url().url());
QString favicon = KMimeType::favIconForUrl(bk.url().url());
if (!favicon.isNull()) {
// kDebug() << "downloadIcon() - favicon" << favicon << endl;
bk.internalElement().setAttribute("icon", favicon);
@ -59,7 +59,7 @@ void FavIconUpdater::downloadIcon(const KBookmark &bk) {
} else {
KonqFavIconMgr::downloadHostIcon(bk.url());
favicon = KMimeType::favIconForURL(bk.url().url());
favicon = KMimeType::favIconForUrl(bk.url().url());
// kDebug() << "favicon == " << favicon << endl;
if (favicon.isNull()) {
downloadIconActual(bk);
@ -150,7 +150,7 @@ void FavIconWebGrabber::slotMimetype(KIO::Job *job, const QString & /*type*/) {
// kDebug() << "slotMimetype : " << typeLocal << endl;
// TODO - what to do if typeLocal is not text/html ??
m_part->openURL(m_url);
m_part->openUrl(m_url);
}
void FavIconWebGrabber::slotFinished(KJob *job) {

2
kfind/kfind.cpp
View file

@ -108,7 +108,7 @@ void Kfind::startSearch()
tabWidget->beginSearch();
dirlister->openURL(KUrl(tabWidget->dirBox->currentText().trimmed()));
dirlister->openUrl(KUrl(tabWidget->dirBox->currentText().trimmed()));
query->start();
}

8
konqueror/about/konq_aboutpage.cc
View file

@ -470,25 +470,25 @@ void KonqAboutPage::urlSelected( const QString &url, int button, int state, cons
if ( url == QLatin1String("launch.html") )
{
emit browserExtension()->openURLNotify();
emit browserExtension()->openUrlNotify();
serve( KonqAboutPageFactory::launch(), "konqueror" );
return;
}
else if ( url == QLatin1String("intro.html") )
{
emit browserExtension()->openURLNotify();
emit browserExtension()->openUrlNotify();
serve( KonqAboutPageFactory::intro(), "konqueror" );
return;
}
else if ( url == QLatin1String("specs.html") )
{
emit browserExtension()->openURLNotify();
emit browserExtension()->openUrlNotify();
serve( KonqAboutPageFactory::specs(), "konqueror" );
return;
}
else if ( url == QLatin1String("tips.html") )
{
emit browserExtension()->openURLNotify();
emit browserExtension()->openUrlNotify();
serve( KonqAboutPageFactory::tips(), "konqueror" );
return;
}

2
konqueror/client/kfmclient.cpp
View file

@ -187,7 +187,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();
KService::List offers = KMimeTypeTrader::self()->query( mimetype, QLatin1String( "KParts/ReadOnlyPart" ) );
KService::Ptr serv;
if( offers.count() > 0 )

10
konqueror/dirpart/konq_part.cc
View file

@ -65,7 +65,7 @@ KonqPart::KonqPart( QWidget* parentWidget, QObject* parent, const QStringList& a
m_model->setItemColor( color );
setWidget( m_view );
m_dirLister->setMainWindow( widget()->topLevelWidget() );
m_fileTip->setOptions( settings->showFileTips(), settings->showPreviewsInFileTips(), settings->numFileTips() );
@ -126,7 +126,7 @@ bool KonqPart::doOpenURL( const KUrl& url )
emit setWindowCaption( url.pathOrUrl() );
KParts::URLArgs args = extension()->urlArgs();
m_dirLister->openURL( url, false, args.reload );
m_dirLister->openUrl( url, false, args.reload );
return true;
}
@ -162,10 +162,10 @@ void KonqPart::slotContextMenu( const QPoint& pos, const QModelIndexList& indexe
void KonqPart::slotUpdateActions()
{
bool canDelete = true;
QModelIndexList indexes = static_cast<KonqListView*>(m_view)->selectedIndexes(); // ### FIXME
foreach ( QModelIndex index, indexes ) {
// ### TODO
// ### TODO
}
emit extension()->enableAction( "copy", !indexes.isEmpty() );
emit extension()->enableAction( "cut", canDelete );
@ -174,7 +174,7 @@ void KonqPart::slotUpdateActions()
emit extension()->enableAction( "properties", !indexes.isEmpty() );
emit extension()->enableAction( "editMimeType", indexes.count() == 1 );
emit extension()->enableAction( "rename", indexes.count() == 1 );
}
void KonqPart::slotPreview( const KFileItem* item, const QPixmap& pixmap )

16
konqueror/iconview/konq_iconview.cc
View file

@ -1184,9 +1184,9 @@ void KonqKfmIconView::slotClear()
void KonqKfmIconView::slotRedirection( const KUrl & url )
{
const QString prettyURL = url.pathOrUrl();
emit m_extension->setLocationBarURL( prettyURL );
emit m_extension->setLocationBarUrl( prettyURL );
emit setWindowCaption( prettyURL );
m_pIconView->setURL( url );
m_pIconView->setUrl( url );
m_url = url;
}
@ -1258,7 +1258,7 @@ void KonqKfmIconView::slotRefreshViewport()
bool KonqKfmIconView::doOpenURL( const KUrl & url )
{
// Store url in the icon view
m_pIconView->setURL( url );
m_pIconView->setUrl( url );
m_bLoading = true;
m_bNeedSetCurrentItem = true;
@ -1279,7 +1279,7 @@ bool KonqKfmIconView::doOpenURL( const KUrl & url )
{
args.xOffset = m_pIconView->contentsX();
args.yOffset = m_pIconView->contentsY();
m_extension->setURLArgs( args );
m_extension->setUrlArgs( args );
m_filesToSelect.clear();
const KFileItemList selItems = selectedFileItems();
@ -1299,7 +1299,7 @@ bool KonqKfmIconView::doOpenURL( const KUrl & url )
m_paOutstandingOverlays.clear();
// Start the directory lister !
m_dirLister->openURL( url, false, args.reload );
m_dirLister->openUrl( url, false, args.reload );
// View properties (icon size, background, ..) will be applied into slotClear()
// if m_bDirPropertiesChanged is set. If so, here we update preview actions.
@ -1487,9 +1487,9 @@ void SpringLoadingManager::springLoadTrigger(KonqKfmIconView *view,
// Open the folder URL, we don't want to modify the browser
// history, hence the use of openURL and setLocationBarURL
view->openURL(url);
view->openUrl(url);
const QString prettyURL = url.pathOrUrl();
emit view->extension()->setLocationBarURL( prettyURL );
emit view->extension()->setLocationBarUrl( prettyURL );
}
void SpringLoadingManager::dragLeft(KonqKfmIconView */*view*/)
@ -1533,7 +1533,7 @@ void SpringLoadingManager::finished()
KonqKfmIconView *view = static_cast<KonqKfmIconView*>(part);
view->openURL(url);
const QString prettyURL = url.pathOrUrl();
emit view->extension()->setLocationBarURL( prettyURL );
emit view->extension()->setLocationBarUrl( prettyURL );
deleteLater();
s_self = 0L;

20
konqueror/konq_mainwindow.cc
View file

@ -572,7 +572,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KUrl &_url,
QByteArray _path( QFile::encodeName(url.path()));
KDE_struct_stat buff;
if ( KDE_stat( _path.data(), &buff ) != -1 )
mimeType = KMimeType::findByURL( url, buff.st_mode )->name();
mimeType = KMimeType::findByUrl( url, buff.st_mode )->name();
}
kDebug(1202) << "trying openView for " << url << " (mimeType " << mimeType << ")" << endl;
@ -660,7 +660,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KUrl &_url,
bool KonqMainWindow::openView( QString mimeType, 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 );
@ -895,7 +895,7 @@ bool KonqMainWindow::openView( QString mimeType, const KUrl &_url, KonqView *chi
//kDebug(1202) << "Referrer: " << req.args.metaData()["referrer"] << endl;
childView->setTypedURL( req.typedUrl );
if ( childView->browserExtension() )
childView->browserExtension()->setURLArgs( req.args );
childView->browserExtension()->setUrlArgs( req.args );
if ( childView->part()->inherits("KonqDirPart") )
static_cast<KonqDirPart *>(childView->part())->setFilesToSelect( req.filesToSelect );
if ( !url.isEmpty() )
@ -945,14 +945,14 @@ void KonqMainWindow::slotOpenURLRequest( const KUrl &url, const KParts::URLArgs
}
if ( hostExtension )
hostExtension->openURLInFrame( url, args );
hostExtension->openUrlInFrame( url, args );
else
mainWindow->openURL( view, url, args );
return;
}
if ( hostExtension )
hostExtension->openURLInFrame( url, args );
hostExtension->openUrlInFrame( url, args );
else
openURL( view, url, args );
return;
@ -1392,7 +1392,7 @@ void KonqMainWindow::slotOpenTerminal()
// If the given directory is not local, it can still be the URL of an
// ioslave using UDS_LOCAL_PATH which to be converted first.
u = KIO::NetAccess::mostLocalURL(u, this);
u = KIO::NetAccess::mostLocalUrl(u, this);
//If the URL is local after the above conversion, set the directory.
if ( u.isLocalFile() )
@ -1433,7 +1433,7 @@ void KonqMainWindow::slotOpenLocation()
dlg.urlRequester()->completionObject()->setDir( currentDir );
dlg.urlRequester()->setMode( KFile::File | KFile::Directory | KFile::ExistingOnly );
dlg.exec();
const KUrl& url = dlg.selectedURL();
const KUrl& url = dlg.selectedUrl();
if (!url.isEmpty())
openFilteredUrl( url.url().trimmed() );
}
@ -1897,7 +1897,7 @@ void KonqMainWindow::slotGoHistory()
if (view) {
KService::Ptr svc = view->service();
if (svc->desktopEntryName() == "konq_sidebartng") {
if (!view->part()->openURL( KUrl( "sidebar:history.desktop" ) ) )
if (!view->part()->openUrl( KUrl( "sidebar:history.desktop" ) ) )
KMessageBox::sorry(0, i18n("Cannot find running history plugin in your sidebar."), i18n("Show History Sidebar"));
break;
}
@ -2862,7 +2862,7 @@ bool KonqMainWindow::askForTarget(const KLocalizedString& text, KUrl& url)
dlg.urlRequester()->setMode( KFile::File | KFile::ExistingOnly | KFile::Directory );
if (dlg.exec())
{
url = dlg.selectedURL();
url = dlg.selectedUrl();
if ( url.isValid() )
return true;
else
@ -3522,7 +3522,7 @@ void KonqMainWindow::slotUpdateFullScreen( bool set )
menuBar()->hide();
m_paShowMenuBar->setChecked( false );
// Qt bug, the flags are lost. They know about it.
// happens only with the hackish non-_NET_WM_STATE_FULLSCREEN way
setAttribute( Qt::WA_DeleteOnClose );

10
konqueror/konq_misc.cc
View file

@ -105,7 +105,7 @@ KonqMainWindow * KonqMisc::createNewWindow( const KUrl &url, const KParts::URLAr
// For HTTP or html files, use the web browsing profile, otherwise use filemanager profile
QString profileName = (!(KProtocolManager::supportsListing(url)) ||
KMimeType::findByURL(url)->name() == "text/html")
KMimeType::findByUrl(url)->name() == "text/html")
? "webbrowsing" : "filemanagement";
QString profile = KStandardDirs::locate( "data", QLatin1String("konqueror/profiles/") + profileName );
@ -195,7 +195,7 @@ QString KonqMisc::konqFilteredURL( QWidget* parent, const QString& _url, const Q
{
if ( !_url.startsWith( "about:" ) ) // Don't filter "about:" URLs
{
KURIFilterData data = _url;
KUriFilterData data = _url;
if( !_path.isEmpty() )
data.setAbsolutePath(_path);
@ -204,9 +204,9 @@ QString KonqMisc::konqFilteredURL( QWidget* parent, const QString& _url, const Q
// from the location bar.
data.setCheckForExecutables (false);
if( KURIFilter::self()->filterURI( data ) )
if( KUriFilter::self()->filterUri( data ) )
{
if( data.uriType() == KURIFilterData::ERROR && !data.errorMsg().isEmpty() )
if( data.uriType() == KUriFilterData::ERROR && !data.errorMsg().isEmpty() )
{
KMessageBox::sorry( parent, i18n( data.errorMsg().toUtf8() ) );
return QString();
@ -256,7 +256,7 @@ void KonqDraggableLabel::mouseMoveEvent( QMouseEvent * ev )
QMimeData* md = new QMimeData();
lst.populateMimeData( md );
drag->setMimeData( md );
QString iconName = KMimeType::iconNameForURL( lst.first() );
QString iconName = KMimeType::iconNameForUrl( lst.first() );
drag->setPixmap(KGlobal::iconLoader()->loadMimeTypeIcon(iconName, K3Icon::Small));

2
konqueror/konq_tabs.cc
View file

@ -515,7 +515,7 @@ void KonqFrameTabs::slotInitiateDrag( QWidget *w )
QMimeData* md = new QMimeData();
frame->activeChildView()->url().populateMimeData(md);
d->setMimeData( md );
QString iconName = KMimeType::iconNameForURL(frame->activeChildView()->url());
QString iconName = KMimeType::iconNameForUrl(frame->activeChildView()->url());
d->setPixmap(KGlobal::iconLoader()->loadIcon(iconName, K3Icon::Small, 0));
//d->setPixmap( KGlobal::iconLoader()->loadMimeTypeIcon(KMimeType::pixmapForURL( frame->activeChildView()->url(), 0), K3Icon::Small ) );
d->start();

12
konqueror/konq_view.cc
View file

@ -175,7 +175,7 @@ void KonqView::openURL( const KUrl &url, const QString & locationBarURL,
if ( !prepareReload( args ) )
return;
if ( ext )
ext->setURLArgs( args );
ext->setUrlArgs( args );
}
#ifdef DEBUG_HISTORY
@ -222,7 +222,7 @@ void KonqView::openURL( const KUrl &url, const QString & locationBarURL,
aboutToOpenURL( url, args );
m_pPart->openURL( url );
m_pPart->openUrl( url );
updateHistoryEntry(false /* don't save location bar URL yet */);
// add pending history entry
@ -844,7 +844,7 @@ void KonqView::restoreHistory()
m_pageReferrer = h.pageReferrer;
}
else
m_pPart->openURL( h.url );
m_pPart->openUrl( h.url );
if ( m_pMainWindow->currentView() == this )
m_pMainWindow->updateToolBarActions();
@ -915,7 +915,7 @@ void KonqView::stop()
KonqHistoryManager::kself()->confirmPending( url(), m_sTypedURL );
//kDebug(1202) << "m_pPart->closeURL()" << endl;
m_pPart->closeURL();
m_pPart->closeUrl();
m_bAborted = true;
m_pKonqFrame->statusbar()->slotLoadingProgress( -1 );
setLoading( false, false );
@ -1001,7 +1001,7 @@ void KonqView::setServiceTypeInExtension()
KParts::URLArgs args( ext->urlArgs() );
args.serviceType = m_serviceType;
ext->setURLArgs( args );
ext->setUrlArgs( args );
}
QStringList KonqView::frameNames() const
@ -1259,7 +1259,7 @@ bool KonqView::eventFilter( QObject *obj, QEvent *e )
KUrl::List lstDragURLs = KUrl::List::fromMimeData( ev->mimeData() );
KParts::BrowserExtension *ext = browserExtension();
if ( !lstDragURLs.isEmpty() && ext && lstDragURLs.first().isValid() )
emit ext->openURLRequest( lstDragURLs.first() ); // this will call m_pMainWindow::slotOpenURLRequest delayed
emit ext->openUrlRequest( lstDragURLs.first() ); // this will call m_pMainWindow::slotOpenURLRequest delayed
}
if ( m_bBackRightClick )

8
konqueror/listview/konq_listviewwidget.cc
View file

@ -884,7 +884,7 @@ KUrl::List KonqBaseListViewWidget::selectedUrls( bool mostLocal )
iterator it = begin();
for ( ; it != end(); it++ )
if ( it->isSelected() )
list.append( mostLocal ? it->item()->mostLocalURL( dummy ) : it->item()->url() );
list.append( mostLocal ? it->item()->mostLocalUrl( dummy ) : it->item()->url() );
return list;
}
@ -1001,7 +1001,7 @@ bool KonqBaseListViewWidget::openURL( const KUrl &url )
{
args.xOffset = contentsX();
args.yOffset = contentsY();
m_pBrowserView->extension()->setURLArgs( args );
m_pBrowserView->extension()->setUrlArgs( args );
if ( currentItem() && itemRect( currentItem() ).isValid() )
m_itemToGoTo = currentItem()->text(0);
@ -1024,7 +1024,7 @@ bool KonqBaseListViewWidget::openURL( const KUrl &url )
m_bUpdateContentsPosAfterListing = true;
// Start the directory lister !
m_dirLister->openURL( url, false /* new url */, args.reload );
m_dirLister->openUrl( url, false /* new url */, args.reload );
// Apply properties and reflect them on the actions
// do it after starting the dir lister to avoid changing the properties
@ -1236,7 +1236,7 @@ void KonqBaseListViewWidget::slotRedirection( const KUrl & url )
createColumns();
}
const QString prettyURL = url.pathOrUrl();
emit m_pBrowserView->extension()->setLocationBarURL( prettyURL );
emit m_pBrowserView->extension()->setLocationBarUrl( prettyURL );
emit m_pBrowserView->setWindowCaption( prettyURL );
m_pBrowserView->m_url = url;
m_url = url;

2
konqueror/listview/konq_treeviewwidget.cc
View file

@ -293,7 +293,7 @@ void KonqTreeViewWidget::slotDeleteItem( KFileItem *_fileItem )
void KonqTreeViewWidget::openSubFolder( KonqListViewDir* _dir, bool _reload )
{
m_dirLister->openURL( _dir->item()->url(), true /* keep existing data */, _reload );
m_dirLister->openUrl( _dir->item()->url(), true /* keep existing data */, _reload );
slotUpdateBackground();
}

4
konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
View file

@ -241,8 +241,8 @@ KRemoteEncodingPlugin::updateBrowser()
// Reload the page with the new charset
KParts::URLArgs args = m_part->extension()->urlArgs();
args.reload = true;
m_part->extension()->setURLArgs(args);
m_part->openURL(m_currentURL);
m_part->extension()->setUrlArgs(args);
m_part->openUrl(m_currentURL);
}
typedef KGenericFactory < KRemoteEncodingPlugin > KRemoteEncodingPluginFactory;

4
konqueror/settings/ebrowsing/main.cpp
View file

@ -45,7 +45,7 @@ KURIFilterModule::KURIFilterModule(QWidget *parent, const QStringList &)
:KCModule(KURIFactory::instance(), parent)
{
filter = KURIFilter::self();
filter = KUriFilter::self();
setQuickHelp( i18n("<h1>Enhanced Browsing</h1> In this module you can configure some enhanced browsing"
" features of KDE. <h2>Internet Keywords</h2>Internet Keywords let you"
@ -68,7 +68,7 @@ KURIFilterModule::KURIFilterModule(QWidget *parent, const QStringList &)
modules.setAutoDelete(true);
QMap<QString,KCModule*> helper;
Q3PtrListIterator<KURIFilterPlugin> it = filter->pluginsIterator();
Q3PtrListIterator<KUriFilterPlugin> it = filter->pluginsIterator();
for (; it.current(); ++it)
{
KCModule *module = it.current()->configModule(this, 0);

4
konqueror/settings/ebrowsing/main.h
View file

@ -29,7 +29,7 @@
//Added by qt3to4:
#include <Q3PtrList>
class KURIFilter;
class KUriFilter;
class KURIFilterModule : public KCModule {
Q_OBJECT
@ -42,7 +42,7 @@ public:
void defaults();
private:
KURIFilter *filter;
KUriFilter *filter;
QWidget *widget;
FilterOptions *opts;

6
konqueror/settings/filetypes/typeslistitem.cpp
View file

@ -97,7 +97,7 @@ void TypesListItem::init(KMimeType::Ptr mimetype)
m_minor = "";
}
m_comment = mimetype->comment(QString());
m_icon = mimetype->icon(QString());
m_icon = mimetype->iconName(QString());
m_patterns = mimetype->patterns();
m_autoEmbed = readAutoEmbed( mimetype );
}
@ -164,9 +164,9 @@ bool TypesListItem::isMimeTypeDirty() const
kDebug() << "Mimetype Comment Dirty: old=" << m_mimetype->comment(QString()) << " m_comment=" << m_comment << endl;
return true;
}
if (m_mimetype->icon(QString()) != m_icon)
if (m_mimetype->iconName(QString()) != m_icon)
{
kDebug() << "Mimetype Icon Dirty: old=" << m_mimetype->icon(QString()) << " m_icon=" << m_icon << endl;
kDebug() << "Mimetype Icon Dirty: old=" << m_mimetype->iconName(QString()) << " m_icon=" << m_icon << endl;
return true;
}

2
konqueror/settings/kio/kmanualproxydlg.cpp
View file

@ -410,7 +410,7 @@ bool KManualProxyDlg::isValidURL( const QString& _url, KUrl* result ) const
// If the typed URL is malformed, and the filters cannot filter it
// then it must be an invalid entry.
if( !(url.isValid() || KURIFilter::self()->filterURI(url, filters)) &&
if( !(url.isValid() || KUriFilter::self()->filterUri(url, filters)) &&
!url.hasHost() )
return false;

10
konqueror/sidebar/sidebar_widget.cpp
View file

@ -495,13 +495,13 @@ void Sidebar_Widget::slotSetURL( )
{
KSimpleConfig ksc(m_path+m_currentButton->file);
ksc.setGroup("Desktop Entry");
if ( !dlg.selectedURL().isValid())
if ( !dlg.selectedUrl().isValid())
{
KMessageBox::error(this, i18n("<qt><b>%1</b> does not exist</qt>", dlg.selectedURL().url()));
KMessageBox::error(this, i18n("<qt><b>%1</b> does not exist</qt>", dlg.selectedUrl().url()));
}
else
{
QString newurl= dlg.selectedURL().prettyUrl();
QString newurl= dlg.selectedUrl().prettyUrl();
//If we are going to set the name by 'set name', we don't set it here.
//ksc.writeEntry("Name",newurl);
ksc.writePathEntry("URL",newurl);
@ -1055,12 +1055,12 @@ 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)
{
getExtension()->openURLRequest(url,args);
getExtension()->openUrlRequest(url,args);
}
void Sidebar_Widget::createNewWindow( const KUrl &url, const KParts::URLArgs &args)

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

@ -105,7 +105,7 @@ bool KonqSidebarDirTreeItem::hasStandardIcon()
{
// The reason why we can't use KFileItem::iconName() is that it doesn't
// take custom icons in .directory files into account
return m_fileItem->determineMimeType()->icon( m_fileItem->url()/*, m_fileItem->isLocalFile()*/ ) == "folder";
return m_fileItem->determineMimeType()->iconName( m_fileItem->url()/*, m_fileItem->isLocalFile()*/ ) == "folder";
}
void KonqSidebarDirTreeItem::paintCell( QPainter *_painter, const QColorGroup & _cg, int _column, int _width, int _alignment )

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

@ -85,7 +85,7 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it
if ( cfg.hasLinkType() )
{
targetURL = cfg.readURL();
targetURL = cfg.readUrl();
// some services might want to make their URL configurable in kcontrol
QString configured = cfg.readEntry("X-KDE-ConfiguredURL");
if (!configured.isEmpty()) {
@ -394,7 +394,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
if (tree()->isOpeningFirstChild()) m_dirLister->setAutoErrorHandlingEnabled(false,0);
else m_dirLister->setAutoErrorHandlingEnabled(true,tree());
m_dirLister->openURL( url, true /*keep*/ );
m_dirLister->openUrl( url, true /*keep*/ );
}
void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )

4
konqueror/sidebar/trees/history_module/history_item.cpp
View file

@ -90,7 +90,7 @@ void KonqSidebarHistoryItem::rightButtonPressed()
bool KonqSidebarHistoryItem::populateMimeData( QMimeData* mimeData, bool /*move*/ )
{
QString icon = KMimeType::favIconForURL( m_entry.url );
QString icon = KMimeType::favIconForUrl( m_entry.url );
KBookmark bookmark = KBookmark::standaloneBookmark( m_entry.title,
m_entry.url, icon );
bookmark.populateMimeData( mimeData );
@ -235,7 +235,7 @@ void KonqSidebarHistoryGroupItem::itemUpdated( KonqSidebarHistoryItem *item )
bool KonqSidebarHistoryGroupItem::populateMimeData( QMimeData* mimeData, bool /*move*/ )
{
QString icon = KMimeType::favIconForURL( m_url );
QString icon = KMimeType::favIconForUrl( m_url );
KBookmark bookmark = KBookmark::standaloneBookmark( QString(), m_url,
icon );
bookmark.populateMimeData( mimeData );

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

@ -333,7 +333,7 @@ KonqSidebarHistoryGroupItem * KonqSidebarHistoryModule::getGroupItem( const KUrl
if ( !group ) {
group = new KonqSidebarHistoryGroupItem( url, m_topLevelItem );
QString icon = KMimeType::favIconForURL( url );
QString icon = KMimeType::favIconForUrl( url );
if ( icon.isEmpty() )
group->setPixmap( 0, m_folderClosed );
else

4
konqueror/sidebar/trees/konq_sidebartree.cpp
View file

@ -408,7 +408,7 @@ void KonqSidebarTree::addUrl(KonqSidebarTreeTopLevelItem* item, const KUrl & url
cfg.writeEntry("URL", url.url());
QString icon = "folder";
if (!url.isLocalFile())
icon = KMimeType::favIconForURL(url);
icon = KMimeType::favIconForUrl(url);
if (icon.isEmpty())
icon = KProtocolInfo::icon( url.protocol() );
cfg.writeEntry("Icon", icon);
@ -702,7 +702,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const QString &path,
QString filePath = QString( *eIt ).prepend( path );
KUrl u;
u.setPath( filePath );
if ( KMimeType::findByURL( u, 0, true )->name() == "application/x-desktop" )
if ( KMimeType::findByUrl( u, 0, true )->name() == "application/x-desktop" )
loadTopLevelItem( parent, filePath );
}

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

@ -137,16 +137,16 @@ void KonqSideBarWebModule::urlClicked(const QString& url, KParts::URLArgs args)
void KonqSideBarWebModule::formClicked(const KUrl& url, const KParts::URLArgs& args)
{
_htmlPart->browserExtension()->setURLArgs(args);
_htmlPart->browserExtension()->setUrlArgs(args);
_htmlPart->openURL(url);
}
void KonqSideBarWebModule::loadFavicon() {
QString icon = KMimeType::favIconForURL(_url);
QString icon = KMimeType::favIconForUrl(_url);
if (icon.isEmpty()) {
KonqFavIconMgr::downloadHostIcon(_url);
icon = KMimeType::favIconForURL(_url);
icon = KMimeType::favIconForUrl(_url);
}
if (!icon.isEmpty()) {

6
kwrite/kwritemain.cpp
View file

@ -236,7 +236,7 @@ void KWrite::setupStatusBar()
// load on url
void KWrite::loadURL(const KUrl &url)
{
m_view->document()->openURL(url);
m_view->document()->openUrl(url);
}
// is closing the window wanted by user ?
@ -263,7 +263,7 @@ void KWrite::changeEditor()
void KWrite::slotFlush ()
{
m_view->document()->closeURL();
m_view->document()->closeUrl();
}
void KWrite::slotNew()
@ -273,7 +273,7 @@ void KWrite::slotNew()
void KWrite::slotOpen()
{
KEncodingFileDialog::Result r=KEncodingFileDialog::getOpenURLsAndEncoding(m_view->document()->encoding(), m_view->document()->url().url(),QString(),this,i18n("Open File"));
KEncodingFileDialog::Result r=KEncodingFileDialog::getOpenUrlsAndEncoding(m_view->document()->encoding(), m_view->document()->url().url(),QString(),this,i18n("Open File"));
for (KUrl::List::Iterator i=r.URLs.begin(); i != r.URLs.end(); ++i)
{

10
lib/konq/favicons/org.kde.FavIcon.xml
View file

@ -3,20 +3,20 @@
<interface name="org.kde.FavIcon">
<signal name="iconChanged">
<arg name="isHost" type="b" direction="out"/>
<arg name="hostOrURL" type="s" direction="out"/>
<arg name="hostOrUrl" type="s" direction="out"/>
<arg name="iconName" type="s" direction="out"/>
</signal>
<signal name="infoMessage">
<arg name="iconURL" type="s" direction="out"/>
<arg name="iconUrl" type="s" direction="out"/>
<arg name="msg" type="s" direction="out"/>
</signal>
<method name="iconForURL">
<method name="iconForUrl">
<arg type="s" direction="out"/>
<arg name="url" type="s" direction="in"/>
</method>
<method name="setIconForURL">
<method name="setIconForUrl">
<arg name="url" type="s" direction="in"/>
<arg name="iconURL" type="s" direction="in"/>
<arg name="iconUrl" type="s" direction="in"/>
</method>
<method name="downloadHostIcon">
<arg name="url" type="s" direction="in"/>

2
lib/konq/kivdirectoryoverlay.cc
View file

@ -64,7 +64,7 @@ void KIVDirectoryOverlay::start()
if ( m_directory->item()->isReadable() ) {
m_popularIcons = new Q3Dict<int>;
m_popularIcons->setAutoDelete(true);
m_lister->openURL(m_directory->item()->url());
m_lister->openUrl(m_directory->item()->url());
} else {
emit finished();
}

8
lib/konq/knewmenu.cc
View file

@ -503,14 +503,14 @@ void KNewMenu::slotResult( KJob * job )
}
else
{
KUrl destURL = static_cast<KIO::CopyJob*>(job)->destURL();
if ( destURL.isLocalFile() )
KUrl destUrl = static_cast<KIO::CopyJob*>(job)->destUrl();
if ( destUrl.isLocalFile() )
{
if ( m_isURLDesktopFile )
{
// destURL is the original destination for the new file.
// 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;
kDebug(1203) << " destUrl=" << destUrl.path() << " " << " d->m_destPath=" << d->m_destPath << endl;
KDesktopFile df( d->m_destPath );
df.writeEntry( "Icon", KProtocolInfo::icon( m_linkURL.protocol() ) );
df.writePathEntry( "URL", m_linkURL.prettyUrl() );
@ -519,7 +519,7 @@ void KNewMenu::slotResult( KJob * job )
else
{
// Normal (local) file. Need to "touch" it, kio_file copied the mtime.
(void) ::utime( QFile::encodeName( destURL.path() ), 0 );
(void) ::utime( QFile::encodeName( destUrl.path() ), 0 );
}
}
}

4
lib/konq/konq_dirpart.cc
View file

@ -326,7 +326,7 @@ void KonqDirPart::lmbClicked( KFileItem * fileItem )
else
{
kDebug() << "emit m_extension->openURLRequest( " << url.url() << "," << args.serviceType << ")" << endl;
emit m_extension->openURLRequest( url, args );
emit m_extension->openUrlRequest( url, args );
}
}
@ -655,7 +655,7 @@ void KonqDirPart::setFindPart( KParts::ReadOnlyPart * part )
emit findOpened( this );
// set the initial URL in the find part
m_findPart->openURL( url() );
m_findPart->openUrl( url() );
}
void KonqDirPart::slotFindClosed()

10
lib/konq/konq_iconviewwidget.cc
View file

@ -777,7 +777,7 @@ void KonqIconViewWidget::refreshMimeTypes()
setIcons( m_size );
}
void KonqIconViewWidget::setURL( const KUrl &kurl )
void KonqIconViewWidget::setUrl( const KUrl &kurl )
{
stopImagePreview();
m_url = kurl;
@ -884,7 +884,7 @@ void KonqIconViewWidget::slotDropped( QDropEvent *ev, const QList<Q3IconDragItem
KUrl dirURL = url();
if ( m_rootItem ) {
bool dummy;
dirURL = m_rootItem->mostLocalURL(dummy);
dirURL = m_rootItem->mostLocalUrl(dummy);
}
KonqOperations::doDrop( m_rootItem /* may be 0L */, dirURL, ev, this );
}
@ -963,7 +963,7 @@ QMimeData * KonqIconViewWidget::konqMimeData(bool moveSelection)
KFileItem* fileItem = static_cast<KFileIVI *>(it)->item();
urls.append(fileItem->url());
bool dummy;
mostLocalUrls.append(fileItem->mostLocalURL(dummy));
mostLocalUrls.append(fileItem->mostLocalUrl(dummy));
#ifdef __GNUC__
#warning how much of the q3icondragitem stuff do we have to duplicate here.... (TODO: jowenn)
#endif
@ -1162,7 +1162,7 @@ KUrl::List KonqIconViewWidget::selectedUrls( UrlFlags flags ) const
for ( Q3IconViewItem *it = firstItem(); it; it = it->nextItem() )
if ( it->isSelected() ) {
KFileItem* item = (static_cast<KFileIVI *>( it ))->item();
lstURLs.append( flags == MostLocalUrls ? item->mostLocalURL( dummy ) : item->url() );
lstURLs.append( flags == MostLocalUrls ? item->mostLocalUrl( dummy ) : item->url() );
}
return lstURLs;
}
@ -1865,7 +1865,7 @@ void KonqIconViewWidget::setNewURL( const QString& url )
u.setPath( url );
else
u = url;
setURL( u );
setUrl( u );
}
void KonqIconViewWidget::setCaseInsensitiveSort( bool b )

2
lib/konq/konq_iconviewwidget.h
View file

@ -178,7 +178,7 @@ public:
void setThumbnailPixmap( KFileIVI * item, const QPixmap & pixmap );
void disableSoundPreviews();
void setURL ( const KUrl & kurl );
void setUrl ( const KUrl & kurl );
const KUrl & url() const { return m_url; }
QString urlString() const { return m_url.url(); }
void setRootItem ( const KFileItem * item ) { m_rootItem = item; }

6
lib/konq/konq_operations.cc
View file

@ -147,7 +147,7 @@ void KonqOperations::doPaste( QWidget * parent, const KUrl & destURL, const QPoi
KIOPasteInfo * pi = new KIOPasteInfo;
pi->mousePos = pos;
op->setPasteInfo( pi );
op->setOperation( job, move ? MOVE : COPY, copyJob->srcURLs(), copyJob->destURL() );
op->setOperation( job, move ? MOVE : COPY, copyJob->srcUrls(), copyJob->destUrl() );
(void) new KonqCommandRecorder( move ? KonqCommand::MOVE : KonqCommand::COPY, KUrl::List(), destURL, job );
}
}
@ -397,7 +397,7 @@ void KonqOperations::doDrop( const KFileItem * destItem, const KUrl & dest, QDro
parent );
if ( job ) // 0 if canceled by user
{
op->setOperation( job, COPY, KUrl::List(), job->destURL() );
op->setOperation( job, COPY, KUrl::List(), job->destUrl() );
(void) new KonqCommandRecorder( KonqCommand::COPY, KUrl::List(), dest, job );
}
ev->acceptProposedAction();
@ -551,7 +551,7 @@ void KonqOperations::doFileCopy()
if ( iconView && iconView->maySetWallpaper() && lst.count() == 1 )
{
KUrl url = lst.first();
KMimeType::Ptr mime = KMimeType::findByURL( url );
KMimeType::Ptr mime = KMimeType::findByUrl( url );
if ( mime && ( ( KImageIO::isSupported(mime->name(), KImageIO::Reading) ) ||
mime->is( "image/svg+xml" ) ) )
{

6
lib/konq/konq_pixmapprovider.cc
View file

@ -67,12 +67,12 @@ QString KonqPixmapProvider::iconNameFor( const KUrl& url )
if ( url.url().isEmpty() ) {
// Use the folder icon for the empty URL
icon = KMimeType::mimeType( "inode/directory" )->icon();
icon = KMimeType::mimeType( "inode/directory" )->iconName();
Q_ASSERT( !icon.isEmpty() );
}
else
{
icon = KMimeType::iconNameForURL( url );
icon = KMimeType::iconNameForUrl( url );
Q_ASSERT( !icon.isEmpty() );
}
@ -139,7 +139,7 @@ void KonqPixmapProvider::notifyChange( bool isHost, QString hostOrURL,
{
// For host default-icons still query the favicon manager to get
// the correct icon for pages that have an own one.
QString icon = isHost ? KMimeType::favIconForURL( url ) : iconName;
QString icon = isHost ? KMimeType::favIconForUrl( url ) : iconName;
if ( !icon.isEmpty() )
*it = icon;
}

4
nsplugins/plugin_part.cpp
View file

@ -320,7 +320,7 @@ void PluginPart::postURL(const QString& url, const QString& target, const QByteA
args.postData = data;
args.setContentType(mime);
emit _extension->openURLRequest(new_url, args);
emit _extension->openUrlRequest(new_url, args);
}
void PluginPart::requestURL(const QString& url, const QString& target)
@ -333,7 +333,7 @@ void PluginPart::requestURL(const QString& url, const QString& target)
args.frameName = target;
args.setDoPost(false);
emit _extension->openURLRequest(new_url, args);
emit _extension->openUrlRequest(new_url, args);
}
void PluginPart::evalJavaScript(int id, const QString & script)

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" ) {