diff --git a/.gitignore b/.gitignore index 8015f2f3..3cf1c657 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,6 @@ win-mingw/bin/fake_qmake.exe win-mingw/bin/rlsvgcat.exe language_bindings/lua/pvslua/pvslua language_bindings/lua/pvslua/pvapplua +/.cproject +/.project +/.settings/ diff --git a/.settings/.gitignore b/.settings/.gitignore new file mode 100644 index 00000000..d81d4c41 --- /dev/null +++ b/.settings/.gitignore @@ -0,0 +1 @@ +/language.settings.xml diff --git a/designer/src/.gitignore b/designer/src/.gitignore new file mode 100644 index 00000000..b3e23c0c --- /dev/null +++ b/designer/src/.gitignore @@ -0,0 +1,2 @@ +/.qmake.stash +/moc_predefs.h diff --git a/designer/src/.qmake.stash b/designer/src/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/designer/src/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/designer/src/moc_predefs.h b/designer/src/moc_predefs.h deleted file mode 100644 index 4b865958..00000000 --- a/designer/src/moc_predefs.h +++ /dev/null @@ -1,386 +0,0 @@ -#define __DBL_MIN_EXP__ (-1021) -#define __FLT32X_MAX_EXP__ 1024 -#define __cpp_attributes 200809 -#define __UINT_LEAST16_MAX__ 0xffff -#define __ATOMIC_ACQUIRE 2 -#define __FLT128_MAX_10_EXP__ 4932 -#define __FLT_MIN__ 1.17549435082228750796873653722224568e-38F -#define __GCC_IEC_559_COMPLEX 2 -#define __cpp_aggregate_nsdmi 201304 -#define __UINT_LEAST8_TYPE__ unsigned char -#define __SIZEOF_FLOAT80__ 16 -#define __INTMAX_C(c) c ## L -#define __CHAR_BIT__ 8 -#define __UINT8_MAX__ 0xff -#define __WINT_MAX__ 0xffffffffU -#define __FLT32_MIN_EXP__ (-125) -#define __cpp_static_assert 200410 -#define __ORDER_LITTLE_ENDIAN__ 1234 -#define __SIZE_MAX__ 0xffffffffffffffffUL -#define __WCHAR_MAX__ 0x7fffffff -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L) -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -#define __GCC_ATOMIC_CHAR_LOCK_FREE 2 -#define __GCC_IEC_559 2 -#define __FLT32X_DECIMAL_DIG__ 17 -#define __FLT_EVAL_METHOD__ 0 -#define __unix__ 1 -#define __cpp_binary_literals 201304 -#define __FLT64_DECIMAL_DIG__ 17 -#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2 -#define __x86_64 1 -#define __cpp_variadic_templates 200704 -#define __UINT_FAST64_MAX__ 0xffffffffffffffffUL -#define __SIG_ATOMIC_TYPE__ int -#define __DBL_MIN_10_EXP__ (-307) -#define __FINITE_MATH_ONLY__ 0 -#define __cpp_variable_templates 201304 -#define __GNUC_PATCHLEVEL__ 1 -#define __FLT32_HAS_DENORM__ 1 -#define __UINT_FAST8_MAX__ 0xff -#define __has_include(STR) __has_include__(STR) -#define __DEC64_MAX_EXP__ 385 -#define __INT8_C(c) c -#define __INT_LEAST8_WIDTH__ 8 -#define __UINT_LEAST64_MAX__ 0xffffffffffffffffUL -#define __SHRT_MAX__ 0x7fff -#define __LDBL_MAX__ 1.18973149535723176502126385303097021e+4932L -#define __FLT64X_MAX_10_EXP__ 4932 -#define __UINT_LEAST8_MAX__ 0xff -#define __GCC_ATOMIC_BOOL_LOCK_FREE 2 -#define __FLT128_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966F128 -#define __UINTMAX_TYPE__ long unsigned int -#define __linux 1 -#define __DEC32_EPSILON__ 1E-6DF -#define __FLT_EVAL_METHOD_TS_18661_3__ 0 -#define __OPTIMIZE__ 1 -#define __unix 1 -#define __UINT32_MAX__ 0xffffffffU -#define __GXX_EXPERIMENTAL_CXX0X__ 1 -#define __LDBL_MAX_EXP__ 16384 -#define __FLT128_MIN_EXP__ (-16381) -#define __WINT_MIN__ 0U -#define __linux__ 1 -#define __FLT128_MIN_10_EXP__ (-4931) -#define __INT_LEAST16_WIDTH__ 16 -#define __SCHAR_MAX__ 0x7f -#define __FLT128_MANT_DIG__ 113 -#define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1) -#define __INT64_C(c) c ## L -#define __DBL_DIG__ 15 -#define __GCC_ATOMIC_POINTER_LOCK_FREE 2 -#define __FLT64X_MANT_DIG__ 64 -#define __SIZEOF_INT__ 4 -#define __SIZEOF_POINTER__ 8 -#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2 -#define __USER_LABEL_PREFIX__ -#define __FLT64X_EPSILON__ 1.08420217248550443400745280086994171e-19F64x -#define __STDC_HOSTED__ 1 -#define __LDBL_HAS_INFINITY__ 1 -#define __FLT32_DIG__ 6 -#define __FLT_EPSILON__ 1.19209289550781250000000000000000000e-7F -#define __GXX_WEAK__ 1 -#define __SHRT_WIDTH__ 16 -#define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L -#define __DEC32_MAX__ 9.999999E96DF -#define __cpp_threadsafe_static_init 200806 -#define __FLT64X_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951F64x -#define __FLT32X_HAS_INFINITY__ 1 -#define __INT32_MAX__ 0x7fffffff -#define __INT_WIDTH__ 32 -#define __SIZEOF_LONG__ 8 -#define __STDC_IEC_559__ 1 -#define __STDC_ISO_10646__ 201706L -#define __UINT16_C(c) c -#define __PTRDIFF_WIDTH__ 64 -#define __DECIMAL_DIG__ 21 -#define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64 -#define __gnu_linux__ 1 -#define __INTMAX_WIDTH__ 64 -#define __FLT64_MIN_EXP__ (-1021) -#define __has_include_next(STR) __has_include_next__(STR) -#define __FLT64X_MIN_10_EXP__ (-4931) -#define __LDBL_HAS_QUIET_NAN__ 1 -#define __FLT64_MANT_DIG__ 53 -#define __GNUC__ 7 -#define __GXX_RTTI 1 -#define __MMX__ 1 -#define __cpp_delegating_constructors 200604 -#define __FLT_HAS_DENORM__ 1 -#define __SIZEOF_LONG_DOUBLE__ 16 -#define __BIGGEST_ALIGNMENT__ 16 -#define __STDC_UTF_16__ 1 -#define __FLT64_MAX_10_EXP__ 308 -#define __FLT32_HAS_INFINITY__ 1 -#define __DBL_MAX__ double(1.79769313486231570814527423731704357e+308L) -#define __cpp_raw_strings 200710 -#define __INT_FAST32_MAX__ 0x7fffffffffffffffL -#define __DBL_HAS_INFINITY__ 1 -#define __INT64_MAX__ 0x7fffffffffffffffL -#define __DEC32_MIN_EXP__ (-94) -#define __INTPTR_WIDTH__ 64 -#define __FLT32X_HAS_DENORM__ 1 -#define __INT_FAST16_TYPE__ long int -#define __LDBL_HAS_DENORM__ 1 -#define __cplusplus 201402L -#define __cpp_ref_qualifiers 200710 -#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL -#define __INT_LEAST32_MAX__ 0x7fffffff -#define __DEC32_MIN__ 1E-95DF -#define __DEPRECATED 1 -#define __cpp_rvalue_references 200610 -#define __DBL_MAX_EXP__ 1024 -#define __WCHAR_WIDTH__ 32 -#define __FLT32_MAX__ 3.40282346638528859811704183484516925e+38F32 -#define __DEC128_EPSILON__ 1E-33DL -#define __SSE2_MATH__ 1 -#define __ATOMIC_HLE_RELEASE 131072 -#define __PTRDIFF_MAX__ 0x7fffffffffffffffL -#define __amd64 1 -#define __STDC_NO_THREADS__ 1 -#define __ATOMIC_HLE_ACQUIRE 65536 -#define __FLT32_HAS_QUIET_NAN__ 1 -#define __GNUG__ 7 -#define __LONG_LONG_MAX__ 0x7fffffffffffffffLL -#define __SIZEOF_SIZE_T__ 8 -#define __cpp_rvalue_reference 200610 -#define __cpp_nsdmi 200809 -#define __FLT64X_MIN_EXP__ (-16381) -#define __SIZEOF_WINT_T__ 4 -#define __LONG_LONG_WIDTH__ 64 -#define __cpp_initializer_lists 200806 -#define __FLT32_MAX_EXP__ 128 -#define __cpp_hex_float 201603 -#define __GCC_HAVE_DWARF2_CFI_ASM 1 -#define __GXX_ABI_VERSION 1011 -#define __FLT128_HAS_INFINITY__ 1 -#define __FLT_MIN_EXP__ (-125) -#define __cpp_lambdas 200907 -#define __FLT64X_HAS_QUIET_NAN__ 1 -#define __INT_FAST64_TYPE__ long int -#define __FLT64_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F64 -#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L) -#define __LP64__ 1 -#define __FLT32X_EPSILON__ 2.22044604925031308084726333618164062e-16F32x -#define __DECIMAL_BID_FORMAT__ 1 -#define __FLT64_MIN_10_EXP__ (-307) -#define __FLT64X_DECIMAL_DIG__ 21 -#define __DEC128_MIN__ 1E-6143DL -#define __REGISTER_PREFIX__ -#define __UINT16_MAX__ 0xffff -#define __DBL_HAS_DENORM__ 1 -#define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32 -#define __UINT8_TYPE__ unsigned char -#define __FLT_MANT_DIG__ 24 -#define __LDBL_DECIMAL_DIG__ 21 -#define __VERSION__ "7.3.1 20180323 [gcc-7-branch revision 258812]" -#define __UINT64_C(c) c ## UL -#define __cpp_unicode_characters 200704 -#define _STDC_PREDEF_H 1 -#define __cpp_decltype_auto 201304 -#define __GCC_ATOMIC_INT_LOCK_FREE 2 -#define __FLT128_MAX_EXP__ 16384 -#define __FLT32_MANT_DIG__ 24 -#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __STDC_IEC_559_COMPLEX__ 1 -#define __FLT128_HAS_DENORM__ 1 -#define __FLT128_DIG__ 33 -#define __SCHAR_WIDTH__ 8 -#define __INT32_C(c) c -#define __DEC64_EPSILON__ 1E-15DD -#define __ORDER_PDP_ENDIAN__ 3412 -#define __DEC128_MIN_EXP__ (-6142) -#define __FLT32_MAX_10_EXP__ 38 -#define __INT_FAST32_TYPE__ long int -#define __UINT_LEAST16_TYPE__ short unsigned int -#define __FLT64X_HAS_INFINITY__ 1 -#define unix 1 -#define __INT16_MAX__ 0x7fff -#define __cpp_rtti 199711 -#define __SIZE_TYPE__ long unsigned int -#define __UINT64_MAX__ 0xffffffffffffffffUL -#define __FLT64X_DIG__ 18 -#define __INT8_TYPE__ signed char -#define __cpp_digit_separators 201309 -#define __ELF__ 1 -#define __GCC_ASM_FLAG_OUTPUTS__ 1 -#define __FLT_RADIX__ 2 -#define __INT_LEAST16_TYPE__ short int -#define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L -#define __UINTMAX_C(c) c ## UL -#define __GLIBCXX_BITSIZE_INT_N_0 128 -#define __k8 1 -#define __SIG_ATOMIC_MAX__ 0x7fffffff -#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 -#define __cpp_sized_deallocation 201309 -#define __SIZEOF_PTRDIFF_T__ 8 -#define __FLT32X_MANT_DIG__ 53 -#define __x86_64__ 1 -#define __FLT32X_MIN_EXP__ (-1021) -#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF -#define __INT_FAST16_MAX__ 0x7fffffffffffffffL -#define __FLT64_DIG__ 15 -#define __UINT_FAST32_MAX__ 0xffffffffffffffffUL -#define __UINT_LEAST64_TYPE__ long unsigned int -#define __FLT_HAS_QUIET_NAN__ 1 -#define __FLT_MAX_10_EXP__ 38 -#define __LONG_MAX__ 0x7fffffffffffffffL -#define __FLT64X_HAS_DENORM__ 1 -#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL -#define __FLT_HAS_INFINITY__ 1 -#define __cpp_unicode_literals 200710 -#define __UINT_FAST16_TYPE__ long unsigned int -#define __DEC64_MAX__ 9.999999999999999E384DD -#define __INT_FAST32_WIDTH__ 64 -#define __CHAR16_TYPE__ short unsigned int -#define __PRAGMA_REDEFINE_EXTNAME 1 -#define __SIZE_WIDTH__ 64 -#define __SEG_FS 1 -#define __INT_LEAST16_MAX__ 0x7fff -#define __DEC64_MANT_DIG__ 16 -#define __UINT_LEAST32_MAX__ 0xffffffffU -#define __SEG_GS 1 -#define __FLT32_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F32 -#define __GCC_ATOMIC_LONG_LOCK_FREE 2 -#define __SIG_ATOMIC_WIDTH__ 32 -#define __INT_LEAST64_TYPE__ long int -#define __INT16_TYPE__ short int -#define __INT_LEAST8_TYPE__ signed char -#define __DEC32_MAX_EXP__ 97 -#define __INT_FAST8_MAX__ 0x7f -#define __FLT128_MAX__ 1.18973149535723176508575932662800702e+4932F128 -#define __INTPTR_MAX__ 0x7fffffffffffffffL -#define linux 1 -#define __cpp_range_based_for 200907 -#define __FLT64_HAS_QUIET_NAN__ 1 -#define __FLT32_MIN_10_EXP__ (-37) -#define __SSE2__ 1 -#define __EXCEPTIONS 1 -#define __LDBL_MANT_DIG__ 64 -#define __DBL_HAS_QUIET_NAN__ 1 -#define __FLT64_HAS_INFINITY__ 1 -#define __FLT64X_MAX__ 1.18973149535723176502126385303097021e+4932F64x -#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1) -#define __code_model_small__ 1 -#define __cpp_return_type_deduction 201304 -#define __k8__ 1 -#define __INTPTR_TYPE__ long int -#define __UINT16_TYPE__ short unsigned int -#define __WCHAR_TYPE__ int -#define __SIZEOF_FLOAT__ 4 -#define __pic__ 2 -#define __UINTPTR_MAX__ 0xffffffffffffffffUL -#define __INT_FAST64_WIDTH__ 64 -#define __DEC64_MIN_EXP__ (-382) -#define __cpp_decltype 200707 -#define __FLT32_DECIMAL_DIG__ 9 -#define __INT_FAST64_MAX__ 0x7fffffffffffffffL -#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1 -#define __FLT_DIG__ 6 -#define __FLT64X_MAX_EXP__ 16384 -#define __UINT_FAST64_TYPE__ long unsigned int -#define __INT_MAX__ 0x7fffffff -#define __amd64__ 1 -#define __INT64_TYPE__ long int -#define __FLT_MAX_EXP__ 128 -#define __ORDER_BIG_ENDIAN__ 4321 -#define __DBL_MANT_DIG__ 53 -#define __cpp_inheriting_constructors 201511 -#define __SIZEOF_FLOAT128__ 16 -#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL -#define __DEC64_MIN__ 1E-383DD -#define __WINT_TYPE__ unsigned int -#define __UINT_LEAST32_TYPE__ unsigned int -#define __SIZEOF_SHORT__ 2 -#define __SSE__ 1 -#define __LDBL_MIN_EXP__ (-16381) -#define __FLT64_MAX__ 1.79769313486231570814527423731704357e+308F64 -#define __WINT_WIDTH__ 32 -#define __INT_LEAST8_MAX__ 0x7f -#define __FLT32X_MAX_10_EXP__ 308 -#define __SIZEOF_INT128__ 16 -#define __LDBL_MAX_10_EXP__ 4932 -#define __ATOMIC_RELAXED 0 -#define __DBL_EPSILON__ double(2.22044604925031308084726333618164062e-16L) -#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128 -#define _LP64 1 -#define __UINT8_C(c) c -#define __FLT64_MAX_EXP__ 1024 -#define __INT_LEAST32_TYPE__ int -#define __SIZEOF_WCHAR_T__ 4 -#define __FLT128_HAS_QUIET_NAN__ 1 -#define __INT_FAST8_TYPE__ signed char -#define __FLT64X_MIN__ 3.36210314311209350626267781732175260e-4932F64x -#define __GNUC_STDC_INLINE__ 1 -#define __FLT64_HAS_DENORM__ 1 -#define __FLT32_EPSILON__ 1.19209289550781250000000000000000000e-7F32 -#define __DBL_DECIMAL_DIG__ 17 -#define __STDC_UTF_32__ 1 -#define __INT_FAST8_WIDTH__ 8 -#define __FXSR__ 1 -#define __DEC_EVAL_METHOD__ 2 -#define __FLT32X_MAX__ 1.79769313486231570814527423731704357e+308F32x -#define __cpp_runtime_arrays 198712 -#define __UINT64_TYPE__ long unsigned int -#define __UINT32_C(c) c ## U -#define __INTMAX_MAX__ 0x7fffffffffffffffL -#define __cpp_alias_templates 200704 -#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F -#define __INT8_MAX__ 0x7f -#define __LONG_WIDTH__ 64 -#define __PIC__ 2 -#define __UINT_FAST32_TYPE__ long unsigned int -#define __CHAR32_TYPE__ unsigned int -#define __FLT_MAX__ 3.40282346638528859811704183484516925e+38F -#define __cpp_constexpr 201304 -#define __INT32_TYPE__ int -#define __SIZEOF_DOUBLE__ 8 -#define __cpp_exceptions 199711 -#define __FLT_MIN_10_EXP__ (-37) -#define __FLT64_MIN__ 2.22507385850720138309023271733240406e-308F64 -#define __INT_LEAST32_WIDTH__ 32 -#define __INTMAX_TYPE__ long int -#define __DEC128_MAX_EXP__ 6145 -#define __FLT32X_HAS_QUIET_NAN__ 1 -#define __ATOMIC_CONSUME 1 -#define __GNUC_MINOR__ 3 -#define __GLIBCXX_TYPE_INT_N_0 __int128 -#define __INT_FAST16_WIDTH__ 64 -#define __UINTMAX_MAX__ 0xffffffffffffffffUL -#define __DEC32_MANT_DIG__ 7 -#define __FLT32X_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F32x -#define __DBL_MAX_10_EXP__ 308 -#define __LDBL_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951L -#define __INT16_C(c) c -#define __cpp_generic_lambdas 201304 -#define __STDC__ 1 -#define __FLT32X_DIG__ 15 -#define __PTRDIFF_TYPE__ long int -#define __ATOMIC_SEQ_CST 5 -#define __UINT32_TYPE__ unsigned int -#define __FLT32X_MIN_10_EXP__ (-307) -#define __UINTPTR_TYPE__ long unsigned int -#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD -#define __DEC128_MANT_DIG__ 34 -#define __LDBL_MIN_10_EXP__ (-4931) -#define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128 -#define __SSE_MATH__ 1 -#define __SIZEOF_LONG_LONG__ 8 -#define __cpp_user_defined_literals 200809 -#define __FLT128_DECIMAL_DIG__ 36 -#define __GCC_ATOMIC_LLONG_LOCK_FREE 2 -#define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x -#define __LDBL_DIG__ 18 -#define __FLT_DECIMAL_DIG__ 9 -#define __UINT_FAST16_MAX__ 0xffffffffffffffffUL -#define __GCC_ATOMIC_SHORT_LOCK_FREE 2 -#define __INT_LEAST64_WIDTH__ 64 -#define __UINT_FAST8_TYPE__ unsigned char -#define _GNU_SOURCE 1 -#define __cpp_init_captures 201304 -#define __ATOMIC_ACQ_REL 4 -#define __ATOMIC_RELEASE 3 diff --git a/fake_qmake/.gitignore b/fake_qmake/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/fake_qmake/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/fake_qmake/.qmake.stash b/fake_qmake/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/fake_qmake/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/language_bindings/lua/lua-5.1/src/.gitignore b/language_bindings/lua/lua-5.1/src/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/language_bindings/lua/lua-5.1/src/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/language_bindings/lua/lua-5.1/src/.qmake.stash b/language_bindings/lua/lua-5.1/src/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/language_bindings/lua/lua-5.1/src/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/language_bindings/lua/pvapplua/.gitignore b/language_bindings/lua/pvapplua/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/language_bindings/lua/pvapplua/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/language_bindings/lua/pvapplua/.qmake.stash b/language_bindings/lua/pvapplua/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/language_bindings/lua/pvapplua/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/language_bindings/lua/pvslua/.gitignore b/language_bindings/lua/pvslua/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/language_bindings/lua/pvslua/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/language_bindings/lua/pvslua/.qmake.stash b/language_bindings/lua/pvslua/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/language_bindings/lua/pvslua/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/pvbrowser/.gitignore b/pvbrowser/.gitignore new file mode 100644 index 00000000..b3e23c0c --- /dev/null +++ b/pvbrowser/.gitignore @@ -0,0 +1,2 @@ +/.qmake.stash +/moc_predefs.h diff --git a/pvbrowser/.qmake.stash b/pvbrowser/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/pvbrowser/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/pvbrowser/moc_predefs.h b/pvbrowser/moc_predefs.h deleted file mode 100644 index 03cdd2e1..00000000 --- a/pvbrowser/moc_predefs.h +++ /dev/null @@ -1,384 +0,0 @@ -#define __DBL_MIN_EXP__ (-1021) -#define __FLT32X_MAX_EXP__ 1024 -#define __cpp_attributes 200809 -#define __UINT_LEAST16_MAX__ 0xffff -#define __ATOMIC_ACQUIRE 2 -#define __FLT128_MAX_10_EXP__ 4932 -#define __FLT_MIN__ 1.17549435082228750796873653722224568e-38F -#define __GCC_IEC_559_COMPLEX 2 -#define __cpp_aggregate_nsdmi 201304 -#define __UINT_LEAST8_TYPE__ unsigned char -#define __SIZEOF_FLOAT80__ 16 -#define __INTMAX_C(c) c ## L -#define __CHAR_BIT__ 8 -#define __UINT8_MAX__ 0xff -#define __WINT_MAX__ 0xffffffffU -#define __FLT32_MIN_EXP__ (-125) -#define __cpp_static_assert 200410 -#define __ORDER_LITTLE_ENDIAN__ 1234 -#define __SIZE_MAX__ 0xffffffffffffffffUL -#define __WCHAR_MAX__ 0x7fffffff -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L) -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -#define __GCC_ATOMIC_CHAR_LOCK_FREE 2 -#define __GCC_IEC_559 2 -#define __FLT32X_DECIMAL_DIG__ 17 -#define __FLT_EVAL_METHOD__ 0 -#define __unix__ 1 -#define __cpp_binary_literals 201304 -#define __FLT64_DECIMAL_DIG__ 17 -#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2 -#define __x86_64 1 -#define __cpp_variadic_templates 200704 -#define __UINT_FAST64_MAX__ 0xffffffffffffffffUL -#define __SIG_ATOMIC_TYPE__ int -#define __DBL_MIN_10_EXP__ (-307) -#define __FINITE_MATH_ONLY__ 0 -#define __cpp_variable_templates 201304 -#define __GNUC_PATCHLEVEL__ 1 -#define __FLT32_HAS_DENORM__ 1 -#define __UINT_FAST8_MAX__ 0xff -#define __has_include(STR) __has_include__(STR) -#define __DEC64_MAX_EXP__ 385 -#define __INT8_C(c) c -#define __INT_LEAST8_WIDTH__ 8 -#define __UINT_LEAST64_MAX__ 0xffffffffffffffffUL -#define __SHRT_MAX__ 0x7fff -#define __LDBL_MAX__ 1.18973149535723176502126385303097021e+4932L -#define __FLT64X_MAX_10_EXP__ 4932 -#define __UINT_LEAST8_MAX__ 0xff -#define __GCC_ATOMIC_BOOL_LOCK_FREE 2 -#define __FLT128_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966F128 -#define __UINTMAX_TYPE__ long unsigned int -#define __linux 1 -#define __DEC32_EPSILON__ 1E-6DF -#define __FLT_EVAL_METHOD_TS_18661_3__ 0 -#define __OPTIMIZE__ 1 -#define __unix 1 -#define __UINT32_MAX__ 0xffffffffU -#define __GXX_EXPERIMENTAL_CXX0X__ 1 -#define __LDBL_MAX_EXP__ 16384 -#define __FLT128_MIN_EXP__ (-16381) -#define __WINT_MIN__ 0U -#define __linux__ 1 -#define __FLT128_MIN_10_EXP__ (-4931) -#define __INT_LEAST16_WIDTH__ 16 -#define __SCHAR_MAX__ 0x7f -#define __FLT128_MANT_DIG__ 113 -#define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1) -#define __INT64_C(c) c ## L -#define __DBL_DIG__ 15 -#define __GCC_ATOMIC_POINTER_LOCK_FREE 2 -#define __FLT64X_MANT_DIG__ 64 -#define __SIZEOF_INT__ 4 -#define __SIZEOF_POINTER__ 8 -#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2 -#define __USER_LABEL_PREFIX__ -#define __FLT64X_EPSILON__ 1.08420217248550443400745280086994171e-19F64x -#define __STDC_HOSTED__ 1 -#define __LDBL_HAS_INFINITY__ 1 -#define __FLT32_DIG__ 6 -#define __FLT_EPSILON__ 1.19209289550781250000000000000000000e-7F -#define __GXX_WEAK__ 1 -#define __SHRT_WIDTH__ 16 -#define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L -#define __DEC32_MAX__ 9.999999E96DF -#define __cpp_threadsafe_static_init 200806 -#define __FLT64X_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951F64x -#define __FLT32X_HAS_INFINITY__ 1 -#define __INT32_MAX__ 0x7fffffff -#define __INT_WIDTH__ 32 -#define __SIZEOF_LONG__ 8 -#define __STDC_IEC_559__ 1 -#define __STDC_ISO_10646__ 201706L -#define __UINT16_C(c) c -#define __PTRDIFF_WIDTH__ 64 -#define __DECIMAL_DIG__ 21 -#define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64 -#define __gnu_linux__ 1 -#define __INTMAX_WIDTH__ 64 -#define __FLT64_MIN_EXP__ (-1021) -#define __has_include_next(STR) __has_include_next__(STR) -#define __FLT64X_MIN_10_EXP__ (-4931) -#define __LDBL_HAS_QUIET_NAN__ 1 -#define __FLT64_MANT_DIG__ 53 -#define __GNUC__ 7 -#define __GXX_RTTI 1 -#define __MMX__ 1 -#define __cpp_delegating_constructors 200604 -#define __FLT_HAS_DENORM__ 1 -#define __SIZEOF_LONG_DOUBLE__ 16 -#define __BIGGEST_ALIGNMENT__ 16 -#define __STDC_UTF_16__ 1 -#define __FLT64_MAX_10_EXP__ 308 -#define __FLT32_HAS_INFINITY__ 1 -#define __DBL_MAX__ double(1.79769313486231570814527423731704357e+308L) -#define __cpp_raw_strings 200710 -#define __INT_FAST32_MAX__ 0x7fffffffffffffffL -#define __DBL_HAS_INFINITY__ 1 -#define __INT64_MAX__ 0x7fffffffffffffffL -#define __DEC32_MIN_EXP__ (-94) -#define __INTPTR_WIDTH__ 64 -#define __FLT32X_HAS_DENORM__ 1 -#define __INT_FAST16_TYPE__ long int -#define __LDBL_HAS_DENORM__ 1 -#define __cplusplus 201402L -#define __cpp_ref_qualifiers 200710 -#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL -#define __INT_LEAST32_MAX__ 0x7fffffff -#define __DEC32_MIN__ 1E-95DF -#define __DEPRECATED 1 -#define __cpp_rvalue_references 200610 -#define __DBL_MAX_EXP__ 1024 -#define __WCHAR_WIDTH__ 32 -#define __FLT32_MAX__ 3.40282346638528859811704183484516925e+38F32 -#define __DEC128_EPSILON__ 1E-33DL -#define __SSE2_MATH__ 1 -#define __ATOMIC_HLE_RELEASE 131072 -#define __PTRDIFF_MAX__ 0x7fffffffffffffffL -#define __amd64 1 -#define __STDC_NO_THREADS__ 1 -#define __ATOMIC_HLE_ACQUIRE 65536 -#define __FLT32_HAS_QUIET_NAN__ 1 -#define __GNUG__ 7 -#define __LONG_LONG_MAX__ 0x7fffffffffffffffLL -#define __SIZEOF_SIZE_T__ 8 -#define __cpp_rvalue_reference 200610 -#define __cpp_nsdmi 200809 -#define __FLT64X_MIN_EXP__ (-16381) -#define __SIZEOF_WINT_T__ 4 -#define __LONG_LONG_WIDTH__ 64 -#define __cpp_initializer_lists 200806 -#define __FLT32_MAX_EXP__ 128 -#define __cpp_hex_float 201603 -#define __GCC_HAVE_DWARF2_CFI_ASM 1 -#define __GXX_ABI_VERSION 1011 -#define __FLT128_HAS_INFINITY__ 1 -#define __FLT_MIN_EXP__ (-125) -#define __cpp_lambdas 200907 -#define __FLT64X_HAS_QUIET_NAN__ 1 -#define __INT_FAST64_TYPE__ long int -#define __FLT64_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F64 -#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L) -#define __LP64__ 1 -#define __FLT32X_EPSILON__ 2.22044604925031308084726333618164062e-16F32x -#define __DECIMAL_BID_FORMAT__ 1 -#define __FLT64_MIN_10_EXP__ (-307) -#define __FLT64X_DECIMAL_DIG__ 21 -#define __DEC128_MIN__ 1E-6143DL -#define __REGISTER_PREFIX__ -#define __UINT16_MAX__ 0xffff -#define __DBL_HAS_DENORM__ 1 -#define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32 -#define __UINT8_TYPE__ unsigned char -#define __FLT_MANT_DIG__ 24 -#define __LDBL_DECIMAL_DIG__ 21 -#define __VERSION__ "7.3.1 20180323 [gcc-7-branch revision 258812]" -#define __UINT64_C(c) c ## UL -#define __cpp_unicode_characters 200704 -#define _STDC_PREDEF_H 1 -#define __cpp_decltype_auto 201304 -#define __GCC_ATOMIC_INT_LOCK_FREE 2 -#define __FLT128_MAX_EXP__ 16384 -#define __FLT32_MANT_DIG__ 24 -#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __STDC_IEC_559_COMPLEX__ 1 -#define __FLT128_HAS_DENORM__ 1 -#define __FLT128_DIG__ 33 -#define __SCHAR_WIDTH__ 8 -#define __INT32_C(c) c -#define __DEC64_EPSILON__ 1E-15DD -#define __ORDER_PDP_ENDIAN__ 3412 -#define __DEC128_MIN_EXP__ (-6142) -#define __FLT32_MAX_10_EXP__ 38 -#define __INT_FAST32_TYPE__ long int -#define __UINT_LEAST16_TYPE__ short unsigned int -#define __FLT64X_HAS_INFINITY__ 1 -#define unix 1 -#define __INT16_MAX__ 0x7fff -#define __cpp_rtti 199711 -#define __SIZE_TYPE__ long unsigned int -#define __UINT64_MAX__ 0xffffffffffffffffUL -#define __FLT64X_DIG__ 18 -#define __INT8_TYPE__ signed char -#define __cpp_digit_separators 201309 -#define __ELF__ 1 -#define __GCC_ASM_FLAG_OUTPUTS__ 1 -#define __FLT_RADIX__ 2 -#define __INT_LEAST16_TYPE__ short int -#define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L -#define __UINTMAX_C(c) c ## UL -#define __GLIBCXX_BITSIZE_INT_N_0 128 -#define __k8 1 -#define __SIG_ATOMIC_MAX__ 0x7fffffff -#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 -#define __cpp_sized_deallocation 201309 -#define __SIZEOF_PTRDIFF_T__ 8 -#define __FLT32X_MANT_DIG__ 53 -#define __x86_64__ 1 -#define __FLT32X_MIN_EXP__ (-1021) -#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF -#define __INT_FAST16_MAX__ 0x7fffffffffffffffL -#define __FLT64_DIG__ 15 -#define __UINT_FAST32_MAX__ 0xffffffffffffffffUL -#define __UINT_LEAST64_TYPE__ long unsigned int -#define __FLT_HAS_QUIET_NAN__ 1 -#define __FLT_MAX_10_EXP__ 38 -#define __LONG_MAX__ 0x7fffffffffffffffL -#define __FLT64X_HAS_DENORM__ 1 -#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL -#define __FLT_HAS_INFINITY__ 1 -#define __cpp_unicode_literals 200710 -#define __UINT_FAST16_TYPE__ long unsigned int -#define __DEC64_MAX__ 9.999999999999999E384DD -#define __INT_FAST32_WIDTH__ 64 -#define __CHAR16_TYPE__ short unsigned int -#define __PRAGMA_REDEFINE_EXTNAME 1 -#define __SIZE_WIDTH__ 64 -#define __SEG_FS 1 -#define __INT_LEAST16_MAX__ 0x7fff -#define __DEC64_MANT_DIG__ 16 -#define __UINT_LEAST32_MAX__ 0xffffffffU -#define __SEG_GS 1 -#define __FLT32_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F32 -#define __GCC_ATOMIC_LONG_LOCK_FREE 2 -#define __SIG_ATOMIC_WIDTH__ 32 -#define __INT_LEAST64_TYPE__ long int -#define __INT16_TYPE__ short int -#define __INT_LEAST8_TYPE__ signed char -#define __DEC32_MAX_EXP__ 97 -#define __INT_FAST8_MAX__ 0x7f -#define __FLT128_MAX__ 1.18973149535723176508575932662800702e+4932F128 -#define __INTPTR_MAX__ 0x7fffffffffffffffL -#define linux 1 -#define __cpp_range_based_for 200907 -#define __FLT64_HAS_QUIET_NAN__ 1 -#define __FLT32_MIN_10_EXP__ (-37) -#define __SSE2__ 1 -#define __EXCEPTIONS 1 -#define __LDBL_MANT_DIG__ 64 -#define __DBL_HAS_QUIET_NAN__ 1 -#define __FLT64_HAS_INFINITY__ 1 -#define __FLT64X_MAX__ 1.18973149535723176502126385303097021e+4932F64x -#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1) -#define __code_model_small__ 1 -#define __cpp_return_type_deduction 201304 -#define __k8__ 1 -#define __INTPTR_TYPE__ long int -#define __UINT16_TYPE__ short unsigned int -#define __WCHAR_TYPE__ int -#define __SIZEOF_FLOAT__ 4 -#define __UINTPTR_MAX__ 0xffffffffffffffffUL -#define __INT_FAST64_WIDTH__ 64 -#define __DEC64_MIN_EXP__ (-382) -#define __cpp_decltype 200707 -#define __FLT32_DECIMAL_DIG__ 9 -#define __INT_FAST64_MAX__ 0x7fffffffffffffffL -#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1 -#define __FLT_DIG__ 6 -#define __FLT64X_MAX_EXP__ 16384 -#define __UINT_FAST64_TYPE__ long unsigned int -#define __INT_MAX__ 0x7fffffff -#define __amd64__ 1 -#define __INT64_TYPE__ long int -#define __FLT_MAX_EXP__ 128 -#define __ORDER_BIG_ENDIAN__ 4321 -#define __DBL_MANT_DIG__ 53 -#define __cpp_inheriting_constructors 201511 -#define __SIZEOF_FLOAT128__ 16 -#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL -#define __DEC64_MIN__ 1E-383DD -#define __WINT_TYPE__ unsigned int -#define __UINT_LEAST32_TYPE__ unsigned int -#define __SIZEOF_SHORT__ 2 -#define __SSE__ 1 -#define __LDBL_MIN_EXP__ (-16381) -#define __FLT64_MAX__ 1.79769313486231570814527423731704357e+308F64 -#define __WINT_WIDTH__ 32 -#define __INT_LEAST8_MAX__ 0x7f -#define __FLT32X_MAX_10_EXP__ 308 -#define __SIZEOF_INT128__ 16 -#define __LDBL_MAX_10_EXP__ 4932 -#define __ATOMIC_RELAXED 0 -#define __DBL_EPSILON__ double(2.22044604925031308084726333618164062e-16L) -#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128 -#define _LP64 1 -#define __UINT8_C(c) c -#define __FLT64_MAX_EXP__ 1024 -#define __INT_LEAST32_TYPE__ int -#define __SIZEOF_WCHAR_T__ 4 -#define __FLT128_HAS_QUIET_NAN__ 1 -#define __INT_FAST8_TYPE__ signed char -#define __FLT64X_MIN__ 3.36210314311209350626267781732175260e-4932F64x -#define __GNUC_STDC_INLINE__ 1 -#define __FLT64_HAS_DENORM__ 1 -#define __FLT32_EPSILON__ 1.19209289550781250000000000000000000e-7F32 -#define __DBL_DECIMAL_DIG__ 17 -#define __STDC_UTF_32__ 1 -#define __INT_FAST8_WIDTH__ 8 -#define __FXSR__ 1 -#define __DEC_EVAL_METHOD__ 2 -#define __FLT32X_MAX__ 1.79769313486231570814527423731704357e+308F32x -#define __cpp_runtime_arrays 198712 -#define __UINT64_TYPE__ long unsigned int -#define __UINT32_C(c) c ## U -#define __INTMAX_MAX__ 0x7fffffffffffffffL -#define __cpp_alias_templates 200704 -#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F -#define __INT8_MAX__ 0x7f -#define __LONG_WIDTH__ 64 -#define __UINT_FAST32_TYPE__ long unsigned int -#define __CHAR32_TYPE__ unsigned int -#define __FLT_MAX__ 3.40282346638528859811704183484516925e+38F -#define __cpp_constexpr 201304 -#define __INT32_TYPE__ int -#define __SIZEOF_DOUBLE__ 8 -#define __cpp_exceptions 199711 -#define __FLT_MIN_10_EXP__ (-37) -#define __FLT64_MIN__ 2.22507385850720138309023271733240406e-308F64 -#define __INT_LEAST32_WIDTH__ 32 -#define __INTMAX_TYPE__ long int -#define __DEC128_MAX_EXP__ 6145 -#define __FLT32X_HAS_QUIET_NAN__ 1 -#define __ATOMIC_CONSUME 1 -#define __GNUC_MINOR__ 3 -#define __GLIBCXX_TYPE_INT_N_0 __int128 -#define __INT_FAST16_WIDTH__ 64 -#define __UINTMAX_MAX__ 0xffffffffffffffffUL -#define __DEC32_MANT_DIG__ 7 -#define __FLT32X_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F32x -#define __DBL_MAX_10_EXP__ 308 -#define __LDBL_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951L -#define __INT16_C(c) c -#define __cpp_generic_lambdas 201304 -#define __STDC__ 1 -#define __FLT32X_DIG__ 15 -#define __PTRDIFF_TYPE__ long int -#define __ATOMIC_SEQ_CST 5 -#define __UINT32_TYPE__ unsigned int -#define __FLT32X_MIN_10_EXP__ (-307) -#define __UINTPTR_TYPE__ long unsigned int -#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD -#define __DEC128_MANT_DIG__ 34 -#define __LDBL_MIN_10_EXP__ (-4931) -#define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128 -#define __SSE_MATH__ 1 -#define __SIZEOF_LONG_LONG__ 8 -#define __cpp_user_defined_literals 200809 -#define __FLT128_DECIMAL_DIG__ 36 -#define __GCC_ATOMIC_LLONG_LOCK_FREE 2 -#define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x -#define __LDBL_DIG__ 18 -#define __FLT_DECIMAL_DIG__ 9 -#define __UINT_FAST16_MAX__ 0xffffffffffffffffUL -#define __GCC_ATOMIC_SHORT_LOCK_FREE 2 -#define __INT_LEAST64_WIDTH__ 64 -#define __UINT_FAST8_TYPE__ unsigned char -#define _GNU_SOURCE 1 -#define __cpp_init_captures 201304 -#define __ATOMIC_ACQ_REL 4 -#define __ATOMIC_RELEASE 3 diff --git a/pvdevelop/.gitignore b/pvdevelop/.gitignore new file mode 100644 index 00000000..b3e23c0c --- /dev/null +++ b/pvdevelop/.gitignore @@ -0,0 +1,2 @@ +/.qmake.stash +/moc_predefs.h diff --git a/pvdevelop/.qmake.stash b/pvdevelop/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/pvdevelop/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/pvdevelop/moc_predefs.h b/pvdevelop/moc_predefs.h deleted file mode 100644 index 03cdd2e1..00000000 --- a/pvdevelop/moc_predefs.h +++ /dev/null @@ -1,384 +0,0 @@ -#define __DBL_MIN_EXP__ (-1021) -#define __FLT32X_MAX_EXP__ 1024 -#define __cpp_attributes 200809 -#define __UINT_LEAST16_MAX__ 0xffff -#define __ATOMIC_ACQUIRE 2 -#define __FLT128_MAX_10_EXP__ 4932 -#define __FLT_MIN__ 1.17549435082228750796873653722224568e-38F -#define __GCC_IEC_559_COMPLEX 2 -#define __cpp_aggregate_nsdmi 201304 -#define __UINT_LEAST8_TYPE__ unsigned char -#define __SIZEOF_FLOAT80__ 16 -#define __INTMAX_C(c) c ## L -#define __CHAR_BIT__ 8 -#define __UINT8_MAX__ 0xff -#define __WINT_MAX__ 0xffffffffU -#define __FLT32_MIN_EXP__ (-125) -#define __cpp_static_assert 200410 -#define __ORDER_LITTLE_ENDIAN__ 1234 -#define __SIZE_MAX__ 0xffffffffffffffffUL -#define __WCHAR_MAX__ 0x7fffffff -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L) -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -#define __GCC_ATOMIC_CHAR_LOCK_FREE 2 -#define __GCC_IEC_559 2 -#define __FLT32X_DECIMAL_DIG__ 17 -#define __FLT_EVAL_METHOD__ 0 -#define __unix__ 1 -#define __cpp_binary_literals 201304 -#define __FLT64_DECIMAL_DIG__ 17 -#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2 -#define __x86_64 1 -#define __cpp_variadic_templates 200704 -#define __UINT_FAST64_MAX__ 0xffffffffffffffffUL -#define __SIG_ATOMIC_TYPE__ int -#define __DBL_MIN_10_EXP__ (-307) -#define __FINITE_MATH_ONLY__ 0 -#define __cpp_variable_templates 201304 -#define __GNUC_PATCHLEVEL__ 1 -#define __FLT32_HAS_DENORM__ 1 -#define __UINT_FAST8_MAX__ 0xff -#define __has_include(STR) __has_include__(STR) -#define __DEC64_MAX_EXP__ 385 -#define __INT8_C(c) c -#define __INT_LEAST8_WIDTH__ 8 -#define __UINT_LEAST64_MAX__ 0xffffffffffffffffUL -#define __SHRT_MAX__ 0x7fff -#define __LDBL_MAX__ 1.18973149535723176502126385303097021e+4932L -#define __FLT64X_MAX_10_EXP__ 4932 -#define __UINT_LEAST8_MAX__ 0xff -#define __GCC_ATOMIC_BOOL_LOCK_FREE 2 -#define __FLT128_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966F128 -#define __UINTMAX_TYPE__ long unsigned int -#define __linux 1 -#define __DEC32_EPSILON__ 1E-6DF -#define __FLT_EVAL_METHOD_TS_18661_3__ 0 -#define __OPTIMIZE__ 1 -#define __unix 1 -#define __UINT32_MAX__ 0xffffffffU -#define __GXX_EXPERIMENTAL_CXX0X__ 1 -#define __LDBL_MAX_EXP__ 16384 -#define __FLT128_MIN_EXP__ (-16381) -#define __WINT_MIN__ 0U -#define __linux__ 1 -#define __FLT128_MIN_10_EXP__ (-4931) -#define __INT_LEAST16_WIDTH__ 16 -#define __SCHAR_MAX__ 0x7f -#define __FLT128_MANT_DIG__ 113 -#define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1) -#define __INT64_C(c) c ## L -#define __DBL_DIG__ 15 -#define __GCC_ATOMIC_POINTER_LOCK_FREE 2 -#define __FLT64X_MANT_DIG__ 64 -#define __SIZEOF_INT__ 4 -#define __SIZEOF_POINTER__ 8 -#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2 -#define __USER_LABEL_PREFIX__ -#define __FLT64X_EPSILON__ 1.08420217248550443400745280086994171e-19F64x -#define __STDC_HOSTED__ 1 -#define __LDBL_HAS_INFINITY__ 1 -#define __FLT32_DIG__ 6 -#define __FLT_EPSILON__ 1.19209289550781250000000000000000000e-7F -#define __GXX_WEAK__ 1 -#define __SHRT_WIDTH__ 16 -#define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L -#define __DEC32_MAX__ 9.999999E96DF -#define __cpp_threadsafe_static_init 200806 -#define __FLT64X_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951F64x -#define __FLT32X_HAS_INFINITY__ 1 -#define __INT32_MAX__ 0x7fffffff -#define __INT_WIDTH__ 32 -#define __SIZEOF_LONG__ 8 -#define __STDC_IEC_559__ 1 -#define __STDC_ISO_10646__ 201706L -#define __UINT16_C(c) c -#define __PTRDIFF_WIDTH__ 64 -#define __DECIMAL_DIG__ 21 -#define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64 -#define __gnu_linux__ 1 -#define __INTMAX_WIDTH__ 64 -#define __FLT64_MIN_EXP__ (-1021) -#define __has_include_next(STR) __has_include_next__(STR) -#define __FLT64X_MIN_10_EXP__ (-4931) -#define __LDBL_HAS_QUIET_NAN__ 1 -#define __FLT64_MANT_DIG__ 53 -#define __GNUC__ 7 -#define __GXX_RTTI 1 -#define __MMX__ 1 -#define __cpp_delegating_constructors 200604 -#define __FLT_HAS_DENORM__ 1 -#define __SIZEOF_LONG_DOUBLE__ 16 -#define __BIGGEST_ALIGNMENT__ 16 -#define __STDC_UTF_16__ 1 -#define __FLT64_MAX_10_EXP__ 308 -#define __FLT32_HAS_INFINITY__ 1 -#define __DBL_MAX__ double(1.79769313486231570814527423731704357e+308L) -#define __cpp_raw_strings 200710 -#define __INT_FAST32_MAX__ 0x7fffffffffffffffL -#define __DBL_HAS_INFINITY__ 1 -#define __INT64_MAX__ 0x7fffffffffffffffL -#define __DEC32_MIN_EXP__ (-94) -#define __INTPTR_WIDTH__ 64 -#define __FLT32X_HAS_DENORM__ 1 -#define __INT_FAST16_TYPE__ long int -#define __LDBL_HAS_DENORM__ 1 -#define __cplusplus 201402L -#define __cpp_ref_qualifiers 200710 -#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL -#define __INT_LEAST32_MAX__ 0x7fffffff -#define __DEC32_MIN__ 1E-95DF -#define __DEPRECATED 1 -#define __cpp_rvalue_references 200610 -#define __DBL_MAX_EXP__ 1024 -#define __WCHAR_WIDTH__ 32 -#define __FLT32_MAX__ 3.40282346638528859811704183484516925e+38F32 -#define __DEC128_EPSILON__ 1E-33DL -#define __SSE2_MATH__ 1 -#define __ATOMIC_HLE_RELEASE 131072 -#define __PTRDIFF_MAX__ 0x7fffffffffffffffL -#define __amd64 1 -#define __STDC_NO_THREADS__ 1 -#define __ATOMIC_HLE_ACQUIRE 65536 -#define __FLT32_HAS_QUIET_NAN__ 1 -#define __GNUG__ 7 -#define __LONG_LONG_MAX__ 0x7fffffffffffffffLL -#define __SIZEOF_SIZE_T__ 8 -#define __cpp_rvalue_reference 200610 -#define __cpp_nsdmi 200809 -#define __FLT64X_MIN_EXP__ (-16381) -#define __SIZEOF_WINT_T__ 4 -#define __LONG_LONG_WIDTH__ 64 -#define __cpp_initializer_lists 200806 -#define __FLT32_MAX_EXP__ 128 -#define __cpp_hex_float 201603 -#define __GCC_HAVE_DWARF2_CFI_ASM 1 -#define __GXX_ABI_VERSION 1011 -#define __FLT128_HAS_INFINITY__ 1 -#define __FLT_MIN_EXP__ (-125) -#define __cpp_lambdas 200907 -#define __FLT64X_HAS_QUIET_NAN__ 1 -#define __INT_FAST64_TYPE__ long int -#define __FLT64_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F64 -#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L) -#define __LP64__ 1 -#define __FLT32X_EPSILON__ 2.22044604925031308084726333618164062e-16F32x -#define __DECIMAL_BID_FORMAT__ 1 -#define __FLT64_MIN_10_EXP__ (-307) -#define __FLT64X_DECIMAL_DIG__ 21 -#define __DEC128_MIN__ 1E-6143DL -#define __REGISTER_PREFIX__ -#define __UINT16_MAX__ 0xffff -#define __DBL_HAS_DENORM__ 1 -#define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32 -#define __UINT8_TYPE__ unsigned char -#define __FLT_MANT_DIG__ 24 -#define __LDBL_DECIMAL_DIG__ 21 -#define __VERSION__ "7.3.1 20180323 [gcc-7-branch revision 258812]" -#define __UINT64_C(c) c ## UL -#define __cpp_unicode_characters 200704 -#define _STDC_PREDEF_H 1 -#define __cpp_decltype_auto 201304 -#define __GCC_ATOMIC_INT_LOCK_FREE 2 -#define __FLT128_MAX_EXP__ 16384 -#define __FLT32_MANT_DIG__ 24 -#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __STDC_IEC_559_COMPLEX__ 1 -#define __FLT128_HAS_DENORM__ 1 -#define __FLT128_DIG__ 33 -#define __SCHAR_WIDTH__ 8 -#define __INT32_C(c) c -#define __DEC64_EPSILON__ 1E-15DD -#define __ORDER_PDP_ENDIAN__ 3412 -#define __DEC128_MIN_EXP__ (-6142) -#define __FLT32_MAX_10_EXP__ 38 -#define __INT_FAST32_TYPE__ long int -#define __UINT_LEAST16_TYPE__ short unsigned int -#define __FLT64X_HAS_INFINITY__ 1 -#define unix 1 -#define __INT16_MAX__ 0x7fff -#define __cpp_rtti 199711 -#define __SIZE_TYPE__ long unsigned int -#define __UINT64_MAX__ 0xffffffffffffffffUL -#define __FLT64X_DIG__ 18 -#define __INT8_TYPE__ signed char -#define __cpp_digit_separators 201309 -#define __ELF__ 1 -#define __GCC_ASM_FLAG_OUTPUTS__ 1 -#define __FLT_RADIX__ 2 -#define __INT_LEAST16_TYPE__ short int -#define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L -#define __UINTMAX_C(c) c ## UL -#define __GLIBCXX_BITSIZE_INT_N_0 128 -#define __k8 1 -#define __SIG_ATOMIC_MAX__ 0x7fffffff -#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 -#define __cpp_sized_deallocation 201309 -#define __SIZEOF_PTRDIFF_T__ 8 -#define __FLT32X_MANT_DIG__ 53 -#define __x86_64__ 1 -#define __FLT32X_MIN_EXP__ (-1021) -#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF -#define __INT_FAST16_MAX__ 0x7fffffffffffffffL -#define __FLT64_DIG__ 15 -#define __UINT_FAST32_MAX__ 0xffffffffffffffffUL -#define __UINT_LEAST64_TYPE__ long unsigned int -#define __FLT_HAS_QUIET_NAN__ 1 -#define __FLT_MAX_10_EXP__ 38 -#define __LONG_MAX__ 0x7fffffffffffffffL -#define __FLT64X_HAS_DENORM__ 1 -#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL -#define __FLT_HAS_INFINITY__ 1 -#define __cpp_unicode_literals 200710 -#define __UINT_FAST16_TYPE__ long unsigned int -#define __DEC64_MAX__ 9.999999999999999E384DD -#define __INT_FAST32_WIDTH__ 64 -#define __CHAR16_TYPE__ short unsigned int -#define __PRAGMA_REDEFINE_EXTNAME 1 -#define __SIZE_WIDTH__ 64 -#define __SEG_FS 1 -#define __INT_LEAST16_MAX__ 0x7fff -#define __DEC64_MANT_DIG__ 16 -#define __UINT_LEAST32_MAX__ 0xffffffffU -#define __SEG_GS 1 -#define __FLT32_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F32 -#define __GCC_ATOMIC_LONG_LOCK_FREE 2 -#define __SIG_ATOMIC_WIDTH__ 32 -#define __INT_LEAST64_TYPE__ long int -#define __INT16_TYPE__ short int -#define __INT_LEAST8_TYPE__ signed char -#define __DEC32_MAX_EXP__ 97 -#define __INT_FAST8_MAX__ 0x7f -#define __FLT128_MAX__ 1.18973149535723176508575932662800702e+4932F128 -#define __INTPTR_MAX__ 0x7fffffffffffffffL -#define linux 1 -#define __cpp_range_based_for 200907 -#define __FLT64_HAS_QUIET_NAN__ 1 -#define __FLT32_MIN_10_EXP__ (-37) -#define __SSE2__ 1 -#define __EXCEPTIONS 1 -#define __LDBL_MANT_DIG__ 64 -#define __DBL_HAS_QUIET_NAN__ 1 -#define __FLT64_HAS_INFINITY__ 1 -#define __FLT64X_MAX__ 1.18973149535723176502126385303097021e+4932F64x -#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1) -#define __code_model_small__ 1 -#define __cpp_return_type_deduction 201304 -#define __k8__ 1 -#define __INTPTR_TYPE__ long int -#define __UINT16_TYPE__ short unsigned int -#define __WCHAR_TYPE__ int -#define __SIZEOF_FLOAT__ 4 -#define __UINTPTR_MAX__ 0xffffffffffffffffUL -#define __INT_FAST64_WIDTH__ 64 -#define __DEC64_MIN_EXP__ (-382) -#define __cpp_decltype 200707 -#define __FLT32_DECIMAL_DIG__ 9 -#define __INT_FAST64_MAX__ 0x7fffffffffffffffL -#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1 -#define __FLT_DIG__ 6 -#define __FLT64X_MAX_EXP__ 16384 -#define __UINT_FAST64_TYPE__ long unsigned int -#define __INT_MAX__ 0x7fffffff -#define __amd64__ 1 -#define __INT64_TYPE__ long int -#define __FLT_MAX_EXP__ 128 -#define __ORDER_BIG_ENDIAN__ 4321 -#define __DBL_MANT_DIG__ 53 -#define __cpp_inheriting_constructors 201511 -#define __SIZEOF_FLOAT128__ 16 -#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL -#define __DEC64_MIN__ 1E-383DD -#define __WINT_TYPE__ unsigned int -#define __UINT_LEAST32_TYPE__ unsigned int -#define __SIZEOF_SHORT__ 2 -#define __SSE__ 1 -#define __LDBL_MIN_EXP__ (-16381) -#define __FLT64_MAX__ 1.79769313486231570814527423731704357e+308F64 -#define __WINT_WIDTH__ 32 -#define __INT_LEAST8_MAX__ 0x7f -#define __FLT32X_MAX_10_EXP__ 308 -#define __SIZEOF_INT128__ 16 -#define __LDBL_MAX_10_EXP__ 4932 -#define __ATOMIC_RELAXED 0 -#define __DBL_EPSILON__ double(2.22044604925031308084726333618164062e-16L) -#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128 -#define _LP64 1 -#define __UINT8_C(c) c -#define __FLT64_MAX_EXP__ 1024 -#define __INT_LEAST32_TYPE__ int -#define __SIZEOF_WCHAR_T__ 4 -#define __FLT128_HAS_QUIET_NAN__ 1 -#define __INT_FAST8_TYPE__ signed char -#define __FLT64X_MIN__ 3.36210314311209350626267781732175260e-4932F64x -#define __GNUC_STDC_INLINE__ 1 -#define __FLT64_HAS_DENORM__ 1 -#define __FLT32_EPSILON__ 1.19209289550781250000000000000000000e-7F32 -#define __DBL_DECIMAL_DIG__ 17 -#define __STDC_UTF_32__ 1 -#define __INT_FAST8_WIDTH__ 8 -#define __FXSR__ 1 -#define __DEC_EVAL_METHOD__ 2 -#define __FLT32X_MAX__ 1.79769313486231570814527423731704357e+308F32x -#define __cpp_runtime_arrays 198712 -#define __UINT64_TYPE__ long unsigned int -#define __UINT32_C(c) c ## U -#define __INTMAX_MAX__ 0x7fffffffffffffffL -#define __cpp_alias_templates 200704 -#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F -#define __INT8_MAX__ 0x7f -#define __LONG_WIDTH__ 64 -#define __UINT_FAST32_TYPE__ long unsigned int -#define __CHAR32_TYPE__ unsigned int -#define __FLT_MAX__ 3.40282346638528859811704183484516925e+38F -#define __cpp_constexpr 201304 -#define __INT32_TYPE__ int -#define __SIZEOF_DOUBLE__ 8 -#define __cpp_exceptions 199711 -#define __FLT_MIN_10_EXP__ (-37) -#define __FLT64_MIN__ 2.22507385850720138309023271733240406e-308F64 -#define __INT_LEAST32_WIDTH__ 32 -#define __INTMAX_TYPE__ long int -#define __DEC128_MAX_EXP__ 6145 -#define __FLT32X_HAS_QUIET_NAN__ 1 -#define __ATOMIC_CONSUME 1 -#define __GNUC_MINOR__ 3 -#define __GLIBCXX_TYPE_INT_N_0 __int128 -#define __INT_FAST16_WIDTH__ 64 -#define __UINTMAX_MAX__ 0xffffffffffffffffUL -#define __DEC32_MANT_DIG__ 7 -#define __FLT32X_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F32x -#define __DBL_MAX_10_EXP__ 308 -#define __LDBL_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951L -#define __INT16_C(c) c -#define __cpp_generic_lambdas 201304 -#define __STDC__ 1 -#define __FLT32X_DIG__ 15 -#define __PTRDIFF_TYPE__ long int -#define __ATOMIC_SEQ_CST 5 -#define __UINT32_TYPE__ unsigned int -#define __FLT32X_MIN_10_EXP__ (-307) -#define __UINTPTR_TYPE__ long unsigned int -#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD -#define __DEC128_MANT_DIG__ 34 -#define __LDBL_MIN_10_EXP__ (-4931) -#define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128 -#define __SSE_MATH__ 1 -#define __SIZEOF_LONG_LONG__ 8 -#define __cpp_user_defined_literals 200809 -#define __FLT128_DECIMAL_DIG__ 36 -#define __GCC_ATOMIC_LLONG_LOCK_FREE 2 -#define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x -#define __LDBL_DIG__ 18 -#define __FLT_DECIMAL_DIG__ 9 -#define __UINT_FAST16_MAX__ 0xffffffffffffffffUL -#define __GCC_ATOMIC_SHORT_LOCK_FREE 2 -#define __INT_LEAST64_WIDTH__ 64 -#define __UINT_FAST8_TYPE__ unsigned char -#define _GNU_SOURCE 1 -#define __cpp_init_captures 201304 -#define __ATOMIC_ACQ_REL 4 -#define __ATOMIC_RELEASE 3 diff --git a/pvserver/.gitignore b/pvserver/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/pvserver/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/pvserver/.qmake.stash b/pvserver/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/pvserver/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/pvserver/processviewserver.h b/pvserver/processviewserver.h index fae76685..b1e3e937 100644 --- a/pvserver/processviewserver.h +++ b/pvserver/processviewserver.h @@ -393,7 +393,7 @@ MessageBoxNoToAll = 0x00020000, MessageBoxAbort = 0x00040000, MessageBoxRetry = 0x00080000, MessageBoxIgnore = 0x00100000, -MessageBoxNoButton +MessageBoxNoButton = 0 }; enum TextBrowserPos{ diff --git a/pvserver/processviewserver_string.h b/pvserver/processviewserver_string.h index 889ed053..65ed36e7 100644 --- a/pvserver/processviewserver_string.h +++ b/pvserver/processviewserver_string.h @@ -12,20 +12,34 @@ inline int pvWait(PARAM *p, string pattern) { return pvWait(p, pattern.c_str()); inline int pvWarning(PARAM *p, string text) { return pvWarning(p, text.c_str()); } inline int pvMainFatal(PARAM *p, string text) { return pvMainFatal(p, text.c_str()); } inline int pvThreadFatal(PARAM *p, string text) { return pvThreadFatal(p, text.c_str()); } +inline int pvSetWhatsThis(PARAM *p, int id, string text) { return pvSetWhatsThis(p, id, text.c_str()); } +inline int pvClientCommand(PARAM *p, string command, string filename, int downloadFile=0) { return pvClientCommand(p, command.c_str(), filename.c_str(), downloadFile); } +inline int pvWriteTextToFileAtClient(PARAM *p, string text, string filename) { return pvWriteTextToFileAtClient(p, text.c_str(), filename.c_str()); } +inline int pvSelectLanguage(PARAM *p, string section) { return pvSelectLanguage(p, section.c_str()); } inline int pvQButtonGroup(PARAM *p, int id, int parent, int columns, int orientation, string title) { return pvQButtonGroup(p, id, parent, columns, orientation, title.c_str()); } inline int pvQImage(PARAM *p, int id, int parent, string imagename, int *w, int *h, int *depth) { return pvQImage(p, id, parent, imagename.c_str(), w, h, depth); } inline int pvQGroupBox(PARAM *p, int id, int parent, int columns, int orientation, string title) { return pvQGroupBox(p, id, parent, columns, orientation, title.c_str()); } inline int pvSetCaption(PARAM *p, string text) { return pvSetCaption(p, text.c_str()); } +inline int pvPlaySound(PARAM *p, string filename) { return pvPlaySound(p, filename.c_str()); } inline int pvToolTip(PARAM *p, int id, string text) { return pvToolTip(p, id, text.c_str()); } +inline int pvSetTextEx(PARAM *p, int id, string text, int option) { return pvSetTextEx(p, id, text.c_str(), option); } inline int pvSetText(PARAM *p, int id, string text) { return pvSetText(p, id, text.c_str()); } +inline int pvSetStyleSheet(PARAM *p, int id, string text) { return pvSetStyleSheet(p, id, text.c_str()); } inline int pvChangeItem(PARAM *p, int id, int index, string bmp_file, string text) { return pvChangeItem(p, id, index, bmp_file.c_str(), text.c_str()); } inline int pvInsertItem(PARAM *p, int id, int index, string bmp_file, string text) { return pvInsertItem(p, id, index, bmp_file.c_str(), text.c_str()); } inline int pvRemoveItemByName(PARAM *p, int id, string name) { return pvRemoveItemByName(p, id, name.c_str()); } inline int pvAddColumn(PARAM *p, int id, string text, int size) { return pvAddColumn(p, id, text.c_str(), size); } inline int pvSetTableText(PARAM *p, int id, int x, int y, string text) { return pvSetTableText(p, id, x, y, text.c_str()); } +inline int pvSetTableButton(PARAM *p, int id, int x, int y, string text) { return pvSetTableButton(p, id, x, y, text.c_str()); } inline int pvSetTableCheckBox(PARAM *p, int id, int x, int y, int state, string text) { return pvSetTableCheckBox(p, id, x, y, state, text.c_str()); } inline int pvSetTableComboBox(PARAM *p, int id, int x, int y, int editable, string textlist) { return pvSetTableComboBox(p, id, x, y, editable, textlist.c_str()); } +inline int pvSetTableLabel(PARAM *p, int id, int x, int y, string text) { return pvSetTableLabel(p, id, x, y, text.c_str()); } +inline int pvMysqldump(PARAM *p, int id, string command) { return pvMysqldump(p, id, command.c_str()); } +inline int pvCSVdump(PARAM *p, int id, string filename, char delimitor='\t') { return pvCSVdump(p, id, filename.c_str(), delimitor); } +inline int pvCSVcreate(PARAM *p, string command, string filename) { return pvCSVcreate(p, command.c_str(), filename.c_str()); } +inline int pvCSV(PARAM *p, int id, string command, char delimitor='\t') { return pvCSV(p, id, command.c_str(), delimitor); } inline int pvSetListViewText(PARAM *p, int id, string path, int column, string text) { return pvSetListViewText(p, id, path.c_str(), column, text.c_str()); } +inline int pvListViewSetSelected(PARAM *p, int id, string path, int column, int selected) { return pvListViewSetSelected(p, id, path.c_str(), column, selected); } inline int pvSetPixmap(PARAM *p, int id, string bmp_file) { return pvSetPixmap(p, id, bmp_file.c_str()); } inline int pvSetTablePixmap(PARAM *p, int id, int x, int y, string bmp_file) { return pvSetTablePixmap(p, id, x, y, bmp_file.c_str()); } inline int pvSetSource(PARAM *p, int id, string html_file) { return pvSetSource(p, id, html_file.c_str()); } @@ -37,6 +51,8 @@ inline int pvSetListViewPixmap(PARAM *p, int id, string path, string bmp_file, i inline int pvRemoveListViewItem(PARAM *p, int id, string path) { return pvRemoveListViewItem(p, id, path.c_str()); } inline int pvRemoveIconViewItem(PARAM *p, int id, string text) { return pvRemoveIconViewItem(p, id, text.c_str()); } inline int pvSetIconViewItem(PARAM *p, int id, string bmp_file, string text) { return pvSetIconViewItem(p, id, bmp_file.c_str(), text.c_str()); } +inline int pvScrollToAnchor(PARAM *p, int id, string anchor) { return pvScrollToAnchor(p, id, anchor.c_str()); } +inline int pvSetWidgetProperty(PARAM *p, int id, string name, string value) { return pvSetWidgetProperty(p, id, name.c_str(), value.c_str()); } inline int pvListViewEnsureVisible(PARAM *p, int id, string path) { return pvListViewEnsureVisible(p, id, path.c_str()); } inline int pvListViewSetOpen(PARAM *p, int id, string path, int open) { return pvListViewSetOpen(p, id, path.c_str(), open); } inline int pvVtkTcl(PARAM *p, int id, string tcl_command) { return pvVtkTcl(p, id, tcl_command.c_str()); } @@ -68,5 +84,8 @@ inline int gComment(PARAM *p, string comment) { return gComment(p, comment.c_str inline int gPlaySVG(PARAM *p, string filename) { return gPlaySVG(p, filename.c_str()); } inline int qwtScaleSetTitle(PARAM *p, int id, string text) { return qwtScaleSetTitle(p, id, text.c_str()); } inline int qwtScaleSetTitleFont(PARAM *p, int id, string family, int pointsize, int bold, int italic, int underline, int strikeout) { return qwtScaleSetTitleFont(p, id, family.c_str(), pointsize, bold, italic, underline, strikeout); } +inline int pvsystem(string command) { return pvsystem(command.c_str()); } +inline int pvIsAccessAllowed(string adr, int trace) { return pvIsAccessAllowed(adr.c_str(), trace); } + #endif diff --git a/pvserver/util.cpp b/pvserver/util.cpp index ee062fa3..0f5bfe7a 100644 --- a/pvserver/util.cpp +++ b/pvserver/util.cpp @@ -766,7 +766,15 @@ int option = 1; { wsa(); /* windows stuff */ /* create a socket */ +#ifdef PVWIN32 + p->os = socket(AF_INET,SOCK_STREAM,0); +#else +#ifdef SOCK_CLOEXEC + p->os = socket(AF_INET,SOCK_STREAM|SOCK_CLOEXEC,0); +#else p->os = socket(AF_INET,SOCK_STREAM,0); +#endif +#endif if(p->os == -1) pvMainFatal(p,"could not create socket"); #ifdef PVWIN32 setsockopt(p->os,SOL_SOCKET,SO_REUSEADDR,(const char *) &option,sizeof(option)); @@ -4813,7 +4821,7 @@ int pvMessageBox(PARAM *p, int id_return, int type, const char *text, int button if(cptr != NULL) *cptr = 12; // insert FF instead else break; } - sprintf(buf,"messageBox(%d,%d,%d,%d,%d,\"%s\")\n",id_return,type,button0,button1,button2,p->mytext); + snprintf(buf, sizeof(buf), "messageBox(%d,%d,%d,%d,%d,\"%s\")\n", id_return, type, button0, button1, button2, p->mytext); pvtcpsend(p, buf, strlen(buf)); p->mytext[0] = '\0'; return 0; diff --git a/pvsexample/.gitignore b/pvsexample/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/pvsexample/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/pvsexample/.qmake.stash b/pvsexample/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/pvsexample/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/qwt/.gitignore b/qwt/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/qwt/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/qwt/.qmake.stash b/qwt/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/qwt/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/qwt/designer/.gitignore b/qwt/designer/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/qwt/designer/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/qwt/designer/.qmake.stash b/qwt/designer/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/qwt/designer/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/qwt/designer/moc/.gitignore b/qwt/designer/moc/.gitignore new file mode 100644 index 00000000..e78ec4cb --- /dev/null +++ b/qwt/designer/moc/.gitignore @@ -0,0 +1 @@ +/moc_predefs.h diff --git a/qwt/designer/moc/moc_predefs.h b/qwt/designer/moc/moc_predefs.h deleted file mode 100644 index 03cdd2e1..00000000 --- a/qwt/designer/moc/moc_predefs.h +++ /dev/null @@ -1,384 +0,0 @@ -#define __DBL_MIN_EXP__ (-1021) -#define __FLT32X_MAX_EXP__ 1024 -#define __cpp_attributes 200809 -#define __UINT_LEAST16_MAX__ 0xffff -#define __ATOMIC_ACQUIRE 2 -#define __FLT128_MAX_10_EXP__ 4932 -#define __FLT_MIN__ 1.17549435082228750796873653722224568e-38F -#define __GCC_IEC_559_COMPLEX 2 -#define __cpp_aggregate_nsdmi 201304 -#define __UINT_LEAST8_TYPE__ unsigned char -#define __SIZEOF_FLOAT80__ 16 -#define __INTMAX_C(c) c ## L -#define __CHAR_BIT__ 8 -#define __UINT8_MAX__ 0xff -#define __WINT_MAX__ 0xffffffffU -#define __FLT32_MIN_EXP__ (-125) -#define __cpp_static_assert 200410 -#define __ORDER_LITTLE_ENDIAN__ 1234 -#define __SIZE_MAX__ 0xffffffffffffffffUL -#define __WCHAR_MAX__ 0x7fffffff -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L) -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -#define __GCC_ATOMIC_CHAR_LOCK_FREE 2 -#define __GCC_IEC_559 2 -#define __FLT32X_DECIMAL_DIG__ 17 -#define __FLT_EVAL_METHOD__ 0 -#define __unix__ 1 -#define __cpp_binary_literals 201304 -#define __FLT64_DECIMAL_DIG__ 17 -#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2 -#define __x86_64 1 -#define __cpp_variadic_templates 200704 -#define __UINT_FAST64_MAX__ 0xffffffffffffffffUL -#define __SIG_ATOMIC_TYPE__ int -#define __DBL_MIN_10_EXP__ (-307) -#define __FINITE_MATH_ONLY__ 0 -#define __cpp_variable_templates 201304 -#define __GNUC_PATCHLEVEL__ 1 -#define __FLT32_HAS_DENORM__ 1 -#define __UINT_FAST8_MAX__ 0xff -#define __has_include(STR) __has_include__(STR) -#define __DEC64_MAX_EXP__ 385 -#define __INT8_C(c) c -#define __INT_LEAST8_WIDTH__ 8 -#define __UINT_LEAST64_MAX__ 0xffffffffffffffffUL -#define __SHRT_MAX__ 0x7fff -#define __LDBL_MAX__ 1.18973149535723176502126385303097021e+4932L -#define __FLT64X_MAX_10_EXP__ 4932 -#define __UINT_LEAST8_MAX__ 0xff -#define __GCC_ATOMIC_BOOL_LOCK_FREE 2 -#define __FLT128_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966F128 -#define __UINTMAX_TYPE__ long unsigned int -#define __linux 1 -#define __DEC32_EPSILON__ 1E-6DF -#define __FLT_EVAL_METHOD_TS_18661_3__ 0 -#define __OPTIMIZE__ 1 -#define __unix 1 -#define __UINT32_MAX__ 0xffffffffU -#define __GXX_EXPERIMENTAL_CXX0X__ 1 -#define __LDBL_MAX_EXP__ 16384 -#define __FLT128_MIN_EXP__ (-16381) -#define __WINT_MIN__ 0U -#define __linux__ 1 -#define __FLT128_MIN_10_EXP__ (-4931) -#define __INT_LEAST16_WIDTH__ 16 -#define __SCHAR_MAX__ 0x7f -#define __FLT128_MANT_DIG__ 113 -#define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1) -#define __INT64_C(c) c ## L -#define __DBL_DIG__ 15 -#define __GCC_ATOMIC_POINTER_LOCK_FREE 2 -#define __FLT64X_MANT_DIG__ 64 -#define __SIZEOF_INT__ 4 -#define __SIZEOF_POINTER__ 8 -#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2 -#define __USER_LABEL_PREFIX__ -#define __FLT64X_EPSILON__ 1.08420217248550443400745280086994171e-19F64x -#define __STDC_HOSTED__ 1 -#define __LDBL_HAS_INFINITY__ 1 -#define __FLT32_DIG__ 6 -#define __FLT_EPSILON__ 1.19209289550781250000000000000000000e-7F -#define __GXX_WEAK__ 1 -#define __SHRT_WIDTH__ 16 -#define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L -#define __DEC32_MAX__ 9.999999E96DF -#define __cpp_threadsafe_static_init 200806 -#define __FLT64X_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951F64x -#define __FLT32X_HAS_INFINITY__ 1 -#define __INT32_MAX__ 0x7fffffff -#define __INT_WIDTH__ 32 -#define __SIZEOF_LONG__ 8 -#define __STDC_IEC_559__ 1 -#define __STDC_ISO_10646__ 201706L -#define __UINT16_C(c) c -#define __PTRDIFF_WIDTH__ 64 -#define __DECIMAL_DIG__ 21 -#define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64 -#define __gnu_linux__ 1 -#define __INTMAX_WIDTH__ 64 -#define __FLT64_MIN_EXP__ (-1021) -#define __has_include_next(STR) __has_include_next__(STR) -#define __FLT64X_MIN_10_EXP__ (-4931) -#define __LDBL_HAS_QUIET_NAN__ 1 -#define __FLT64_MANT_DIG__ 53 -#define __GNUC__ 7 -#define __GXX_RTTI 1 -#define __MMX__ 1 -#define __cpp_delegating_constructors 200604 -#define __FLT_HAS_DENORM__ 1 -#define __SIZEOF_LONG_DOUBLE__ 16 -#define __BIGGEST_ALIGNMENT__ 16 -#define __STDC_UTF_16__ 1 -#define __FLT64_MAX_10_EXP__ 308 -#define __FLT32_HAS_INFINITY__ 1 -#define __DBL_MAX__ double(1.79769313486231570814527423731704357e+308L) -#define __cpp_raw_strings 200710 -#define __INT_FAST32_MAX__ 0x7fffffffffffffffL -#define __DBL_HAS_INFINITY__ 1 -#define __INT64_MAX__ 0x7fffffffffffffffL -#define __DEC32_MIN_EXP__ (-94) -#define __INTPTR_WIDTH__ 64 -#define __FLT32X_HAS_DENORM__ 1 -#define __INT_FAST16_TYPE__ long int -#define __LDBL_HAS_DENORM__ 1 -#define __cplusplus 201402L -#define __cpp_ref_qualifiers 200710 -#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL -#define __INT_LEAST32_MAX__ 0x7fffffff -#define __DEC32_MIN__ 1E-95DF -#define __DEPRECATED 1 -#define __cpp_rvalue_references 200610 -#define __DBL_MAX_EXP__ 1024 -#define __WCHAR_WIDTH__ 32 -#define __FLT32_MAX__ 3.40282346638528859811704183484516925e+38F32 -#define __DEC128_EPSILON__ 1E-33DL -#define __SSE2_MATH__ 1 -#define __ATOMIC_HLE_RELEASE 131072 -#define __PTRDIFF_MAX__ 0x7fffffffffffffffL -#define __amd64 1 -#define __STDC_NO_THREADS__ 1 -#define __ATOMIC_HLE_ACQUIRE 65536 -#define __FLT32_HAS_QUIET_NAN__ 1 -#define __GNUG__ 7 -#define __LONG_LONG_MAX__ 0x7fffffffffffffffLL -#define __SIZEOF_SIZE_T__ 8 -#define __cpp_rvalue_reference 200610 -#define __cpp_nsdmi 200809 -#define __FLT64X_MIN_EXP__ (-16381) -#define __SIZEOF_WINT_T__ 4 -#define __LONG_LONG_WIDTH__ 64 -#define __cpp_initializer_lists 200806 -#define __FLT32_MAX_EXP__ 128 -#define __cpp_hex_float 201603 -#define __GCC_HAVE_DWARF2_CFI_ASM 1 -#define __GXX_ABI_VERSION 1011 -#define __FLT128_HAS_INFINITY__ 1 -#define __FLT_MIN_EXP__ (-125) -#define __cpp_lambdas 200907 -#define __FLT64X_HAS_QUIET_NAN__ 1 -#define __INT_FAST64_TYPE__ long int -#define __FLT64_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F64 -#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L) -#define __LP64__ 1 -#define __FLT32X_EPSILON__ 2.22044604925031308084726333618164062e-16F32x -#define __DECIMAL_BID_FORMAT__ 1 -#define __FLT64_MIN_10_EXP__ (-307) -#define __FLT64X_DECIMAL_DIG__ 21 -#define __DEC128_MIN__ 1E-6143DL -#define __REGISTER_PREFIX__ -#define __UINT16_MAX__ 0xffff -#define __DBL_HAS_DENORM__ 1 -#define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32 -#define __UINT8_TYPE__ unsigned char -#define __FLT_MANT_DIG__ 24 -#define __LDBL_DECIMAL_DIG__ 21 -#define __VERSION__ "7.3.1 20180323 [gcc-7-branch revision 258812]" -#define __UINT64_C(c) c ## UL -#define __cpp_unicode_characters 200704 -#define _STDC_PREDEF_H 1 -#define __cpp_decltype_auto 201304 -#define __GCC_ATOMIC_INT_LOCK_FREE 2 -#define __FLT128_MAX_EXP__ 16384 -#define __FLT32_MANT_DIG__ 24 -#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __STDC_IEC_559_COMPLEX__ 1 -#define __FLT128_HAS_DENORM__ 1 -#define __FLT128_DIG__ 33 -#define __SCHAR_WIDTH__ 8 -#define __INT32_C(c) c -#define __DEC64_EPSILON__ 1E-15DD -#define __ORDER_PDP_ENDIAN__ 3412 -#define __DEC128_MIN_EXP__ (-6142) -#define __FLT32_MAX_10_EXP__ 38 -#define __INT_FAST32_TYPE__ long int -#define __UINT_LEAST16_TYPE__ short unsigned int -#define __FLT64X_HAS_INFINITY__ 1 -#define unix 1 -#define __INT16_MAX__ 0x7fff -#define __cpp_rtti 199711 -#define __SIZE_TYPE__ long unsigned int -#define __UINT64_MAX__ 0xffffffffffffffffUL -#define __FLT64X_DIG__ 18 -#define __INT8_TYPE__ signed char -#define __cpp_digit_separators 201309 -#define __ELF__ 1 -#define __GCC_ASM_FLAG_OUTPUTS__ 1 -#define __FLT_RADIX__ 2 -#define __INT_LEAST16_TYPE__ short int -#define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L -#define __UINTMAX_C(c) c ## UL -#define __GLIBCXX_BITSIZE_INT_N_0 128 -#define __k8 1 -#define __SIG_ATOMIC_MAX__ 0x7fffffff -#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 -#define __cpp_sized_deallocation 201309 -#define __SIZEOF_PTRDIFF_T__ 8 -#define __FLT32X_MANT_DIG__ 53 -#define __x86_64__ 1 -#define __FLT32X_MIN_EXP__ (-1021) -#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF -#define __INT_FAST16_MAX__ 0x7fffffffffffffffL -#define __FLT64_DIG__ 15 -#define __UINT_FAST32_MAX__ 0xffffffffffffffffUL -#define __UINT_LEAST64_TYPE__ long unsigned int -#define __FLT_HAS_QUIET_NAN__ 1 -#define __FLT_MAX_10_EXP__ 38 -#define __LONG_MAX__ 0x7fffffffffffffffL -#define __FLT64X_HAS_DENORM__ 1 -#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL -#define __FLT_HAS_INFINITY__ 1 -#define __cpp_unicode_literals 200710 -#define __UINT_FAST16_TYPE__ long unsigned int -#define __DEC64_MAX__ 9.999999999999999E384DD -#define __INT_FAST32_WIDTH__ 64 -#define __CHAR16_TYPE__ short unsigned int -#define __PRAGMA_REDEFINE_EXTNAME 1 -#define __SIZE_WIDTH__ 64 -#define __SEG_FS 1 -#define __INT_LEAST16_MAX__ 0x7fff -#define __DEC64_MANT_DIG__ 16 -#define __UINT_LEAST32_MAX__ 0xffffffffU -#define __SEG_GS 1 -#define __FLT32_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F32 -#define __GCC_ATOMIC_LONG_LOCK_FREE 2 -#define __SIG_ATOMIC_WIDTH__ 32 -#define __INT_LEAST64_TYPE__ long int -#define __INT16_TYPE__ short int -#define __INT_LEAST8_TYPE__ signed char -#define __DEC32_MAX_EXP__ 97 -#define __INT_FAST8_MAX__ 0x7f -#define __FLT128_MAX__ 1.18973149535723176508575932662800702e+4932F128 -#define __INTPTR_MAX__ 0x7fffffffffffffffL -#define linux 1 -#define __cpp_range_based_for 200907 -#define __FLT64_HAS_QUIET_NAN__ 1 -#define __FLT32_MIN_10_EXP__ (-37) -#define __SSE2__ 1 -#define __EXCEPTIONS 1 -#define __LDBL_MANT_DIG__ 64 -#define __DBL_HAS_QUIET_NAN__ 1 -#define __FLT64_HAS_INFINITY__ 1 -#define __FLT64X_MAX__ 1.18973149535723176502126385303097021e+4932F64x -#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1) -#define __code_model_small__ 1 -#define __cpp_return_type_deduction 201304 -#define __k8__ 1 -#define __INTPTR_TYPE__ long int -#define __UINT16_TYPE__ short unsigned int -#define __WCHAR_TYPE__ int -#define __SIZEOF_FLOAT__ 4 -#define __UINTPTR_MAX__ 0xffffffffffffffffUL -#define __INT_FAST64_WIDTH__ 64 -#define __DEC64_MIN_EXP__ (-382) -#define __cpp_decltype 200707 -#define __FLT32_DECIMAL_DIG__ 9 -#define __INT_FAST64_MAX__ 0x7fffffffffffffffL -#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1 -#define __FLT_DIG__ 6 -#define __FLT64X_MAX_EXP__ 16384 -#define __UINT_FAST64_TYPE__ long unsigned int -#define __INT_MAX__ 0x7fffffff -#define __amd64__ 1 -#define __INT64_TYPE__ long int -#define __FLT_MAX_EXP__ 128 -#define __ORDER_BIG_ENDIAN__ 4321 -#define __DBL_MANT_DIG__ 53 -#define __cpp_inheriting_constructors 201511 -#define __SIZEOF_FLOAT128__ 16 -#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL -#define __DEC64_MIN__ 1E-383DD -#define __WINT_TYPE__ unsigned int -#define __UINT_LEAST32_TYPE__ unsigned int -#define __SIZEOF_SHORT__ 2 -#define __SSE__ 1 -#define __LDBL_MIN_EXP__ (-16381) -#define __FLT64_MAX__ 1.79769313486231570814527423731704357e+308F64 -#define __WINT_WIDTH__ 32 -#define __INT_LEAST8_MAX__ 0x7f -#define __FLT32X_MAX_10_EXP__ 308 -#define __SIZEOF_INT128__ 16 -#define __LDBL_MAX_10_EXP__ 4932 -#define __ATOMIC_RELAXED 0 -#define __DBL_EPSILON__ double(2.22044604925031308084726333618164062e-16L) -#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128 -#define _LP64 1 -#define __UINT8_C(c) c -#define __FLT64_MAX_EXP__ 1024 -#define __INT_LEAST32_TYPE__ int -#define __SIZEOF_WCHAR_T__ 4 -#define __FLT128_HAS_QUIET_NAN__ 1 -#define __INT_FAST8_TYPE__ signed char -#define __FLT64X_MIN__ 3.36210314311209350626267781732175260e-4932F64x -#define __GNUC_STDC_INLINE__ 1 -#define __FLT64_HAS_DENORM__ 1 -#define __FLT32_EPSILON__ 1.19209289550781250000000000000000000e-7F32 -#define __DBL_DECIMAL_DIG__ 17 -#define __STDC_UTF_32__ 1 -#define __INT_FAST8_WIDTH__ 8 -#define __FXSR__ 1 -#define __DEC_EVAL_METHOD__ 2 -#define __FLT32X_MAX__ 1.79769313486231570814527423731704357e+308F32x -#define __cpp_runtime_arrays 198712 -#define __UINT64_TYPE__ long unsigned int -#define __UINT32_C(c) c ## U -#define __INTMAX_MAX__ 0x7fffffffffffffffL -#define __cpp_alias_templates 200704 -#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F -#define __INT8_MAX__ 0x7f -#define __LONG_WIDTH__ 64 -#define __UINT_FAST32_TYPE__ long unsigned int -#define __CHAR32_TYPE__ unsigned int -#define __FLT_MAX__ 3.40282346638528859811704183484516925e+38F -#define __cpp_constexpr 201304 -#define __INT32_TYPE__ int -#define __SIZEOF_DOUBLE__ 8 -#define __cpp_exceptions 199711 -#define __FLT_MIN_10_EXP__ (-37) -#define __FLT64_MIN__ 2.22507385850720138309023271733240406e-308F64 -#define __INT_LEAST32_WIDTH__ 32 -#define __INTMAX_TYPE__ long int -#define __DEC128_MAX_EXP__ 6145 -#define __FLT32X_HAS_QUIET_NAN__ 1 -#define __ATOMIC_CONSUME 1 -#define __GNUC_MINOR__ 3 -#define __GLIBCXX_TYPE_INT_N_0 __int128 -#define __INT_FAST16_WIDTH__ 64 -#define __UINTMAX_MAX__ 0xffffffffffffffffUL -#define __DEC32_MANT_DIG__ 7 -#define __FLT32X_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F32x -#define __DBL_MAX_10_EXP__ 308 -#define __LDBL_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951L -#define __INT16_C(c) c -#define __cpp_generic_lambdas 201304 -#define __STDC__ 1 -#define __FLT32X_DIG__ 15 -#define __PTRDIFF_TYPE__ long int -#define __ATOMIC_SEQ_CST 5 -#define __UINT32_TYPE__ unsigned int -#define __FLT32X_MIN_10_EXP__ (-307) -#define __UINTPTR_TYPE__ long unsigned int -#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD -#define __DEC128_MANT_DIG__ 34 -#define __LDBL_MIN_10_EXP__ (-4931) -#define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128 -#define __SSE_MATH__ 1 -#define __SIZEOF_LONG_LONG__ 8 -#define __cpp_user_defined_literals 200809 -#define __FLT128_DECIMAL_DIG__ 36 -#define __GCC_ATOMIC_LLONG_LOCK_FREE 2 -#define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x -#define __LDBL_DIG__ 18 -#define __FLT_DECIMAL_DIG__ 9 -#define __UINT_FAST16_MAX__ 0xffffffffffffffffUL -#define __GCC_ATOMIC_SHORT_LOCK_FREE 2 -#define __INT_LEAST64_WIDTH__ 64 -#define __UINT_FAST8_TYPE__ unsigned char -#define _GNU_SOURCE 1 -#define __cpp_init_captures 201304 -#define __ATOMIC_ACQ_REL 4 -#define __ATOMIC_RELEASE 3 diff --git a/qwt/src/.gitignore b/qwt/src/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/qwt/src/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/qwt/src/.qmake.stash b/qwt/src/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/qwt/src/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/qwt/src/moc/.gitignore b/qwt/src/moc/.gitignore new file mode 100644 index 00000000..e78ec4cb --- /dev/null +++ b/qwt/src/moc/.gitignore @@ -0,0 +1 @@ +/moc_predefs.h diff --git a/qwt/src/moc/moc_predefs.h b/qwt/src/moc/moc_predefs.h deleted file mode 100644 index 77a0c4f1..00000000 --- a/qwt/src/moc/moc_predefs.h +++ /dev/null @@ -1,387 +0,0 @@ -#define __DBL_MIN_EXP__ (-1021) -#define __FLT32X_MAX_EXP__ 1024 -#define __cpp_attributes 200809 -#define __UINT_LEAST16_MAX__ 0xffff -#define __ATOMIC_ACQUIRE 2 -#define __FLT128_MAX_10_EXP__ 4932 -#define __FLT_MIN__ 1.17549435082228750796873653722224568e-38F -#define __GCC_IEC_559_COMPLEX 2 -#define __cpp_aggregate_nsdmi 201304 -#define __UINT_LEAST8_TYPE__ unsigned char -#define __SIZEOF_FLOAT80__ 16 -#define __INTMAX_C(c) c ## L -#define __CHAR_BIT__ 8 -#define __UINT8_MAX__ 0xff -#define __WINT_MAX__ 0xffffffffU -#define __FLT32_MIN_EXP__ (-125) -#define __cpp_static_assert 200410 -#define __ORDER_LITTLE_ENDIAN__ 1234 -#define __SIZE_MAX__ 0xffffffffffffffffUL -#define __WCHAR_MAX__ 0x7fffffff -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L) -#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -#define __GCC_ATOMIC_CHAR_LOCK_FREE 2 -#define __GCC_IEC_559 2 -#define __FLT32X_DECIMAL_DIG__ 17 -#define __FLT_EVAL_METHOD__ 0 -#define __unix__ 1 -#define __cpp_binary_literals 201304 -#define __FLT64_DECIMAL_DIG__ 17 -#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2 -#define __x86_64 1 -#define __cpp_variadic_templates 200704 -#define __UINT_FAST64_MAX__ 0xffffffffffffffffUL -#define __SIG_ATOMIC_TYPE__ int -#define __DBL_MIN_10_EXP__ (-307) -#define __FINITE_MATH_ONLY__ 0 -#define __cpp_variable_templates 201304 -#define __GNUC_PATCHLEVEL__ 1 -#define __FLT32_HAS_DENORM__ 1 -#define __UINT_FAST8_MAX__ 0xff -#define __has_include(STR) __has_include__(STR) -#define __DEC64_MAX_EXP__ 385 -#define __INT8_C(c) c -#define __INT_LEAST8_WIDTH__ 8 -#define __UINT_LEAST64_MAX__ 0xffffffffffffffffUL -#define __SHRT_MAX__ 0x7fff -#define __LDBL_MAX__ 1.18973149535723176502126385303097021e+4932L -#define __FLT64X_MAX_10_EXP__ 4932 -#define __UINT_LEAST8_MAX__ 0xff -#define __GCC_ATOMIC_BOOL_LOCK_FREE 2 -#define __FLT128_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966F128 -#define __UINTMAX_TYPE__ long unsigned int -#define __linux 1 -#define __DEC32_EPSILON__ 1E-6DF -#define __FLT_EVAL_METHOD_TS_18661_3__ 0 -#define __OPTIMIZE__ 1 -#define __unix 1 -#define __UINT32_MAX__ 0xffffffffU -#define __GXX_EXPERIMENTAL_CXX0X__ 1 -#define __LDBL_MAX_EXP__ 16384 -#define __FLT128_MIN_EXP__ (-16381) -#define __WINT_MIN__ 0U -#define __linux__ 1 -#define __FLT128_MIN_10_EXP__ (-4931) -#define __INT_LEAST16_WIDTH__ 16 -#define __SCHAR_MAX__ 0x7f -#define __FLT128_MANT_DIG__ 113 -#define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1) -#define __INT64_C(c) c ## L -#define __DBL_DIG__ 15 -#define __GCC_ATOMIC_POINTER_LOCK_FREE 2 -#define __FLT64X_MANT_DIG__ 64 -#define __SIZEOF_INT__ 4 -#define __SIZEOF_POINTER__ 8 -#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2 -#define __USER_LABEL_PREFIX__ -#define __FLT64X_EPSILON__ 1.08420217248550443400745280086994171e-19F64x -#define __STDC_HOSTED__ 1 -#define __LDBL_HAS_INFINITY__ 1 -#define __FLT32_DIG__ 6 -#define __FLT_EPSILON__ 1.19209289550781250000000000000000000e-7F -#define __GXX_WEAK__ 1 -#define __SHRT_WIDTH__ 16 -#define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L -#define __DEC32_MAX__ 9.999999E96DF -#define __cpp_threadsafe_static_init 200806 -#define __FLT64X_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951F64x -#define __FLT32X_HAS_INFINITY__ 1 -#define __INT32_MAX__ 0x7fffffff -#define __INT_WIDTH__ 32 -#define __SIZEOF_LONG__ 8 -#define __STDC_IEC_559__ 1 -#define __STDC_ISO_10646__ 201706L -#define __UINT16_C(c) c -#define __PTRDIFF_WIDTH__ 64 -#define __DECIMAL_DIG__ 21 -#define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64 -#define __gnu_linux__ 1 -#define __INTMAX_WIDTH__ 64 -#define __FLT64_MIN_EXP__ (-1021) -#define __has_include_next(STR) __has_include_next__(STR) -#define __FLT64X_MIN_10_EXP__ (-4931) -#define __LDBL_HAS_QUIET_NAN__ 1 -#define __FLT64_MANT_DIG__ 53 -#define _REENTRANT 1 -#define __GNUC__ 7 -#define __GXX_RTTI 1 -#define __MMX__ 1 -#define __cpp_delegating_constructors 200604 -#define __FLT_HAS_DENORM__ 1 -#define __SIZEOF_LONG_DOUBLE__ 16 -#define __BIGGEST_ALIGNMENT__ 16 -#define __STDC_UTF_16__ 1 -#define __FLT64_MAX_10_EXP__ 308 -#define __FLT32_HAS_INFINITY__ 1 -#define __DBL_MAX__ double(1.79769313486231570814527423731704357e+308L) -#define __cpp_raw_strings 200710 -#define __INT_FAST32_MAX__ 0x7fffffffffffffffL -#define __DBL_HAS_INFINITY__ 1 -#define __INT64_MAX__ 0x7fffffffffffffffL -#define __DEC32_MIN_EXP__ (-94) -#define __INTPTR_WIDTH__ 64 -#define __FLT32X_HAS_DENORM__ 1 -#define __INT_FAST16_TYPE__ long int -#define __LDBL_HAS_DENORM__ 1 -#define __cplusplus 201402L -#define __cpp_ref_qualifiers 200710 -#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL -#define __INT_LEAST32_MAX__ 0x7fffffff -#define __DEC32_MIN__ 1E-95DF -#define __DEPRECATED 1 -#define __cpp_rvalue_references 200610 -#define __DBL_MAX_EXP__ 1024 -#define __WCHAR_WIDTH__ 32 -#define __FLT32_MAX__ 3.40282346638528859811704183484516925e+38F32 -#define __DEC128_EPSILON__ 1E-33DL -#define __SSE2_MATH__ 1 -#define __ATOMIC_HLE_RELEASE 131072 -#define __PTRDIFF_MAX__ 0x7fffffffffffffffL -#define __amd64 1 -#define __STDC_NO_THREADS__ 1 -#define __ATOMIC_HLE_ACQUIRE 65536 -#define __FLT32_HAS_QUIET_NAN__ 1 -#define __GNUG__ 7 -#define __LONG_LONG_MAX__ 0x7fffffffffffffffLL -#define __SIZEOF_SIZE_T__ 8 -#define __cpp_rvalue_reference 200610 -#define __cpp_nsdmi 200809 -#define __FLT64X_MIN_EXP__ (-16381) -#define __SIZEOF_WINT_T__ 4 -#define __LONG_LONG_WIDTH__ 64 -#define __cpp_initializer_lists 200806 -#define __FLT32_MAX_EXP__ 128 -#define __cpp_hex_float 201603 -#define __GCC_HAVE_DWARF2_CFI_ASM 1 -#define __GXX_ABI_VERSION 1011 -#define __FLT128_HAS_INFINITY__ 1 -#define __FLT_MIN_EXP__ (-125) -#define __cpp_lambdas 200907 -#define __FLT64X_HAS_QUIET_NAN__ 1 -#define __INT_FAST64_TYPE__ long int -#define __FLT64_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F64 -#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L) -#define __LP64__ 1 -#define __FLT32X_EPSILON__ 2.22044604925031308084726333618164062e-16F32x -#define __DECIMAL_BID_FORMAT__ 1 -#define __FLT64_MIN_10_EXP__ (-307) -#define __FLT64X_DECIMAL_DIG__ 21 -#define __DEC128_MIN__ 1E-6143DL -#define __REGISTER_PREFIX__ -#define __UINT16_MAX__ 0xffff -#define __DBL_HAS_DENORM__ 1 -#define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32 -#define __UINT8_TYPE__ unsigned char -#define __FLT_MANT_DIG__ 24 -#define __LDBL_DECIMAL_DIG__ 21 -#define __VERSION__ "7.3.1 20180323 [gcc-7-branch revision 258812]" -#define __UINT64_C(c) c ## UL -#define __cpp_unicode_characters 200704 -#define _STDC_PREDEF_H 1 -#define __cpp_decltype_auto 201304 -#define __GCC_ATOMIC_INT_LOCK_FREE 2 -#define __FLT128_MAX_EXP__ 16384 -#define __FLT32_MANT_DIG__ 24 -#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __STDC_IEC_559_COMPLEX__ 1 -#define __FLT128_HAS_DENORM__ 1 -#define __FLT128_DIG__ 33 -#define __SCHAR_WIDTH__ 8 -#define __INT32_C(c) c -#define __DEC64_EPSILON__ 1E-15DD -#define __ORDER_PDP_ENDIAN__ 3412 -#define __DEC128_MIN_EXP__ (-6142) -#define __FLT32_MAX_10_EXP__ 38 -#define __INT_FAST32_TYPE__ long int -#define __UINT_LEAST16_TYPE__ short unsigned int -#define __FLT64X_HAS_INFINITY__ 1 -#define unix 1 -#define __INT16_MAX__ 0x7fff -#define __cpp_rtti 199711 -#define __SIZE_TYPE__ long unsigned int -#define __UINT64_MAX__ 0xffffffffffffffffUL -#define __FLT64X_DIG__ 18 -#define __INT8_TYPE__ signed char -#define __cpp_digit_separators 201309 -#define __ELF__ 1 -#define __GCC_ASM_FLAG_OUTPUTS__ 1 -#define __FLT_RADIX__ 2 -#define __INT_LEAST16_TYPE__ short int -#define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L -#define __UINTMAX_C(c) c ## UL -#define __GLIBCXX_BITSIZE_INT_N_0 128 -#define __k8 1 -#define __SIG_ATOMIC_MAX__ 0x7fffffff -#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 -#define __cpp_sized_deallocation 201309 -#define __SIZEOF_PTRDIFF_T__ 8 -#define __FLT32X_MANT_DIG__ 53 -#define __x86_64__ 1 -#define __FLT32X_MIN_EXP__ (-1021) -#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF -#define __INT_FAST16_MAX__ 0x7fffffffffffffffL -#define __FLT64_DIG__ 15 -#define __UINT_FAST32_MAX__ 0xffffffffffffffffUL -#define __UINT_LEAST64_TYPE__ long unsigned int -#define __FLT_HAS_QUIET_NAN__ 1 -#define __FLT_MAX_10_EXP__ 38 -#define __LONG_MAX__ 0x7fffffffffffffffL -#define __FLT64X_HAS_DENORM__ 1 -#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL -#define __FLT_HAS_INFINITY__ 1 -#define __cpp_unicode_literals 200710 -#define __UINT_FAST16_TYPE__ long unsigned int -#define __DEC64_MAX__ 9.999999999999999E384DD -#define __INT_FAST32_WIDTH__ 64 -#define __CHAR16_TYPE__ short unsigned int -#define __PRAGMA_REDEFINE_EXTNAME 1 -#define __SIZE_WIDTH__ 64 -#define __SEG_FS 1 -#define __INT_LEAST16_MAX__ 0x7fff -#define __DEC64_MANT_DIG__ 16 -#define __UINT_LEAST32_MAX__ 0xffffffffU -#define __SEG_GS 1 -#define __FLT32_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F32 -#define __GCC_ATOMIC_LONG_LOCK_FREE 2 -#define __SIG_ATOMIC_WIDTH__ 32 -#define __INT_LEAST64_TYPE__ long int -#define __INT16_TYPE__ short int -#define __INT_LEAST8_TYPE__ signed char -#define __DEC32_MAX_EXP__ 97 -#define __INT_FAST8_MAX__ 0x7f -#define __FLT128_MAX__ 1.18973149535723176508575932662800702e+4932F128 -#define __INTPTR_MAX__ 0x7fffffffffffffffL -#define linux 1 -#define __cpp_range_based_for 200907 -#define __FLT64_HAS_QUIET_NAN__ 1 -#define __FLT32_MIN_10_EXP__ (-37) -#define __SSE2__ 1 -#define __EXCEPTIONS 1 -#define __LDBL_MANT_DIG__ 64 -#define __DBL_HAS_QUIET_NAN__ 1 -#define __FLT64_HAS_INFINITY__ 1 -#define __FLT64X_MAX__ 1.18973149535723176502126385303097021e+4932F64x -#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1) -#define __code_model_small__ 1 -#define __cpp_return_type_deduction 201304 -#define __k8__ 1 -#define __INTPTR_TYPE__ long int -#define __UINT16_TYPE__ short unsigned int -#define __WCHAR_TYPE__ int -#define __SIZEOF_FLOAT__ 4 -#define __pic__ 2 -#define __UINTPTR_MAX__ 0xffffffffffffffffUL -#define __INT_FAST64_WIDTH__ 64 -#define __DEC64_MIN_EXP__ (-382) -#define __cpp_decltype 200707 -#define __FLT32_DECIMAL_DIG__ 9 -#define __INT_FAST64_MAX__ 0x7fffffffffffffffL -#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1 -#define __FLT_DIG__ 6 -#define __FLT64X_MAX_EXP__ 16384 -#define __UINT_FAST64_TYPE__ long unsigned int -#define __INT_MAX__ 0x7fffffff -#define __amd64__ 1 -#define __INT64_TYPE__ long int -#define __FLT_MAX_EXP__ 128 -#define __ORDER_BIG_ENDIAN__ 4321 -#define __DBL_MANT_DIG__ 53 -#define __cpp_inheriting_constructors 201511 -#define __SIZEOF_FLOAT128__ 16 -#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL -#define __DEC64_MIN__ 1E-383DD -#define __WINT_TYPE__ unsigned int -#define __UINT_LEAST32_TYPE__ unsigned int -#define __SIZEOF_SHORT__ 2 -#define __SSE__ 1 -#define __LDBL_MIN_EXP__ (-16381) -#define __FLT64_MAX__ 1.79769313486231570814527423731704357e+308F64 -#define __WINT_WIDTH__ 32 -#define __INT_LEAST8_MAX__ 0x7f -#define __FLT32X_MAX_10_EXP__ 308 -#define __SIZEOF_INT128__ 16 -#define __LDBL_MAX_10_EXP__ 4932 -#define __ATOMIC_RELAXED 0 -#define __DBL_EPSILON__ double(2.22044604925031308084726333618164062e-16L) -#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128 -#define _LP64 1 -#define __UINT8_C(c) c -#define __FLT64_MAX_EXP__ 1024 -#define __INT_LEAST32_TYPE__ int -#define __SIZEOF_WCHAR_T__ 4 -#define __FLT128_HAS_QUIET_NAN__ 1 -#define __INT_FAST8_TYPE__ signed char -#define __FLT64X_MIN__ 3.36210314311209350626267781732175260e-4932F64x -#define __GNUC_STDC_INLINE__ 1 -#define __FLT64_HAS_DENORM__ 1 -#define __FLT32_EPSILON__ 1.19209289550781250000000000000000000e-7F32 -#define __DBL_DECIMAL_DIG__ 17 -#define __STDC_UTF_32__ 1 -#define __INT_FAST8_WIDTH__ 8 -#define __FXSR__ 1 -#define __DEC_EVAL_METHOD__ 2 -#define __FLT32X_MAX__ 1.79769313486231570814527423731704357e+308F32x -#define __cpp_runtime_arrays 198712 -#define __UINT64_TYPE__ long unsigned int -#define __UINT32_C(c) c ## U -#define __INTMAX_MAX__ 0x7fffffffffffffffL -#define __cpp_alias_templates 200704 -#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ -#define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F -#define __INT8_MAX__ 0x7f -#define __LONG_WIDTH__ 64 -#define __PIC__ 2 -#define __UINT_FAST32_TYPE__ long unsigned int -#define __CHAR32_TYPE__ unsigned int -#define __FLT_MAX__ 3.40282346638528859811704183484516925e+38F -#define __cpp_constexpr 201304 -#define __INT32_TYPE__ int -#define __SIZEOF_DOUBLE__ 8 -#define __cpp_exceptions 199711 -#define __FLT_MIN_10_EXP__ (-37) -#define __FLT64_MIN__ 2.22507385850720138309023271733240406e-308F64 -#define __INT_LEAST32_WIDTH__ 32 -#define __INTMAX_TYPE__ long int -#define __DEC128_MAX_EXP__ 6145 -#define __FLT32X_HAS_QUIET_NAN__ 1 -#define __ATOMIC_CONSUME 1 -#define __GNUC_MINOR__ 3 -#define __GLIBCXX_TYPE_INT_N_0 __int128 -#define __INT_FAST16_WIDTH__ 64 -#define __UINTMAX_MAX__ 0xffffffffffffffffUL -#define __DEC32_MANT_DIG__ 7 -#define __FLT32X_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F32x -#define __DBL_MAX_10_EXP__ 308 -#define __LDBL_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951L -#define __INT16_C(c) c -#define __cpp_generic_lambdas 201304 -#define __STDC__ 1 -#define __FLT32X_DIG__ 15 -#define __PTRDIFF_TYPE__ long int -#define __ATOMIC_SEQ_CST 5 -#define __UINT32_TYPE__ unsigned int -#define __FLT32X_MIN_10_EXP__ (-307) -#define __UINTPTR_TYPE__ long unsigned int -#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD -#define __DEC128_MANT_DIG__ 34 -#define __LDBL_MIN_10_EXP__ (-4931) -#define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128 -#define __SSE_MATH__ 1 -#define __SIZEOF_LONG_LONG__ 8 -#define __cpp_user_defined_literals 200809 -#define __FLT128_DECIMAL_DIG__ 36 -#define __GCC_ATOMIC_LLONG_LOCK_FREE 2 -#define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x -#define __LDBL_DIG__ 18 -#define __FLT_DECIMAL_DIG__ 9 -#define __UINT_FAST16_MAX__ 0xffffffffffffffffUL -#define __GCC_ATOMIC_SHORT_LOCK_FREE 2 -#define __INT_LEAST64_WIDTH__ 64 -#define __UINT_FAST8_TYPE__ unsigned char -#define _GNU_SOURCE 1 -#define __cpp_init_captures 201304 -#define __ATOMIC_ACQ_REL 4 -#define __ATOMIC_RELEASE 3 diff --git a/qwt/textengines/.gitignore b/qwt/textengines/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/qwt/textengines/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/qwt/textengines/.qmake.stash b/qwt/textengines/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/qwt/textengines/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/rllib/lib/.gitignore b/rllib/lib/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/rllib/lib/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/rllib/lib/.qmake.stash b/rllib/lib/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/rllib/lib/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/rllib/lib/rldefine.h b/rllib/lib/rldefine.h index b8ec3aa6..6a0289f2 100644 --- a/rllib/lib/rldefine.h +++ b/rllib/lib/rldefine.h @@ -104,6 +104,6 @@ The header that is included in every file of rllib. #define BIT30 256*256*256*64 #define BIT31 256*256*256*128 -#define RLCRLF "\r\n" +#define RLCRLF "\r\n" #endif diff --git a/rllib/lib/rleibnetip.cpp b/rllib/lib/rleibnetip.cpp index 82546373..ba2e0601 100644 --- a/rllib/lib/rleibnetip.cpp +++ b/rllib/lib/rleibnetip.cpp @@ -58,7 +58,8 @@ static void *eib_reader(void *arg) // thread THREAD_PARAM *p = (THREAD_PARAM *) arg; rlEIBnetIP *eib = (rlEIBnetIP *) p->user; rlEIBnetIP::PDU pdu; - rlTime now, last, diff; + rlTime now, last; + double diff; int ret, len; int recseq = 0; int expected_recseq = 0; @@ -136,7 +137,7 @@ static void *eib_reader(void *arg) // thread } } diff = now - last; - if(eib->isConnected() && eib->channelid != -1 && diff.second > 50) + if(eib->isConnected() && eib->channelid != -1 && diff > 50) { // send heartbeat if(eib->debug) ::printf("send heartbeat\n"); pdu.headersize = EIB_HEADERSIZE; @@ -789,7 +790,7 @@ int rlEIBnetIP::getText(const char *name, char *text, int maxlen) int rlEIBnetIP::setText(const char *name, const char *text) { - if(name == NULL || text == NULL) return rlEIBnetIP::EIBERROR; + if(name == NULL || text == NULL) return rlEIBnetIP::EIBERROR; char buf[16]; int length = strlen(text); unsigned int a1,a2,a3,daddr; diff --git a/rllib/lib/rlhistorylogger.cpp b/rllib/lib/rlhistorylogger.cpp index b69528b5..1ca50fa8 100644 --- a/rllib/lib/rlhistorylogger.cpp +++ b/rllib/lib/rlhistorylogger.cpp @@ -26,13 +26,7 @@ rlHistoryLogger::rlHistoryLogger(const char *csvName, int maxHoursPerFile, int m max_hours_per_file = maxHoursPerFile; if(max_hours_per_file <= 0) max_hours_per_file = 1; val = max_hours_per_file; - time_diff.hour = val % 24; - val = val / 24; - time_diff.day = val % 31; // we are on the save side if we assume a month with 31 days - val = val / 31; - time_diff.month = val % 12; - val = val / 12; - time_diff.year = val; + time_diff = val * 3600; max_lines_in_memory = maxLinesInMemory; if(max_lines_in_memory <= 0) max_lines_in_memory = 1; current_file = -1; @@ -164,16 +158,18 @@ int rlHistoryLogger::openFile() current_file = i_oldest; sprintf(csv_file_name,"%s%d.csv",csv_name,i_oldest); fout = fopen(csv_file_name,"w"); + file_start_time.getLocalTime(); } else { // open next file for writing current_file++; - if(current_file >= 10) current_file = 0; + if(current_file >= 10) + current_file = 0; sprintf(csv_file_name,"%s%d.csv",csv_name,current_file); fout = fopen(csv_file_name,"w"); + file_start_time.getLocalTime(); } - file_start_time.getLocalTime(); return 0; } diff --git a/rllib/lib/rlhistorylogger.h b/rllib/lib/rlhistorylogger.h index f7a37439..18e47659 100644 --- a/rllib/lib/rlhistorylogger.h +++ b/rllib/lib/rlhistorylogger.h @@ -47,7 +47,8 @@ class rlHistoryLogger int pushLineToFile(const char *line); int openFile(); rlHistoryLogLine *first_line,*current_line; - rlTime time,file_start_time,time_diff; + rlTime time,file_start_time; + time_t time_diff; FILE *fout; int max_hours_per_file, max_lines_in_memory, current_file; char *csv_name, *csv_file_name; diff --git a/rllib/lib/rltime_v2.cpp b/rllib/lib/rltime_v2.cpp index 779546a1..43332b4e 100644 --- a/rllib/lib/rltime_v2.cpp +++ b/rllib/lib/rltime_v2.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #ifdef RLUNIX #include @@ -95,8 +96,79 @@ static struct tm* localtime_r(const time_t* t, struct tm* r) namespace ns_rltime_v2 { +void rlTime::normalizeAsRelativeTime() +{ + assert(objectHoldsRelativeTime && "object must represent relative time, otherwise normalization as relative time is not defined"); + + // accumulate years and months into days, assuming 30.5 days per month and 365.25 days per year + if (year != 0) + { + day += year * 365 + (year / 4); + year = 0; + } + + if (month != 0) + { + day += month * 30 + (month / 2); + month = 0; + } + + if ( + (1000 <= std::abs(millisecond)) or + (60 <= std::abs(second)) or + (60 <= std::abs(minute)) or + (24 <= std::abs(hour)) + ) + { + time_t linear_value = second + (minute * 60) + (hour * 60 * 60) + (day * 24 * 60 * 60); + + // normalize milliseconds + std::lldiv_t d = std::lldiv(millisecond, 1000); + millisecond = d.rem; + while (0 > millisecond) + { + millisecond += 1000; + --d.quot; + } + + // adjust linear value + linear_value += d.quot; + + // normalize milliseconds to negative, if linear value is negative + if (0 > linear_value) + { + if (0 < millisecond) + { + millisecond -= 1000; + ++linear_value; + } + } + + // decompose linear value + if (linear_value) + { + d = std::lldiv(linear_value, 60); + second = d.rem; + if (d.quot) + { + d = std::lldiv(d.quot, 60); + minute = d.rem; + if (d.quot) + { + d = std::lldiv(d.quot, 24); + hour = d.rem; + day = d.quot; + } + } + } + } +} + void rlTime::normalizeAsDate() { + assert(not objectHoldsRelativeTime && "object must represent absolute time and date, otherwise normalization as time and date is not defined"); + assert(year >= 1970); + if (year) { // read members @@ -140,19 +212,38 @@ rlTime::rlTime(int Year, int Month, int Day, int Hour, int Minute, int Second, i second = Second; millisecond = Millisecond; + memset(time_string, 0, sizeof(time_string)); + memset(iso_time_string, 0, sizeof(iso_time_string)); + + if (1970 <= year) + { + objectHoldsRelativeTime = false; normalizeAsDate(); } - -rlTime::~rlTime() + else { + objectHoldsRelativeTime = true; + normalizeAsRelativeTime(); + } } +rlTime::~rlTime() +{ +} + const char *rlTime::version() { return __FILE__; } -void rlTime::setTimeFromString(const char *time_string) +/*** + * Read an absolute point in time from time_string. + * + * This method expects a time formatted as in return from getTimeString(), + * following the template "YYYY-MM-DD hh:mm:ss ms". + * @param time_string + */ +rlTime& rlTime::setTimeFromString(const char *time_string) { year = 0; month = 0; @@ -161,11 +252,21 @@ void rlTime::setTimeFromString(const char *time_string) minute = 0; second = 0; millisecond = 0; + objectHoldsRelativeTime = false; sscanf(time_string,"%d-%d-%d %d:%d:%d %d",&year,&month,&day, &hour,&minute,&second, &millisecond); normalizeAsDate(); + + return *this; } -void rlTime::setTimeFromIsoString(const char *iso_time_string) +/*** + * Read an absolute point in time from time_string. + * + * This method expects a time formatted as in return from getIsoTimeString(), + * following the template "YYYY-MM-DDThh:mm:ss.xxx". + * @param time_string + */ +rlTime& rlTime::setTimeFromIsoString(const char *iso_time_string) { year = 0; month = 0; @@ -174,8 +275,11 @@ void rlTime::setTimeFromIsoString(const char *iso_time_string) minute = 0; second = 0; millisecond = 0; + objectHoldsRelativeTime = false; sscanf(iso_time_string,"%d-%d-%dT%d:%d:%d.%d",&year,&month,&day, &hour,&minute,&second, &millisecond); normalizeAsDate(); + + return *this; } /*! 
@@ -183,43 +287,54 @@ void rlTime::setTimeFromIsoString(const char *iso_time_string)
  * milliseconds within the fraction
  * calculating with 1 month <=> 30.5 days
*/ -void rlTime::setTimeFromSeconds(double seconds) +rlTime& rlTime::setTimeFromSeconds(double seconds) { // we assume that the average month has 30.5 days - double mod = fmod(seconds*1000, 1000); + double mod = fmod(seconds * 1000, 1000.); millisecond = (int) mod; - mod = fmod(seconds, 60); + mod = fmod(seconds, 60.); second = (int) mod; seconds /= 60; - mod = fmod(seconds, 60); + mod = fmod(seconds, 60.); minute = (int) mod; seconds /= 60; - mod = fmod(seconds, 24); + mod = fmod(seconds, 24.); hour = (int) mod; seconds /= 24; - mod = fmod(seconds, 30.5); - day = (int) mod; - - seconds /= 30.5; - mod = fmod(seconds, 12); - month = (int) mod; - - seconds /= 12; - year = (int) seconds; + day = int(seconds); + +// mod = fmod(seconds, 30.5); +// day = (int) mod; +// +// seconds /= 30.5; +// mod = fmod(seconds, 12); +// month = (int) mod; +// +// seconds /= 12; +// year = (int) seconds; + + objectHoldsRelativeTime = true; + normalizeAsRelativeTime(); + + return *this; } const char *rlTime::getTimeString() { + assert(not objectHoldsRelativeTime && "object must hold an absolute time and date"); + memset(time_string, 0, sizeof(time_string)); sprintf(time_string,"%04d-%02d-%02d %02d:%02d:%02d %03d",year, month, day, hour, minute, second, millisecond); return time_string; } const char *rlTime::getIsoTimeString() { + assert(not objectHoldsRelativeTime && "object must hold an absolute time and date"); + memset(iso_time_string, 0, sizeof(iso_time_string)); sprintf(iso_time_string,"%04d-%02d-%02dT%02d:%02d:%02d.%03d",year, month, day, hour, minute, second, millisecond); return iso_time_string; } @@ -264,6 +379,8 @@ const char *rlTime::getIsoTimeString() */ const char *rlTime::toString(const char *format) { + memset(time_string, 0, sizeof(time_string)); + // See: // https://doc.qt.io/qt-5/qdatetime.html#toString // @@ -448,7 +565,7 @@ const char *rlTime::toString(const char *format) return time_string; } -void rlTime::getLocalTime() +rlTime& rlTime::getLocalTime() { #ifdef RLUNIX time_t t; @@ -497,6 +614,10 @@ void rlTime::getLocalTime() month = st.wMonth; year = st.wYear; #endif + + objectHoldsRelativeTime = false; + + return *this; } int rlTime::getFileModificationTime(const char *filename) @@ -506,7 +627,7 @@ int rlTime::getFileModificationTime(const char *filename) struct tm tmsbuf; #ifdef RLUNIX - if(lstat(filename,&statbuf)) return -1; + if(lstat(filename, &statbuf)) return -1; #else if(stat(filename,&statbuf)) return -1; #endif @@ -523,12 +644,15 @@ int rlTime::getFileModificationTime(const char *filename) day = (int)tms->tm_mday; month = (int)tms->tm_mon; year = (int)tms->tm_year; + objectHoldsRelativeTime = false; return 0; } void rlTime::setLocalTime() { + assert(not this->objectHoldsRelativeTime && "cannot set local time/clock from relative time object"); + #ifdef RLUNIX struct timeval tv; struct tm t; @@ -595,318 +719,61 @@ void rlTime::setLocalTime() st.wMilliseconds = millisecond; SetSystemTime(&st); #endif -} -rlTime& rlTime::operator+=(const rlTime &time) -{ - rlTime t; - t = *this + time; - *this = t; - return *this; -} - -rlTime& rlTime::operator-=(const rlTime &time) -{ - rlTime t; - t = *this - time; - *this = t; - return *this; + objectHoldsRelativeTime = false; } -rlTime rlTime::operator+(const rlTime &time) const +rlTime& rlTime::operator+=(time_t seconds) { - int maxmonth,y,m; - rlTime t; - - t.year = year + time.year; - t.month = month + time.month; - t.day = day + time.day; - t.hour = hour + time.hour; - t.minute = minute + time.minute; - t.second = second + time.second; - t.millisecond = millisecond + time.millisecond; - - y = t.year; - if(t.month > 12 || (t.month==12 && t.day==31 && t.hour>=24)) y++; - m = t.month; - if(t.month > 12 || (t.month==12 && t.day==31 && t.hour>=24)) m = 1; - - switch(m % 12) - { - case 1: // january - maxmonth = 31; - break; - case 2: // february - maxmonth = 28; - // Annus bisextilis (calendario Gregoriano) - if(y%4==0) - { - maxmonth = 29; - int hth = y % 100; - int special = y % 400; // 1900-+-2100-2200-2300-+-2500-2600-2700 - if(hth == 0 && special != 0) maxmonth = 28; - } - break; - case 3: // march - maxmonth = 31; - break; - case 4: // april - maxmonth = 30; - break; - case 5: // may - maxmonth = 31; - break; - case 6: // june - maxmonth = 30; - break; - case 7: // july - maxmonth = 31; - break; - case 8: // august - maxmonth = 31; - break; - case 9: // september - maxmonth = 30; - break; - case 10: // october - maxmonth = 31; - break; - case 11: // november - maxmonth = 30; - break; - case 12: // december - maxmonth = 31; - break; - default: - maxmonth = 31; - break; - } + if (0 > seconds) + return this->operator -=(-seconds); - if(t.millisecond >= 1000) { t.second++; t.millisecond -= 1000; } - if(t.second >= 60) { t.minute++; t.second -= 60; } - if(t.minute >= 60) { t.hour++, t.minute -= 60; } - if(t.hour >= 24) { t.day++; t.hour -= 24; } - if(t.day > maxmonth) { t.month++; t.day -= maxmonth; } - if(t.month > 12) { t.year++; t.month -= 12; } - return t; -} - -rlTime rlTime::operator-(const rlTime &time) const -{ - int maxmonth,y,m; - rlTime t; - - y = 0; - t.year = year - time.year; - t.month = month - time.month; - t.day = day - time.day; - t.hour = hour - time.hour; - t.minute = minute - time.minute; - t.second = second - time.second; - t.millisecond = millisecond - time.millisecond; - - if(t.millisecond < 0) { t.second--; t.millisecond += 1000; } - if(t.second < 0) { t.minute--; t.second += 60; } - if(t.minute < 0) { t.hour--, t.minute += 60; } - if(t.hour < 0) { t.day--; t.hour += 24; } - - if(t.day < 0) - { - t.month--; - y = t.year; - m = t.month; - if(m <= 0) { m += 12; y--; } - switch(m % 12) - { - case 1: // january - maxmonth = 31; - break; - case 2: // february - maxmonth = 28; - // Annus bisextilis (calendario Gregoriano) - if(y%4==0) - { - maxmonth = 29; - int hth = y % 100; - int special = y % 400; // 1900-+-2100-2200-2300-+-2500-2600-2700 - if(hth == 0 && special != 0) maxmonth = 28; - } - break; - case 3: // march - maxmonth = 31; - break; - case 4: // april - maxmonth = 30; - break; - case 5: // may - maxmonth = 31; - break; - case 6: // june - maxmonth = 30; - break; - case 7: // july - maxmonth = 31; - break; - case 8: // august - maxmonth = 31; - break; - case 9: // september - maxmonth = 30; - break; - case 10: // october - maxmonth = 31; - break; - case 11: // november - maxmonth = 30; - break; - case 12: // december - maxmonth = 31; - break; - default: - maxmonth = 31; - break; - } - t.day += maxmonth; - } - - if(y >= 0) - { - //printf("after christ was born. thus everything is ok.\n"); - } - else - { - //printf("before christ was born. now also ok\n"); - { t.month++; t.day -= 30; } - if(t.day < 30) { t.day++; t.hour -= 24; } - if(t.hour < 0 ) { t.hour++; t.minute -= 60; } - if(t.minute < 0 ) { t.minute++; t.second -= 60; } - if(t.second < 0 ) { t.second++; t.millisecond -= 1000; } - } - - return t; -} - -int rlTime::operator==(const rlTime &time) const -{ - if(year != time.year) return 0; - if(month != time.month) return 0; - if(day != time.day) return 0; - if(hour != time.hour) return 0; - if(minute != time.minute) return 0; - if(second != time.second) return 0; - if(millisecond != time.millisecond) return 0; - - return 1; -} - -int rlTime::operator<(const rlTime &time) const -{ - if(this->year < time.year) return 1; - else if(this->year == time.year) - { - if(this->month < time.month) return 1; - else if(this->month == time.month) - { - if(this->day < time.day) return 1; - else if(this->day == time.day) - { - if(this->hour < time.hour) return 1; - else if(this->hour == time.hour) - { - if(this->minute < time.minute) return 1; - else if(this->minute == time.minute) - { - if(this->second < time.second) return 1; - else if(this->second == time.second) - { - if(this->millisecond < time.millisecond) return 1; - } - } - } - } - } - } - return 0; -} - -int rlTime::operator<=(const rlTime &time) const -{ - if((*this) == time) return 1; - if((*this) < time) return 1; - return 0; -} - -int rlTime::operator>(const rlTime &time) const -{ - if(this->year > time.year) return 1; - else if(this->year == time.year) - { - if(this->month > time.month) return 1; - else if(this->month == time.month) - { - if(this->day > time.day) return 1; - else if(this->day == time.day) - { - if(this->hour > time.hour) return 1; - else if(this->hour == time.hour) - { - if(this->minute > time.minute) return 1; - else if(this->minute == time.minute) - { - if(this->second > time.second) return 1; - else if (this->second == time.second) - { - if(this->millisecond > time.millisecond) return 1; - } - } - } - } - } - } - return 0; -} - -int rlTime::operator>=(const rlTime &time) const -{ - if((*this) == time) return 1; - if((*this) > time) return 1; - return 0; -} - -rlTime& rlTime::operator+=(time_t seconds) -{ - if(0 > seconds) return this->operator -=(-seconds); - lldiv_t d = lldiv(seconds, time_t(60)); + std::lldiv_t d = std::lldiv(seconds, time_t(60)); second += d.rem; if(d.quot) { - d = lldiv(d.quot, time_t(60)); + d = std::lldiv(d.quot, time_t(60)); minute += d.rem; if(d.quot) { - d = lldiv(d.quot, time_t(24)); + d = std::lldiv(d.quot, time_t(24)); hour += d.rem; if (d.quot) { - d = lldiv(d.quot, time_t(31)); + if (not objectHoldsRelativeTime) + { + d = std::lldiv(d.quot, time_t(31)); day += d.rem; if(d.quot) { - d = lldiv(d.quot, time_t(12)); + d = std::lldiv(d.quot, time_t(12)); month += d.rem; year += d.quot; } } + else // do not split remaining days down to months and years, as this is not linear + { + day += d.quot; + } + } } } - this->normalizeAsDate(); + + // now normalize the values, as this is not done above + if (not objectHoldsRelativeTime) + normalizeAsDate(); + else + normalizeAsRelativeTime(); + return *this; } rlTime& rlTime::operator-=(time_t seconds) { - if(0 > seconds) return this->operator +=(-seconds); - lldiv_t d = lldiv(seconds, time_t(60)); + if (0 > seconds) + return this->operator +=(-seconds); + + std::lldiv_t d = std::lldiv(seconds, time_t(60)); second -= d.rem; if(second < 0) { @@ -915,7 +782,7 @@ rlTime& rlTime::operator-=(time_t seconds) } if(d.quot) { - d = lldiv(d.quot, time_t(60)); + d = std::lldiv(d.quot, time_t(60)); minute -= d.rem; if(minute < 0) { @@ -924,7 +791,7 @@ rlTime& rlTime::operator-=(time_t seconds) } if(d.quot) { - d = lldiv(d.quot, time_t(24)); + d = std::lldiv(d.quot, time_t(24)); hour -= d.rem; if(hour < 0) { @@ -933,7 +800,9 @@ rlTime& rlTime::operator-=(time_t seconds) } if(d.quot) { - d = lldiv(d.quot, time_t(31)); + if (not objectHoldsRelativeTime) + { + d = std::lldiv(d.quot, time_t(31)); day -= d.rem; if(day < 0) { @@ -942,7 +811,7 @@ rlTime& rlTime::operator-=(time_t seconds) } if(d.quot) { - d = lldiv(d.quot, time_t(12)); + d = std::lldiv(d.quot, time_t(12)); month -= d.rem; if(month < 0) { @@ -952,13 +821,24 @@ rlTime& rlTime::operator-=(time_t seconds) year -= d.quot; } } + else // do not split remaining days down to months and years, as this is not linear + { + day -= d.quot; + } + } } } - this->normalizeAsDate(); + + // now normalize the values, as this is not done above + if (not objectHoldsRelativeTime) + normalizeAsDate(); + else + normalizeAsRelativeTime(); + return *this; } -rlTime rlTime::operator+(time_t seconds) const +rlTime rlTime::operator+(time_t seconds) const { rlTime t(*this); @@ -971,50 +851,215 @@ rlTime rlTime::operator-(time_t seconds) const rlTime t(*this); t -= seconds; + + return t; +} + +rlTime& rlTime::operator +=(const double& seconds) +{ + int ms = fmod(round(seconds * 1000.), 1000.); + time_t sec = time_t(seconds); + + millisecond += ms; + *this += sec; + + return *this; +} + +rlTime& rlTime::operator -=(const double& seconds) +{ + int ms = fmod(round(seconds * 1000.), 1000.); + time_t sec = time_t(seconds); + + millisecond -= ms; + *this -= sec; + + return *this; +} + +rlTime rlTime::operator +(const double& seconds) const + { + rlTime t(*this); + + t += seconds; + return t; } -// ??? -//double rlTime::operator-(const rlTime &time) const -//{ -// return this->secondsSinceEpoche() - time.secondsSinceEpoche(); -//} +rlTime rlTime::operator -(const double& seconds) const + { + rlTime t(*this); + + t -= seconds; + + return t; +} -rlTime& rlTime::operator+=(double seconds) +rlTime& rlTime::operator+=(const RelativeTime &t) { - rlTime t, sec; - sec.setTimeFromSeconds(seconds); - t = *this + sec; - *this = t; + time_t linear_value = t.m_myParent_.second + (t.m_myParent_.minute * 60) + (t.m_myParent_.hour * 60 * 60) + (t.m_myParent_.day * 24 * 60 * 60); + this->millisecond += t.m_myParent_.millisecond; + *this += linear_value; + return *this; } - -rlTime& rlTime::operator-=(double seconds) + +rlTime& rlTime::operator-=(const RelativeTime &t) { - rlTime t, sec; - sec.setTimeFromSeconds(seconds); - t = *this - sec; - *this = t; + time_t linear_value = t.m_myParent_.second + (t.m_myParent_.minute * 60) + (t.m_myParent_.hour * 60 * 60) + (t.m_myParent_.day * 24 * 60 * 60); + this->millisecond -= t.m_myParent_.millisecond; + *this -= linear_value; + return *this; } - -rlTime rlTime::operator+(double seconds) const + +rlTime rlTime::operator+(const RelativeTime &time) const { - rlTime t, sec; - sec.setTimeFromSeconds(seconds); - t = *this + sec; + rlTime t(*this); + + t += time; + return t; } - -rlTime rlTime::operator-(double seconds) const + +rlTime rlTime::operator-(const RelativeTime &time) const { - rlTime t, sec; - sec.setTimeFromSeconds(seconds); - t = *this - sec; + rlTime t(*this); + + t -= time; + return t; } -time_t rlTime::timegm(struct tm* tm_) +double rlTime::operator-(const rlTime &time) const + { + if (this->objectHoldsRelativeTime and time.objectHoldsRelativeTime) + return (this->seconds() - time.seconds()); + else if (not this->objectHoldsRelativeTime and time.objectHoldsRelativeTime) + return this->secondsSinceEpoche() - time.seconds(); + else if (not this->objectHoldsRelativeTime and not time.objectHoldsRelativeTime) + return (this->secondsSinceEpoche() - time.secondsSinceEpoche()); + else + { + assert(not time.objectHoldsRelativeTime && "you cannot run the difference between relative and absolute time this way (relative minus absolute)"); + return std::numeric_limits::quiet_NaN();; // just to make code inspection tools happy, in case assert() is defined empty + } +} + +int rlTime::operator==(const rlTime &time) const + { + if (objectHoldsRelativeTime != time.objectHoldsRelativeTime) + return 0; + if(year != time.year) return 0; + if(month != time.month) return 0; + if(day != time.day) return 0; + if(hour != time.hour) return 0; + if(minute != time.minute) return 0; + if(second != time.second) return 0; + if(millisecond != time.millisecond) return 0; + + return 1; +} + +int rlTime::operator<=(const rlTime &time) const + { + if (objectHoldsRelativeTime != time.objectHoldsRelativeTime) + return 0; + if((*this) == time) return 1; + if((*this) < time) return 1; + return 0; +} + +int rlTime::operator>=(const rlTime &time) const + { + if (objectHoldsRelativeTime != time.objectHoldsRelativeTime) + return 0; + if((*this) == time) return 1; + if((*this) > time) return 1; + return 0; +} + +int rlTime::operator<(const rlTime &time) const + { + if (objectHoldsRelativeTime != time.objectHoldsRelativeTime) + return 0; + if (this->year < time.year) + return 1; + else if (this->year == time.year) + { + if (this->month < time.month) + return 1; + else if (this->month == time.month) + { + if (this->day < time.day) + return 1; + else if (this->day == time.day) + { + if (this->hour < time.hour) + return 1; + else if (this->hour == time.hour) + { + if (this->minute < time.minute) + return 1; + else if (this->minute == time.minute) + { + if (this->second < time.second) + return 1; + else if (this->second == time.second) + { + if (this->millisecond < time.millisecond) + return 1; + } + } + } + } + } + } + + return 0; +} + +int rlTime::operator>(const rlTime &time) const + { + if (objectHoldsRelativeTime != time.objectHoldsRelativeTime) + return 0; + if (this->year > time.year) + return 1; + else if (this->year == time.year) + { + if (this->month > time.month) + return 1; + else if (this->month == time.month) + { + if (this->day > time.day) + return 1; + else if (this->day == time.day) + { + if (this->hour > time.hour) + return 1; + else if (this->hour == time.hour) + { + if (this->minute > time.minute) + return 1; + else if (this->minute == time.minute) + { + if (this->second > time.second) + return 1; + else if (this->second == time.second) + { + if (this->millisecond > time.millisecond) + return 1; + } + } + } + } + } + } + + return 0; +} + +time_t rlTime::timegm(struct tm* tm_) { time_t t = mktime(tm_); struct tm ltm; @@ -1027,6 +1072,8 @@ time_t rlTime::timegm(struct tm* tm_) double rlTime::secondsSinceEpoche() const { + assert(not objectHoldsRelativeTime && "object must hold an absolute time and date"); + struct tm begin; struct tm test; @@ -1061,7 +1108,11 @@ double rlTime::secondsSinceEpoche() const */ double rlTime::seconds() const { - double ret = (((double) millisecond) / 1000) + second + minute*60 + hour*60*60 + month*60*60*30.5 + year*60*60*30.5*12; + assert(objectHoldsRelativeTime && "object must hold an relative time"); + + double ret = (((double) millisecond) / 1000); + ret += second + minute * 60 + hour * 60 * 60 + day * 24 * 60 * 60; + ret += month*60*60*30.5 + year*60*60*30.5*12; return ret; } @@ -1132,25 +1183,23 @@ const char* rlTime::formatTimeDiff(double tdiff, enum FormatLargestUnit fmt, uns return buffer; } -const char* rlTime::formatTimeDiff(const rlTime& t1, const rlTime& t2, enum FormatLargestUnit fmt, unsigned bufferLength, char* buffer) +const char* rlTime::formatTimeDiff(const rlTime& t1, const rlTime& t2, enum FormatLargestUnit fmt, unsigned bufferLength, char* buffer) { - rlTime tdiff; - tdiff = t2 - t1; - return formatTimeDiff(tdiff.seconds(), fmt, bufferLength, buffer); + return formatTimeDiff(t2 - t1, fmt, bufferLength, buffer); } -const char *rlTime::formatTimeDiffString(double tdiff, enum FormatLargestUnit fmt) +std::string rlTime::formatTimeDiffString(double tdiff, enum FormatLargestUnit fmt) { char strBuffer[32]; const char* result = formatTimeDiff(tdiff, fmt, sizeof(strBuffer), strBuffer); - int len = strlen(result); - time_string[0] = '\0'; - if(len+1 < (int) sizeof(time_string)) strcpy(time_string, result); - return time_string; + + std::string diffStr(result); + + return diffStr; } -const char *rlTime::formatTimeDiffString(const rlTime& t1, const rlTime& t2, enum FormatLargestUnit fmt) +std::string rlTime::formatTimeDiffString(const rlTime& t1, const rlTime& t2, enum FormatLargestUnit fmt) { return formatTimeDiffString(t2 - t1, fmt); } diff --git a/rllib/lib/rltime_v2.h b/rllib/lib/rltime_v2.h index 0e3cf818..6bb5938f 100644 --- a/rllib/lib/rltime_v2.h +++ b/rllib/lib/rltime_v2.h @@ -18,11 +18,28 @@ #include "rldefine.h" #include +#include +#include +#include + +#ifdef RLCPP11 +#include +#endif namespace ns_rltime_v2 { /*! 
-class for handling time.
+class for handling time. It supports also simple formatting of time differences.
+
+If the year is smaller than 1970 a relative time is assumed in contrast to an absolute point in time for
+years greater than 1970.
+
+For good clarity of what you want express, avoid years and months for relative times and express relative
+times as days, hours etc.
+
+Relative times are normalized in a fashion that, as of its nonlinear nature of months length and year length,
+finally the most rough granularity component for relative times is expressed in days. This way are assumptions of
+month length and year length are taken out of calculations as early as possible.
*/ class rlTime { @@ -31,6 +48,9 @@ class rlTime // typedef int64_t time_t; ///< for applying relative adjustments to the time, it's a redefintion on most modern platform, but anyway // typedef double ftime_t; ///< for applying relative adjustments in fractions of a second + struct RelativeTime; ///< a proxy type for adding relative time to absolutes + + explicit rlTime(int Year=0, int Month=0, int Day=0, int Hour=0, int Minute=0, int Second=0, int Millisecond=0); #ifdef RLCPP11 rlTime(double&) = delete; @@ -40,40 +60,61 @@ class rlTime const char *getTimeString(); const char *getIsoTimeString(); const char *toString(const char *format); - void getLocalTime(); + rlTime& getLocalTime(); int getFileModificationTime(const char *filename); /*! 
   format: sscanf(time_string,"%d-%d-%d %d:%d:%d %d",&year,&month,&day, &hour,&minute,&second, &millisecond);
*/ - void setTimeFromString(const char *time_string); - void setTimeFromIsoString(const char *iso_time_string); - void setTimeFromSeconds(double const seconds); // we assume 30.5 days per month + rlTime& setTimeFromString(const char *time_string); + rlTime& setTimeFromIsoString(const char *iso_time_string); + rlTime& setTimeFromSeconds(double seconds); void setLocalTime(); double secondsSinceEpoche() const; - double seconds() const; // we assume 30.5 days per month - - rlTime& operator+= (const rlTime &time); - rlTime& operator-= (const rlTime &time); - rlTime operator+ (const rlTime &time) const; - rlTime operator- (const rlTime &time) const; - - rlTime& operator+= (double seconds); // we assume 30.5 days per month - rlTime& operator-= (double seconds); // we assume 30.5 days per month - rlTime operator+ (double seconds) const; // we assume 30.5 days per month - rlTime operator- (double seconds) const; // we assume 30.5 days per month - - rlTime& operator+= (time_t seconds); ///< adjust absolute time by number of seconds - rlTime& operator-= (time_t seconds); ///< adjust absolute time by number of seconds - rlTime operator+ (time_t seconds) const; ///< make new object with absolute time adjusted by number of seconds - rlTime operator- (time_t seconds) const; ///< make new object with absolute time adjusted by number of seconds - - // already defined see: "double const" above - //rlTime& operator += (const ftime_t& seconds); // we assume 30.5 days per month - //rlTime& operator -= (const ftime_t& seconds); // we assume 30.5 days per month - //rlTime operator + (const ftime_t& seconds) const; // we assume 30.5 days per month - //rlTime operator - (const ftime_t& seconds) const; // we assume 30.5 days per month + double seconds() const; + + // implicitly converted rlTime objects for doing relative adjustments to objects + rlTime& operator+= (const RelativeTime &time); + rlTime& operator-= (const RelativeTime &time); + rlTime operator+ (const RelativeTime &time) const; + rlTime operator- (const RelativeTime &time) const; // one must cast explicitly to get an rlTime object back, i.e. t2 - RelativeTime(t1); + + // integral time spans, pre C++11 compiler users must convert argument value explicitly to time_t by time_t(seconds) + rlTime& operator+= (time_t seconds); ///< adjust absolute time by number of seconds + rlTime& operator-= (time_t seconds); ///< adjust absolute time by number of seconds + rlTime operator+ (time_t seconds) const; ///< make new object with absolute time adjusted by number of seconds + rlTime operator- (time_t seconds) const; ///< make new object with absolute time adjusted by number of seconds + + // floating point time spans with millisecond resolution, pre C++11 compiler users must convert argument value to double by double(seconds) + rlTime& operator += (const double& seconds); + rlTime& operator -= (const double& seconds); + rlTime operator + (const double& seconds) const; + rlTime operator - (const double& seconds) const; + +#ifdef RLCPP11 + // some templates to catch all other integer type arguments and convert them to time_t + template::value, argType>::type* = nullptr> + rlTime& operator+= (argType seconds); ///< adjust absolute time by number of seconds + template::value, argType>::type* = nullptr> + rlTime& operator-= (argType seconds); ///< adjust absolute time by number of seconds + template::value, argType>::type* = nullptr> + rlTime operator+ (argType seconds) const; ///< make new object with absolute time adjusted by number of seconds + template::value, argType>::type* = nullptr> + rlTime operator- (argType seconds) const; ///< make new object with absolute time adjusted by number of seconds + + // some templates to catch all other floating point type arguments and convert them to double + template::value, argType>::type* = nullptr> + rlTime& operator+= (argType seconds); ///< adjust absolute time by number of seconds + template::value, argType>::type* = nullptr> + rlTime& operator-= (argType seconds); ///< adjust absolute time by number of seconds + template::value, argType>::type* = nullptr> + rlTime operator+ (argType seconds) const; ///< make new object with absolute time adjusted by number of seconds + template::value, argType>::type* = nullptr> + rlTime operator- (argType seconds) const; ///< make new object with absolute time adjusted by number of seconds +#endif + + double operator- (const rlTime &time) const; ///< difference of two points in time in seconds.milliseconds int operator== (const rlTime &time) const; int operator< (const rlTime &time) const; @@ -108,26 +149,97 @@ class rlTime static const char* formatTimeDiff(const rlTime& t1, const rlTime& t2, enum FormatLargestUnit = HoursMinutesSecondsFraction, unsigned bufferLength = 32, char* buffer = 0); ///< Caller chooses formatting template, default is Hours:Minutes:Seconds.Milliseconds, returned object manages string memory - const char *formatTimeDiffString(double, enum FormatLargestUnit = HoursMinutesSecondsFraction); + static std::string formatTimeDiffString(double, enum FormatLargestUnit = HoursMinutesSecondsFraction); ///< Caller chooses formatting template, default is Hours:Minutes:Seconds.Milliseconds, returned object manages string memory - const char *formatTimeDiffString(const rlTime& t1, const rlTime& t2, enum FormatLargestUnit = HoursMinutesSecondsFraction); + static std::string formatTimeDiffString(const rlTime& t1, const rlTime& t2, enum FormatLargestUnit = HoursMinutesSecondsFraction); + + static + time_t timegm(struct tm* tm_); ///< emulates the POSIX function, which is i.e. under Windows not available + + void normalizeAsDate(); ///< normalizes odd constructions of time and date, such 2014-03-36 is normalized to 2014-04-05, simelar oddities for the time are corrected. + void normalizeAsRelativeTime(); // we assume 30.5 days per month and 365.25 days per year and accumulate months and years in the days component + struct RelativeTime // inline implmentation of the proxy type for adding relative time to absolutes + { + inline + RelativeTime(const rlTime& rlt) + : m_myParent_(rlt) + { + assert(rlt.objectHoldsRelativeTime); + } + + inline + operator double() const + { + return m_myParent_.seconds(); + } + + const rlTime& m_myParent_; + }; - static time_t timegm(struct tm* tm_); ///< emulates the POSIX function, - /// which is i.e. under Windows not available - void normalizeAsDate(); ///< normalizes odd constructions of time and date, - /// such 2014-03-36 is normalized to 2014-04-05, - // similar oddities for the time are corrected. private: char time_string[32*2]; // 2001-11-23 12:52:60 056 char iso_time_string[32]; // 2001-11-23T12:52:60.056 + bool objectHoldsRelativeTime:1; + #ifndef RLCPP11 explicit rlTime(double&); // intentionally no implementation, as this shall not be explicit or implicit used #endif }; +#ifdef RLCPP11 +// implementation of the template declarations and overloads above +template::value, argType>::type*> +rlTime& rlTime::operator+= (argType seconds) +{ + return this->operator +=(time_t(seconds)); +} + +template::value, argType>::type*> +rlTime& rlTime::operator-= (argType seconds) +{ + return this->operator -=(time_t(seconds)); +} + +template::value, argType>::type*> +rlTime rlTime::operator+ (argType seconds) const +{ + return this->operator +(time_t(seconds)); +} + +template::value, argType>::type*> +rlTime rlTime::operator- (argType seconds) const +{ + return this->operator -(time_t(seconds)); +} + +template::value, argType>::type*> +rlTime& rlTime::operator+= (argType seconds) +{ + return this->operator +=(double(seconds)); +} + +template::value, argType>::type*> +rlTime& rlTime::operator-= (argType seconds) +{ + return this->operator -=(double(seconds)); +} + +template::value, argType>::type*> +rlTime rlTime::operator+ (argType seconds) const +{ + return this->operator +(double(seconds)); +} + +template::value, argType>::type*> +rlTime rlTime::operator- (argType seconds) const +{ + return this->operator -(double(seconds)); +} +#endif + } // end of namespace ns_rltime_v2 #endif diff --git a/rllib/lib/testrltimeex.cpp b/rllib/lib/testrltimeex.cpp new file mode 100644 index 00000000..e1dd04b1 --- /dev/null +++ b/rllib/lib/testrltimeex.cpp @@ -0,0 +1,50 @@ +#include +#include "unistd.h" +#include "rltimeex.h" + +int main() +{ + rlTimeEx now, start, diff, t; + + now.getLocalTime(); + start = now; + /* + while(1) + { + now.getLocalTime(); + diff = now - start; + double ddiff = diff.seconds(); + printf("start=%s now=%s diff=%s seconds=%f\n", start.getIsoTimeString(), now.getIsoTimeString(), diff.getIsoTimeString(), (float) ddiff); + + t.setTimeFromSeconds(ddiff); + printf("ddiff=%lf t=%s seconds()=%f\n", ddiff, t.getIsoTimeString(), t.seconds()); + sleep(1); + } + */ + + /* + double diffsec = 61; + printf("start=%s diffsec=%lf\n", start.getIsoTimeString(), diffsec); + start -= diffsec; + printf("start=%s diffsec=%lf\n", start.getIsoTimeString(), diffsec); + */ + + /* + double diffsec = 61; + printf("start=%s diffsec=%lf\n", start.getIsoTimeString(), diffsec); + now = start - diffsec; + printf(" now=%s diffsec=%lf\n", now.getIsoTimeString(), diffsec); + + printf("toString dd-MMM-yyyy %s\n", now.toString("dd-MMM-yyyy hh:mm:ss zzz")); + printf("toString dd-MM-yyyy %s\n", now.toString("dd-MM-yyyy hh:mm:ss zzz")); + printf("toString d-M-yy %s\n", now.toString("d-M-yy h:m:s z AP")); + */ + + while(1) + { + printf("now=%s\n", now.getIsoTimeString()); + now += 1.01; + sleep(1); + } + return 0; +} diff --git a/rllib/lib/testrltimeex.sh b/rllib/lib/testrltimeex.sh new file mode 100644 index 00000000..98f45a02 --- /dev/null +++ b/rllib/lib/testrltimeex.sh @@ -0,0 +1,3 @@ +#!/bin/bash +g++ -o testrltimeex testrltimeex.cpp rltimeex.cpp -lrllib -I . +./testrltimeex diff --git a/rllib/rlfind/.gitignore b/rllib/rlfind/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/rllib/rlfind/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/rllib/rlfind/.qmake.stash b/rllib/rlfind/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/rllib/rlfind/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/rllib/rlhistory/.gitignore b/rllib/rlhistory/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/rllib/rlhistory/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/rllib/rlhistory/.qmake.stash b/rllib/rlhistory/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/rllib/rlhistory/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/rllib/rlhtml2pdf/.gitignore b/rllib/rlhtml2pdf/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/rllib/rlhtml2pdf/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/rllib/rlhtml2pdf/.qmake.stash b/rllib/rlhtml2pdf/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/rllib/rlhtml2pdf/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/rllib/rlsvg/.gitignore b/rllib/rlsvg/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/rllib/rlsvg/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/rllib/rlsvg/.qmake.stash b/rllib/rlsvg/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/rllib/rlsvg/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION diff --git a/start_pvbapp/.gitignore b/start_pvbapp/.gitignore new file mode 100644 index 00000000..d55ae3a9 --- /dev/null +++ b/start_pvbapp/.gitignore @@ -0,0 +1 @@ +/.qmake.stash diff --git a/start_pvbapp/.qmake.stash b/start_pvbapp/.qmake.stash deleted file mode 100644 index d4ff624e..00000000 --- a/start_pvbapp/.qmake.stash +++ /dev/null @@ -1,25 +0,0 @@ -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/7 \ - /usr/include/c++/7/x86_64-suse-linux \ - /usr/include/c++/7/backward \ - /usr/lib64/gcc/x86_64-suse-linux/7/include \ - /usr/local/include \ - /usr/lib64/gcc/x86_64-suse-linux/7/include-fixed \ - /usr/x86_64-suse-linux/include \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib64/gcc/x86_64-suse-linux/7 \ - /usr/lib64 \ - /lib64 \ - /usr/x86_64-suse-linux/lib \ - /lib \ - /usr/lib -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION