summaryrefslogtreecommitdiffstats
path: root/installerbuilder/libinstaller
diff options
context:
space:
mode:
authorkh1 <qt-info@nokia.com>2011-06-13 21:51:10 +0200
committerkh1 <qt-info@nokia.com>2011-06-13 21:51:10 +0200
commit5ba3fcc9edf27a23650e9399d6ac04ba89a6eaee (patch)
tree76d3a81fb2d656533b07ec30c69c5c8d1d03d414 /installerbuilder/libinstaller
parentf087f99f89787a573749348f462dc603edf3f625 (diff)
Remove unused classes.
Diffstat (limited to 'installerbuilder/libinstaller')
-rw-r--r--installerbuilder/libinstaller/installationprogressdialog.cpp87
-rw-r--r--installerbuilder/libinstaller/installationprogressdialog.h61
-rw-r--r--installerbuilder/libinstaller/kdmmappedfileiodevice.cpp108
-rw-r--r--installerbuilder/libinstaller/kdmmappedfileiodevice.h64
-rw-r--r--installerbuilder/libinstaller/libinstaller.pro4
5 files changed, 0 insertions, 324 deletions
diff --git a/installerbuilder/libinstaller/installationprogressdialog.cpp b/installerbuilder/libinstaller/installationprogressdialog.cpp
deleted file mode 100644
index 44bfb1966..000000000
--- a/installerbuilder/libinstaller/installationprogressdialog.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt SDK**
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).*
-**
-** Contact: Nokia Corporation qt-info@nokia.com**
-**
-** 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
-**
-** 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 are unsure which license is appropriate for your use, please contact
-** (qt-info@nokia.com).
-**
-**************************************************************************/
-#include "installationprogressdialog.h"
-#include "performinstallationform.h"
-#include "progresscoordinator.h"
-#include "common/utils.h"
-
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QLayout>
-#include <QtGui/QPushButton>
-
-using namespace QInstaller;
-
-InstallationProgressDialog::InstallationProgressDialog(QWidget *parent)
- : QDialog(parent),
- m_performInstallationForm(new PerformInstallationForm(this))
-{
- m_performInstallationForm->setupUi(this);
- connect(ProgressCoordninator::instance(), SIGNAL( detailTextChanged( QString ) ),
- m_performInstallationForm, SLOT( appendProgressDetails( QString ) ) );
- connect(ProgressCoordninator::instance(), SIGNAL(detailTextResetNeeded()),
- m_performInstallationForm, SLOT(clearDetailsBrowser()));
-
- m_dialogBtns = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Ok, Qt::Horizontal, this);
- m_dialogBtns->button(QDialogButtonBox::Ok)->setEnabled(false);
- layout()->addWidget( m_dialogBtns );
-
- connect(m_dialogBtns, SIGNAL( rejected() ), this, SIGNAL( canceled() ) );
- connect(m_dialogBtns, SIGNAL( rejected() ), this, SLOT( reject() ) );
- connect(m_dialogBtns, SIGNAL( accepted() ), this, SLOT( close() ) );
-
- m_dialogBtns->button( QDialogButtonBox::Ok )->setEnabled( false );
- m_dialogBtns->button( QDialogButtonBox::Cancel )->setEnabled( true );
-
- m_performInstallationForm->enableDetails();
- m_performInstallationForm->startUpdateProgress();
-}
-
-InstallationProgressDialog::~InstallationProgressDialog()
-{
- delete m_performInstallationForm;
-}
-
-
-//bool InstallationProgressDialog::isShowingDetails() const
-//{
-// return m_performInstallationForm->isShowingDetails();
-//}
-
-void InstallationProgressDialog::finished()
-{
- m_performInstallationForm->stopUpdateProgress();
- m_performInstallationForm->scrollDetailsToTheEnd();
- m_performInstallationForm->setDetailsButtonEnabled(false);
- m_dialogBtns->button(QDialogButtonBox::Ok)->setEnabled( true );
- m_dialogBtns->button(QDialogButtonBox::Cancel)->setEnabled( false );
-}
diff --git a/installerbuilder/libinstaller/installationprogressdialog.h b/installerbuilder/libinstaller/installationprogressdialog.h
deleted file mode 100644
index 712a7794a..000000000
--- a/installerbuilder/libinstaller/installationprogressdialog.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt SDK**
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
-**
-** Contact: Nokia Corporation qt-info@nokia.com**
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please contact
-** (qt-info@nokia.com).
-**
-**************************************************************************/
-#ifndef INSTALLATIONPROGRESSDIALOG_H
-#define INSTALLATIONPROGRESSDIALOG_H
-
-#include <QtGui/QDialog>
-
-QT_BEGIN_NAMESPACE
-class QDialogButtonBox;
-QT_END_NAMESPACE
-
-namespace QInstaller {
-
-class PerformInstallationForm;
-
-class InstallationProgressDialog : public QDialog
-{
- Q_OBJECT
-
-public:
- explicit InstallationProgressDialog( QWidget* parent=0 );
- ~InstallationProgressDialog();
- //bool isShowingDetails() const;
-
-Q_SIGNALS:
- void canceled();
-
-private Q_SLOTS:
- void finished();
-
-private:
- PerformInstallationForm *m_performInstallationForm;
- QDialogButtonBox* m_dialogBtns;
-};
-
-} // namespace QInstaller
-
-#endif
diff --git a/installerbuilder/libinstaller/kdmmappedfileiodevice.cpp b/installerbuilder/libinstaller/kdmmappedfileiodevice.cpp
deleted file mode 100644
index 888f1e803..000000000
--- a/installerbuilder/libinstaller/kdmmappedfileiodevice.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt SDK**
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).*
-**
-** Contact: Nokia Corporation qt-info@nokia.com**
-**
-** 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
-**
-** 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 are unsure which license is appropriate for your use, please contact
-** (qt-info@nokia.com).
-**
-**************************************************************************/
-#include "kdmmappedfileiodevice.h"
-
-#include <cassert>
-
-#include <QFile>
-
-KDMMappedFileIODevice::KDMMappedFileIODevice( QFile* file, qint64 offset, qint64 length, QObject* parent )
- : QIODevice( parent )
- , m_file( file )
- , m_ownsFile( false )
- , m_offset( offset )
- , m_length( length )
- , m_data( 0 ) {
- assert( m_file );
-}
-
-KDMMappedFileIODevice::KDMMappedFileIODevice( const QString& filename, qint64 offset, qint64 length, QObject* parent )
- : QIODevice( parent )
- , m_file( new QFile( filename ) )
- , m_ownsFile( true )
- , m_offset( offset )
- , m_length( length )
- , m_data( 0 ) {
- if ( !open( QIODevice::ReadOnly ) )
- assert( !"Could not open device" );
-}
-
-KDMMappedFileIODevice::~KDMMappedFileIODevice() {
- assert( m_file );
- if ( m_ownsFile )
- delete m_file;
-}
-
-qint64 KDMMappedFileIODevice::readData( char* data, qint64 maxSize ) {
- ensureMapped();
- if ( maxSize < 0 )
- return 0;
- const qint64 actual = std::min( maxSize, m_length - pos() );
- memcpy( data, m_data + pos(), actual );
- return actual;
-}
-
-qint64 KDMMappedFileIODevice::writeData( const char* data, qint64 maxSize ) {
- Q_UNUSED( data )
- Q_UNUSED( maxSize )
- ensureMapped();
- assert( !"not implemented" );
- return -1;
-}
-
-bool KDMMappedFileIODevice::ensureMapped() {
- if ( m_data )
- return true;
- assert( m_file );
- m_data = m_file->map( m_offset, m_length );
- return m_data != false;
-}
-
-bool KDMMappedFileIODevice::open( QIODevice::OpenMode openMode ) {
- if ( openMode != QIODevice::ReadOnly )
- qWarning( "%s: Write not supported\n", Q_FUNC_INFO );
- if ( openMode == QIODevice::WriteOnly )
- return false;
- const bool opened = m_file->open( openMode );
- if ( opened )
- setOpenMode( openMode );
- return opened;
-}
-
-void KDMMappedFileIODevice::close() {
- if ( m_data )
- m_file->unmap( m_data );
- m_data = 0;
- m_file->close();
-}
-
diff --git a/installerbuilder/libinstaller/kdmmappedfileiodevice.h b/installerbuilder/libinstaller/kdmmappedfileiodevice.h
deleted file mode 100644
index d4c5e51d5..000000000
--- a/installerbuilder/libinstaller/kdmmappedfileiodevice.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt SDK**
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
-**
-** Contact: Nokia Corporation qt-info@nokia.com**
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please contact
-** (qt-info@nokia.com).
-**
-**************************************************************************/
-#ifndef KDMMAPPEDFILEIODEVICE_H
-#define KDMMAPPEDFILEIODEVICE_H
-
-#include <QtCore/QIODevice>
-
-#include "installer_global.h"
-
-QT_BEGIN_NAMESPACE
-class QFile;
-QT_END_NAMESPACE
-
-class INSTALLER_EXPORT KDMMappedFileIODevice : public QIODevice
-{
- Q_OBJECT
-
-public:
- KDMMappedFileIODevice( QFile* file, qint64 offset, qint64 length, QObject* parent=0 );
- KDMMappedFileIODevice( const QString& filename, qint64 offset, qint64 length, QObject* parent=0 );
- ~KDMMappedFileIODevice();
-
- /* reimp */ bool open( QIODevice::OpenMode openMode );
- /* reimp */ void close();
-
-private:
- /* reimp */ qint64 readData( char* data, qint64 maxSize );
- /* reimp */ qint64 writeData( const char* data, qint64 maxSize );
-
-private:
- bool ensureMapped();
-
-private:
- QFile* const m_file;
- const bool m_ownsFile;
- const qint64 m_offset;
- const qint64 m_length;
- unsigned char* m_data;
-};
-
-#endif // KDMMAPPEDFILEIODEVICE_H
diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro
index f0457213e..9cf4f0f3a 100644
--- a/installerbuilder/libinstaller/libinstaller.pro
+++ b/installerbuilder/libinstaller/libinstaller.pro
@@ -40,7 +40,6 @@ HEADERS += $$PWD/qinstaller.h \
../common/zipjob.h \
../common/utils.h \
../common/errors.h \
- kdmmappedfileiodevice.h \
component.h \
componentmodel.h \
qinstallerglobal.h \
@@ -80,7 +79,6 @@ HEADERS += $$PWD/qinstaller.h \
fsengineclient.h \
fsengineserver.h \
elevatedexecuteoperation.h \
- installationprogressdialog.h \
fakestopprocessforupdateoperation.h \
lazyplaintextedit.h \
progresscoordinator.h \
@@ -108,7 +106,6 @@ SOURCES += $$PWD/qinstaller.cpp \
../common/installersettings.cpp \
../common/fileutils.cpp \
../common/utils.cpp \
- kdmmappedfileiodevice.cpp \
component.cpp \
componentmodel.cpp \
qtpatch.cpp \
@@ -144,7 +141,6 @@ SOURCES += $$PWD/qinstaller.cpp \
fsengineclient.cpp \
fsengineserver.cpp \
elevatedexecuteoperation.cpp \
- installationprogressdialog.cpp \
fakestopprocessforupdateoperation.cpp \
lazyplaintextedit.cpp \
progresscoordinator.cpp \