Commit 8e9d8fe5 authored by Stephan Kulow's avatar Stephan Kulow
Browse files

replacing openURL with openUrl unless it's about kfmclient

svn path=/trunk/KDE/kdebase/konqueror/; revision=580680
parent 0c3c68f8
......@@ -784,7 +784,7 @@ void KfindTabWidget::getDirectory()
void KfindTabWidget::beginSearch()
{
/// dirlister->openURL(KUrl(dirBox->currentText().trimmed()));
/// dirlister->openUrl(KUrl(dirBox->currentText().trimmed()));
saveHistory();
setEnabled( false );
......
......@@ -51,7 +51,7 @@ KonqMainWindow:
openFilteredURL or slotOpenURLRequest
|
|
-----openURL----
-----openUrl----
| | |
| | |
| KonqRun KRun
......@@ -64,10 +64,10 @@ KonqView: |
|
[switchView if different mode required]
|
openURL [emits openURLEvent (after calling openURL)]
openUrl [emits openURLEvent (after calling openURL)]
Part: |
|
openURL [emits started, progress info, completed]
openUrl [emits started, progress info, completed]
...
......@@ -92,7 +92,7 @@ KHTMLPart saves the whole structure (all frames, and their URL) in the
history buffer (saveState/restoreState).
Every time a frame changes its URL, we want a new item in the history.
But when this happens, since it's internal to khtml, konqueror wouldn't know
about it. That's why there is the openURLNotify() signal in browser extension
about it. That's why there is the openUrlNotify() signal in browser extension
(see there for extensive docu about it).
When khtml emits it, KonqView creates a new history entry and fills it
(calling saveState).
......
......@@ -32,7 +32,7 @@ KonqViewAdaptor::~KonqViewAdaptor()
void KonqViewAdaptor::openUrl( const QString& url, const QString & locationBarURL, const QString & nameFilter )
{
m_pView->openURL( KUrl(url), locationBarURL, nameFilter );
m_pView->openUrl( KUrl(url), locationBarURL, nameFilter );
}
bool KonqViewAdaptor::changeViewMode( const QString &serviceType,
......
......@@ -845,7 +845,7 @@ void KonqKfmIconView::slotMouseButtonClicked(int _button, Q3IconViewItem* _item,
void KonqKfmIconView::slotStarted()
{
// Only emit started if this comes after openURL, i.e. it's not for an update.
// Only emit started if this comes after openUrl, i.e. it's not for an update.
// We don't want to start a spinning wheel during updates.
if ( m_bLoading )
emit started( 0 );
......@@ -864,7 +864,7 @@ void KonqKfmIconView::slotCanceled()
void KonqKfmIconView::slotCanceled( const KUrl& url )
{
// Check if this canceled() signal is about the URL we're listing.
// It could be about the URL we were listing, and openURL() aborted it.
// It could be about the URL we were listing, and openUrl() aborted it.
if ( m_bLoading && url.equals( m_pIconView->url(), KUrl::CompareWithoutTrailingSlash ) )
{
emit canceled( QString() );
......@@ -1272,7 +1272,7 @@ bool KonqKfmIconView::doOpenURL( const KUrl & url )
m_dirLister->setMimeFilter( mimeFilter() );
// This *must* happen before m_dirLister->openURL because it emits
// This *must* happen before m_dirLister->openUrl because it emits
// clear() and Q3IconView::clear() calls setContentsPos(0,0)!
KParts::URLArgs args = m_extension->urlArgs();
if ( args.reload )
......@@ -1486,7 +1486,7 @@ void SpringLoadingManager::springLoadTrigger(KonqKfmIconView *view,
args.trustedSource = true;
// Open the folder URL, we don't want to modify the browser
// history, hence the use of openURL and setLocationBarURL
// history, hence the use of openUrl and setLocationBarURL
view->openUrl(url);
const QString prettyURL = url.pathOrUrl();
emit view->extension()->setLocationBarUrl( prettyURL );
......
......@@ -159,7 +159,7 @@ protected:
/**
* Set to true while the dirlister is running, _if_ we asked it
* explicitly (openURL). If it is auto-updating, this is not set to true.
* explicitly (openUrl). If it is auto-updating, this is not set to true.
*/
bool m_bLoading:1;
......
......@@ -263,7 +263,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle )
if ( m_mainWindow->currentView() )
{
QString locBarURL = m_mainWindow->currentView()->url().prettyUrl(); // default one in case it doesn't set it
childView->openURL( m_mainWindow->currentView()->url(), locBarURL );
childView->openUrl( m_mainWindow->currentView()->url(), locBarURL );
}
#endif
......
......@@ -292,7 +292,7 @@ KonqMainWindow::KonqMainWindow( const KUrl &initialURL, bool openInitialURL, con
{
KUrl homeURL;
homeURL.setPath( QDir::homePath() );
openURL( 0, homeURL );
openUrl( 0, homeURL );
}
else
// silent
......@@ -468,7 +468,7 @@ void KonqMainWindow::openFilteredUrl( const QString & url, KonqOpenURLRequest &
m_currentDir.clear();
openURL( 0, filteredURL, QString(), req );
openUrl( 0, filteredURL, QString(), req );
// #4070: Give focus to view after URL was entered manually
// Note: we do it here if the view mode (i.e. part) wasn't changed
......@@ -488,12 +488,12 @@ void KonqMainWindow::openFilteredUrl( const QString & _url, bool inNewTab, bool
openFilteredUrl( _url, req );
}
void KonqMainWindow::openURL( KonqView *_view, const KUrl &_url,
void KonqMainWindow::openUrl( KonqView *_view, const KUrl &_url,
const QString &_mimeType, KonqOpenURLRequest& req,
bool trustedSource )
{
#ifndef NDEBUG // needed for req.debug()
kDebug(1202) << "KonqMainWindow::openURL : url = '" << _url << "' "
kDebug(1202) << "KonqMainWindow::openUrl : url = '" << _url << "' "
<< "mimeType='" << _mimeType << " req=" << req.debug()
<< "' view=" << _view << endl;
#endif
......@@ -587,11 +587,11 @@ void KonqMainWindow::openURL( KonqView *_view, const KUrl &_url,
// Built-in view ?
if ( !openView( mimeType, url, view /* can be 0 */, req ) )
{
//kDebug(1202) << "KonqMainWindow::openURL : openView returned false" << endl;
//kDebug(1202) << "KonqMainWindow::openUrl : openView returned false" << endl;
// Are we following another view ? Then forget about this URL. Otherwise fire app.
if ( !req.followMode )
{
//kDebug(1202) << "KonqMainWindow::openURL : we were not following. Fire app." << endl;
//kDebug(1202) << "KonqMainWindow::openUrl : we were not following. Fire app." << endl;
// We know the servicetype, let's try its preferred service
if ( isMimeTypeAssociatedWithSelf( mimeType, offer ) ) {
KMessageBox::error( this, i18n("There appears to be a configuration error. You have associated Konqueror with %1, but it cannot handle this file type.", mimeType));
......@@ -863,7 +863,7 @@ bool KonqMainWindow::openView( QString mimeType, const KUrl &_url, KonqView *chi
// If the protocol doesn't support writing (e.g. HTTP) then we might want to save instead of just embedding.
// So (if embedding would succeed, hence the checks above) we ask the user
// Otherwise the user will get asked 'open or save' in openURL anyway.
// Otherwise the user will get asked 'open or save' in openUrl anyway.
if ( ok && !forceAutoEmbed && !KProtocolManager::supportsWriting( url ) ) {
QString suggestedFilename;
......@@ -899,7 +899,7 @@ bool KonqMainWindow::openView( QString mimeType, const KUrl &_url, KonqView *chi
if ( childView->part()->inherits("KonqDirPart") )
static_cast<KonqDirPart *>(childView->part())->setFilesToSelect( req.filesToSelect );
if ( !url.isEmpty() )
childView->openURL( url, originalURL, req.nameFilter, req.tempFile );
childView->openUrl( url, originalURL, req.nameFilter, req.tempFile );
}
kDebug(1202) << "KonqMainWindow::openView ok=" << ok << " bOthersFollowed=" << bOthersFollowed << " returning "
<< (ok || bOthersFollowed)
......@@ -947,26 +947,26 @@ void KonqMainWindow::slotOpenURLRequest( const KUrl &url, const KParts::URLArgs
if ( hostExtension )
hostExtension->openUrlInFrame( url, args );
else
mainWindow->openURL( view, url, args );
mainWindow->openUrl( view, url, args );
return;
}
if ( hostExtension )
hostExtension->openUrlInFrame( url, args );
else
openURL( view, url, args );
openUrl( view, url, args );
return;
}
}
KonqView *view = childView( callingPart );
openURL( view, url, args );
openUrl( view, url, args );
}
//Called by slotOpenURLRequest
void KonqMainWindow::openURL( KonqView *childView, const KUrl &url, const KParts::URLArgs &args )
void KonqMainWindow::openUrl( KonqView *childView, const KUrl &url, const KParts::URLArgs &args )
{
kDebug(1202) << "KonqMainWindow::openURL (from slotOpenURLRequest) url=" << url.prettyUrl() << endl;
kDebug(1202) << "KonqMainWindow::openUrl (from slotOpenURLRequest) url=" << url.prettyUrl() << endl;
KonqOpenURLRequest req;
req.args = args;
......@@ -987,7 +987,7 @@ void KonqMainWindow::openURL( KonqView *childView, const KUrl &url, const KParts
return;
}
openURL( childView, url, args.serviceType, req, args.trustedSource );
openUrl( childView, url, args.serviceType, req, args.trustedSource );
}
QObject *KonqMainWindow::lastFrame( KonqView *view )
......@@ -1014,7 +1014,7 @@ bool KonqMainWindow::makeViewsFollow( const KUrl & url, const KParts::URLArgs &a
KonqOpenURLRequest req;
req.followMode = true;
req.args = args;
// We can't iterate over the map here, and openURL for each, because the map can get modified
// We can't iterate over the map here, and openUrl for each, because the map can get modified
// (e.g. by part changes). Better copy the views into a list.
QList<KonqView*> listViews = m_mapViews.values();
......@@ -1032,9 +1032,9 @@ bool KonqMainWindow::makeViewsFollow( const KUrl & url, const KParts::URLArgs &a
if ( senderFrame && viewFrame && viewFrame != senderFrame )
continue;
kDebug(1202) << "makeViewsFollow: Sending openURL to view " << view->part()->metaObject()->className() << " url=" << url << endl;
kDebug(1202) << "makeViewsFollow: Sending openUrl to view " << view->part()->metaObject()->className() << " url=" << url << endl;
// XXX duplicate code from ::openURL
// XXX duplicate code from ::openUrl
if ( view == m_currentView )
{
abortLoading();
......@@ -1095,7 +1095,7 @@ void KonqMainWindow::slotCreateNewWindow( const KUrl &url, const KParts::URLArgs
if (QApplication::keyboardModifiers() & Qt::ShiftModifier)
req.newTabInFront = !req.newTabInFront;
req.args = args;
openURL( 0, url, QString(), req );
openUrl( 0, url, QString(), req );
}
else
{
......@@ -1142,7 +1142,7 @@ 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();
......@@ -1157,7 +1157,7 @@ void KonqMainWindow::slotCreateNewWindow( const KUrl &url, const KParts::URLArgs
req.args = args;
if ( args.serviceType.isEmpty() )
mainWindow->openURL( 0, url, QString(), req );
mainWindow->openUrl( 0, url, QString(), req );
else if ( !mainWindow->openView( args.serviceType, url, 0, req ) )
{
// we have problems. abort.
......@@ -1481,7 +1481,7 @@ void KonqMainWindow::slotToolFind()
KStandardDirs::locate( "data", QLatin1String("konqueror/profiles/filemanagement") ),
"filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ );
mw->m_paFindFiles->setChecked(true);
// Delay it after the openURL call (hacky!)
// Delay it after the openUrl call (hacky!)
QTimer::singleShot( 1, mw, SLOT(slotToolFind()));
m_paFindFiles->setChecked(false);
}
......@@ -1638,7 +1638,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
QString nameFilter = detectNameFilter( locURL );
if( m_currentView->part()->inherits( "KonqDirPart" ) )
static_cast<KonqDirPart*>( m_currentView->part() )->setFilesToSelect( filesToSelect );
m_currentView->openURL( locURL, locationBarURL, nameFilter );
m_currentView->openUrl( locURL, locationBarURL, nameFilter );
}
// Now save this setting, either locally or globally (for directories only)
......@@ -1785,7 +1785,7 @@ void KonqMainWindow::slotReload( KonqView* reloadView )
reloadView->lockHistory();
// Reuse current servicetype for local files, but not for remote files (it could have changed, e.g. over HTTP)
QString serviceType = reloadView->url().isLocalFile() ? reloadView->serviceType() : QString();
openURL( reloadView, reloadView->url(), serviceType, req );
openUrl( reloadView, reloadView->url(), serviceType, req );
}
}
......@@ -1833,46 +1833,46 @@ void KonqMainWindow::slotHome()
void KonqMainWindow::slotGoSystem()
{
openURL( 0, KUrl( "system:/" ) );
openUrl( 0, KUrl( "system:/" ) );
}
void KonqMainWindow::slotGoApplications()
{
openURL( 0, KUrl( "programs:/" ) );
openUrl( 0, KUrl( "programs:/" ) );
}
void KonqMainWindow::slotGoMedia()
{
openURL( 0, KUrl( "media:/" ) );
openUrl( 0, KUrl( "media:/" ) );
}
void KonqMainWindow::slotGoNetworkFolders()
{
openURL( 0, KUrl( "remote:/" ) );
openUrl( 0, KUrl( "remote:/" ) );
}
void KonqMainWindow::slotGoSettings()
{
openURL( 0, KUrl( "settings:/" ) );
openUrl( 0, KUrl( "settings:/" ) );
}
void KonqMainWindow::slotGoDirTree()
{
KUrl u;
u.setPath( KStandardDirs::locateLocal( "data", "konqueror/dirtree/" ) );
openURL( 0, u );
openUrl( 0, u );
}
void KonqMainWindow::slotGoTrash()
{
openURL( 0, KUrl( "trash:/" ) );
openUrl( 0, KUrl( "trash:/" ) );
}
void KonqMainWindow::slotGoAutostart()
{
KUrl u;
u.setPath( KGlobalSettings::autostartPath() );
openURL( 0, u );
openUrl( 0, u );
}
void KonqMainWindow::slotGoHistory()
......@@ -2510,14 +2510,14 @@ void KonqMainWindow::slotSplitViewHorizontal()
{
KonqView * newView = m_pViewManager->splitView( Qt::Horizontal );
if (newView == 0) return;
newView->openURL( m_currentView->url(), m_currentView->locationBarURL() );
newView->openUrl( m_currentView->url(), m_currentView->locationBarURL() );
}
void KonqMainWindow::slotSplitViewVertical()
{
KonqView * newView = m_pViewManager->splitView( Qt::Vertical );
if (newView == 0) return;
newView->openURL( m_currentView->url(), m_currentView->locationBarURL() );
newView->openUrl( m_currentView->url(), m_currentView->locationBarURL() );
}
void KonqMainWindow::slotAddTab()
......@@ -2527,7 +2527,7 @@ void KonqMainWindow::slotAddTab()
false,
KonqSettings::openAfterCurrentPage());
if (newView == 0) return;
openURL( newView, KUrl("about:blank"),QString());
openUrl( newView, KUrl("about:blank"),QString());
m_pViewManager->showTab( newView );
focusLocationBar();
m_pWorkingTab = 0;
......@@ -2605,7 +2605,7 @@ void KonqMainWindow::slotPopupThisWindow()
{
kDebug(1202) << "KonqMainWindow::slotPopupThisWindow()" << endl;
openURL( 0, popupItems.first()->url() );
openUrl( 0, popupItems.first()->url() );
}
void KonqMainWindow::slotPopupNewTab()
......@@ -2646,7 +2646,7 @@ void KonqMainWindow::popupNewTab(bool infront, bool openAfterCurrentPage)
{
req.newTabInFront = true;
}
openURL( 0, popupItems[i]->url(), QString(), req );
openUrl( 0, popupItems[i]->url(), QString(), req );
}
}
......@@ -2659,7 +2659,7 @@ void KonqMainWindow::openMultiURL( KUrl::List url )
KonqView* newView = m_pViewManager->addTab();
Q_ASSERT( newView );
if (newView == 0) continue;
openURL( newView, *it,QString());
openUrl( newView, *it,QString());
m_pViewManager->showTab( newView );
focusLocationBar();
m_pWorkingTab = 0;
......@@ -3028,7 +3028,7 @@ void KonqMainWindow::slotUpActivated( int id )
const int idx = m_paUp->menu()->indexOf( id ) + 1;
for ( int i = 0 ; i < idx ; i ++ )
u = u.upUrl();
openURL( 0, u );
openUrl( 0, u );
}
void KonqMainWindow::slotGoMenuAboutToShow()
......@@ -4816,7 +4816,7 @@ void KonqMainWindow::slotOpenEmbeddedDoIt()
m_currentView->setTypedURL(QString());
if ( m_currentView->changeViewMode( m_popupServiceType,
m_popupService ) )
m_currentView->openURL( m_popupUrl, m_popupUrl.pathOrUrl() );
m_currentView->openUrl( m_popupUrl, m_popupUrl.pathOrUrl() );
}
void KonqMainWindow::slotDatabaseChanged()
......@@ -5247,7 +5247,7 @@ void KonqMainWindow::setIcon( const QPixmap& pix )
void KonqMainWindow::slotIntro()
{
openURL( 0, KUrl("about:konqueror") );
openUrl( 0, KUrl("about:konqueror") );
}
void KonqMainWindow::goURL()
......@@ -5268,7 +5268,7 @@ void KonqMainWindow::slotLocationLabelActivated()
void KonqMainWindow::slotOpenURL( const KUrl& url )
{
openURL( 0, url );
openUrl( 0, url );
}
bool KonqMainWindow::sidebarVisible() const
......
......@@ -115,24 +115,24 @@ public:
/**
* Filters the URL and calls the main openURL method.
* Filters the URL and calls the main openUrl method.
*/
void openFilteredUrl( const QString & _url, KonqOpenURLRequest& _req);
/**
* Filters the URL and calls the main openURL method.
* Filters the URL and calls the main openUrl method.
*/
void openFilteredUrl( const QString &_url, bool inNewTab = false, bool tempFile = false );
/**
* The main openURL method.
* The main openUrl method.
*/
void openURL( KonqView * view, const KUrl & url,
void openUrl( KonqView * view, const KUrl & url,
const QString &serviceType = QString(),
KonqOpenURLRequest & req = KonqOpenURLRequest::null, bool trustedSource = false );
/**
* Called by openURL when it knows the service type (either directly,
* Called by openUrl when it knows the service type (either directly,
* or using KonqRun)
*/
bool openView( QString serviceType, const KUrl &_url, KonqView *childView,
......@@ -354,7 +354,7 @@ public Q_SLOTS:
*/
void slotOpenURLRequest( const KUrl &url, const KParts::URLArgs &args );
void openURL( KonqView *childView, const KUrl &url, const KParts::URLArgs &args );
void openUrl( KonqView *childView, const KUrl &url, const KParts::URLArgs &args );
void slotCreateNewWindow( const KUrl &url, const KParts::URLArgs &args );
void slotCreateNewWindow( const KUrl &url, const KParts::URLArgs &args,
......
......@@ -79,7 +79,7 @@ KonqMainWindow * KonqMisc::createSimpleWindow( const KUrl & _url, const QString
KonqMainWindow *win = new KonqMainWindow( KUrl(), false );
win->setInitialFrameName( frameName );
win->openURL( 0L, url );
win->openUrl( 0L, url );
win->show();
return win;
......@@ -93,13 +93,13 @@ KonqMainWindow * KonqMisc::createSimpleWindow( const KUrl & url, const KParts::U
req.args = args;
req.tempFile = tempFile;
KonqMainWindow *win = new KonqMainWindow( KUrl(), false );
win->openURL( 0L, url, QString(), req );
win->openUrl( 0L, url, QString(), req );
win->show();
return win;
}
KonqMainWindow * KonqMisc::createNewWindow( const KUrl &url, const KParts::URLArgs &args, bool forbidUseHTML, QStringList filesToSelect, bool tempFile, bool openURL )
KonqMainWindow * KonqMisc::createNewWindow( const KUrl &url, const KParts::URLArgs &args, bool forbidUseHTML, QStringList filesToSelect, bool tempFile, bool openUrl )
{
kDebug() << "KonqMisc::createNewWindow url=" << url << endl;
......@@ -111,10 +111,10 @@ KonqMainWindow * KonqMisc::createNewWindow( const KUrl &url, const KParts::URLAr
QString profile = KStandardDirs::locate( "data", QLatin1String("konqueror/profiles/") + profileName );
return createBrowserWindowFromProfile(profile, profileName,
url, args,
forbidUseHTML, filesToSelect, tempFile, openURL );
forbidUseHTML, filesToSelect, tempFile, openUrl );
}
KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const QString &path, const QString &filename, const KUrl &url, const KParts::URLArgs &args, bool forbidUseHTML, const QStringList& filesToSelect, bool tempFile, bool openURL )
KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const QString &path, const QString &filename, const KUrl &url, const KParts::URLArgs &args, bool forbidUseHTML, const QStringList& filesToSelect, bool tempFile, bool openUrl )
{
kDebug(1202) << "void KonqMisc::createBrowserWindowFromProfile() " << endl;
kDebug(1202) << "path=" << path << ",filename=" << filename << ",url=" << url.prettyUrl() << endl;
......@@ -160,7 +160,7 @@ KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const QString &path,
req.args = args;
req.filesToSelect = filesToSelect;
req.tempFile = tempFile;
mainWindow->viewManager()->loadViewProfile( cfg, filename, url, req, false, openURL );
mainWindow->viewManager()->loadViewProfile( cfg, filename, url, req, false, openUrl );
}
mainWindow->setInitialFrameName( args.frameName );
mainWindow->show();
......@@ -177,7 +177,7 @@ KonqMainWindow * KonqMisc::newWindowFromHistory( KonqView* view, int steps )
return 0L;
KonqMainWindow* mainwindow = createNewWindow(he->url, KParts::URLArgs(),
false, QStringList(), false, /*openURL*/false);
false, QStringList(), false, /*openUrl*/false);
if(!mainwindow)
return 0L;
KonqView* newView = mainwindow->currentView();
......@@ -287,7 +287,7 @@ void KonqDraggableLabel::dropEvent( QDropEvent* ev )
void KonqDraggableLabel::delayedOpenURL()
{
m_mw->openURL( 0L, _savedLst.first() );
m_mw->openUrl( 0L, _savedLst.first() );
}
#include "konq_misc.moc"
......@@ -69,20 +69,20 @@ public:
/**
* Create a new window for @p url using @p args and the appropriate profile for this URL.
* @param forbidUseHTML internal. True when called by "Find Files"
* @param openURL If it is false, no url is openend in the new window. The url is used to guess the profile
* @param openUrl If it is false, no url is openend in the new window. The url is used to guess the profile
*/
static KonqMainWindow * createNewWindow( const KUrl &url,
const KParts::URLArgs &args = KParts::URLArgs(),
bool forbidUseHTML = false,
QStringList filesToSelect = QStringList(),
bool tempFile = false,
bool openURL = true);
bool openUrl = true);
/**
* Create a new window from the profile defined by @p filename and @p path.
* @param url an optional URL to open in this profile.
* @param forbidUseHTML internal. True when called by "Find Files"
* @param openURL If false no url is opened
* @param openUrl If false no url is opened
*/
static KonqMainWindow * createBrowserWindowFromProfile( const QString &path,
const QString &filename,
......@@ -91,7 +91,7 @@ public:
bool forbidUseHTML = false,
const QStringList& filesToSelect = QStringList(),
bool tempFile = false,
bool openURL = true);
bool openUrl = true);
/**
* Creates a new window from the history of a view, copies the history
......
......@@ -453,7 +453,7 @@ void KonqFrameTabs::slotMouseMiddleClick()
if ( !filteredURL.isEmpty() ) {
KonqView* newView = m_pViewManager->addTab(QString(), QString(), false, false);
if (newView == 0L) return;
m_pViewManager->mainWindow()->openURL( newView, filteredURL, QString() );
m_pViewManager->mainWindow()->openUrl( newView, filteredURL, QString() );
m_pViewManager->showTab( newView );
m_pViewManager->mainWindow()->focusLocationBar();
}
......@@ -473,7 +473,7 @@ void KonqFrameTabs::slotMouseMiddleClick( QWidget *w )
if ( !filteredURL.isEmpty() ) {
KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w);
if (frame) {
m_pViewManager->mainWindow()->openURL( frame->activeChildView(), filteredURL );
m_pViewManager->mainWindow()->openUrl( frame->activeChildView(), filteredURL );
}
}
}
......@@ -490,7 +490,7 @@ void KonqFrameTabs::slotReceivedDropEvent( QDropEvent *e )
if ( lstDragURLs.count() ) {
KonqView* newView = m_pViewManager->addTab(QString(), QString(), false, false);
if (newView == 0L) return;
m_pViewManager->mainWindow()->openURL( newView, lstDragURLs.first(), QString() );
m_pViewManager->mainWindow()->openUrl( newView, lstDragURLs.first(), QString() );
m_pViewManager->showTab( newView );
m_pViewManager->mainWindow()->focusLocationBar();
}
......@@ -503,7 +503,7 @@ void KonqFrameTabs::slotReceivedDropEvent( QWidget *w, QDropEvent *e )
if ( lstDragURLs.count() && frame ) {
KUrl lstDragURL = lstDragURLs.first();
if ( lstDragURL != frame->activeChildView()->url() )
m_pViewManager->mainWindow()->openURL( frame->activeChildView(), lstDragURL );
m_pViewManager->mainWindow()->openUrl( frame->activeChildView(), lstDragURL );
}
}
......
......@@ -138,10 +138,10 @@ KonqView::~KonqView()
//kDebug(1202) << "KonqView::~KonqView " << this << " done" << endl;
}
void KonqView::openURL( const KUrl &url, const QString & locationBarURL,
void KonqView::openUrl( const KUrl &url, const QString & locationBarURL,
const QString & nameFilter, bool tempFile )
{
kDebug(1202) << "KonqView::openURL url=" << url << " locationBarURL=" << locationBarURL << endl;