← Back to branch summary

~samuel-thibault/compiz/clone

~samuel-thibault/compiz/clone

« back to all changes in this revision

Viewing changes to src/timer/src/privatetimer.h

Committer: Daniel van Vugt
Date: 2012-01-12 06:48:58 UTC
mfrom: (2908 compiz-core)
mto: (2908.6.2 trunk)
mto: This revision was merged to the branch mainline in revision 2916.
Revision ID: vanvugt@gmail.com-20120112064858-xcu22jq1dlerirmp

Merge with upstream changes (lp:compiz-core).

files added:
cmake/EnableCoverageReport.cmake

cmake/FindLcov.cmake

cmake/Findgcovr.cmake

cmake/ParseArguments.cmake

include/core/global.h

include/core/logmessage.h

include/core/string.h

src/logmessage

src/logmessage/CMakeLists.txt

src/logmessage/include

src/logmessage/include/core

src/logmessage/include/core/logmessage.h

src/logmessage/src

src/logmessage/tests

src/logmessage/tests/CMakeLists.txt

src/logmessage/tests/test-logmessage.cpp

src/pluginclasshandler/CMakeLists.txt

src/pluginclasshandler/include

src/pluginclasshandler/include/core

src/pluginclasshandler/src

src/pluginclasshandler/tests

src/pluginclasshandler/tests/construct/src

src/pluginclasshandler/tests/get/src

src/pluginclasshandler/tests/indexes/src

src/pluginclasshandler/tests/typenames/src

src/string

src/string/CMakeLists.txt

src/string/include

src/string/src

src/string/tests

src/string/tests/CMakeLists.txt

src/string/tests/printf

src/string/tests/printf/src

src/string/tests/printf/src/test-string-printf.cpp

src/string/tests/test-string.cpp

src/string/tests/test-string.h

src/timer

src/timer/CMakeLists.txt

src/timer/include

src/timer/include/core

src/timer/src

src/timer/tests

src/timer/tests/callbacks/src

src/timer/tests/diffs/src

src/timer/tests/diffs/src/test-timer-diffs.cpp

src/timer/tests/set-values/src

src/timer/tests/while-calling/src

files removed:
include/compiz-common.h.in

include/compiz.h

tests

tests/CMakeLists.txt

tests/pluginclasshandler/construct/CMakeLists.txt

tests/pluginclasshandler/get/CMakeLists.txt

tests/pluginclasshandler/indexes/CMakeLists.txt

tests/pluginclasshandler/typenames/CMakeLists.txt

tests/timer

tests/timer/callbacks/CMakeLists.txt

tests/timer/diffs/CMakeLists.txt

tests/timer/diffs/test-timer-diffs.cpp

tests/timer/set-values/CMakeLists.txt

tests/timer/while-calling/CMakeLists.txt

files renamed:
src/logmessage.cpp => src/logmessage/src/logmessage.cpp

tests/pluginclasshandler/ => src/pluginclasshandler/

include/core/pluginclasses.h => src/pluginclasshandler/include/core/pluginclasses.h

include/core/pluginclasshandler.h => src/pluginclasshandler/include/core/pluginclasshandler.h

include/core/valueholder.h => src/pluginclasshandler/include/core/valueholder.h

src/pluginclasses.cpp => src/pluginclasshandler/src/pluginclasses.cpp

src/valueholder.cpp => src/pluginclasshandler/src/valueholder.cpp

src/valueholder.h => src/pluginclasshandler/src/valueholder.h

tests/pluginclasshandler/CMakeLists.txt => src/pluginclasshandler/tests/CMakeLists.txt

tests/pluginclasshandler/construct/ => src/pluginclasshandler/tests/construct/

tests/pluginclasshandler/construct/test-pch-construct.cpp => src/pluginclasshandler/tests/construct/src/test-pch-construct.cpp

tests/pluginclasshandler/get/ => src/pluginclasshandler/tests/get/

tests/pluginclasshandler/get/test-pch-get.cpp => src/pluginclasshandler/tests/get/src/test-pch-get.cpp

tests/pluginclasshandler/indexes/ => src/pluginclasshandler/tests/indexes/

tests/pluginclasshandler/indexes/test-pch-indexes.cpp => src/pluginclasshandler/tests/indexes/src/test-pch-indexes.cpp

tests/pluginclasshandler/test-pluginclasshandler.cpp => src/pluginclasshandler/tests/test-pluginclasshandler.cpp

tests/pluginclasshandler/test-pluginclasshandler.h => src/pluginclasshandler/tests/test-pluginclasshandler.h

tests/pluginclasshandler/typenames/ => src/pluginclasshandler/tests/typenames/

tests/pluginclasshandler/typenames/test-pch-typenames.cpp => src/pluginclasshandler/tests/typenames/src/test-pch-typenames.cpp

src/string.cpp => src/string/src/string.cpp

include/core/timeouthandler.h => src/timer/include/core/timeouthandler.h

include/core/timer.h => src/timer/include/core/timer.h

src/privatetimeouthandler.h => src/timer/src/privatetimeouthandler.h

src/privatetimeoutsource.h => src/timer/src/privatetimeoutsource.h

src/privatetimer.h => src/timer/src/privatetimer.h

src/timeouthandler.cpp => src/timer/src/timeouthandler.cpp

src/timer.cpp => src/timer/src/timer.cpp

tests/timer/CMakeLists.txt => src/timer/tests/CMakeLists.txt

tests/timer/callbacks/ => src/timer/tests/callbacks/

tests/timer/callbacks/test-timer-callbacks.cpp => src/timer/tests/callbacks/src/test-timer-callbacks.cpp

tests/timer/diffs/ => src/timer/tests/diffs/

tests/timer/set-values/ => src/timer/tests/set-values/

tests/timer/set-values/test-timer-set-values.cpp => src/timer/tests/set-values/src/test-timer-set-values.cpp

tests/timer/test-timer.cpp => src/timer/tests/test-timer.cpp

tests/timer/test-timer.h => src/timer/tests/test-timer.h

tests/timer/while-calling/ => src/timer/tests/while-calling/

tests/timer/while-calling/test-timer-set-times-while-calling.cpp => src/timer/tests/while-calling/src/test-timer-set-times-while-calling.cpp

files modified:
CMakeLists.txt

cmake/CompizCommon.cmake

cmake/CompizPlugin.cmake

gtk/window-decorator/metacity.c

include/CMakeLists.txt

include/core/CMakeLists.txt

include/core/core.h

include/core/match.h

include/core/option.h

include/core/plugin.h

include/core/region.h

include/core/session.h

kde/window-decorator-kde4/window.cpp

metadata/CMakeLists.txt

plugins/CMakeLists.txt

plugins/composite/src/screen.cpp

plugins/decor/src/decor.cpp

plugins/decor/src/decor.h

plugins/kde/src/dispatcher.cpp

plugins/move/src/move.cpp

plugins/opengl/include/opengl/opengl.h

plugins/opengl/src/matrix.cpp

plugins/opengl/src/privates.h

plugins/opengl/src/screen.cpp

plugins/opengl/src/texture.cpp

po/POTFILES.in

src/CMakeLists.txt

src/action.cpp

src/main.cpp

src/privatescreen.h

src/region.cpp

src/screen.cpp

src/session.cpp

src/window.cpp

Show diffs side-by-side

added added

removed removed

src/timer/src/privatetimer.h

38

38

bool mActive;

39

39

unsigned int mMinTime;

40

40

unsigned int mMaxTime;

41

int mMinLeft;

42

int mMaxLeft;

41

gint64 mMinDeadline;

42

gint64 mMaxDeadline;

43

43

CompTimer::CallBack mCallBack;

44

44

};

45

45

Older »