kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 00:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

port to new qt 4.2 snapshot

Browse source 
svn path=/trunk/KDE/kdebase/konqueror/; revision=575652
This commit is contained in:
Stephan Kulow 2006-08-21 20:18:49 +00:00
parent ea68c151ea
commit 6009d735a3
27 changed files with 73 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kdialog/progressdialog.cpp
View file

@ -26,8 +26,8 @@ ProgressDialog::ProgressDialog(QWidget* parent, const QString& caption, const QS
: KProgressDialog(parent, caption, text, false)
{
(void)new ProgressDialogAdaptor( this );
QDBus::sessionBus().registerObject( QLatin1String("/ProgressDialog"), this );
QDBus::sessionBus().registerService( "org.kde.kdialog" );
QDBusConnection::sessionBus().registerObject( QLatin1String("/ProgressDialog"), this );
QDBusConnection::sessionBus().registerService( "org.kde.kdialog" );
setAutoClose( false );
progressBar()->setMaximum( totalSteps );
showCancelButton( false );

2
keditbookmarks/dcop.cpp
View file

@ -30,7 +30,7 @@
KBookmarkEditorIface::KBookmarkEditorIface()
: QObject()
{
QDBus::sessionBus().connect( QString(), // any service
QDBusConnection::sessionBus().connect( QString(), // any service
"/", "org.kde.KIO.KBookmarkNotifier", // path and interface, see kbookmarknotifier.cpp
"updatedAccessMetadata", // signal name
this, SLOT(slotDcopUpdatedAccessMetadata(QString,QString)) );

2
konqueror/KonquerorAdaptor.cpp
View file

@ -48,7 +48,7 @@
KonquerorAdaptor::KonquerorAdaptor()
: QObject( kapp )
{
QDBusConnection dbus = QDBus::sessionBus();
QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerObject( KONQ_MAIN_PATH, this, QDBusConnection::ExportNonScriptableSlots );
}

14
konqueror/client/kfmclient.cpp
View file

@ -219,7 +219,7 @@ static void needDBus()
if ( !s_dbus_initialized ) {
extern void qDBusBindToApplication();
qDBusBindToApplication();
if (!QDBus::sessionBus().isConnected())
if (!QDBusConnection::sessionBus().isConnected())
kFatal(101) << "Session bus not found" << endl;
s_dbus_initialized = true;
}
@ -235,7 +235,7 @@ static QString getPreloadedKonqy()
if( cfg.readEntry( "MaxPreloadCount", 1 ) == 0 )
return QString();
needDBus();
QDBusInterface ref( "org.kde.kded", "/modules/konqy_preloader", "org.kde.konqueror.Preloader", QDBus::sessionBus() );
QDBusInterface ref( "org.kde.kded", "/modules/konqy_preloader", "org.kde.konqueror.Preloader", QDBusConnection::sessionBus() );
// ## used to have NoEventLoop and 3s timeout with dcop
QDBusReply<QString> reply = ref.call( "getPreloadedKonqy", currentScreen() );
if ( reply.isValid() )
@ -252,7 +252,7 @@ static QString konqyToReuse( const QString& url, const QString& mimetype, const
if( startNewKonqueror( url, mimetype, profile ))
return QString();
needDBus();
QDBusConnection dbus = QDBus::sessionBus();
QDBusConnection dbus = QDBusConnection::sessionBus();
QDBusReply<QStringList> reply = dbus.interface()->registeredServiceNames();
if ( !reply.isValid() )
return QString();
@ -319,7 +319,7 @@ bool ClientApp::createNewWindow(const KUrl & url, bool newTab, bool tempFile, co
}
needDBus();
QDBusConnection dbus = QDBus::sessionBus();
QDBusConnection dbus = QDBusConnection::sessionBus();
KConfig cfg( QLatin1String( "konquerorrc" ), true );
cfg.setGroup( "FMSettings" );
if ( newTab || cfg.readEntry( "KonquerorTabforExternalURL", false) ) {
@ -336,7 +336,7 @@ bool ClientApp::createNewWindow(const KUrl & url, bool newTab, bool tempFile, co
QDBusReply<QDBusObjectPath> windowReply = konq.windowForTab();
if ( windowReply.isValid() ) {
QDBusObjectPath path = windowReply;
if ( !path.value.isEmpty() ) {
if ( !path.path().isEmpty() ) {
foundApp = service;
foundObj = path;
}
@ -346,7 +346,7 @@ bool ClientApp::createNewWindow(const KUrl & url, bool newTab, bool tempFile, co
}
if ( !foundApp.isEmpty() ) {
org::kde::Konqueror::MainWindow konqWindow( foundApp, foundObj.value, dbus );
org::kde::Konqueror::MainWindow konqWindow( foundApp, foundObj.path(), dbus );
QDBusReply<void> newTabReply = konqWindow.newTabASN( url.url(), startup_id_str, tempFile );
if ( newTabReply.isValid() ) {
sendASNChange();
@ -419,7 +419,7 @@ bool ClientApp::openProfile( const QString & profileName, const QString & url, c
::exit( 0 );
}
needDBus();
org::kde::Konqueror::Main konqy( appId, "/KonqMain", QDBus::sessionBus() );
org::kde::Konqueror::Main konqy( appId, "/KonqMain", QDBusConnection::sessionBus() );
if ( url.isEmpty() )
konqy.createBrowserWindowFromProfile( profile, profileName, startup_id_str );
else if ( mimetype.isEmpty() )

2
konqueror/konq_application.cpp
View file

@ -28,7 +28,7 @@ KonquerorApplication::KonquerorApplication()
{
new KonquerorAdaptor; // not really an adaptor
const QString dbusInterface = "org.kde.Konqueror.Main";
QDBusConnection dbus = QDBus::sessionBus();
QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.connect(QString(), KONQ_MAIN_PATH, dbusInterface, "reparseConfiguration", this, SLOT(slotReparseConfiguration()));
}

7
konqueror/konq_main.cc
View file

@ -129,17 +129,16 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
#ifdef Q_WS_X11
if( KonqSettings::maxPreloadCount() > 0 )
{
QDBusInterface ref( "org.kde.kded", "/modules/konqy_preloader", "org.kde.konqueror.Preloader", QDBus::sessionBus() );
QDBusInterface ref( "org.kde.kded", "/modules/konqy_preloader", "org.kde.konqueror.Preloader", QDBusConnection::sessionBus() );
QX11Info info;
QDBusReply<bool> retVal = ref.call( QDBus::Block, "registerPreloadedKonqy",
QDBus::sessionBus().baseService(), info.screen());
QDBusReply<bool> retVal = ref.call( QDBus::Block, "registerPreloadedKonqy", QDBusConnection::sessionBus().baseService(), info.screen());
if( !retVal )
return 0; // too many preloaded or failed
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 );
kDebug(1202) << "Konqy preloaded :" << QDBus::sessionBus().baseService() << endl;
kDebug(1202) << "Konqy preloaded :" << QDBusConnection::sessionBus().baseService() << endl;
}
else
{

13
konqueror/konq_mainwindow.cc
View file

@ -3615,7 +3615,7 @@ void KonqMainWindow::comboAction( int action, const QString& url, const QString&
}
// only one instance should save...
if ( combo && senderId == QDBus::sessionBus().baseService() )
if ( combo && senderId == QDBusConnection::sessionBus().baseService() )
combo->saveItems();
}
@ -5622,8 +5622,8 @@ void KonqMainWindow::setPreloadedFlag( bool preloaded )
delete s_preloadedWindow; // preloaded state was abandoned without reusing the window
s_preloadedWindow = NULL;
kapp->enableSessionManagement(); // enable SM again
QDBusInterface ref( "org.kde.kded", "/modules/konqy_preloader", "org.kde.konqueror.Preloader", QDBus::sessionBus() );
ref.call( "unregisterPreloadedKonqy", QDBus::sessionBus().baseService() );
QDBusInterface ref( "org.kde.kded", "/modules/konqy_preloader", "org.kde.konqueror.Preloader", QDBusConnection::sessionBus() );
ref.call( "unregisterPreloadedKonqy", QDBusConnection::sessionBus().baseService() );
}
void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window )
@ -5736,16 +5736,15 @@ bool KonqMainWindow::stayPreloaded()
viewManager()->clear(); // reduce resource usage before checking it
if( !checkPreloadResourceUsage())
return false;
QDBusInterface ref( "org.kde.kded", "/modules/konqy_preloader", "org.kde.konqueror.Preloader", QDBus::sessionBus() );
QDBusInterface ref( "org.kde.kded", "/modules/konqy_preloader", "org.kde.konqueror.Preloader", QDBusConnection::sessionBus() );
QX11Info info;
QDBusReply<bool> retVal = ref.call( QDBus::Block, "registerPreloadedKonqy",
QDBus::sessionBus().baseService(), info.screen());
QDBusReply<bool> retVal = ref.call( QDBus::Block, "registerPreloadedKonqy", QDBusConnection::sessionBus().baseService(), info.screen());
if ( !retVal )
{
return false;
}
KonqMainWindow::setPreloadedFlag( true );
kDebug(1202) << "Konqy kept for preloading :" << QDBus::sessionBus().baseService() << endl;
kDebug(1202) << "Konqy kept for preloading :" << QDBusConnection::sessionBus().baseService() << endl;
KonqMainWindow::setPreloadedWindow( this );
return true;
#else

2
konqueror/konq_view.cc
View file

@ -1216,7 +1216,7 @@ QString KonqView::dbusObjectPath()
if ( m_dbusObjectPath.isEmpty() ) {
m_dbusObjectPath = '/' + m_pMainWindow->objectName() + '/' + QString::number( ++s_viewNumber );
new KonqViewAdaptor( this );
QDBus::sessionBus().registerObject( m_dbusObjectPath, this );
QDBusConnection::sessionBus().registerObject( m_dbusObjectPath, this );
}
return m_dbusObjectPath;
}

2
konqueror/kttsplugin/khtmlkttsd.cpp
View file

@ -60,7 +60,7 @@ void KHTMLPluginKTTSD::slotReadOut()
"this plugin, sorry." ));
else
{
if (!QDBus::sessionBus().interface()->isServiceRegistered("kttsd"))
if (!QDBusConnection::sessionBus().interface()->isServiceRegistered("kttsd"))
{
QString error;
if (KToolInvocation::startServiceByDesktopName("kttsd", QStringList(), &error))

10
konqueror/preloader/preloader.cc
View file

@ -32,8 +32,8 @@ KonqyPreloader::KonqyPreloader()
reconfigure();
(void)new PreloaderAdaptor(this);
connect( QDBus::sessionBus().interface(), SIGNAL( serviceUnregistered( const QString & )),
connect( QDBusConnection::sessionBus().interface(), SIGNAL( serviceUnregistered( const QString & )),
SLOT( appRemoved( const QString& )));
check_always_preloaded_timer.setSingleShot( true );
connect( &check_always_preloaded_timer, SIGNAL( timeout()),
@ -88,7 +88,7 @@ void KonqyPreloader::appRemoved( const QString& id )
{
unregisterPreloadedKonqy( id );
}
void KonqyPreloader::reconfigure()
{
KonqSettings::self()->readConfig();
@ -133,7 +133,7 @@ void KonqyPreloader::checkAlwaysPreloaded()
// but I have no idea how to do it
updateCount();
}
void KonqyPreloader::unloadAllPreloaded()
{
while( instances.count() > 0 )
@ -145,7 +145,7 @@ void KonqyPreloader::unloadAllPreloaded()
}
// ignore 'always_have_preloaded' here
}
extern "C"
KDE_EXPORT KDEDModule *create_konqy_preloader()
{

12
konqueror/settings/kio/kcookiesmanagement.cpp
View file

@ -148,7 +148,7 @@ void KCookiesManagement::save()
// If delete all cookies was requested!
if(m_bDeleteAll)
{
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBus::sessionBus());
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBusConnection::sessionBus());
QDBusReply<void> reply = kded.call( "deleteAllCookies" );
if (!reply.isValid())
{
@ -165,7 +165,7 @@ void KCookiesManagement::save()
QStringList::Iterator dIt = deletedDomains.begin();
while( dIt != deletedDomains.end() )
{
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBus::sessionBus());
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBusConnection::sessionBus());
QDBusReply<void> reply = kded.call( "deleteCookiesFromDomain",( *dIt ) );
if( !reply.isValid() )
{
@ -189,7 +189,7 @@ void KCookiesManagement::save()
while(*cookie)
{
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBus::sessionBus());
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBusConnection::sessionBus());
QDBusReply<void> reply = kded.call( "deleteCookie",(*cookie)->domain,
(*cookie)->host, (*cookie)->path,
(*cookie)->name );
@ -249,7 +249,7 @@ QString KCookiesManagement::quickHelp() const
void KCookiesManagement::getDomains()
{
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBus::sessionBus());
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBusConnection::sessionBus());
QDBusReply<QStringList> reply = kded.call( "findDomains" );
if( !reply.isValid() )
{
@ -289,7 +289,7 @@ void KCookiesManagement::getCookies(Q3ListViewItem *cookieDom)
QList<QVariant> fields;
fields << QVariant(0) << QVariant(1) << QVariant(2) << QVariant(3);
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBus::sessionBus());
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBusConnection::sessionBus());
QDBusReply<QStringList> reply = kded.call( "findCookies", fields, ckd->domain(),
QString(),
QString(),
@ -320,7 +320,7 @@ bool KCookiesManagement::cookieDetails(CookieProp *cookie)
QList<QVariant> fields;
fields << QVariant(4) << QVariant(5) << QVariant(7);
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBus::sessionBus());
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBusConnection::sessionBus());
QDBusReply<QStringList> reply = kded.call( "findCookies", fields,
cookie->domain,
cookie->host,

4
konqueror/settings/kio/kcookiespolicies.cpp
View file

@ -403,12 +403,12 @@ void KCookiesPolicies::save()
// Update the cookiejar...
if (!dlg->cbEnableCookies->isChecked())
{
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBus::sessionBus());
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBusConnection::sessionBus());
kded.call( "shutdown" );
}
else
{
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBus::sessionBus());
QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBusConnection::sessionBus());
QDBusReply<void> reply = kded.call( "reloadPolicy" );
if (!reply.isValid())
KMessageBox::sorry(0, i18n("Unable to communicate with the cookie handler service.\n"

8
konqueror/settings/konq/behaviour.cpp
View file

@ -281,16 +281,16 @@ void KBehaviourOptions::save()
config->writeEntry( "ShowList", cbListProgress->isChecked() );
config->sync();
// Tell the running server
if ( QDBus::sessionBus().interface()->isServiceRegistered( "org.kde.kio_uiserver" ) )
if ( QDBusConnection::sessionBus().interface()->isServiceRegistered( "org.kde.kio_uiserver" ) )
{
QDBusInterface uiserver( "org.kde.kio_uiserver", "/UIServer", QString(), QDBus::sessionBus() );
QDBusInterface uiserver( "org.kde.kio_uiserver", "/UIServer", QString(), QDBusConnection::sessionBus() );
uiserver.call( "setListMode", cbListProgress->isChecked() );
}
// Send signal to all konqueror instances
QDBusMessage message =
QDBusMessage::signal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration", QDBus::sessionBus());
QDBus::sessionBus().send(message);
QDBusMessage::createSignal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration");
QDBusConnection::sessionBus().send(message);
}
void KBehaviourOptions::updateWinPixmap(bool b)

4
konqueror/settings/konq/fontopts.cpp
View file

@ -372,8 +372,8 @@ void KonqFontOptions::save()
// Send signal to konqueror
// Warning. In case something is added/changed here, keep kfmclient in sync
QDBusMessage message =
QDBusMessage::signal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration", QDBus::sessionBus());
QDBus::sessionBus().send(message);
QDBusMessage::createSignal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration");
QDBusConnection::sessionBus().send(message);
// Tell kdesktop about the new config file
int konq_screen_number = KApplication::desktop()->primaryScreen();

4
konqueror/settings/konq/previews.cpp
View file

@ -215,8 +215,8 @@ void KPreviewOptions::save()
// Send signal to all konqueror instances
QDBusMessage message =
QDBusMessage::signal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration", QDBus::sessionBus());
QDBus::sessionBus().send(message);
QDBusMessage::createSignal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration");
QDBusConnection::sessionBus().send(message);
}
void KPreviewOptions::changed()

6
konqueror/settings/konqhtml/filteropts.cpp
View file

@ -62,7 +62,7 @@ KCMFilter::KCMFilter( QWidget *parent, const QStringList& )
topLayout->addWidget( topBox );
QVBoxLayout *vbox = new QVBoxLayout;
mListBox = new Q3ListBox;
mListBox->setSelectionMode(Q3ListBox::Extended);
vbox->addWidget(mListBox);
@ -254,8 +254,8 @@ void KCMFilter::save()
mConfig->sync();
QDBusMessage message =
QDBusMessage::signal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration", QDBus::sessionBus());
QDBus::sessionBus().send(message);
QDBusMessage::createSignal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration");
QDBusConnection::sessionBus().send(message);
}
void KCMFilter::load()

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

@ -108,8 +108,8 @@ void KJSParts::save()
// Send signal to konqueror
// Warning. In case something is added/changed here, keep kfmclient in sync
QDBusMessage message =
QDBusMessage::signal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration", QDBus::sessionBus());
QDBus::sessionBus().send(message);
QDBusMessage::createSignal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration");
QDBusConnection::sessionBus().send(message);
}

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

@ -13,7 +13,7 @@ KonqSidebarHistorySettings::KonqSidebarHistorySettings( QObject *parent )
new KonqSidebarHistorySettingsAdaptor( this );
const QString dbusPath = "/KonqSidebarHistorySettings";
const QString dbusInterface = "org.kde.Konqueror.SidebarHistorySettings";
QDBusConnection *dbus = &QDBus::sessionBus();
QDBusConnection *dbus = &QDBusConnection::sessionBus();
dbus->registerObject( dbusPath, this );
dbus->connect(QString(), dbusPath, dbusInterface, "notifySettingsChanged", this, SLOT(slotSettingsChanged()));
}

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

@ -198,7 +198,7 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, QWidget *parentWidge
setFrameStyle( QFrame::ToolBarPanel | QFrame::Raised );
OrgKdeKDirNotifyInterface *kdirnotify = new OrgKdeKDirNotifyInterface(QString(), QString(), QDBus::sessionBus());
OrgKdeKDirNotifyInterface *kdirnotify = new OrgKdeKDirNotifyInterface(QString(), QString(), QDBusConnection::sessionBus());
kdirnotify->setParent(this);
connect(kdirnotify, SIGNAL(FilesAdded(QString)), SLOT(slotFilesAdded(QString)));
connect(kdirnotify, SIGNAL(FilesChanged(QStringList)), SLOT(slotFilesChanged(QStringList)));

3
lib/konq/konq_faviconmgr.cc
View file

@ -29,8 +29,7 @@
KonqFavIconMgr::KonqFavIconMgr(QObject *parent)
: QObject(parent)
{
m_favIconsModule = new QDBusInterface("org.kde.kded", "/modules/favicons", FAVICONINTERFACE,
QDBus::sessionBus(), this);
m_favIconsModule = new QDBusInterface("org.kde.kded", "/modules/favicons", FAVICONINTERFACE, QDBusConnection::sessionBus(), this);
connect( m_favIconsModule, SIGNAL(iconChanged(bool,QString,QString)),
this, SLOT(notifyChange(bool,QString,QString)));

4
lib/konq/konq_historymgr.cc
View file

@ -62,7 +62,7 @@ KonqHistoryManager::KonqHistoryManager( QObject *parent )
const QString dbusPath = "/KonqHistoryManager";
const QString dbusInterface = "org.kde.libkonq.KonqHistoryManager";
QDBusConnection dbus = QDBus::sessionBus();
QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerObject( dbusPath, this );
dbus.connect(QString(), dbusPath, dbusInterface, "notifyClear", this, SLOT(slotNotifyClear(QDBusMessage)));
dbus.connect(QString(), dbusPath, dbusInterface, "notifyHistoryEntry", this, SLOT(slotNotifyHistoryEntry(QByteArray,QDBusMessage)));
@ -81,7 +81,7 @@ KonqHistoryManager::~KonqHistoryManager()
static QString dbusService()
{
return QDBus::sessionBus().baseService();
return QDBusConnection::sessionBus().baseService();
}
bool KonqHistoryManager::isSenderOfSignal( const QDBusMessage& msg )

5
lib/konq/konq_popupmenu.cc
View file

@ -689,7 +689,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( cfg.hasKey( "X-KDE-ShowIfRunning" ) )
{
const QString app = cfg.readEntry( "X-KDE-ShowIfRunning" );
if ( QDBus::sessionBus().interface()->serviceOwner( app ).value().isEmpty() )
if ( QDBusConnection::sessionBus().interface()->serviceOwner( app ).value().isEmpty() )
continue;
}
if ( cfg.hasKey( "X-KDE-ShowIfDBusCall" ) )
@ -711,8 +711,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
QDBusMessage reply = QDBusInterface( app, obj, interface ).
call( method, m_lstPopupURLs.toStringList() );
if ( reply.count() < 1 || reply.at(0).type() != QVariant::Bool ||
!reply.at(0).toBool() )
if ( reply.arguments().count() < 1 || reply.arguments().at(0).type() != QVariant::Bool || !reply.arguments().at(0).toBool() )
continue;
}

2
lib/konq/konq_undo.cc
View file

@ -189,7 +189,7 @@ KonqUndoManager::KonqUndoManager()
const QString dbusPath = "/KonqUndoManager";
const QString dbusInterface = "org.kde.libkonq.UndoManager";
QDBusConnection dbus = QDBus::sessionBus();
QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerObject( dbusPath, this );
dbus.connect(QString(), dbusPath, dbusInterface, "lock", this, SLOT(slotLock()));
dbus.connect(QString(), dbusPath, dbusInterface, "pop", this, SLOT(slotPop()));

17
nsplugins/nspluginloader.cpp
View file

@ -57,7 +57,7 @@ int NSPluginLoader::s_refCount = 0;
NSPluginInstance::NSPluginInstance(QWidget *parent, const QString& app, const QString& id)
: EMBEDCLASS(parent)
{
_instanceInterface = new org::kde::nsplugins::Instance( app, id, QDBus::sessionBus() );
_instanceInterface = new org::kde::nsplugins::Instance( app, id, QDBusConnection::sessionBus() );
_loader = 0;
shown = false;
@ -140,7 +140,7 @@ NSPluginLoader::NSPluginLoader()
_filetype.setAutoDelete(true);
// trap dbus register events
QObject::connect(QDBus::sessionBus().interface(),
QObject::connect(QDBusConnection::sessionBus().interface(),
SIGNAL(serviceRegistered(const QString&)),
this, SLOT(applicationRegistered(const QString&)));
@ -316,7 +316,7 @@ bool NSPluginLoader::loadViewer()
// wait for the process to run
int cnt = 0;
while (!QDBus::sessionBus().interface()->isServiceRegistered(_dbusService))
while (!QDBusConnection::sessionBus().interface()->isServiceRegistered(_dbusService))
{
//kapp->processEvents(); // would lead to recursive calls in khtml
#ifdef HAVE_USLEEP
@ -345,7 +345,7 @@ bool NSPluginLoader::loadViewer()
}
// get viewer dcop interface
_viewer = new org::kde::nsplugins::Viewer( _dbusService, "/Viewer", QDBus::sessionBus() );
_viewer = new org::kde::nsplugins::Viewer( _dbusService, "/Viewer", QDBusConnection::sessionBus() );
return _viewer!=0;
}
@ -440,12 +440,12 @@ NSPluginInstance *NSPluginLoader::newInstance(QWidget *parent, const QString& ur
// get plugin class object
QDBusObjectPath cls_ref = _viewer->newClass( plugin_name );
if ( cls_ref.value.isEmpty() )
if ( cls_ref.path().isEmpty() )
{
kDebug() << "Couldn't create plugin class" << endl;
return 0;
}
org::kde::nsplugins::Class* cls = new org::kde::nsplugins::Class( appId, cls_ref.value, QDBus::sessionBus() );
org::kde::nsplugins::Class* cls = new org::kde::nsplugins::Class( appId, cls_ref.path(), QDBusConnection::sessionBus() );
// handle special plugin cases
if ( mime=="application/x-shockwave-flash" )
@ -454,15 +454,14 @@ NSPluginInstance *NSPluginLoader::newInstance(QWidget *parent, const QString& ur
// get plugin instance
QDBusObjectPath inst_ref = cls->newInstance( url, mime, embed, argn, argv, appId, callbackId, reload );
if ( inst_ref.value.isEmpty() )
if ( inst_ref.path().isEmpty() )
{
kDebug() << "Couldn't create plugin instance" << endl;
delete cls;
return 0;
}
NSPluginInstance *plugin = new NSPluginInstance( parent, appId,
inst_ref.value );
NSPluginInstance *plugin = new NSPluginInstance( parent, appId, inst_ref.path() );
kDebug() << "<- NSPluginLoader::NewInstance = " << (void*)plugin << endl;

4
nsplugins/plugin_part.cpp
View file

@ -176,7 +176,7 @@ PluginPart::PluginPart(QWidget *parentWidget, QObject *parent, const QStringList
_destructed(0L)
{
(void) new NsPluginsCallBackAdaptor( this );
QDBus::sessionBus().registerObject( s_callBackObjectPath, this );
QDBusConnection::sessionBus().registerObject( s_callBackObjectPath, this );
setInstance(PluginFactory::instance());
kDebug(1432) << "PluginPart::PluginPart" << endl;
@ -273,7 +273,7 @@ bool PluginPart::openURL(const KUrl &url)
// create plugin widget
NSPluginInstance *inst = _loader->newInstance( _canvas, surl, smime, embed,
argn, argv,
QDBus::sessionBus().baseService(),
QDBusConnection::sessionBus().baseService(),
s_callBackObjectPath, reload);
if ( inst ) {

10
nsplugins/viewer/nsplugin.cpp
View file

@ -588,7 +588,7 @@ NSPluginInstance::NSPluginInstance(NPP privateData, NPPluginFuncs *pluginFuncs,
// The object name is the dbus object path
(void) new InstanceAdaptor( this );
setObjectName( QString( "/Instance_" ) + QString::number( ++s_instanceCounter ) );
QDBus::sessionBus().registerObject( objectName(), this );
QDBusConnection::sessionBus().registerObject( objectName(), this );
Q_UNUSED(embed);
_firstResize = true;
@ -602,7 +602,7 @@ NSPluginInstance::NSPluginInstance(NPP privateData, NPPluginFuncs *pluginFuncs,
_tempFiles.setAutoDelete( true );
_streams.setAutoDelete( true );
_waitingRequests.setAutoDelete( true );
_callback = new org::kde::nsplugins::CallBack( appId, callbackId, QDBus::sessionBus() );
_callback = new org::kde::nsplugins::CallBack( appId, callbackId, QDBusConnection::sessionBus() );
KUrl base(src);
base.setFileName( QString() );
@ -1207,9 +1207,9 @@ NSPluginViewer::NSPluginViewer( QObject *parent )
: QObject( parent )
{
(void) new ViewerAdaptor( this );
QDBus::sessionBus().registerObject( "/Viewer", this );
QDBusConnection::sessionBus().registerObject( "/Viewer", this );
QObject::connect(QDBus::sessionBus().interface(),
QObject::connect(QDBusConnection::sessionBus().interface(),
SIGNAL(serviceUnregistered(const QString&)),
this, SLOT(appUnregistered(const QString&)));
}
@ -1283,7 +1283,7 @@ NSPluginClass::NSPluginClass( const QString &library,
(void) new ClassAdaptor( this );
// The object name is used to store the dbus object path
setObjectName( QString( "/Class_" ) + QString::number( ++s_classCounter ) );
QDBus::sessionBus().registerObject( objectName(), this );
QDBusConnection::sessionBus().registerObject( objectName(), this );
// initialize members
_handle = KLibLoader::self()->library(QFile::encodeName(library));

2
nsplugins/viewer/viewer.cpp
View file

@ -143,7 +143,7 @@ int main(int argc, char** argv)
kDebug(1430) << "5 - dbus requestName" << endl;
if (!g_dbusServiceName.isEmpty()) {
QDBusConnectionInterface* bus = QDBus::sessionBus().interface(); // already null-checked by KApplication
QDBusConnectionInterface* bus = QDBusConnection::sessionBus().interface(); // already null-checked by KApplication
if ( bus->registerService(g_dbusServiceName, QDBusConnectionInterface::DontQueueService) == QDBusConnectionInterface::ServiceNotRegistered ) {
kError(101) << "Couldn't register name '" << g_dbusServiceName << "' with DBUS - another process owns it already!" << endl;
::exit(126);