diff --git a/src/libs/utils/hostosinfo.cpp b/src/libs/utils/hostosinfo.cpp deleted file mode 100644 index d00887f719d..00000000000 --- a/src/libs/utils/hostosinfo.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ -** -** -** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ -#include "hostosinfo.h" - -namespace Utils { - -HostOsInfo::HostOs HostOsInfo::hostOs() -{ -#if defined(Q_OS_WIN) - return HostOsWindows; -#elif defined(Q_OS_LINUX) - return HostOsLinux; -#elif defined(Q_OS_MAC) - return HostOsMac; -#elif defined(Q_OS_UNIX) - return HostOsOtherUnix; -#else - return HostOsOther; -#endif -} - -bool HostOsInfo::isAnyUnixHost() -{ -#ifdef Q_OS_UNIX - return true; -#else - return false; -#endif -} - -} // namespace Utils diff --git a/src/libs/utils/hostosinfo.h b/src/libs/utils/hostosinfo.h index e456ff7e73f..84df1f05479 100644 --- a/src/libs/utils/hostosinfo.h +++ b/src/libs/utils/hostosinfo.h @@ -40,14 +40,38 @@ public: // Add more as needed. enum HostOs { HostOsWindows, HostOsLinux, HostOsMac, HostOsOtherUnix, HostOsOther }; - static HostOs hostOs(); + static inline HostOs hostOs(); static bool isWindowsHost() { return hostOs() == HostOsWindows; } static bool isLinuxHost() { return hostOs() == HostOsLinux; } static bool isMacHost() { return hostOs() == HostOsMac; } - static bool isAnyUnixHost(); + static inline bool isAnyUnixHost(); }; +HostOsInfo::HostOs HostOsInfo::hostOs() +{ +#if defined(Q_OS_WIN) + return HostOsWindows; +#elif defined(Q_OS_LINUX) + return HostOsLinux; +#elif defined(Q_OS_MAC) + return HostOsMac; +#elif defined(Q_OS_UNIX) + return HostOsOtherUnix; +#else + return HostOsOther; +#endif +} + +bool HostOsInfo::isAnyUnixHost() +{ +#ifdef Q_OS_UNIX + return true; +#else + return false; +#endif +} + } // namespace Utils #endif // HOSTOSINFO_H diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro index fa2d8ccc716..30bba918bab 100644 --- a/src/libs/utils/utils.pro +++ b/src/libs/utils/utils.pro @@ -17,8 +17,7 @@ HEADERS += \ hostosinfo.h SOURCES += \ - proxyaction.cpp \ - hostosinfo.cpp + proxyaction.cpp win32: LIBS += -lUser32 # PortsGatherer