Merge lp://qastaging/~mc-return/compiz/compiz.merge-replace-defines into lp://qastaging/compiz/0.9.8
Proposed by
MC Return
Status: | Merged |
---|---|
Approved by: | Sam Spilsbury |
Approved revision: | 3353 |
Merged at revision: | 3358 |
Proposed branch: | lp://qastaging/~mc-return/compiz/compiz.merge-replace-defines |
Merge into: | lp://qastaging/compiz/0.9.8 |
Diff against target: |
1482 lines (+298/-160) 84 files modified
gtk/window-decorator/gtk-window-decorator.c (+17/-0) gtk/window-decorator/gtk-window-decorator.h (+13/-13) include/core/screen.h (+9/-9) kde/window-decorator-kde4/decorator.cpp (+11/-4) kde/window-decorator-kde4/decorator.h (+5/-5) libdecoration/decoration.c (+1/-1) plugins/animation/include/animation/animation.h (+2/-1) plugins/animation/src/animation.cpp (+5/-1) plugins/animation/src/private.h (+1/-1) plugins/animationaddon/src/animationaddon.cpp (+3/-0) plugins/animationaddon/src/polygon.cpp (+2/-2) plugins/animationaddon/src/private.h (+1/-1) plugins/bench/src/bench.cpp (+2/-2) plugins/blur/src/blur.cpp (+7/-1) plugins/blur/src/blur.h (+4/-4) plugins/ccp/src/ccp.cpp (+2/-2) plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h (+2/-2) plugins/compiztoolbox/src/compiztoolbox.cpp (+3/-0) plugins/copytex/src/copytex.cpp (+3/-0) plugins/copytex/src/copytex.h (+2/-2) plugins/cubeaddon/src/cubeaddon.cpp (+10/-0) plugins/cubeaddon/src/cubeaddon.h (+9/-9) plugins/dbus/src/dbus.h (+4/-4) plugins/decor/src/decor.h (+3/-3) plugins/expo/src/expo.cpp (+1/-1) plugins/firepaint/src/firepaint.cpp (+2/-0) plugins/firepaint/src/firepaint.h (+1/-1) plugins/grid/src/grid.h (+1/-1) plugins/group/src/glow.cpp (+10/-0) plugins/group/src/glow.h (+9/-9) plugins/group/src/group.cpp (+3/-1) plugins/group/src/group.h (+1/-1) plugins/group/src/tab.cpp (+1/-1) plugins/imgpng/src/imgpng.cpp (+2/-0) plugins/imgpng/src/imgpng.h (+1/-1) plugins/maximumize/src/maximumize.cpp (+4/-0) plugins/maximumize/src/maximumize.h (+3/-3) plugins/mousepoll/src/mousepoll.cpp (+3/-0) plugins/mousepoll/src/private.h (+2/-2) plugins/move/src/move.cpp (+5/-0) plugins/move/src/move.h (+3/-3) plugins/notification/src/notification.cpp (+3/-1) plugins/notification/src/notification.h (+1/-1) plugins/obs/src/obs.cpp (+4/-0) plugins/obs/src/obs.h (+4/-4) plugins/opacify/src/opacify.cpp (+2/-0) plugins/opacify/src/opacify.h (+1/-1) plugins/opengl/include/opengl/opengl.h (+7/-7) plugins/opengl/src/opengl.cpp (+10/-0) plugins/place/src/place.cpp (+2/-2) plugins/place/src/smart/src/smart.cpp (+3/-3) plugins/put/src/put.cpp (+4/-4) plugins/resize/src/logic/include/resize-defs.h (+2/-2) plugins/resize/src/logic/src/resize-logic.cpp (+4/-4) plugins/resizeinfo/src/resizeinfo.cpp (+5/-0) plugins/resizeinfo/src/resizeinfo.h (+3/-3) plugins/ring/src/ring.cpp (+4/-0) plugins/ring/src/ring.h (+2/-2) plugins/rotate/src/rotate.cpp (+1/-1) plugins/scaleaddon/src/scaleaddon.cpp (+1/-1) plugins/shelf/src/shelf.cpp (+2/-0) plugins/shelf/src/shelf.h (+1/-1) plugins/shift/src/shift.cpp (+2/-0) plugins/shift/src/shift.h (+1/-1) plugins/showdesktop/src/showdesktop.cpp (+5/-0) plugins/showdesktop/src/showdesktop.h (+4/-4) plugins/splash/src/splash.cpp (+3/-0) plugins/splash/src/splash.h (+2/-2) plugins/staticswitcher/src/staticswitcher.cpp (+3/-0) plugins/staticswitcher/src/staticswitcher.h (+2/-2) plugins/switcher/src/switcher.cpp (+6/-0) plugins/switcher/src/switcher.h (+4/-4) plugins/td/src/3d.cpp (+2/-0) plugins/td/src/3d.h (+1/-1) plugins/text/src/text.cpp (+1/-1) plugins/thumbnail/src/thumbnail.cpp (+2/-0) plugins/thumbnail/src/thumbnail.h (+1/-1) plugins/wall/src/wall.cpp (+4/-4) plugins/water/src/water.cpp (+4/-0) plugins/water/src/water.h (+2/-2) plugins/wobbly/src/wobbly.h (+1/-1) src/event.cpp (+3/-3) src/screen.cpp (+5/-5) src/timer/src/timer.cpp (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~mc-return/compiz/compiz.merge-replace-defines |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sam Spilsbury | Approve | ||
MC Return | Needs Resubmitting | ||
Review via email:
|
Commit message
Replaced #defines of standard variable types
Description of the change
Replaces #defines of standard variable types
To post a comment you must log in.
If this is a good idea I could continue this...
I also noticed that PI for example is defined by several plug-ins. It could be made global, no ?