Rename OsxProbe to XcodeProbe.

This name is more accurate and more consistent with e.g. MsvcProbe.

Change-Id: I7694da8070dba80178db733c434eb4bd777cc469
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

5 files changed, 22 insertions, 22 deletions

diff --git a/src/app/detect-toolchains/detect-toolchains.pro b/src/app/detect-toolchains/detect-toolchains.pro
index d6bfb83ca..755c5f8dc 100644
--- a/src/app/detect-toolchains/detect-toolchains.pro
+++ b/src/app/detect-toolchains/detect-toolchains.pro
@@ -2,5 +2,5 @@ include(../app.pri)
 
 TARGET = qbs-detect-toolchains
 
-HEADERS += probe.h msvcprobe.h ../shared/qbssettings.h osxprobe.h
-SOURCES += main.cpp probe.cpp msvcprobe.cpp osxprobe.cpp
+HEADERS += probe.h msvcprobe.h xcodeprobe.h ../shared/qbssettings.h
+SOURCES += main.cpp probe.cpp msvcprobe.cpp xcodeprobe.cpp
diff --git a/src/app/detect-toolchains/detect-toolchains.qbs b/src/app/detect-toolchains/detect-toolchains.qbs
index 2eb701eaa..7af4b458d 100644
--- a/src/app/detect-toolchains/detect-toolchains.qbs
+++ b/src/app/detect-toolchains/detect-toolchains.qbs
@@ -8,10 +8,10 @@ QbsApp {
         "main.cpp",
         "msvcprobe.cpp",
         "msvcprobe.h",
-        "osxprobe.cpp",
-        "osxprobe.h",
         "probe.cpp",
-        "probe.h"
+        "probe.h",
+        "xcodeprobe.cpp",
+        "xcodeprobe.h"
     ]
 }
 
diff --git a/src/app/detect-toolchains/probe.cpp b/src/app/detect-toolchains/probe.cpp
index fd85bb598..431b29ca4 100644
--- a/src/app/detect-toolchains/probe.cpp
+++ b/src/app/detect-toolchains/probe.cpp
@@ -29,7 +29,7 @@
 #include "probe.h"
 
 #include "msvcprobe.h"
-#include "osxprobe.h"
+#include "xcodeprobe.h"
 #include "../shared/logging/consolelogger.h"
 
 #include <logging/translator.h>
@@ -222,7 +222,7 @@ int probe(Settings *settings)
         msvcProbe(settings, profiles);
         mingwProbe(settings, profiles);
     } else if (HostOsInfo::isOsxHost()) {
-        osxProbe(settings, profiles);
+        xcodeProbe(settings, profiles);
         specific_probe(settings, profiles, QLatin1String("gcc"));
         specific_probe(settings, profiles, QLatin1String("clang"));
     } else {
diff --git a/src/app/detect-toolchains/osxprobe.cpp b/src/app/detect-toolchains/xcodeprobe.cpp
index 7c38082fe..a93e488b6 100644
--- a/src/app/detect-toolchains/osxprobe.cpp
+++ b/src/app/detect-toolchains/xcodeprobe.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "osxprobe.h"
 #include "probe.h"
+#include "xcodeprobe.h"
 
 #include "../shared/logging/consolelogger.h"
 
@@ -59,10 +59,10 @@ static QString qsystem(const QString &exe, const QStringList &args = QStringList
     return QString::fromLocal8Bit(p.readAll());
 }
 
-class OsxProbe
+class XcodeProbe
 {
 public:
-    OsxProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles)
+    XcodeProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles)
         : settings(settings), profiles(profiles)
     { }
 
@@ -78,7 +78,7 @@ private:
     QStringList developerPaths;
 };
 
-int OsxProbe::compareVersions(const QString &v1, const QString &v2)
+int XcodeProbe::compareVersions(const QString &v1, const QString &v2)
 {
     QStringList v1L = v1.split(QLatin1Char('.'));
     QStringList v2L = v2.split(QLatin1Char('.'));
@@ -104,7 +104,7 @@ int OsxProbe::compareVersions(const QString &v1, const QString &v2)
     return 0;
 }
 
-bool OsxProbe::addDeveloperPath(const QString &path)
+bool XcodeProbe::addDeveloperPath(const QString &path)
 {
     if (path.isEmpty())
         return false;
@@ -118,7 +118,7 @@ bool OsxProbe::addDeveloperPath(const QString &path)
     return true;
 }
 
-void OsxProbe::detectDeveloperPaths()
+void XcodeProbe::detectDeveloperPaths()
 {
     QProcess selectedXcode;
     QString program = "/usr/bin/xcode-select";
@@ -133,7 +133,7 @@ void OsxProbe::detectDeveloperPaths()
     addDeveloperPath(QLatin1String("/Applications/Xcode.app/Contents/Developer"));
 }
 
-void OsxProbe::setArch(Profile *profile, const QString &pathToGcc, const QStringList &extraFlags)
+void XcodeProbe::setArch(Profile *profile, const QString &pathToGcc, const QStringList &extraFlags)
 {
     if (!extraFlags.isEmpty()) {
         profile->setValue("cpp.platformCommonCompilerFlags", extraFlags);
@@ -164,7 +164,7 @@ void OsxProbe::setArch(Profile *profile, const QString &pathToGcc, const QString
     profile->setValue("qbs.architecture", HostOsInfo::canonicalArchitecture(architecture));
 }
 
-void OsxProbe::setupDefaultToolchains(const QString &devPath, const QString &xCodeName)
+void XcodeProbe::setupDefaultToolchains(const QString &devPath, const QString &xCodeName)
 {
     qbsInfo() << Tr::tr("Setting up profile '%1'.").arg(xCodeName);
     QString indent = QLatin1String("  ");
@@ -332,7 +332,7 @@ void OsxProbe::setupDefaultToolchains(const QString &devPath, const QString &xCo
     }
 }
 
-void OsxProbe::detectAll()
+void XcodeProbe::detectAll()
 {
     detectDeveloperPaths();
     QString xcodeName = QLatin1String("xcode");
@@ -343,9 +343,9 @@ void OsxProbe::detectAll()
 }
 } // end anonymous namespace
 
-void osxProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles)
+void xcodeProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles)
 {
-    OsxProbe probe(settings, profiles);
+    XcodeProbe probe(settings, profiles);
     probe.detectAll();
 }
 
diff --git a/src/app/detect-toolchains/osxprobe.h b/src/app/detect-toolchains/xcodeprobe.h
index 70da56a91..ee5f5e7ad 100644
--- a/src/app/detect-toolchains/osxprobe.h
+++ b/src/app/detect-toolchains/xcodeprobe.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef OSXPROBE_H
-#define OSXPROBE_H
+#ifndef XCODEPROBE_H
+#define XCODEPROBE_H
 
 #include <QList>
 
@@ -37,6 +37,6 @@ class Profile;
 class Settings;
 }
 
-void osxProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles);
+void xcodeProbe(qbs::Settings *settings, QList<qbs::Profile> &profiles);
 
-#endif // OSXPROBE_H
+#endif // XCODEPROBE_H