diff --git a/mythplugins/mythgallery/mythgallery/gallerysettings.cpp b/mythplugins/mythgallery/mythgallery/gallerysettings.cpp
index c23db74..984b00f 100644
a
|
b
|
static HostLineEdit *MythGalleryDir() |
39 | 39 | { |
40 | 40 | HostLineEdit *gc = new HostLineEdit("GalleryDir"); |
41 | 41 | gc->setLabel(QObject::tr("Directory that holds images")); |
42 | | #ifdef Q_WS_MACX |
| 42 | #ifdef Q_OS_MAC |
43 | 43 | gc->setValue(QDir::homePath() + "/Pictures"); |
44 | 44 | #else |
45 | 45 | gc->setValue("/var/lib/pictures"); |
diff --git a/mythtv/libs/libmyth/mythcontext.cpp b/mythtv/libs/libmyth/mythcontext.cpp
index 3505b6d..c5cfa5c 100644
a
|
b
|
void MythContextPrivate::TempMainWindow(bool languagePrompt) |
244 | 244 | SilenceDBerrors(); |
245 | 245 | |
246 | 246 | gCoreContext->OverrideSettingForSession("Theme", DEFAULT_UI_THEME); |
247 | | #ifdef Q_WS_MACX |
| 247 | #ifdef Q_OS_MAC |
248 | 248 | // Qt 4.4 has window-focus problems |
249 | 249 | gCoreContext->OverrideSettingForSession("RunFrontendInWindow", "1"); |
250 | 250 | #endif |
diff --git a/mythtv/libs/libmythbase/mythcommandlineparser.cpp b/mythtv/libs/libmythbase/mythcommandlineparser.cpp
index 3bbac88..cf2108a 100644
a
|
b
|
bool MythCommandLineParser::Parse(int argc, const char * const * argv) |
1485 | 1485 | return false; |
1486 | 1486 | } |
1487 | 1487 | |
1488 | | #ifdef Q_WS_MACX |
| 1488 | #ifdef Q_OS_MAC |
1489 | 1489 | if (opt.startsWith("-psn_")) |
1490 | 1490 | { |
1491 | 1491 | cerr << "Ignoring Process Serial Number from command line" |
diff --git a/mythtv/libs/libmythmetadata/globals.cpp b/mythtv/libs/libmythmetadata/globals.cpp
index ae594e0..dd65bc4 100644
a
|
b
|
const QString JUMP_VIDEO_TREE = "Video Listings"; |
29 | 29 | const QString JUMP_VIDEO_GALLERY = "Video Gallery"; |
30 | 30 | const QString JUMP_VIDEO_DEFAULT = "Video Default"; |
31 | 31 | |
32 | | #ifdef Q_WS_MACX |
| 32 | #ifdef Q_OS_MAC |
33 | 33 | const QString DEFAULT_VIDEOSTARTUP_DIR = QDir::homePath() + "/Movies"; |
34 | 34 | #else |
35 | 35 | const QString DEFAULT_VIDEOSTARTUP_DIR = "/share/Movies/dvd"; |
diff --git a/mythtv/libs/libmythui/mythdisplay.cpp b/mythtv/libs/libmythui/mythdisplay.cpp
index 651a9a5..2bf6fb2 100644
a
|
b
|
|
2 | 2 | #include "mythdisplay.h" |
3 | 3 | #include "mythmainwindow.h" |
4 | 4 | |
5 | | #if defined(Q_WS_MAC) |
| 5 | #if defined(Q_OS_MAC) |
6 | 6 | #import "util-osx.h" |
7 | 7 | #elif USING_X11 |
8 | 8 | #include "mythxdisplay.h" |
… |
… |
DisplayInfo MythDisplay::GetDisplayInfo(int video_rate) |
41 | 41 | { |
42 | 42 | DisplayInfo ret; |
43 | 43 | |
44 | | #if defined(Q_WS_MAC) |
| 44 | #if defined(Q_OS_MAC) |
45 | 45 | CGDirectDisplayID disp = GetOSXDisplay(GetWindowID()); |
46 | 46 | if (!disp) |
47 | 47 | return ret; |
… |
… |
DisplayInfo MythDisplay::GetDisplayInfo(int video_rate) |
63 | 63 | uint height = (uint)CGDisplayPixelsHigh(disp); |
64 | 64 | ret.res = QSize(width, height); |
65 | 65 | |
66 | | #elif defined(Q_WS_WIN) |
| 66 | #elif defined(Q_OS_WIN) |
67 | 67 | HDC hdc = GetDC(GetWindowID()); |
68 | 68 | int rate = 0; |
69 | 69 | if (hdc) |
diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
index 53ffe57..13ef2ad 100644
a
|
b
|
void MythMainWindow::attach(QWidget *child) |
1298 | 1298 | currentWidget()->setEnabled(false); |
1299 | 1299 | |
1300 | 1300 | d->widgetList.push_back(child); |
1301 | | #ifndef Q_WS_MACX |
| 1301 | #ifndef Q_OS_MAC |
1302 | 1302 | child->winId(); |
1303 | 1303 | #endif |
1304 | 1304 | child->raise(); |
diff --git a/mythtv/libs/libmythui/mythrender_opengl.cpp b/mythtv/libs/libmythui/mythrender_opengl.cpp
index 10a9999..85ee086 100644
a
|
b
|
MythRenderOpenGL* MythRenderOpenGL::Create(const QString &painter, |
76 | 76 | LOG(VB_GENERAL, LOG_INFO, LOC + "Sync to VBlank is enabled (good!)"); |
77 | 77 | } |
78 | 78 | |
79 | | #if defined(Q_WS_MAC) |
| 79 | #if defined(Q_OS_MAC) |
80 | 80 | LOG(VB_GENERAL, LOG_INFO, LOC + "Forcing swap interval for OS X."); |
81 | 81 | setswapinterval = true; |
82 | 82 | #endif |
… |
… |
void MythRenderOpenGL::doneCurrent() |
175 | 175 | |
176 | 176 | void MythRenderOpenGL::Release(void) |
177 | 177 | { |
178 | | #if !defined(Q_WS_WIN) |
| 178 | #if !defined(Q_OS_WIN) |
179 | 179 | while (m_lock_level > 0) |
180 | 180 | doneCurrent(); |
181 | 181 | #endif |
diff --git a/mythtv/libs/libmythui/mythrender_opengl.h b/mythtv/libs/libmythui/mythrender_opengl.h
index 2d15a5d..f5721b6 100644
a
|
b
|
|
23 | 23 | #include <GL/glext.h> |
24 | 24 | #endif |
25 | 25 | |
26 | | #ifdef Q_WS_MACX |
| 26 | #ifdef Q_OS_MAC |
27 | 27 | #include "util-osx.h" |
28 | 28 | #import <agl.h> |
29 | 29 | #endif |
diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
index 75fc5ee..b466067 100644
a
|
b
|
OSDSettings::OSDSettings() |
3459 | 3459 | //cc->addChild(DecodeVBIFormat()); |
3460 | 3460 | //addChild(cc); |
3461 | 3461 | |
3462 | | #if CONFIG_DARWIN |
| 3462 | #if Q_OS_MAC |
3463 | 3463 | // Any Mac OS-specific OSD stuff would go here. |
3464 | | // Note that this define should be Q_WS_MACX |
3465 | 3464 | #endif |
3466 | 3465 | } |
3467 | 3466 | |
diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp
index 0192097..1fc82dc 100644
a
|
b
|
int main(int argc, char **argv) |
1467 | 1467 | |
1468 | 1468 | CleanupGuard callCleanup(cleanup); |
1469 | 1469 | |
1470 | | #ifdef Q_WS_MACX |
| 1470 | #ifdef Q_OS_MAC |
1471 | 1471 | // Without this, we can't set focus to any of the CheckBoxSetting, and most |
1472 | 1472 | // of the MythPushButton widgets, and they don't use the themed background. |
1473 | 1473 | QApplication::setDesktopSettingsAware(false); |
diff --git a/mythtv/programs/mythtv-setup/main.cpp b/mythtv/programs/mythtv-setup/main.cpp
index 36cd975..8fb33ac 100644
a
|
b
|
int main(int argc, char *argv[]) |
276 | 276 | |
277 | 277 | CleanupGuard callCleanup(cleanup); |
278 | 278 | |
279 | | #ifdef Q_WS_MACX |
| 279 | #ifdef Q_OS_MAC |
280 | 280 | // Without this, we can't set focus to any of the CheckBoxSetting, and most |
281 | 281 | // of the MythPushButton widgets, and they don't use the themed background. |
282 | 282 | QApplication::setDesktopSettingsAware(FALSE); |