forked from qt-creator/qt-creator
		
	RemoteLinux: Move constants and functions to more suitable locations.
Mostly to facilitate splitting up generic Linux und Maemo-specific things. Change-Id: I6072ae7deaea013219e8969d6a5254e6c5c96693 Reviewed-on: http://codereview.qt.nokia.com/2098 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
		@@ -31,6 +31,8 @@
 | 
			
		||||
**************************************************************************/
 | 
			
		||||
#include "linuxdeviceconfiguration.h"
 | 
			
		||||
 | 
			
		||||
#include "remotelinux_constants.h"
 | 
			
		||||
 | 
			
		||||
#include <QtCore/QSettings>
 | 
			
		||||
#include <QtGui/QDesktopServices>
 | 
			
		||||
 | 
			
		||||
@@ -103,10 +105,10 @@ LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QSettings &settings,
 | 
			
		||||
    if (m_osType.isEmpty()) {
 | 
			
		||||
        const int oldOsType = settings.value(OldOsVersionKey, -1).toInt();
 | 
			
		||||
        switch (oldOsType) {
 | 
			
		||||
        case 0: m_osType = Maemo5OsType; break;
 | 
			
		||||
        case 1: m_osType = HarmattanOsType; break;
 | 
			
		||||
        case 2: m_osType = MeeGoOsType; break;
 | 
			
		||||
        default: m_osType = GenericLinuxOsType;
 | 
			
		||||
        case 0: m_osType = QLatin1String("Maemo5OsType"); break;
 | 
			
		||||
        case 1: m_osType = QLatin1String("HarmattanOsType"); break;
 | 
			
		||||
        case 2: m_osType = QLatin1String("MeeGoOsType"); break;
 | 
			
		||||
        default: m_osType = QLatin1String(Constants::GenericLinuxOsType);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -162,8 +164,4 @@ void LinuxDeviceConfiguration::save(QSettings &settings) const
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const LinuxDeviceConfiguration::Id LinuxDeviceConfiguration::InvalidId = 0;
 | 
			
		||||
const QString LinuxDeviceConfiguration::Maemo5OsType = QLatin1String("Maemo5OsType");
 | 
			
		||||
const QString LinuxDeviceConfiguration::HarmattanOsType = QLatin1String("HarmattanOsType");
 | 
			
		||||
const QString LinuxDeviceConfiguration::MeeGoOsType = QLatin1String("MeeGoOsType");
 | 
			
		||||
const QString LinuxDeviceConfiguration::GenericLinuxOsType = QLatin1String("GenericLinuxOsType");
 | 
			
		||||
} // namespace RemoteLinux
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user