Ticket #11094: 0001-qt5-defines.patch

File 0001-qt5-defines.patch, 6.2 KB (added by Gary Buhrmaster <gary.buhrmaster@…>, 13 years ago)

  • mythplugins/mythgallery/mythgallery/gallerysettings.cpp 

    diff --git a/mythplugins/mythgallery/mythgallery/gallerysettings.cpp b/mythplugins/mythgallery/mythgallery/gallerysettings.cpp
index c23db74..984b00f 100644
    a b static HostLineEdit *MythGalleryDir()  
    3939{
    4040    HostLineEdit *gc = new HostLineEdit("GalleryDir");
    4141    gc->setLabel(QObject::tr("Directory that holds images"));
    42 #ifdef Q_WS_MACX
     42#ifdef Q_OS_MAC
    4343    gc->setValue(QDir::homePath() + "/Pictures");
    4444#else
    4545    gc->setValue("/var/lib/pictures");

  • mythtv/libs/libmyth/mythcontext.cpp 

    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)  
    244244    SilenceDBerrors();
    245245
    246246    gCoreContext->OverrideSettingForSession("Theme", DEFAULT_UI_THEME);
    247 #ifdef Q_WS_MACX
     247#ifdef Q_OS_MAC
    248248    // Qt 4.4 has window-focus problems
    249249    gCoreContext->OverrideSettingForSession("RunFrontendInWindow", "1");
    250250#endif

  • mythtv/libs/libmythbase/mythcommandlineparser.cpp 

    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)  
    14851485            return false;
    14861486        }
    14871487
    1488 #ifdef Q_WS_MACX
     1488#ifdef Q_OS_MAC
    14891489        if (opt.startsWith("-psn_"))
    14901490        {
    14911491            cerr << "Ignoring Process Serial Number from command line"

  • mythtv/libs/libmythmetadata/globals.cpp 

    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";  
    2929const QString JUMP_VIDEO_GALLERY = "Video Gallery";
    3030const QString JUMP_VIDEO_DEFAULT = "Video Default";
    3131
    32 #ifdef Q_WS_MACX
     32#ifdef Q_OS_MAC
    3333const QString DEFAULT_VIDEOSTARTUP_DIR = QDir::homePath() + "/Movies";
    3434#else
    3535const QString DEFAULT_VIDEOSTARTUP_DIR = "/share/Movies/dvd";

  • mythtv/libs/libmythui/mythdisplay.cpp 

    diff --git a/mythtv/libs/libmythui/mythdisplay.cpp b/mythtv/libs/libmythui/mythdisplay.cpp
index 651a9a5..2bf6fb2 100644
    a b  
    22#include "mythdisplay.h"
    33#include "mythmainwindow.h"
    44
    5 #if defined(Q_WS_MAC)
     5#if defined(Q_OS_MAC)
    66#import "util-osx.h"
    77#elif USING_X11
    88#include "mythxdisplay.h"
    … … DisplayInfo MythDisplay::GetDisplayInfo(int video_rate)  
    4141{
    4242    DisplayInfo ret;
    4343
    44 #if defined(Q_WS_MAC)
     44#if defined(Q_OS_MAC)
    4545    CGDirectDisplayID disp = GetOSXDisplay(GetWindowID());
    4646    if (!disp)
    4747        return ret;
    … … DisplayInfo MythDisplay::GetDisplayInfo(int video_rate)  
    6363    uint height = (uint)CGDisplayPixelsHigh(disp);
    6464    ret.res     = QSize(width, height);
    6565
    66 #elif defined(Q_WS_WIN)
     66#elif defined(Q_OS_WIN)
    6767    HDC hdc = GetDC(GetWindowID());
    6868    int rate = 0;
    6969    if (hdc)

  • mythtv/libs/libmythui/mythmainwindow.cpp 

    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)  
    12981298        currentWidget()->setEnabled(false);
    12991299
    13001300    d->widgetList.push_back(child);
    1301 #ifndef Q_WS_MACX
     1301#ifndef Q_OS_MAC
    13021302    child->winId();
    13031303#endif
    13041304    child->raise();

  • mythtv/libs/libmythui/mythrender_opengl.cpp 

    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,  
    7676        LOG(VB_GENERAL, LOG_INFO, LOC + "Sync to VBlank is enabled (good!)");
    7777    }
    7878
    79 #if defined(Q_WS_MAC)
     79#if defined(Q_OS_MAC)
    8080    LOG(VB_GENERAL, LOG_INFO, LOC + "Forcing swap interval for OS X.");
    8181    setswapinterval = true;
    8282#endif
    … … void MythRenderOpenGL::doneCurrent()  
    175175
    176176void MythRenderOpenGL::Release(void)
    177177{
    178 #if !defined(Q_WS_WIN)
     178#if !defined(Q_OS_WIN)
    179179    while (m_lock_level > 0)
    180180        doneCurrent();
    181181#endif

  • mythtv/libs/libmythui/mythrender_opengl.h 

    diff --git a/mythtv/libs/libmythui/mythrender_opengl.h b/mythtv/libs/libmythui/mythrender_opengl.h
index 2d15a5d..f5721b6 100644
    a b  
    2323#include <GL/glext.h>
    2424#endif
    2525
    26 #ifdef Q_WS_MACX
     26#ifdef Q_OS_MAC
    2727#include "util-osx.h"
    2828#import <agl.h>
    2929#endif

  • mythtv/programs/mythfrontend/globalsettings.cpp 

    diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
index 75fc5ee..b466067 100644
    a b OSDSettings::OSDSettings()  
    34593459    //cc->addChild(DecodeVBIFormat());
    34603460    //addChild(cc);
    34613461
    3462 #if CONFIG_DARWIN
     3462#if Q_OS_MAC
    34633463    // Any Mac OS-specific OSD stuff would go here.
    3464     // Note that this define should be Q_WS_MACX
    34653464#endif
    34663465}
    34673466

  • mythtv/programs/mythfrontend/main.cpp 

    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)  
    14671467
    14681468    CleanupGuard callCleanup(cleanup);
    14691469
    1470 #ifdef Q_WS_MACX
     1470#ifdef Q_OS_MAC
    14711471    // Without this, we can't set focus to any of the CheckBoxSetting, and most
    14721472    // of the MythPushButton widgets, and they don't use the themed background.
    14731473    QApplication::setDesktopSettingsAware(false);

  • mythtv/programs/mythtv-setup/main.cpp 

    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[])  
    276276
    277277    CleanupGuard callCleanup(cleanup);
    278278
    279 #ifdef Q_WS_MACX
     279#ifdef Q_OS_MAC
    280280    // Without this, we can't set focus to any of the CheckBoxSetting, and most
    281281    // of the MythPushButton widgets, and they don't use the themed background.
    282282    QApplication::setDesktopSettingsAware(FALSE);