Maemo: Move MaemoQemuRuntime class to its own file.

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h b/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
index a426269..9040e3f 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
@@ -39,14 +39,6 @@
 namespace Qt4ProjectManager {
 namespace Internal {
 
-enum QemuStatus {
-    QemuStarting,
-    QemuFailedToStart,
-    QemuFinished,
-    QemuCrashed,
-    QemuUserReason
-};
-
 #define PREFIX "Qt4ProjectManager.MaemoRunConfiguration"
 
 #ifdef Q_OS_WIN32

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h b/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
index b83296b..5ffa242 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
@@ -31,9 +31,8 @@
 #define QEMURUNTIMEMANAGER_H
 
 #include "maemoconstants.h"
-#include "maemodeviceconfigurations.h"
+#include "maemoqemuruntime.h"
 
-#include <QtCore/QHash>
 #include <QtCore/QMap>
 #include <QtCore/QObject>
 #include <QtCore/QProcess>
@@ -57,24 +56,6 @@ namespace Qt4ProjectManager {
     namespace Internal {
     class MaemoRunConfiguration;
 
-struct MaemoQemuRuntime
-{
-    MaemoQemuRuntime() {}
-    MaemoQemuRuntime(const QString &root)
-        : m_root(root) {}
-    bool isValid() const {
-        return !m_bin.isEmpty();
-    }
-
-    QString m_name;
-    QString m_bin;
-    QString m_root;
-    QString m_args;
-    QString m_sshPort;
-    QString m_watchPath;
-    QHash<QString, QString> m_environment;
-    MaemoPortList m_freePorts;
-};
 
 class MaemoQemuManager : public QObject
 {
@@ -166,7 +147,7 @@ private:
     QFileSystemWatcher *m_runtimeFolderWatcher;
 };
 
-    }   // namespace Qt4ProjectManager
 }   // namespace Internal
+}   // namespace Qt4ProjectManager
 
 #endif  // QEMURUNTIMEMANAGER_H

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntime.h b/src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntime.h
new file mode 100644 (file)
index 0000000..0e78481
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntime.h
@@ -0,0 +1,69 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+**************************************************************************/
+#ifndef MAEMOQEMURUNTIME_H
+#define MAEMOQEMURUNTIME_H
+
+#include "maemodeviceconfigurations.h"
+
+#include <QtCore/QHash>
+#include <QtCore/QString>
+
+namespace Qt4ProjectManager {
+namespace Internal {
+
+enum QemuStatus {
+    QemuStarting,
+    QemuFailedToStart,
+    QemuFinished,
+    QemuCrashed,
+    QemuUserReason
+};
+
+struct MaemoQemuRuntime
+{
+    MaemoQemuRuntime() {}
+    MaemoQemuRuntime(const QString &root) : m_root(root) {}
+    bool isValid() const {
+        return !m_bin.isEmpty();
+    }
+
+    QString m_name;
+    QString m_bin;
+    QString m_root;
+    QString m_args;
+    QString m_sshPort;
+    QString m_watchPath;
+    QHash<QString, QString> m_environment;
+    MaemoPortList m_freePorts;
+};
+
+}   // namespace Internal
+}   // namespace Qt4ProjectManager
+
+#endif // MAEMOQEMURUNTIME_H

diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri b/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
index 4fb2963..e8051fa 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
+++ b/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
@@ -41,7 +41,8 @@ HEADERS += \
     $$PWD/maemopublishinguploadsettingspagefremantlefree.h \
     $$PWD/maemopublishingwizardfremantlefree.h \
     $$PWD/maemopublishingresultpagefremantlefree.h \
-    $$PWD/maemopublisherfremantlefree.h
+    $$PWD/maemopublisherfremantlefree.h \
+    $$PWD/maemoqemuruntime.h
 
 SOURCES += \
     $$PWD/maemoconfigtestdialog.cpp \