diff --git gtk2/common/config_file.c gtk2/common/config_file.c
index f8ed1ba..ac900d5 100644
|
|
|
31 | 31 | #define OLD_CONFIG_FILE "qtcurvestylerc" |
32 | 32 | #define VERSION_KEY "version" |
33 | 33 | |
34 | | #if defined(__MACH__) || defined(darwin) |
| 34 | #if defined(__MACH__) || defined(__APPLE__) |
35 | 35 | /* This code is public domain -- Will Hartung 4/9/09 */ |
36 | 36 | // http://stackoverflow.com/questions/735126/are-there-alternate-implementations-of-gnu-getline-interface |
37 | 37 | #include <stdio.h> |
diff --git gtk2/style/qt_settings.c gtk2/style/qt_settings.c
index 00bc7c5..e4671eb 100644
|
|
Options opts; |
49 | 49 | #define qtc_gtkrc_printf(args...) \ |
50 | 50 | gtk_rc_parse_string(QTC_LOCAL_BUFF_PRINTF(args)) |
51 | 51 | |
52 | | #if defined(__MACH__) || defined(darwin) |
| 52 | #if defined(__MACH__) || defined(__APPLE__) |
53 | 53 | /* This code is public domain -- Will Hartung 4/9/09 */ |
54 | 54 | // http://stackoverflow.com/questions/735126/are-there-alternate-implementations-of-gnu-getline-interface |
55 | 55 | #include <stdio.h> |
diff --git lib/utils/color.h lib/utils/color.h
index 2c7081f..b8aae3c 100644
|
|
|
25 | 25 | |
26 | 26 | #include "utils.h" |
27 | 27 | #include "options.h" |
| 28 | #ifdef Q_OS_MAC |
| 29 | #include <math.h> |
| 30 | #if QT_VERSION >= 0x050000 |
| 31 | #define isnan(x) std::isnan(x) |
| 32 | #endif //QT_VERSION |
| 33 | #endif // Q_OS_MAC |
28 | 34 | |
29 | 35 | QTC_BEGIN_DECLS |
30 | 36 | |
diff --git lib/utils/map.c lib/utils/map.c
index a829e9e..136a7d7 100644
|
|
|
21 | 21 | |
22 | 22 | #include "map.h" |
23 | 23 | |
| 24 | #if defined(__MACH__) || defined(__APPLE__) |
| 25 | qtcStrMapItemCompare(void *_map, const void *_left, const void *_right) |
| 26 | { |
| 27 | const char **left = (const char**)_left; |
| 28 | const char **right = (const char**)_right; |
| 29 | QtcStrMap *map = (QtcStrMap*)_map; |
| 30 | return (map->case_sensitive ? strcmp(*left, *right) : |
| 31 | strcasecmp(*left, *right)); |
| 32 | } |
| 33 | #else |
24 | 34 | static int |
25 | 35 | qtcStrMapItemCompare(const void *_left, const void *_right, void *_map) |
26 | 36 | { |
… |
… |
qtcStrMapItemCompare(const void *_left, const void *_right, void *_map) |
30 | 40 | return (map->case_sensitive ? strcmp(*left, *right) : |
31 | 41 | strcasecmp(*left, *right)); |
32 | 42 | } |
| 43 | #endif |
33 | 44 | |
34 | 45 | QTC_EXPORT void |
35 | 46 | qtcStrMapInit(QtcStrMap *map) |
36 | 47 | { |
37 | 48 | QTC_RET_IF_FAIL(map && !map->inited && map->items && map->size && map->num); |
| 49 | #if defined(__MACH__) || defined(__APPLE__) |
| 50 | qsort_r(map->items, map->num, map->size, |
| 51 | map, qtcStrMapItemCompare); |
| 52 | #else |
38 | 53 | qsort_r(map->items, map->num, map->size, |
39 | 54 | qtcStrMapItemCompare, map); |
| 55 | #endif |
40 | 56 | map->inited = true; |
41 | 57 | } |
42 | 58 | |
diff --git lib/utils/timer.c lib/utils/timer.c
index 84d058f..4687ea7 100644
|
|
|
35 | 35 | static mach_timebase_info_data_t sTimebaseInfo; |
36 | 36 | static double calibrator= 0; |
37 | 37 | |
38 | | #include <stdio.h> |
| 38 | // #include <stdio.h> |
39 | 39 | __attribute__((constructor)) static void init_HRTime() |
40 | 40 | { |
41 | 41 | if( !calibrator ){ |
42 | 42 | mach_timebase_info(&sTimebaseInfo); |
43 | 43 | /* go from absolute time units to nanoseconds: */ |
44 | 44 | calibrator= ((double)sTimebaseInfo.numer / (double)sTimebaseInfo.denom); |
45 | | fprintf( stderr, "init_HRTime(): calibrator=%g\n", calibrator ); |
| 45 | // fprintf( stderr, "init_HRTime(): calibrator=%g\n", calibrator ); |
46 | 46 | } |
47 | 47 | } |
48 | 48 | |
diff --git qt4/style/qtcurve.cpp qt4/style/qtcurve.cpp
index fa2036a..e7129ba 100644
|
|
setOpacityProp(QWidget *w, unsigned short opacity) |
581 | 581 | if (WId wid = qtcGetWid(w->window())) { |
582 | 582 | #ifdef Q_WS_X11 |
583 | 583 | qtcX11SetOpacity(wid, opacity); |
| 584 | #else |
| 585 | w->setWindowOpacity( 0.01 * opacity ); |
584 | 586 | #endif |
585 | 587 | } |
586 | 588 | } |
diff --git qt5/CMakeLists.txt qt5/CMakeLists.txt
index 1d0359e..226210d 100644
|
|
if(ENABLE_QT5) |
13 | 13 | set(QTC_QT5_DEFS ${QTC_QT5_DEFS} ${${QtModule}_DEFINITIONS}) |
14 | 14 | set(QTC_QT5_INCLUDES ${QTC_QT5_INCLUDES} ${${QtModule}_INCLUDE_DIRS}) |
15 | 15 | endforeach() |
| 16 | if(NOT APPLE) |
16 | 17 | set(QTC_QT5_OPT_MODULES Qt5X11Extras) |
| 18 | endif(NOT APPLE) |
17 | 19 | foreach(QtModule ${QTC_QT5_OPT_MODULES}) |
18 | 20 | find_package(${QtModule}) |
19 | 21 | if(${QtModule}_FOUND) |