From 14ceda410c18d8a88b7316bd58f606ddc301dc54 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Wed, 14 Apr 2010 09:48:41 +0200
Subject: [PATCH] Maemo: Put package creation widget into its own class.
It will grow.
---
.../qt-maemo/maemopackagecreationstep.cpp | 14 +---
.../qt-maemo/maemopackagecreationwidget.cpp | 69 +++++++++++++++++++
.../qt-maemo/maemopackagecreationwidget.h | 68 ++++++++++++++++++
.../qt4projectmanager/qt-maemo/qt-maemo.pri | 6 +-
4 files changed, 142 insertions(+), 15 deletions(-)
create mode 100644 src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
create mode 100644 src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.h
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
index 1c029be179c..9d3fc608768 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
@@ -42,6 +42,7 @@
#include "maemopackagecreationstep.h"
#include "maemoconstants.h"
+#include "maemopackagecreationwidget.h"
#include "maemotoolchain.h"
#include <qt4buildconfiguration.h>
@@ -58,22 +59,9 @@
using ProjectExplorer::BuildConfiguration;
using ProjectExplorer::BuildStepConfigWidget;
-
namespace Qt4ProjectManager {
namespace Internal {
-class MaemoPackageCreationWidget : public ProjectExplorer::BuildStepConfigWidget
-{
-public:
- MaemoPackageCreationWidget(MaemoPackageCreationStep *step)
- : ProjectExplorer::BuildStepConfigWidget(), m_step(step) {}
- virtual void init() {}
- virtual QString summaryText() const { return tr("Package Creation"); }
- virtual QString displayName() const { return m_step->displayName(); }
-private:
- MaemoPackageCreationStep *m_step;
-};
-
MaemoPackageCreationStep::MaemoPackageCreationStep(BuildConfiguration *buildConfig)
: ProjectExplorer::BuildStep(buildConfig, CreatePackageId)
{
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
new file mode 100644
index 00000000000..aabcf8d302e
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of Qt Creator.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.
+**
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "maemopackagecreationwidget.h"
+
+#include "maemopackagecreationstep.h"
+
+namespace Qt4ProjectManager {
+namespace Internal {
+
+MaemoPackageCreationWidget::MaemoPackageCreationWidget(MaemoPackageCreationStep *step)
+ : ProjectExplorer::BuildStepConfigWidget(), m_step(step)
+{
+}
+
+void MaemoPackageCreationWidget::init()
+{
+}
+
+QString MaemoPackageCreationWidget::summaryText() const
+{
+ return tr("Package Creation");
+}
+
+QString MaemoPackageCreationWidget::displayName() const
+{
+ return m_step->displayName();
+}
+
+} // namespace Internal
+} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.h b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.h
new file mode 100644
index 00000000000..b03331ff795
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of Qt Creator.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.
+**
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MAEMOPACKAGECREATIONWIDGET_H
+#define MAEMOPACKAGECREATIONWIDGET_H
+
+#include <projectexplorer/buildstep.h>
+
+namespace Qt4ProjectManager {
+namespace Internal {
+
+class MaemoPackageCreationStep;
+
+class MaemoPackageCreationWidget : public ProjectExplorer::BuildStepConfigWidget
+{
+ Q_OBJECT
+public:
+ MaemoPackageCreationWidget(MaemoPackageCreationStep *step);
+
+ virtual void init();
+ virtual QString summaryText() const;
+ virtual QString displayName() const;
+private:
+ MaemoPackageCreationStep * const m_step;
+};
+
+} // namespace Internal
+} // namespace Qt4ProjectManager
+
+#endif // MAEMOPACKAGECREATIONWIDGET_H
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri b/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
index 240a22f6000..0ccdaa8414a 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
+++ b/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
@@ -18,7 +18,8 @@ HEADERS += \
$$PWD/maemotoolchain.h \
$$PWD/maemopackagecreationstep.h \
$$PWD/maemopackagecreationfactory.h \
- $$PWD/ne7sshobject.h
+ $$PWD/ne7sshobject.h \
+ $$PWD/maemopackagecreationwidget.h
SOURCES += \
$$PWD/maemoconfigtestdialog.cpp \
@@ -35,7 +36,8 @@ SOURCES += \
$$PWD/maemotoolchain.cpp \
$$PWD/maemopackagecreationstep.cpp \
$$PWD/maemopackagecreationfactory.cpp \
- $$PWD/ne7sshobject.cpp
+ $$PWD/ne7sshobject.cpp \
+ $$PWD/maemopackagecreationwidget.cpp
FORMS += \
$$PWD/maemoconfigtestdialog.ui \
--
GitLab