Commit 9575ac9a authored by Maik Qualmann's avatar Maik Qualmann

deprecated Q_OS_OSX ==> Q_OS_MACOS

parent 3a0a677f
Pipeline #26917 canceled with stage
......@@ -130,7 +130,7 @@ int main(int argc, char* argv[])
#endif
#ifndef Q_OS_OSX
#ifndef Q_OS_MACOS
app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
......
......@@ -89,7 +89,7 @@ ExpoBlendingIntroPage::ExpoBlendingIntroPage(ExpoBlendingManager* const mngr, QW
d->binariesWidget->addBinary(d->mngr->alignBinary());
d->binariesWidget->addBinary(d->mngr->enfuseBinary());
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
// Hugin bundle PKG install
d->binariesWidget->addDirectory(QLatin1String("/Applications/Hugin/HuginTools"));
d->binariesWidget->addDirectory(QLatin1String("/Applications/Hugin/Hugin.app/Contents/MacOS"));
......
......@@ -140,7 +140,7 @@ PanoIntroPage::PanoIntroPage(PanoManager* const mngr, QWizard* const dlg)
d->mngr->checkBinaries();
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
// Hugin bundle PKG install
......
......@@ -39,7 +39,7 @@ public:
GimpBinary()
: DBinaryIface(
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
QLatin1String("GIMP-bin"),
......
......@@ -108,7 +108,7 @@ AdvPrintIntroPage::AdvPrintIntroPage(QWizard* const dialog, const QString& title
d->binSearch = new DBinarySearch(binaryBox);
d->binSearch->addBinary(d->gimpBin);
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
// Gimp bundle PKG install
......
......@@ -131,7 +131,7 @@ MailIntroPage::MailIntroPage(QWizard* const dialog, const QString& title)
d->binSearch->addBinary(d->sylphBin);
d->binSearch->addBinary(d->thundBin);
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
// Std Macports install
......
......@@ -136,7 +136,7 @@ void DatabaseSettingsWidget::setupMainArea()
d->dbBinariesWidget->addDirectory(QLatin1String("/usr/sbin"));
#endif
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
// Std Macports install
d->dbBinariesWidget->addDirectory(QLatin1String("/opt/local/bin"));
d->dbBinariesWidget->addDirectory(QLatin1String("/opt/local/sbin"));
......
......@@ -501,7 +501,7 @@ QStringList IccProfile::defaultSearchPaths()
candidates << QDir::rootPath() + QLatin1String("/Windows/Spool/Drivers/Color/"); // For Win2K and WinXP
candidates << QDir::rootPath() + QLatin1String("/Windows/Color/"); // For Win98 and WinMe
#elif defined (Q_OS_OSX)
#elif defined (Q_OS_MACOS)
// Use a scheme highly identical to the Linux scheme, adapted for MacPorts in /opt/local, ofcial PKG installer, and the OS X standard ColorSync directories
......
......@@ -306,7 +306,7 @@ IccProfile IccSettings::Private::profileFromWindowSystem(QWidget* const widget)
#elif defined Q_OS_WIN
//TODO
Q_UNUSED(widget);
#elif defined Q_OS_OSX
#elif defined Q_OS_MACOS
//TODO
Q_UNUSED(widget);
#else
......
......@@ -78,7 +78,7 @@ QFileInfoList DPluginLoader::Private::pluginEntriesList() const
qCDebug(DIGIKAM_GENERAL_LOG) << "Parsing plugins from" << path;
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
QString filter(QLatin1String("*.dylib *.so"));
#elif defined Q_OS_WIN
QString filter(QLatin1String("*.dll"));
......
......@@ -243,7 +243,7 @@ int get_mem_stats(Digikam::KMemoryInfo::KMemoryInfoData* const data)
MEMORYSTATUSEX memstats;
#endif
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
Q_UNUSED(data);
#endif
......@@ -559,7 +559,7 @@ int get_mem_stats(Digikam::KMemoryInfo::KMemoryInfoData* const data)
int get_swap_stats(Digikam::KMemoryInfo::KMemoryInfoData* const data)
{
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
Q_UNUSED(data);
#endif
......
......@@ -225,7 +225,7 @@ void ApplicationSettings::readSettings()
d->showPermanentDeleteDialog = group.readEntry(d->configShowPermanentDeleteDialogEntry, true);
d->sidebarApplyDirectly = group.readEntry(d->configApplySidebarChangesDirectlyEntry, false);
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
d->useNativeFileDialog = group.readEntry(d->configUseNativeFileDialogEntry, true);
#else
d->useNativeFileDialog = group.readEntry(d->configUseNativeFileDialogEntry, false);
......
......@@ -298,7 +298,7 @@ void DFileOperations::openInFileManager(const QList<QUrl>& urls)
return;
}
#elif defined Q_OS_OSX
#elif defined Q_OS_MACOS
QStringList args;
args << QLatin1String("-e");
......
......@@ -202,7 +202,7 @@ void DBinaryIface::slotNavigateAndCheck()
}
else
{
#if defined Q_OS_OSX
#if defined Q_OS_MACOS
start = QUrl::fromLocalFile(QLatin1String("/Applications/"));
#elif defined Q_OS_WIN
start = QUrl::fromLocalFile(QLatin1String("C:/Program Files/"));
......
......@@ -160,7 +160,7 @@ QFileDialog::Option DFileDialog::getNativeFileDialogOption()
group = config->group(QLatin1String("ImageViewer Settings"));
}
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
bool useNativeFileDialog = group.readEntry(QLatin1String("Use Native File Dialog"), true);
#else
bool useNativeFileDialog = group.readEntry(QLatin1String("Use Native File Dialog"), false);
......
......@@ -139,7 +139,7 @@ bool ItemViewToolTip::eventFilter(QObject* o, QEvent* e)
switch (e->type())
{
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
case QEvent::KeyPress:
case QEvent::KeyRelease:
{
......@@ -157,7 +157,7 @@ bool ItemViewToolTip::eventFilter(QObject* o, QEvent* e)
break;
}
#endif // Q_OS_OSX
#endif // Q_OS_MACOS
case QEvent::Leave:
hide(); // could add a 300ms timer here, like Qt
......
......@@ -354,7 +354,7 @@ void DXmlGuiWindow::createSidebarActions()
void DXmlGuiWindow::createSettingsActions()
{
d->showMenuBarAction = KStandardAction::showMenubar(this, SLOT(slotShowMenuBar()), actionCollection());
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
// Under MacOS the menu bar visibility is managed by desktop.
d->showMenuBarAction->setVisible(false);
......
......@@ -102,7 +102,7 @@ int main(int argc, char* argv[])
#endif
#ifndef Q_OS_OSX
#ifndef Q_OS_MACOS
app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
......
......@@ -287,7 +287,7 @@ void ShowfotoSettings::readSettings()
d->showSplash = group.readEntry(d->configShowSplash, true);
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
d->nativeFileDialog = group.readEntry(d->configNativeFileDialog, true);
#else
d->nativeFileDialog = group.readEntry(d->configNativeFileDialog, false);
......
......@@ -55,14 +55,14 @@ WelcomePage::WelcomePage(QWizard* const dlg)
"</qt>",
QLatin1String(digikam_version_short));
#if defined Q_OS_WIN || defined Q_OS_OSX
#if defined Q_OS_WIN || defined Q_OS_MACOS
// Windows settings place.
QString newPlace = QLatin1String("~/Local Settings/");
QString oldPlace = QLatin1String("~/AppData/Local/");
#if defined Q_OS_OSX
#if defined Q_OS_MACOS
// MacOS settings place.
......
......@@ -910,7 +910,7 @@ void SetupICC::slotShowDefaultSearchPaths()
QDir::rootPath(),
existingPaths);
#elif defined (Q_OS_OSX)
#elif defined (Q_OS_MACOS)
QString text = i18n("On Mac OS X, the default search paths include "
"<ul>"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment