diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2017-05-06 16:31:29 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2017-05-06 16:31:29 +0200 |
| commit | a1f4e968563763435027a905be8349cda1974e00 (patch) | |
| tree | e048f6c4bf7f41cdc87166ab1d00fead43adfb6d /test/uitests | |
| parent | b7b5b9ee2a9d6cefe9b83589122cedb89c22279c (diff) | |
Get rid of platform dependent usleep/SleepEx.
Diffstat (limited to 'test/uitests')
| -rw-r--r-- | test/uitests/filebrowsertest.cc | 16 | ||||
| -rw-r--r-- | test/uitests/framewidgettest.cc | 16 | ||||
| -rw-r--r-- | test/uitests/resizetest.cc | 16 | ||||
| -rw-r--r-- | test/uitests/tabwidgettest.cc | 16 |
4 files changed, 12 insertions, 52 deletions
diff --git a/test/uitests/filebrowsertest.cc b/test/uitests/filebrowsertest.cc index c558fab..5f78921 100644 --- a/test/uitests/filebrowsertest.cc +++ b/test/uitests/filebrowsertest.cc @@ -25,14 +25,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ #include <iostream> - -#include <platform.h> - -#if DG_PLATFORM == DG_PLATFORM_WINDOWS -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#endif -#include <unistd.h> +#include <chrono> +#include <thread> #include <hugin.hpp> #include <window.h> @@ -135,11 +129,7 @@ int main() while(test_window.processEvents()) { -#if DG_PLATFORM == DG_PLATFORM_WINDOWS - SleepEx(50, FALSE); -#else - usleep(50000); -#endif + std::this_thread::sleep_for(std::chrono::milliseconds(50)); } return 0; diff --git a/test/uitests/framewidgettest.cc b/test/uitests/framewidgettest.cc index 2b94688..a2a24db 100644 --- a/test/uitests/framewidgettest.cc +++ b/test/uitests/framewidgettest.cc @@ -25,14 +25,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ #include <iostream> - -#include <platform.h> - -#if DG_PLATFORM == DG_PLATFORM_WINDOWS -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#endif -#include <unistd.h> +#include <chrono> +#include <thread> #include <button.h> #include <checkbox.h> @@ -180,11 +174,7 @@ int main() while(test_window.processEvents()) { -#ifdef WIN32 - SleepEx(50, FALSE); -#else - usleep(50000); -#endif + std::this_thread::sleep_for(std::chrono::milliseconds(50)); } return 0; diff --git a/test/uitests/resizetest.cc b/test/uitests/resizetest.cc index f5ba01b..5ede2b6 100644 --- a/test/uitests/resizetest.cc +++ b/test/uitests/resizetest.cc @@ -25,14 +25,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ #include <iostream> - -#include <platform.h> - -#if DG_PLATFORM == DG_PLATFORM_WINDOWS -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#endif -#include <unistd.h> +#include <chrono> +#include <thread> #include <hugin.hpp> #include <window.h> @@ -135,11 +129,7 @@ int main() while(test_window.processEvents()) { -#if DG_PLATFORM == DG_PLATFORM_WINDOWS - SleepEx(50, FALSE); -#else - usleep(50000); -#endif + std::this_thread::sleep_for(std::chrono::milliseconds(50)); } return 0; diff --git a/test/uitests/tabwidgettest.cc b/test/uitests/tabwidgettest.cc index 292991c..722dc02 100644 --- a/test/uitests/tabwidgettest.cc +++ b/test/uitests/tabwidgettest.cc @@ -25,14 +25,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ #include <iostream> - -#include <platform.h> - -#if DG_PLATFORM == DG_PLATFORM_WINDOWS -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#endif -#include <unistd.h> +#include <chrono> +#include <thread> #include <hugin.hpp> #include <window.h> @@ -156,11 +150,7 @@ int main() while(test_window.processEvents()) { -#if DG_PLATFORM == DG_PLATFORM_WINDOWS - SleepEx(50, FALSE); -#else - usleep(50000); -#endif + std::this_thread::sleep_for(std::chrono::milliseconds(50)); } return 0; |