Commit 41e0c5be authored by Aaron J. Seigo's avatar Aaron J. Seigo
Browse files

port to new snapshot

move kicer kcm while we're at it

svn path=/trunk/KDE/kdebase/apps/; revision=543485
parent 529c85d4
......@@ -151,7 +151,7 @@ EditCommand::EditCommand(const QString & address, int col, const QString & newVa
{
if(mCol == 1)
{
KUrl u = KUrl::fromPathOrUrl(newValue);
KUrl u(newValue);
mNewValue = u.url( KUrl::LeaveTrailingSlash );
}
else
......@@ -234,7 +234,7 @@ void EditCommand::modify(QString newValue)
{
if(mCol == 1)
{
KUrl u = KUrl::fromPathOrUrl(newValue);
KUrl u(newValue);
mNewValue = u.url( KUrl::LeaveTrailingSlash );
}
else
......
......@@ -25,6 +25,7 @@
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <kregexpeditorinterface.h>
#include <kservicetypetrader.h>
#include <kparts/componentfactory.h>
#include <kstandarddirs.h>
#include "kquery.h"
......@@ -304,7 +305,7 @@ KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
binaryContextCb->setToolTip(binaryTooltip);
QPushButton* editRegExp = 0;
if ( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
if ( !KServiceTypeTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
// The editor is available, so lets use it.
editRegExp = new QPushButton(i18n("&Edit..."), pages[2]);
editRegExp->setObjectName( "editRegExp" );
......@@ -611,7 +612,7 @@ void KfindTabWidget::setQuery(KQuery *query)
// only start if we have valid dates
if (!isDateValid()) return;
query->setPath(KUrl::fromPathOrUrl(dirBox->currentText().trimmed()));
query->setPath(KUrl(dirBox->currentText().trimmed()));
for (int idx=0; idx<dirBox->count(); idx++)
if (dirBox->itemText(idx)==dirBox->currentText())
......@@ -785,7 +786,7 @@ void KfindTabWidget::getDirectory()
void KfindTabWidget::beginSearch()
{
/// dirlister->openURL(KUrl::fromPathOrUrl(dirBox->currentText().trimmed()));
/// dirlister->openURL(KUrl(dirBox->currentText().trimmed()));
saveHistory();
setEnabled( false );
......
......@@ -430,5 +430,5 @@ void KfindWindow::slotContextMenu(K3ListView *,Q3ListViewItem *item,const QPoint
void KfindWindow::slotOpenWith()
{
KRun::displayOpenWithDialog( KUrl::split(((KfFileLVI*)currentItem())->fileitem.url()) );
KRun::displayOpenWithDialog( KUrl::split(((KfFileLVI*)currentItem())->fileitem.url()), topLevelWidget() );
}
......@@ -458,7 +458,7 @@ void KonqAboutPage::serve( const QString& html, const QString& what )
void KonqAboutPage::urlSelected( const QString &url, int button, int state, const QString &target, KParts::URLArgs _args )
{
KUrl u = KUrl::fromPathOrUrl( url );
KUrl u( url );
if ( u.protocol() == "exec" )
{
QStringList args = url.mid( 6 ).split(QChar( ' ' ), QString::SkipEmptyParts );
......
......@@ -30,12 +30,12 @@
#include <kcmdlineargs.h>
#include <kpropertiesdialog.h>
#include <klocale.h>
#include <ktrader.h>
#include <kprocess.h>
#include <kstandarddirs.h>
#include <kopenwith.h>
#include <kurlrequesterdlg.h>
#include <kmessagebox.h>
#include <kmimetypetrader.h>
#include <kfiledialog.h>
#include <kdebug.h>
#include <dcopclient.h>
......@@ -178,7 +178,7 @@ static void needInstance()
is configured to reuse always,
or it's not configured to never reuse, and the URL to-be-opened is "safe".
The URL is safe, if the view used to view it is listed in the allowed KPart's.
In order to find out the part, mimetype is needed, and KTrader is needed.
In order to find out the part, mimetype is needed, and KMimeTypeTrader is needed.
If mimetype is not known, KMimeType is used (which doesn't work e.g. for remote
URLs, but oh well). Since this function may be running without a KApplication
instance, I'm actually quite surprised it works, and it may sooner or later break.
......@@ -236,8 +236,7 @@ static bool startNewKonqueror( QString url, QString mimetype, const QString& pro
}
if( mimetype.isEmpty())
mimetype = KMimeType::findByURL( KUrl( url ) )->name();
KTrader::OfferList offers = KTrader::self()->query( mimetype, QLatin1String( "KParts/ReadOnlyPart" ),
QString(), QString() );
KService::List offers = KMimeTypeTrader::self()->query( mimetype, QLatin1String( "KParts/ReadOnlyPart" ) );
KService::Ptr serv;
if( offers.count() > 0 )
serv = offers.first();
......@@ -566,10 +565,11 @@ bool clientApp::doIt()
{
KUrl::List urls;
urls.append( args->url(1) );
const KTrader::OfferList offers = KTrader::self()->query( QString::fromLocal8Bit( args->arg( 2 ) ), QLatin1String( "Application" ), QString(), QString() );
const KService::List offers = KMimeTypeTrader::self()->query( QString::fromLocal8Bit( args->arg( 2 ) ),
QLatin1String( "Application" ) );
if (offers.isEmpty()) return 1;
KService::Ptr serv = offers.first();
return KRun::run( *serv, urls );
return KRun::run( *serv, urls, 0 );
}
}
else if ( command == "move" )
......
......@@ -43,7 +43,7 @@
#include <kstaticdeleter.h>
#include <kstdaction.h>
#include <kparts/factory.h>
#include <ktrader.h>
#include <kservicetypetrader.h>
#include <ktoggleaction.h>
#include <QRegExp>
......@@ -226,9 +226,9 @@ KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const
m_pamPreview->insert( m_paEnablePreviews );
m_pamPreview->insert( new KSeparatorAction(actionCollection()) );
KTrader::OfferList plugins = KTrader::self()->query( "ThumbCreator" );
KService::List plugins = KServiceTypeTrader::self()->query( "ThumbCreator" );
QMap< QString, KToggleAction* > previewActions;
for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
for ( KService::List::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
{
if ( KToggleAction*& preview = previewActions[ ( *it )->name() ] )
// Bypassing KAction restriction - this action will not be found via KActionCollection when doing a name search
......@@ -1182,9 +1182,9 @@ void KonqKfmIconView::slotClear()
void KonqKfmIconView::slotRedirection( const KUrl & url )
{
const QString prettyUrl = url.pathOrUrl();
emit m_extension->setLocationBarURL( prettyUrl );
emit setWindowCaption( prettyUrl );
const QString prettyURL = url.pathOrUrl();
emit m_extension->setLocationBarURL( prettyURL );
emit setWindowCaption( prettyURL );
m_pIconView->setURL( url );
m_url = url;
}
......@@ -1322,8 +1322,8 @@ bool KonqKfmIconView::doOpenURL( const KUrl & url )
}
}
const QString prettyUrl = url.pathOrUrl();
emit setWindowCaption( prettyUrl );
const QString prettyURL = url.pathOrUrl();
emit setWindowCaption( prettyURL );
return true;
}
......@@ -1487,8 +1487,8 @@ 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);
const QString prettyUrl = url.pathOrUrl();
emit view->extension()->setLocationBarURL( prettyUrl );
const QString prettyURL = url.pathOrUrl();
emit view->extension()->setLocationBarURL( prettyURL );
}
void SpringLoadingManager::dragLeft(KonqKfmIconView */*view*/)
......@@ -1531,8 +1531,8 @@ void SpringLoadingManager::finished()
KonqKfmIconView *view = static_cast<KonqKfmIconView*>(part);
view->openURL(url);
const QString prettyUrl = url.pathOrUrl();
emit view->extension()->setLocationBarURL( prettyUrl );
const QString prettyURL = url.pathOrUrl();
emit view->extension()->setLocationBarURL( prettyURL );
deleteLater();
s_self = 0L;
......
......@@ -51,7 +51,7 @@ const int KonqCombo::temporary = 0;
static QString titleOfURL( const QString& urlStr )
{
KUrl url = KUrl::fromPathOrUrl( urlStr );
KUrl url( urlStr );
KonqHistoryList historylist = KonqHistoryManager::kself()->entries();
KonqHistoryList::iterator historyentry = historylist.findEntry( url );
if ( historyentry == historylist.end() && !url.url().endsWith( "/" ) ) {
......@@ -582,7 +582,7 @@ void KonqCombo::mouseMoveEvent( QMouseEvent *e )
(e->pos() - m_dragStart).manhattanLength() >
KGlobalSettings::dndEventDelay() )
{
KUrl url = KUrl::fromPathOrUrl( currentText() );
KUrl url( currentText() );
if ( url.isValid() )
{
QDrag* drag = new QDrag(this);
......
......@@ -30,6 +30,7 @@
#include <kaboutdata.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kmimetypetrader.h>
#include <QWidget>
#include <QFile>
......@@ -79,14 +80,14 @@ KParts::ReadOnlyPart *KonqViewFactory::create( QWidget *parentWidget, QObject *
KonqViewFactory KonqFactory::createView( const QString &serviceType,
const QString &serviceName,
KService::Ptr *serviceImpl,
KTrader::OfferList *partServiceOffers,
KTrader::OfferList *appServiceOffers,
KService::List *partServiceOffers,
KService::List *appServiceOffers,
bool forceAutoEmbed )
{
kDebug(1202) << "Trying to create view for \"" << serviceType << "\"" << endl;
// We need to get those in any case
KTrader::OfferList offers, appOffers;
KService::List offers, appOffers;
// Query the trader
getOffers( serviceType, &offers, &appOffers );
......@@ -119,7 +120,7 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType,
// Look for this service
if ( !serviceName.isEmpty() )
{
KTrader::OfferList::Iterator it = offers.begin();
KService::List::Iterator it = offers.begin();
for ( ; it != offers.end() && !service ; ++it )
{
if ( (*it)->desktopEntryName() == serviceName )
......@@ -142,7 +143,7 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType,
service->name(), KLibLoader::self()->lastErrorMessage()));
}
KTrader::OfferList::Iterator it = offers.begin();
KService::List::Iterator it = offers.begin();
for ( ; !factory && it != offers.end() ; ++it )
{
service = (*it);
......@@ -186,20 +187,18 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType,
}
void KonqFactory::getOffers( const QString & serviceType,
KTrader::OfferList *partServiceOffers,
KTrader::OfferList *appServiceOffers )
KService::List *partServiceOffers,
KService::List *appServiceOffers )
{
if ( appServiceOffers )
{
*appServiceOffers = KTrader::self()->query( serviceType, "Application",
"DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'",
QString() );
*appServiceOffers = KMimeTypeTrader::self()->query( serviceType, "Application",
"DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'");
}
if ( partServiceOffers )
{
*partServiceOffers = KTrader::self()->query( serviceType, "KParts/ReadOnlyPart",
QString(), QString() );
*partServiceOffers = KMimeTypeTrader::self()->query( serviceType, "KParts/ReadOnlyPart" );
}
}
......
......@@ -26,7 +26,7 @@
#include <QStringList>
#include <klibloader.h>
#include <ktrader.h>
#include <kservice.h>
#include <kparts/part.h>
......@@ -68,13 +68,13 @@ public:
static KonqViewFactory createView( const QString &serviceType,
const QString &serviceName = QString(),
KService::Ptr *serviceImpl = 0,
KTrader::OfferList *partServiceOffers = 0,
KTrader::OfferList *appServiceOffers = 0,
KService::List *partServiceOffers = 0,
KService::List *appServiceOffers = 0,
bool forceAutoEmbed = false );
static void getOffers( const QString & serviceType,
KTrader::OfferList *partServiceOffers = 0,
KTrader::OfferList *appServiceOffers = 0);
KService::List *partServiceOffers = 0,
KService::List *appServiceOffers = 0);
static const KAboutData* aboutData();
......
......@@ -18,17 +18,19 @@
*/
#include <kdebug.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmenubar.h>
#include <kservicetypetrader.h>
#include "konq_view.h"
#include "konq_settingsxt.h"
#include "konq_frame.h"
#include "konq_guiclients.h"
#include "konq_viewmgr.h"
#include <kiconloader.h>
PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
const KTrader::OfferList &embeddingServices,
const KService::List &embeddingServices,
bool showEmbeddingServices, bool doTabHandling )
{
//giving a name to each guiclient: just for debugging
......@@ -66,8 +68,8 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
if ( showEmbeddingServices )
{
KTrader::OfferList::ConstIterator it = embeddingServices.begin();
KTrader::OfferList::ConstIterator end = embeddingServices.end();
KService::List::ConstIterator it = embeddingServices.begin();
KService::List::ConstIterator end = embeddingServices.end();
if ( embeddingServices.count() == 1 )
{
......@@ -160,8 +162,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
{
m_mainWindow = mainWindow;
KTrader::OfferList offers = KTrader::self()->query( "Browser/View" );
KTrader::OfferList::Iterator it = offers.begin();
KService::List offers = KServiceTypeTrader::self()->query( "Browser/View" );
KService::List::Iterator it = offers.begin();
while ( it != offers.end() )
{
QVariant prop = (*it)->property( "X-KDE-BrowserView-Toggable" );
......@@ -182,8 +184,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
if ( m_empty )
return;
KTrader::OfferList::ConstIterator cIt = offers.begin();
KTrader::OfferList::ConstIterator cEnd = offers.end();
KService::List::ConstIterator cIt = offers.begin();
KService::List::ConstIterator cEnd = offers.end();
for (; cIt != cEnd; ++cIt )
{
QString description = i18n( "Show %1" , (*cIt)->name() );
......
......@@ -23,7 +23,7 @@
#include <kxmlguiclient.h>
#include <QObject>
#include <QHash>
#include <ktrader.h>
#include <kservice.h>
class KAction;
class KActionCollection;
......@@ -55,7 +55,7 @@ class KonqView;
class PopupMenuGUIClient : public KXMLGUIClient
{
public:
PopupMenuGUIClient( KonqMainWindow *mainWindow, const KTrader::OfferList &embeddingServices,
PopupMenuGUIClient( KonqMainWindow *mainWindow, const KService::List &embeddingServices,
bool isIntoTrash, bool doTabHandling );
virtual ~PopupMenuGUIClient();
......
......@@ -98,6 +98,7 @@
#include "konq_main.h"
#include <konq_undo.h>
#include <kprotocolinfo.h>
#include <kprotocolmanager.h>
#include <kseparatoraction.h>
#include <kstdaccel.h>
#include <kstdaction.h>
......@@ -107,7 +108,7 @@
#include <ktoolbarpopupaction.h>
#include <kurlrequesterdlg.h>
#include <kurlrequester.h>
#include <kuserprofile.h>
#include <kmimetypetrader.h>
#include <kwin.h>
#include <kfiledialog.h>
#include <klocale.h>
......@@ -425,7 +426,7 @@ void KonqMainWindow::removeContainer( QWidget *container, QWidget *parent, QDomE
// Note: this removes the filter from the URL.
QString KonqMainWindow::detectNameFilter( KUrl & url )
{
if ( !KProtocolInfo::supportsListing(url) )
if ( !KProtocolManager::supportsListing(url) )
return QString();
// Look for wildcard selection
......@@ -580,7 +581,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KUrl &_url,
if ( ( !serviceType.isEmpty() && serviceType != "application/octet-stream") ||
url.url() == "about:konqueror" || url.url() == "about:plugins" )
{
KService::Ptr offer = KServiceTypeProfile::preferredService(serviceType, "Application");
KService::Ptr offer = KMimeTypeTrader::self()->preferredService(serviceType, "Application");
// If the associated app is konqueror itself, then make sure we try to embed before bailing out.
if ( isMimeTypeAssociatedWithSelf( serviceType, offer ) )
req.forceAutoEmbed = true;
......@@ -615,7 +616,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KUrl &_url,
lst.append(url);
//kDebug(1202) << "Got offer " << (offer ? offer->name().toLatin1() : "0") << endl;
if ( ( trustedSource || KonqRun::allowExecution( serviceType, url ) ) &&
( KonqRun::isExecutable( serviceType ) || !offer || !KRun::run( *offer, lst ) ) )
( KonqRun::isExecutable( serviceType ) || !offer || !KRun::run( *offer, lst, this ) ) )
{
setLocationBarURL( oldLocationBarURL ); // Revert to previous locationbar URL
(void)new KRun( url, this );
......@@ -865,7 +866,7 @@ bool KonqMainWindow::openView( QString serviceType, const KUrl &_url, KonqView *
// 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.
if ( ok && !forceAutoEmbed && !KProtocolInfo::supportsWriting( url ) ) {
if ( ok && !forceAutoEmbed && !KProtocolManager::supportsWriting( url ) ) {
QString suggestedFilename;
KonqRun* run = childView->run();
......@@ -1475,7 +1476,7 @@ void KonqMainWindow::slotToolFind()
{
KUrl url;
if ( m_currentView && m_currentView->url().isLocalFile() )
url = KUrl::fromPathOrUrl( m_currentView->locationBarURL() );
url = m_currentView->locationBarURL();
else
url.setPath( QDir::homePath() );
KonqMainWindow * mw = KonqMisc::createBrowserWindowFromProfile(
......@@ -1521,13 +1522,13 @@ void KonqMainWindow::slotOpenWith()
QString serviceName = sender()->objectName();
KTrader::OfferList offers = m_currentView->appServiceOffers();
KTrader::OfferList::ConstIterator it = offers.begin();
KTrader::OfferList::ConstIterator end = offers.end();
KService::List offers = m_currentView->appServiceOffers();
KService::List::ConstIterator it = offers.begin();
KService::List::ConstIterator end = offers.end();
for (; it != end; ++it )
if ( (*it)->desktopEntryName() == serviceName )
{
KRun::run( **it, lst );
KRun::run( **it, lst, this );
return;
}
}
......@@ -1569,9 +1570,9 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
// iterate over all services, update the toolbar service map
// and check if we can do a quick property-based viewmode change
const KTrader::OfferList offers = m_currentView->partServiceOffers();
KTrader::OfferList::ConstIterator oIt = offers.begin();
KTrader::OfferList::ConstIterator oEnd = offers.end();
const KService::List offers = m_currentView->partServiceOffers();
KService::List::ConstIterator oIt = offers.begin();
KService::List::ConstIterator oEnd = offers.end();
const QString currentServiceKey = viewModeActionKey( m_currentView->service() );
for (; oIt != oEnd; ++oIt )
{
......@@ -1634,7 +1635,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
if ( !bQuickViewModeChange )
{
m_currentView->changeViewMode( m_currentView->serviceType(), modeName );
KUrl locURL = KUrl::fromPathOrUrl( locationBarURL );
KUrl locURL( locationBarURL );
QString nameFilter = detectNameFilter( locURL );
if( m_currentView->part()->inherits( "KonqDirPart" ) )
static_cast<KonqDirPart*>( m_currentView->part() )->setFilesToSelect( filesToSelect );
......@@ -1698,7 +1699,7 @@ void KonqMainWindow::showHTML( KonqView * _view, bool b, bool _activateView )
{
KUrl u( _view->url() );
QString fileName = u.fileName().toLower();
if ( KProtocolInfo::supportsListing( u ) && fileName.startsWith("index.htm") ) {
if ( KProtocolManager::supportsListing( u ) && fileName.startsWith("index.htm") ) {
_view->lockHistory();
u.setPath( u.directory() );
openView( "inode/directory", u, _view );
......@@ -2093,7 +2094,7 @@ void KonqMainWindow::slotViewCompleted( KonqView * view )
// changes the directory!! (DA)
if( m_pURLCompletion )
{
KUrl u = KUrl::fromPathOrUrl( view->locationBarURL() );
KUrl u( view->locationBarURL() );
if( u.isLocalFile() )
m_pURLCompletion->setDir( u.path() );
else
......@@ -2961,7 +2962,7 @@ void KonqMainWindow::slotUpAboutToShow()
// Use the location bar URL, because in case we display a index.html
// we want to go up from the dir, not from the index.html
KUrl u = KUrl::fromPathOrUrl( m_currentView->locationBarURL() );
KUrl u( m_currentView->locationBarURL() );
u = u.upUrl();
while ( u.hasPath() )
{
......@@ -3020,7 +3021,7 @@ void KonqMainWindow::slotUpDelayed()
void KonqMainWindow::slotUpActivated( int id )
{
KUrl u = KUrl::fromPathOrUrl( m_currentView->locationBarURL() );
KUrl u( m_currentView->locationBarURL() );
kDebug(1202) << "slotUpActivated. Start URL is " << u << endl;
for ( int i = 0 ; i < m_paUp->menu()->indexOf( id ) + 1 ; i ++ )
u = u.upUrl();
......@@ -4089,7 +4090,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::fromPathOrUrl( m_currentView->locationBarURL() ).path();
QString locPath = KUrl( m_currentView->locationBarURL() ).path();
m_ptaUseHTML->setEnabled( QFileInfo( locPath ).isDir() );
} else
m_ptaUseHTML->setEnabled( false );
......@@ -4620,14 +4621,14 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
bool sReading = false;
if ( _items.count() > 0 )
{
m_popupURL = _items.first()->url();
sReading = KProtocolInfo::supportsReading( m_popupURL );
m_popupUrl = _items.first()->url();
sReading = KProtocolManager::supportsReading( m_popupUrl );
if (sReading)
m_popupServiceType = _items.first()->mimetype();
}
else
{
m_popupURL = KUrl();
m_popupUrl = KUrl();
m_popupServiceType.clear();
}
......@@ -4635,7 +4636,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
QString currentServiceName = currentView->service()->desktopEntryName();
// List of services for the "Preview In" submenu.
m_popupEmbeddingServices = KTrader::self()->query(
m_popupEmbeddingServices = KMimeTypeTrader::self()->query(
m_popupServiceType,
"KParts/ReadOnlyPart",
// Obey "HideFromMenus". It defaults to false so we want "absent or true"
......@@ -4643,8 +4644,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const QPoint &_global
"(not exist [X-KDE-BrowserView-HideFromMenus] or not [X-KDE-BrowserView-HideFromMenus]) "
"and DesktopEntryName != '"+currentServiceName+"' "
// I had an old local dirtree.desktop without lib, no need for invalid entries
"and exist [Library]",
QString() );
"and exist [Library]");
}
......@@ -4798,11 +4798,11 @@ void KonqMainWindow::slotOpenEmbedded()
void KonqMainWindow::slotOpenEmbeddedDoIt()
{
m_currentView->stop();
m_currentView->setLocationBarURL(m_popupURL);
m_currentView->setLocationBarURL(m_popupUrl);
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()
......@@ -4818,9 +4818,9 @@ void KonqMainWindow::slotDatabaseChanged()
void KonqMainWindow::slotPopupPasteTo()
{
if ( !m_currentView || m_popupURL.isEmpty() )
if ( !m_currentView || m_popupUrl.isEmpty() )
return;
m_currentView->callExtensionURLMethod( "pasteTo(const KUrl&)", m_popupURL );
m_currentView->callExtensionURLMethod( "pasteTo(const KUrl&)", m_popupUrl );
}
void KonqMainWindow::slotReconfigure()
......@@ -4868,9 +4868,9 @@ void KonqMainWindow::updateOpenWithActions()
if (!KAuthorized::authorizeKAction("openwith"))
return;
const KTrader::OfferList & services = m_currentView->appServiceOffers();
KTrader::OfferList::ConstIterator it = services.begin();
KTrader::OfferList::ConstIterator end = services.end();
const KService::List & services = m_currentView->appServiceOffers();
KService::List::ConstIterator it = services.begin();
KService::List::ConstIterator end = services.end();
for (; it != end; ++it )
{
KAction *action = new KAction( i18n( "Open with %1" , (*it)->name() ), 0, 0, 0, actionCollection(), (*it)->desktopEntryName().toLatin1() );
......@@ -4924,7 +4924,7 @@ void KonqMainWindow::updateViewModeActions()
m_viewModeToolBarServices.clear();
}
KTrader::OfferList services = m_currentView->partServiceOffers();
KService::List services = m_currentView->partServiceOffers();
if ( services.count() <= 1 )
return;
......@@ -4945,8 +4945,8 @@ void KonqMainWindow::updateViewModeActions()
KConfig * config = KGlobal::config();
KConfigGroup barServicesGroup( config, "ModeToolBarServices" );