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

merge changes from bleeding edge branch

Browse source 
svn path=/trunk/KDE/kdebase/konqueror/; revision=557225
This commit is contained in:
Dirk Mueller 2006-07-02 18:31:00 +00:00
parent 11a24af95a
commit f3638aaa99
49 changed files with 111 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kdepasswd/kcm/chfacedlg.cpp
View file

@ -62,7 +62,7 @@ ChFaceDlg::ChFaceDlg(const QString& picsdir, QWidget *parent, const char *name,
setCaption( i18n("Change your Face") );
setButtons( Ok|Cancel );
setDefaultButton( Ok );
enableButtonSeparator( true );
showButtonSeparator( true );
QWidget *page = new QWidget(this);
setMainWidget( page );

2
kdialog/kdialogadaptor.h
View file

@ -11,7 +11,7 @@
#define KDIALOGADAPTOR_H_214641149585043
#include <QtCore/QObject>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
class QByteArray;
template<class T> class QList;
template<class Key, class Value> class QMap;

2
kdialog/klistboxdialog.cpp
View file

@ -31,7 +31,7 @@ KListBoxDialog::KListBoxDialog(const QString &text, QWidget *parent)
{
setModal(true);
setButtons( Ok | Cancel );
enableButtonSeparator(true);
showButtonSeparator(true);
KVBox *page = new KVBox(this);
setMainWidget(page);

2
keditbookmarks/dcop.cpp
View file

@ -22,7 +22,7 @@
#include "dcop.h"
#include "toplevel.h"
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <kdebug.h>
#include <kbookmarkmanager.h>

2
kfind/kfinddlg.cpp
View file

@ -30,7 +30,7 @@ KfindDlg::KfindDlg(const KUrl & url, QWidget *parent, const char *name)
setDefaultButton( Apply );
setObjectName( name );
setModal( true );
enableButtonSeparator( true );
showButtonSeparator( true );
setButtonGuiItem( User1, KStdGuiItem::stop() );
setButtonGuiItem( User2, KStdGuiItem::saveAs() );

2
konqueror/KonqMainWindowAdaptor.h
View file

@ -21,7 +21,7 @@
#ifndef __KonqMainWindowAdaptor_h__
#define __KonqMainWindowAdaptor_h__
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
class KonqMainWindow;

2
konqueror/KonqViewAdaptor.h
View file

@ -22,7 +22,7 @@
#define __KonqViewAdaptor_h__
#include <QStringList>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
class KonqView;

12
konqueror/KonquerorAdaptor.h
View file

@ -22,7 +22,7 @@
#define __KonquerorAdaptor_h__
#include <QStringList>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
/**
* DBus interface of a konqueror process
@ -115,22 +115,22 @@ public slots:
/**
* Called internally as broadcast when the user adds/removes/renames a view profile
*/
Q_ASYNC void updateProfileList();
Q_NOREPLY void updateProfileList();
/**
* Called internally as broadcast when a URL is to be added to the combobox.
*/
Q_ASYNC void addToCombo( const QString& url, const QDBusMessage& msg );
Q_NOREPLY void addToCombo( const QString& url, const QDBusMessage& msg );
/**
* Called internall as broadcast when a URL has to be removed from the combo.
*/
Q_ASYNC void removeFromCombo( const QString& url, const QDBusMessage& msg );
Q_NOREPLY void removeFromCombo( const QString& url, const QDBusMessage& msg );
/**
* Called internally as a broadcast when the combobox was cleared.
*/
Q_ASYNC void comboCleared( const QDBusMessage& msg );
Q_NOREPLY void comboCleared( const QDBusMessage& msg );
/**
* Used by kfmclient when the 'minimize memory usage' setting is set
@ -142,7 +142,7 @@ public slots:
* Called from konqy_preloader to terminate this Konqueror instance,
* if it's in the preloaded mode, and there are too many preloaded Konqy's
*/
Q_ASYNC void terminatePreloaded();
Q_NOREPLY void terminatePreloaded();
Q_SIGNALS:
/**

2
konqueror/client/kfmclient.cc
View file

@ -38,7 +38,7 @@
#include <kservice.h>
#include <kstaticdeleter.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <QDir>
#include <QRegExp>

2
konqueror/konq_application.cpp
View file

@ -18,7 +18,7 @@
#include "konq_application.h"
#include <konq_settings.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include "konq_mainwindow.h"
#include "KonquerorAdaptor.h"

2
konqueror/konq_extensionmanager.cc
View file

@ -50,7 +50,7 @@ KonqExtensionManager::KonqExtensionManager(QWidget *parent, KonqMainWindow *main
setButtons( Default | Cancel | Apply | Ok | User1 );
setButtonGuiItem( User1, KStdGuiItem::reset() );
setObjectName( "extensionmanager" );
enableButtonSeparator( true );
showButtonSeparator( true );
d = new KonqExtensionManagerPrivate;
showButton(User1, false);

8
konqueror/konq_main.cc
View file

@ -37,7 +37,7 @@
#include <QX11Info>
#endif
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
static const KCmdLineOptions options[] =
{
@ -129,10 +129,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
#ifdef Q_WS_X11
if( KonqSettings::maxPreloadCount() > 0 )
{
QDBusInterfacePtr ref( QDBus::sessionBus().findInterface("org.kde.kded", "/modules/konqy_preloader", "org.kde.KonqyPreloader") );
QDBusInterface ref( QDBus::sessionBus().findInterface("org.kde.kded", "/modules/konqy_preloader", "org.kde.KonqyPreloader") );
QX11Info info;
QDBusReply<bool> retVal = ref->call( QDBusAbstractInterface::NoUseEventLoop, "registerPreloadedKonqy",
QDBus::sessionBus().baseService(), info.screen());
QDBusReply<bool> retVal = ref.call( QDBusAbstractInterface::NoUseEventLoop, "registerPreloadedKonqy",
QDBus::sessionBus().baseService(), info.screen());
if( !retVal )
return 0; // too many preloaded or failed
KonqMainWindow* win = new KonqMainWindow( KUrl(), false ); // prepare an empty window too

10
konqueror/konq_mainwindow.cc
View file

@ -137,7 +137,7 @@
#include <ktoolinvocation.h>
#include <kstaticdeleter.h>
#include "konq_mainwindow_p.h"
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
template class QList<QPixmap*>;
template class QList<KToggleAction*>;
@ -5611,8 +5611,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
QDBusInterfacePtr ref( QDBus::sessionBus().findInterface("org.kde.kded", "/modules/konqy_preloader", "org.kde.KonqyPreloader") );
ref->call( "unregisterPreloadedKonqy", QDBus::sessionBus().baseService() );
QDBusInterface ref( QDBus::sessionBus().findInterface("org.kde.kded", "/modules/konqy_preloader", "org.kde.KonqyPreloader") );
ref.call( "unregisterPreloadedKonqy", QDBus::sessionBus().baseService() );
}
void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window )
@ -5725,9 +5725,9 @@ bool KonqMainWindow::stayPreloaded()
viewManager()->clear(); // reduce resource usage before checking it
if( !checkPreloadResourceUsage())
return false;
QDBusInterfacePtr ref( QDBus::sessionBus().findInterface("org.kde.kded", "/modules/konqy_preloader", "org.kde.KonqyPreloader") );
QDBusInterface ref( QDBus::sessionBus().findInterface("org.kde.kded", "/modules/konqy_preloader", "org.kde.KonqyPreloader") );
QX11Info info;
QDBusReply<bool> retVal = ref->call( QDBusAbstractInterface::NoUseEventLoop, "registerPreloadedKonqy",
QDBusReply<bool> retVal = ref.call( QDBusAbstractInterface::NoUseEventLoop, "registerPreloadedKonqy",
QDBus::sessionBus().baseService(), info.screen());
if ( !retVal )
{

2
konqueror/konq_profiledlg.cc
View file

@ -80,7 +80,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const QString & presel
setCaption( i18n( "Profile Management" ) );
setButtons( Close | BTN_RENAME | BTN_DELETE | BTN_SAVE );
setDefaultButton( BTN_SAVE );
enableButtonSeparator( true );
showButtonSeparator( true );
setButtonGuiItem( BTN_RENAME, KGuiItem( i18n( "&Rename Profile" ) ) );
setButtonGuiItem( BTN_DELETE, KGuiItem( i18n( "&Delete Profile" ), "editdelete" ) );
setButtonGuiItem( BTN_SAVE, KStdGuiItem::save() );

2
konqueror/settings/css/kcmcss.cpp
View file

@ -35,7 +35,7 @@ CSSConfig::CSSConfig(QWidget *parent, const QStringList &)
customDialogBase->setModal( true );
customDialogBase->setButtons( KDialog::Close );
customDialogBase->setDefaultButton( KDialog::Close );
customDialogBase->enableButtonSeparator( true );
customDialogBase->showButtonSeparator( true );
customDialog = new CSSCustomDialog(customDialogBase);
customDialogBase->setMainWidget(customDialog);
configDialog = new CSSConfigDialog(this);

4
konqueror/settings/filetypes/keditfiletype.cpp
View file

@ -41,7 +41,7 @@ FileTypeDialog::FileTypeDialog( KMimeType::Ptr mime )
: KDialog( 0 )
{
setButtons( Cancel | Apply | Ok );
enableButtonSeparator( false );
showButtonSeparator( false );
init( mime, false );
}
@ -50,7 +50,7 @@ FileTypeDialog::FileTypeDialog( KMimeType::Ptr mime, bool newItem )
: KDialog( 0 )
{
setButtons( Cancel | Apply | Ok );
enableButtonSeparator( false );
showButtonSeparator( false );
init( mime, newItem );
}

2
konqueror/settings/filetypes/newtypedlg.cpp
View file

@ -21,7 +21,7 @@ NewTypeDialog::NewTypeDialog(QStringList groups,
setModal( true );
setCaption( i18n( "Create New File Type" ) );
setButtons( Ok | Cancel );
enableButtonSeparator( true );
showButtonSeparator( true );
QFrame *main = new QFrame( this );
setMainWidget( main );

8
konqueror/settings/kio/kcookiesmain.cpp
View file

@ -5,7 +5,7 @@
#include <QLayout>
#include <QTabWidget>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <klocale.h>
#include <kapplication.h>
@ -22,10 +22,10 @@ KCookiesMain::KCookiesMain(KInstance *inst, QWidget *parent)
management = 0;
bool managerOK = true;
QDBusInterfacePtr kded("org.kde.kded", "/modules/kded", "org.kde.kded.Kded");
QDBusReply<bool> reply = kded->call("loadModule",QString( "kcookiejar" ) );
QDBusInterface kded("org.kde.kded", "/modules/kded", "org.kde.kded.Kded");
QDBusReply<bool> reply = kded.call("loadModule",QString( "kcookiejar" ) );
if( !reply.isSuccess() )
if( !reply.isValid() )
{
managerOK = false;
kDebug(7103) << "kcm_kio: KDED could not load KCookiejar!" << endl;

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

@ -30,7 +30,7 @@
#include <QVBoxLayout>
#include <QList>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <kidna.h>
#include <kdebug.h>
@ -148,9 +148,9 @@ void KCookiesManagement::save()
// If delete all cookies was requested!
if(m_bDeleteAll)
{
QDBusInterfacePtr kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<void> reply = kded->call( "deleteAllCookies" );
if (!reply.isSuccess())
QDBusInterface kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<void> reply = kded.call( "deleteAllCookies" );
if (!reply.isValid())
{
QString caption = i18n ("DBUS Communication Error");
QString message = i18n ("Unable to delete all the cookies as requested.");
@ -165,9 +165,9 @@ void KCookiesManagement::save()
QStringList::Iterator dIt = deletedDomains.begin();
while( dIt != deletedDomains.end() )
{
QDBusInterfacePtr kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<void> reply = kded->call( "deleteCookiesFromDomain",( *dIt ) );
if( !reply.isSuccess() )
QDBusInterface kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<void> reply = kded.call( "deleteCookiesFromDomain",( *dIt ) );
if( !reply.isValid() )
{
QString caption = i18n ("DBUS Communication Error");
QString message = i18n ("Unable to delete cookies as requested.");
@ -189,11 +189,11 @@ void KCookiesManagement::save()
while(*cookie)
{
QDBusInterfacePtr kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<void> reply = kded->call( "deleteCookie",(*cookie)->domain,
QDBusInterface kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<void> reply = kded.call( "deleteCookie",(*cookie)->domain,
(*cookie)->host, (*cookie)->path,
(*cookie)->name );
if( !reply.isSuccess() )
if( !reply.isValid() )
{
success = false;
break;
@ -249,9 +249,9 @@ QString KCookiesManagement::quickHelp() const
void KCookiesManagement::getDomains()
{
QDBusInterfacePtr kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<QStringList> reply = kded->call( "findDomains" );
if( !reply.isSuccess() )
QDBusInterface kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<QStringList> reply = kded.call( "findDomains" );
if( !reply.isValid() )
{
QString caption = i18n ("Information Lookup Failure");
QString message = i18n ("Unable to retrieve information about the "
@ -289,13 +289,13 @@ void KCookiesManagement::getCookies(Q3ListViewItem *cookieDom)
QList<int> fields;
fields << 0 << 1 << 2 << 3;
QDBusInterfacePtr kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<QStringList> reply = kded->call( "findCookies", fields, ckd->domain(),
QDBusInterface kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<QStringList> reply = kded.call( "findCookies", fields, ckd->domain(),
QString(),
QString(),
QString() );
if(reply.isSuccess())
if(reply.isValid())
{
QStringList fieldVal = reply;
QStringList::Iterator fIt = fieldVal.begin();
@ -320,13 +320,13 @@ bool KCookiesManagement::cookieDetails(CookieProp *cookie)
QList<int> fields;
fields << 4 << 5 << 7;
QDBusInterfacePtr kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<QStringList> reply = kded->call( "findCookies", fields,
QDBusInterface kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<QStringList> reply = kded.call( "findCookies", fields,
cookie->domain,
cookie->host,
cookie->path,
cookie->name);
if( !reply.isSuccess() )
if( !reply.isValid() )
return false;
QStringList fieldVal = reply;

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

@ -30,7 +30,7 @@
#include <QToolButton>
//Added by qt3to4:
#include <QVBoxLayout>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <kiconloader.h>
#include <kidna.h>
@ -403,14 +403,14 @@ void KCookiesPolicies::save()
// Update the cookiejar...
if (!dlg->cbEnableCookies->isChecked())
{
QDBusInterfacePtr kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
kded->call( "shutdown" );
QDBusInterface kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
kded.call( "shutdown" );
}
else
{
QDBusInterfacePtr kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<void> reply = kded->call( "reloadPolicy" );
if (!reply.isSuccess())
QDBusInterface kded("org.kde.kded", "/modules/Kcookiejar", "org.kde.kded.kcookiejar");
QDBusReply<void> reply = kded.call( "reloadPolicy" );
if (!reply.isValid())
KMessageBox::sorry(0, i18n("Unable to communicate with the cookie handler service.\n"
"Any changes you made will not take effect until the service "
"is restarted."));

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

@ -64,7 +64,7 @@ KProxyDialogBase::KProxyDialogBase( QWidget* parent, const char* name,
setModal( modal );
setCaption( caption );
setButtons( Ok|Cancel );
enableButtonSeparator( true );
showButtonSeparator( true );
m_bHasValidData = false;
}

8
konqueror/settings/kio/ksaveioconfig.cpp
View file

@ -22,7 +22,7 @@
#include <kmessagebox.h>
#include <kstaticdeleter.h>
#include <kio/ioslave_defaults.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include "ksaveioconfig.h"
@ -251,9 +251,9 @@ void KSaveIOConfig::updateProxyScout( QWidget * parent )
{
// Inform the proxyscout kded module about changes
// if we cannot update, ioslaves inform the end user...
QDBusInterfacePtr kded("org.kde.kded", "/modules/Proxyscout", "org.kde.kded.ProxyScout");
QDBusReply<void> reply = kded->call( "reset" );
if (!reply.isSuccess())
QDBusInterface kded("org.kde.kded", "/modules/Proxyscout", "org.kde.kded.ProxyScout");
QDBusReply<void> reply = kded.call( "reset" );
if (!reply.isValid())
{
QString caption = i18n("Update Failed");
QString message = i18n("You have to restart KDE "

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

@ -64,7 +64,7 @@ PolicyDlg::PolicyDlg (const QString& caption, QWidget *parent,
setModal( true );
setCaption( caption );
setButtons( Ok|Cancel );
enableButtonSeparator( true );
showButtonSeparator( true );
m_dlgUI = new PolicyDlgUI (this);
setMainWidget(m_dlgUI);

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

@ -27,7 +27,7 @@
#include <kstandarddirs.h>
#include <kurlrequester.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <kdialog.h>
@ -278,8 +278,8 @@ void KBehaviourOptions::save()
// Tell the running server
if ( QDBus::sessionBus().busService()->nameHasOwner( "org.kde.kio_uiserver" ) )
{
QDBusInterfacePtr uiserver( QDBus::sessionBus().findInterface("org.kde.kio_uiserver", "/UIServer") );
uiserver->call( "setListMode", cbListProgress->isChecked() );
QDBusInterface uiserver( QDBus::sessionBus().findInterface("org.kde.kio_uiserver", "/UIServer") );
uiserver.call( "setListMode", cbListProgress->isChecked() );
}
// Send signal to all konqueror instances

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

@ -28,7 +28,7 @@
#include <Q3CString>
#include <QDesktopWidget>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <kapplication.h>
#include <kcolorbutton.h>

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

@ -27,7 +27,7 @@
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <kapplication.h>
#include <kconfig.h>

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

@ -24,7 +24,7 @@
#include <Q3CString>
#include <QDesktopWidget>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <kapplication.h>
#include <kcustommenueditor.h>

2
konqueror/settings/konqhtml/advancedTabDialog.cpp
View file

@ -40,7 +40,7 @@ advancedTabDialog::advancedTabDialog(QWidget* parent, KConfig* config, const cha
setCaption( i18n("Advanced Options") );
setObjectName( name );
setModal( true );
enableButtonSeparator( true );
showButtonSeparator( true );
connect(this, SIGNAL(applyClicked()),
this, SLOT(save()));

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

@ -31,7 +31,7 @@
#include <QCheckBox>
#include <QTextStream>
#include <QRegExp>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include "filteropts.h"
#include "filteropts.moc"

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

@ -28,7 +28,7 @@
#include <kapplication.h>
#include <QTabWidget>
#include <QLayout>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include "jsopts.h"
#include "javaopts.h"

2
konqueror/settings/konqhtml/policydlg.cpp
View file

@ -22,7 +22,7 @@ PolicyDialog::PolicyDialog( Policies *policies, QWidget *parent, const char *nam
setObjectName( name );
setModal( true );
setButtons( Ok|Cancel );
enableButtonSeparator( true );
showButtonSeparator( true );
QFrame *main = new QFrame( this );
setMainWidget( main );

6
konqueror/settings/performance/konqueror.cpp
View file

@ -19,7 +19,7 @@
#include "konqueror.h"
#include <kconfig.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <QRadioButton>
#include <QSpinBox>
#include <QLabel>
@ -134,8 +134,8 @@ void Konqueror::save()
DCOPRef ref1( "konqueror*", "KonquerorIface" );
ref1.send( "reparseConfiguration()" );
#endif
QDBusInterfacePtr kded("org.kde.kded", "/modules/Konqy_preloader", "org.kde.kded.Konqy_proxy");
kded->call( "reconfigure" );
QDBusInterface kded("org.kde.kded", "/modules/Konqy_preloader", "org.kde.kded.Konqy_proxy");
kded.call( "reconfigure" );
}
void Konqueror::defaults()

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

@ -532,7 +532,7 @@ BookmarkEditDialog::BookmarkEditDialog(const QString& title, const QString& url,
setModal( true );
setCaption( caption );
setButtons( Ok|Cancel );
enableButtonSeparator( false );
showButtonSeparator( false );
setButtonText( Ok, i18n( "&Update" ) );

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

@ -22,7 +22,7 @@
#include <QFont>
#include <QObject>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
class KonqSidebarHistorySettings : public QObject
{

2
lib/konq/favicons/favicons_adaptor.h
View file

@ -16,7 +16,7 @@
#define FAVICONS_ADAPTOR_H_117111150580530
#include <QtCore/QObject>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
class QByteArray;
template<class T> class QList;

2
lib/konq/knewmenu.cc
View file

@ -528,7 +528,7 @@ KUrlDesktopFileDlg::KUrlDesktopFileDlg( const QString& textFileName, const QStri
setModal( true );
setButtons( Ok | Cancel | User1 );
setButtonGuiItem( User1, KStdGuiItem::clear() );
enableButtonSeparator( true );
showButtonSeparator( true );
initDialog( textFileName, QString(), textUrl, QString() );
}

10
lib/konq/konq_faviconmgr.cc
View file

@ -21,7 +21,7 @@
#include <kglobal.h>
#include <kmimetype.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include "konq_faviconmgr.h"
#define FAVICONINTERFACE "org.kde.FavIcon"
@ -46,12 +46,12 @@ KonqFavIconMgr::~KonqFavIconMgr()
void KonqFavIconMgr::setIconForURL(const KUrl &url, const KUrl &iconURL)
{
QDBusInterfacePtr favicon("org.kde.kded", "/modules/favicons", FAVICONINTERFACE);
favicon->call(QDBusInterface::NoWaitForReply, "setIconForURL", url.url(), iconURL.url());
QDBusInterface favicon("org.kde.kded", "/modules/favicons", FAVICONINTERFACE);
favicon.call(QDBus::NoBlock, "setIconForURL", url.url(), iconURL.url());
}
void KonqFavIconMgr::downloadHostIcon(const KUrl &url)
{
QDBusInterfacePtr favicon("org.kde.kded", "/modules/favicons", FAVICONINTERFACE);
favicon->call(QDBusInterface::NoWaitForReply, "downloadHostIcon", url.url());
QDBusInterface favicon("org.kde.kded", "/modules/favicons", FAVICONINTERFACE);
favicon.call(QDBus::NoBlock, "downloadHostIcon", url.url());
}

2
lib/konq/konq_historymgr.cc
View file

@ -21,7 +21,7 @@
#include "konq_historymgr_adaptor.h"
#include "konqbookmarkmanager.h"
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <kapplication.h>
#include <kdebug.h>
#include <ksavefile.h>

2
lib/konq/konq_historymgr_adaptor.h
View file

@ -13,7 +13,7 @@
#define KONQ_HISTORYMGR_ADAPTOR_H_73691150740458
#include <QtCore/QObject>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include "konq_historymgr.h"
class QByteArray;
template<class T> class QList;

2
lib/konq/konq_operations.cc
View file

@ -31,7 +31,7 @@
#include <kshell.h>
#include <kshortcut.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <kdirnotify.h>
#include "konq_undo.h"
#include "konq_defaults.h"

4
lib/konq/konq_popupmenu.cc
View file

@ -40,7 +40,7 @@
#include <kprocess.h>
#include <kauthorized.h>
#include <kglobal.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <QDir>
#include <QPixmap>
@ -708,7 +708,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
//if ( !QDBus::sessionBus().busService()->nameHasOwner( app ) )
// continue; //app does not exist so cannot send call
QDBusMessage reply = QDBusInterfacePtr( app, obj, interface )->
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() )

2
lib/konq/konq_undo.cc
View file

@ -21,7 +21,7 @@
#include "konq_undo.h"
#include "konq_undoadaptor.h"
#include "kio/observer.h"
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <kdirnotify.h>
#include <assert.h>

2
lib/konq/konq_undoadaptor.h
View file

@ -13,7 +13,7 @@
#define KONQ_UNDOADAPTOR_H_188381151072115
#include <QtCore/QObject>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include "konq_undo.h"
class QByteArray;
template<class T> class QList;

10
nsplugins/callbackadaptor.h
View file

@ -13,7 +13,7 @@
#define CALLBACKADAPTOR_H_226561151514943
#include <QtCore/QObject>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include "plugin_part.h"
class QByteArray;
template<class T> class QList;
@ -63,10 +63,10 @@ public:
public: // PROPERTIES
public Q_SLOTS: // METHODS
Q_ASYNC void evalJavaScript(int id, const QString &script);
Q_ASYNC void postURL(const QString &url, const QString &target, const QByteArray &data, const QString &mime);
Q_ASYNC void requestURL(const QString &url, const QString &target);
Q_ASYNC void statusMessage(const QString &msg);
Q_NOREPLY void evalJavaScript(int id, const QString &script);
Q_NOREPLY void postURL(const QString &url, const QString &target, const QByteArray &data, const QString &mime);
Q_NOREPLY void requestURL(const QString &url, const QString &target);
Q_NOREPLY void statusMessage(const QString &msg);
Q_SIGNALS: // SIGNALS
};

8
nsplugins/pluginscan.cpp
View file

@ -38,7 +38,7 @@
#include <QRegExp>
#include <QBuffer>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <kapplication.h>
#include <kdebug.h>
@ -678,8 +678,8 @@ int main( int argc, char **argv )
}
// Tel kded to update sycoca database.
QDBusInterfacePtr kbuildsycoca("org.kde.kded", "/kbuildsycoca",
QDBusInterface kbuildsycoca("org.kde.kded", "/kbuildsycoca",
"org.kde.kbuildsycoca");
if (kbuildsycoca->isValid())
kbuildsycoca->call("recreate");
if (kbuildsycoca.isValid())
kbuildsycoca.call("recreate");
}

10
nsplugins/viewer/callback_proxy.h
View file

@ -18,7 +18,7 @@
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QVariant>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
/*
* Proxy class for interface org.kde.nsplugins.CallBack
@ -36,22 +36,22 @@ public:
~OrgKdeNspluginsCallBackInterface();
public Q_SLOTS: // METHODS
inline Q_ASYNC void evalJavaScript(int id, const QString &script)
inline Q_NOREPLY void evalJavaScript(int id, const QString &script)
{
call(NoWaitForReply, QLatin1String("evalJavaScript.is"), id, script);
}
inline Q_ASYNC void postURL(const QString &url, const QString &target, const QByteArray &data, const QString &mime)
inline Q_NOREPLY void postURL(const QString &url, const QString &target, const QByteArray &data, const QString &mime)
{
call(NoWaitForReply, QLatin1String("postURL.ssays"), url, target, data, mime);
}
inline Q_ASYNC void requestURL(const QString &url, const QString &target)
inline Q_NOREPLY void requestURL(const QString &url, const QString &target)
{
call(NoWaitForReply, QLatin1String("requestURL.ss"), url, target);
}
inline Q_ASYNC void statusMessage(const QString &msg)
inline Q_NOREPLY void statusMessage(const QString &msg)
{
call(NoWaitForReply, QLatin1String("statusMessage.s"), msg);
}

2
nsplugins/viewer/dbusadaptors.h
View file

@ -12,7 +12,7 @@
#define VIEWER_ADAPTOR_H_230831151535345
#include <QtCore/QObject>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include "nsplugin.h"
class QByteArray;
template<class T> class QList;

2
nsplugins/viewer/viewer.cpp
View file

@ -49,7 +49,7 @@
#include <kconfig.h>
#include "qxteventloop.h"
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
/**
* Use RLIMIT_DATA on systems that don't define RLIMIT_AS,

2
nsplugins/viewer_proxy.h
View file

@ -18,7 +18,7 @@
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QVariant>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
/*
* Proxy class for interface org.kde.nsplugins.Class