port to new qt 4.2 snapshot
svn path=/trunk/KDE/kdebase/workspace/; revision=575652
This commit is contained in:
parent
abe0960a3a
commit
4472c82d68
3 changed files with 3 additions and 3 deletions
|
@ -76,7 +76,7 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QStringList &)
|
|||
pluginObject(0)
|
||||
{
|
||||
new DecorationAdaptor(this);
|
||||
QDBus::sessionBus().registerObject("/KWinClientDecoration", this);
|
||||
QDBusConnection::sessionBus().registerObject("/KWinClientDecoration", this);
|
||||
kwinConfig.setGroup("Style");
|
||||
plugins = new KDecorationPreviewPlugins( &kwinConfig );
|
||||
|
||||
|
|
2
main.cpp
2
main.cpp
|
@ -281,7 +281,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
|
|||
else
|
||||
appname.sprintf("org.kde.kwin-screen-%d", KWinInternal::screen_number);
|
||||
|
||||
QDBus::sessionBus().interface()->registerService( appname, QDBusConnectionInterface::DontQueueService );
|
||||
QDBusConnection::sessionBus().interface()->registerService( appname, QDBusConnectionInterface::DontQueueService );
|
||||
|
||||
return a.exec();
|
||||
}
|
||||
|
|
|
@ -124,7 +124,7 @@ Workspace::Workspace( bool restore )
|
|||
block_stacking_updates( 0 ),
|
||||
forced_global_mouse_grab( false )
|
||||
{
|
||||
new KWinAdaptor( "org.kde.kwin", "/KWin", QDBus::sessionBus(), this );
|
||||
new KWinAdaptor( "org.kde.kwin", "/KWin", QDBusConnection::sessionBus(), this );
|
||||
|
||||
_self = this;
|
||||
mgr = new PluginMgr;
|
||||
|
|
Loading…
Reference in a new issue