Skip to content
Snippets Groups Projects
Commit 9da98805 authored by Eike Ziller's avatar Eike Ziller Committed by hjk
Browse files

Remove dead code. 


Change-Id: Ifb5a14f587358e696eb3e199f5d223832a0c2837
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent c03b9b0c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tests/manual/progressmanager/find.png deleted 100644 → 0
+ 0
− 0
View file @ c03b9b0c
tests/manual/progressmanager/find.png

737 B

tests/manual/progressmanager/main.cpp deleted 100644 → 0
+ 0
− 43
View file @ c03b9b0c
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2012 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.
**
** 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.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#include "roundprogress.h"
#include <QtGui/QApplication>
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
roundprogress w;
w.show();
return a.exec();
}
tests/manual/progressmanager/roundprogress.cpp deleted 100644 → 0
+ 0
− 70
View file @ c03b9b0c
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2012 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.
**
** 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.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#include "roundprogress.h"
#include "multitask.h"
#include "runextensions.h"
roundprogress::roundprogress(QWidget *parent)
: QWidget(parent), task(MyInternalTask(true)), task2(MyInternalTask(false))
{
ui.setupUi(this);
ui.progressButton->setIcon(QIcon("find.png"));
connect(ui.startButton, SIGNAL(clicked()), this, SLOT(start()));
connect(ui.startButton2, SIGNAL(clicked()), this, SLOT(start2()));
connect(ui.startBothButton, SIGNAL(clicked()), this, SLOT(start3()));
ui.startButton->setFocus();
}
void roundprogress::start()
{
if (future.isRunning())
return;
future = QtConcurrent::run(&MyInternalTask::run, &task);
ui.progressButton->setFuture(future);
}
void roundprogress::start2()
{
if (future.isRunning())
return;
future = QtConcurrent::run(&MyInternalTask::run, &task2);
ui.progressButton->setFuture(future);
}
void roundprogress::start3()
{
if (future.isRunning())
return;
future = QtConcurrent::run(&MyInternalTask::run, QList<MyInternalTask*>() << &task2 << &task);
ui.progressButton->setFuture(future);
}
tests/manual/progressmanager/roundprogress.h deleted 100644 → 0
+ 0
− 117
View file @ c03b9b0c
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2012 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.
**
** 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.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#ifndef ROUNDPROGRESS_H
#define ROUNDPROGRESS_H
#include "ui_roundprogress.h"
#include <QtCore>
#include <QtGui>
#include <QtDebug>
#include <QtGui/QMainWindow>
#include <QtCore/QFutureInterface>
#include <QtCore/QFuture>
class MyInternalTask : public QObject
{
Q_OBJECT
public:
static const int MAX = 10;
MyInternalTask(bool withProgress)
{
m_hasProgress = withProgress;
if (m_hasProgress)
m_duration = 4000;
else
m_duration = 2500;
}
MyInternalTask(const MyInternalTask &) : QObject() {}
void run(QFutureInterface<void> &f)
{
m_future = &f;
m_count = 0;
m_future->setProgressRange(0, (m_hasProgress ? MAX : 0));
m_future->setProgressValueAndText(m_count, tr("Starting..."));
m_loop = new QEventLoop;
m_timer = new QTimer;
m_timer->setInterval(m_duration/MAX);
m_timer->setSingleShot(false);
connect(m_timer, SIGNAL(timeout()), this, SLOT(advance()));
m_timer->start();
m_loop->exec();
delete m_timer;
delete m_loop;
}
private slots:
void advance()
{
++m_count;
m_future->setProgressValueAndText(m_count, tr("Something happening %1").arg(m_count));
if (m_count == MAX || m_future->isCanceled()) {
m_future->setProgressValueAndText(m_count, tr("Finished!"));
m_loop->quit();
}
}
private:
bool m_hasProgress;
QEventLoop *m_loop;
QTimer *m_timer;
QFutureInterface<void> *m_future;
int m_count;
int m_duration;
};
class roundprogress : public QWidget
{
Q_OBJECT
public:
roundprogress(QWidget *parent = 0);
~roundprogress() {}
private slots:
void start();
void start2();
void start3();
private:
Ui::roundprogressClass ui;
MyInternalTask task;
MyInternalTask task2;
QFuture<void> future;
};
#endif // ROUNDPROGRESS_H
tests/manual/progressmanager/roundprogress.pro deleted 100644 → 0
+ 0
− 15
View file @ c03b9b0c
TARGET = roundprogress
TEMPLATE = app
QT += core \
gui
INCLUDEPATH += $$PWD/../../../src/plugins/core/progressmanager $$PWD/../../../src/libs/qtconcurrent
SOURCES += main.cpp \
roundprogress.cpp \
$$PWD/../../../src/plugins/core/progressmanager/progresspie.cpp \
$$PWD/../../../src/plugins/core/progressmanager/futureprogress.cpp
HEADERS += roundprogress.h \
$$PWD/../../../src/libs/qtconcurrent/multitask.h \
$$PWD/../../../src/plugins/core/progressmanager/progresspie_p.h \
$$PWD/../../../src/plugins/core/progressmanager/progresspie.h \
$$PWD/../../../src/plugins/core/progressmanager/futureprogress.h
FORMS += roundprogress.ui
tests/manual/progressmanager/roundprogress.ui deleted 100644 → 0
+ 0
− 52
View file @ c03b9b0c
<ui version="4.0" >
<class>roundprogressClass</class>
<widget class="QWidget" name="roundprogressClass" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>212</width>
<height>144</height>
</rect>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="FutureProgress" name="progressButton" >
<property name="font" >
<font/>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QPushButton" name="startButton" >
<property name="text" >
<string>Start with progress</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QPushButton" name="startButton2" >
<property name="text" >
<string>Start with animation</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QPushButton" name="startBothButton" >
<property name="text" >
<string>Start both</string>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>FutureProgress</class>
<extends>QToolButton</extends>
<header>../../../src/plugins/core/progressmanager/futureprogress.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment