update Q_OS_MAC ifdefs for Qt 5

This commit is contained in:
Stephen Birarda 2013-08-15 11:12:17 -07:00
parent 10109fff10
commit c6baa56022
3 changed files with 6 additions and 10 deletions

View file

@ -9,7 +9,7 @@
#include "quazip.h"
#include "quazipfile.h"
#ifdef Q_WS_MAC
#ifdef Q_OS_MAC
#include "CoreFoundation/CoreFoundation.h"
#endif
@ -228,7 +228,7 @@ void FvUpdater::httpUpdateDownloadFinished()
{
if (reply->isReadable())
{
#ifdef Q_WS_MAC
#ifdef Q_OS_MAC
CFURLRef appURLRef = CFBundleCopyBundleURL(CFBundleGetMainBundle());
char path[PATH_MAX];
if (!CFURLGetFileSystemRepresentation(appURLRef, TRUE, (UInt8 *)path, PATH_MAX)) {

View file

@ -160,7 +160,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
}
// setup QSettings
#ifdef Q_WS_MAC
#ifdef Q_OS_MAC
QString resourcesPath = QCoreApplication::applicationDirPath() + "/../Resources";
#else
QString resourcesPath = QCoreApplication::applicationDirPath() + "/resources";
@ -217,13 +217,14 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
_window->setCentralWidget(_glWidget);
#if defined(Q_WS_MAC) && defined(QT_NO_DEBUG)
#if defined(Q_OS_MAC) && defined(QT_NO_DEBUG)
// if this is a release OS X build use fervor to check for an update
FvUpdater::sharedUpdater()->SetFeedURL("https://s3-us-west-1.amazonaws.com/highfidelity/appcast.xml");
FvUpdater::sharedUpdater()->CheckForUpdatesSilent();
#endif
initMenu();
// call Menu getInstance static method to set up the menur
Menu::getInstance();
QRect available = desktop()->availableGeometry();
_window->resize(available.size());
@ -1636,10 +1637,6 @@ void Application::pasteVoxels() {
}
}
void Application::initMenu() {
}
void Application::setListenModeNormal() {
_audio.setListenMode(AudioRingBuffer::NORMAL);
}

View file

@ -201,7 +201,6 @@ private:
static void processAvatarFaceVideoMessage(unsigned char* packetData, size_t dataBytes);
static void sendPingPackets();
void initMenu();
void updateFrustumRenderModeAction();
void initDisplay();
void init();