yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge changes from bleeding edge branch

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=557225
This commit is contained in:
Dirk Mueller 2006-07-02 18:31:00 +00:00
parent 2ffa69988e
commit ecd63e0d90
12 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/update_default_rules.cpp
View file

@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <kdebug.h>
#include <kinstance.h>
#include <kstandarddirs.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
int main( int argc, char* argv[] )
{
@ -54,6 +54,6 @@ int main( int argc, char* argv[] )
#warning D-BUS TODO
// kwin* , and an attach to dbus is missing as well
#endif
QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin->call( "reconfigure" );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin.call( "reconfigure" );
}

6
data/update_window_settings.cpp
View file

@ -17,7 +17,7 @@ License. See the file "COPYING" for the exact licensing terms.
//Added by qt3to4:
#include <QByteArray>
#include <Q3PtrList>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
struct SessionInfo
{
@ -170,6 +170,6 @@ int main()
#warning D-BUS TODO
// kwin* , and an attach to dbus is missing as well
#endif
QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin->call( "reconfigure" );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin.call( "reconfigure" );
}

8
kcmkwin/kwindecoration/kwindecoration.cpp
View file

@ -44,7 +44,7 @@
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <kapplication.h>
#include <kcombobox.h>
@ -63,7 +63,7 @@
#include <kdecorationfactory.h>
#include <kvbox.h>
#include "kwindecorationadaptor.h"
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
// KCModule plugin interface
// =========================
@ -534,8 +534,8 @@ void KWinDecorationModule::save()
emit pluginSave( &kwinConfig );
kwinConfig.sync();
QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin->call( "reconfigure" );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin.call( "reconfigure" );
}

2
kcmkwin/kwindecoration/kwindecorationadaptor.h
View file

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

10
kcmkwin/kwinoptions/main.cpp
View file

@ -21,7 +21,7 @@
//Added by qt3to4:
#include <QVBoxLayout>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <kapplication.h>
#include <kglobal.h>
@ -179,8 +179,8 @@ void KWinOptions::save()
#warning D-BUS TODO
// All these calls in kcmkwin modules should be actually kwin*, because of multihead.
#endif
QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin->call( "reconfigure" );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin.call( "reconfigure" );
}
@ -253,8 +253,8 @@ void KActionsOptions::save()
emit KCModule::changed( false );
// Send signal to kwin
mConfig->sync();
QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin->call( "reconfigure" );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin.call( "reconfigure" );
}

10
kcmkwin/kwinoptions/mouse.cpp
View file

@ -37,7 +37,7 @@
#include <kdialog.h>
#include <kglobalsettings.h>
#include <kseparator.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <X11/X.h>
#include <X11/Xlib.h>
@ -571,8 +571,8 @@ void KTitleBarActionsConfig::save()
if (standAlone)
{
config->sync();
QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin->call( "reconfigure" );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin.call( "reconfigure" );
}
}
@ -847,8 +847,8 @@ void KWindowActionsConfig::save()
if (standAlone)
{
config->sync();
QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin->call( "reconfigure" );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin.call( "reconfigure" );
}
}

18
kcmkwin/kwinoptions/windows.cpp
View file

@ -49,7 +49,7 @@
#include <kglobal.h>
#include <kprocess.h>
#include <QTabWidget>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <X11/X.h>
#include <X11/Xlib.h>
@ -497,8 +497,8 @@ void KFocusConfig::save( void )
if (standAlone)
{
config->sync();
QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin->call( "reconfigure" );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin.call( "reconfigure" );
}
emit KCModule::changed(false);
}
@ -724,8 +724,8 @@ void KAdvancedConfig::save( void )
if (standAlone)
{
config->sync();
QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin->call( "reconfigure" );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin.call( "reconfigure" );
}
emit KCModule::changed(false);
}
@ -1188,8 +1188,8 @@ void KMovingConfig::save( void )
if (standAlone)
{
config->sync();
QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin->call( "reconfigure" );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin.call( "reconfigure" );
}
emit KCModule::changed(false);
}
@ -1591,8 +1591,8 @@ void KTranslucencyConfig::save( void )
if (standAlone)
{
config->sync();
QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin->call( "reconfigure" );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin.call( "reconfigure" );
}
emit KCModule::changed(false);
}

6
kcmkwin/kwinrules/kcm.cpp
View file

@ -25,7 +25,7 @@
#include <klocale.h>
#include <kapplication.h>
#include <kaboutdata.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include "ruleslist.h"
@ -67,8 +67,8 @@ void KCMRules::save()
emit KCModule::changed( false );
// Send signal to kwin
config.sync();
QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin->call( "reconfigure" );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin.call( "reconfigure" );
}
void KCMRules::defaults()

6
kcmkwin/kwinrules/main.cpp
View file

@ -21,7 +21,7 @@
#include <kconfig.h>
#include <klocale.h>
#include <kwin.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include <X11/Xlib.h>
#include <fixx11h.h>
@ -257,8 +257,8 @@ static int edit( Window wid, bool whole_app )
delete orig_rule;
}
saveRules( rules );
QDBusInterfacePtr kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin->call( "reconfigure" );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" );
kwin.call( "reconfigure" );
return 0;
}

10
kwinadaptor.h
View file

@ -11,7 +11,7 @@
#define KWINADAPTOR_H_187881149684785
#include <QtCore/QObject>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
class QByteArray;
template<class T> class QList;
template<class Key, class Value> class QMap;
@ -91,15 +91,15 @@ public:
public: // PROPERTIES
public Q_SLOTS: // METHODS
Q_ASYNC void cascadeDesktop();
Q_NOREPLY void cascadeDesktop();
void circulateDesktopApplications();
int currentDesktop();
void doNotManage(const QString &name);
Q_ASYNC void killWindow();
Q_NOREPLY void killWindow();
bool kompmgrIsRunning();
void nextDesktop();
void previousDesktop();
Q_ASYNC void reconfigure();
Q_NOREPLY void reconfigure();
void refresh();
bool setCurrentDesktop(int desktop);
void setDesktopLayout(int orientation, int x, int y);
@ -109,7 +109,7 @@ public Q_SLOTS: // METHODS
void showWindowMenuAt(qlonglong winId, int x, int y);
void startKompmgr();
void stopKompmgr();
Q_ASYNC void unclutterDesktop();
Q_NOREPLY void unclutterDesktop();
Q_SIGNALS: // SIGNALS
void dcopResetAllClients();
void kompmgrStarted();

6
main.cpp
View file

@ -24,7 +24,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <QX11Info>
#include <stdio.h>
#include <fixx11h.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include "atoms.h"
#include "options.h"
@ -124,8 +124,8 @@ Application::Application( )
initting = false; // startup done, we are up and running now.
QDBusInterfacePtr ksplash( "org.kde.ksplash", "/ksplash", "org.kde.KSplash" );
ksplash->call( "upAndRunning", QString( "wm started" ));
QDBusInterface ksplash( "org.kde.ksplash", "/ksplash", "org.kde.KSplash" );
ksplash.call( "upAndRunning", QString( "wm started" ));
XEvent e;
e.xclient.type = ClientMessage;
e.xclient.message_type = XInternAtom( QX11Info::display(), "_KDE_SPLASH_PROGRESS", False );

2
workspace.cpp
View file

@ -31,7 +31,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <kipc.h>
#include <kactioncollection.h>
#include <kaction.h>
#include <dbus/qdbus.h>
#include <QtDBus/QtDBus>
#include "plugins.h"
#include "client.h"