feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

remove unused return value

Browse Source 
Change-Id: I92451d983f685df18651d700ed28a8eb275d2ea1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Tim Jenssen
2014-12-09 14:50:13 +01:00
parent fbfafd0a01
commit 8df9c08dca
9 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+1 -3
View File
@@ -251,10 +251,8 @@ void NodeInstanceServer::createScene(const CreateSceneCommand &command)
QUnifiedTimer::instance()->setSlowdownFactor(0.00001);
QUnifiedTimer::instance()->setSlowModeEnabled(true);
QList<ServerNodeInstance> instanceList = setupScene(command);
setupScene(command);
refreshBindings();
startRenderTimer();
}
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h
+1 -1
View File
@@ -171,7 +171,7 @@ protected:
void setSlowRenderTimerInterval(int timerInterval);
virtual void initializeView() = 0;
virtual QList<ServerNodeInstance> setupScene(const CreateSceneCommand &command) = 0;
virtual void setupScene(const CreateSceneCommand &command) = 0;
void loadDummyDataFiles(const QString& directory);
void loadDummyDataContext(const QString& directory);
void loadDummyDataFile(const QFileInfo& fileInfo);
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+2 -5
View File
@@ -88,17 +88,14 @@ void Qt5NodeInstanceServer::resetAllItems()
DesignerSupport::resetDirty(item);
}
QList<ServerNodeInstance> Qt5NodeInstanceServer::setupScene(const CreateSceneCommand &command)
void Qt5NodeInstanceServer::setupScene(const CreateSceneCommand &command)
{
setupFileUrl(command.fileUrl());
setupImports(command.imports());
setupDummyData(command.fileUrl());
QList<ServerNodeInstance> instanceList = setupInstances(command);
setupInstances(command);
quickView()->resize(rootNodeInstance().boundingRect().size().toSize());
return instanceList;
}
QList<QQuickItem*> subItems(QQuickItem *parentItem)
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
+1 -1
View File
@@ -64,7 +64,7 @@ protected:
void initializeView() Q_DECL_OVERRIDE;
void resizeCanvasSizeToRootItemSize() Q_DECL_OVERRIDE;
void resetAllItems();
QList<ServerNodeInstance> setupScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE;
void setupScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE;
QList<QQuickItem*> allItems() const;
private:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
-1
View File
@@ -51,7 +51,6 @@ void Qt5PreviewNodeInstanceServer::createScene(const CreateSceneCommand &command
{
initializeView();
setupScene(command);
startRenderTimer();
}
void Qt5PreviewNodeInstanceServer::startRenderTimer()
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp
+1 -3
View File
@@ -250,10 +250,8 @@ void NodeInstanceServer::createScene(const CreateSceneCommand &command)
QUnifiedTimer::instance()->setSlowdownFactor(0.00001);
QUnifiedTimer::instance()->setSlowModeEnabled(true);
QList<ServerNodeInstance> instanceList = setupScene(command);
setupScene(command);
refreshBindings();
startRenderTimer();
}
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.h
+1 -1
View File
@@ -172,7 +172,7 @@ protected:
void setSlowRenderTimerInterval(int timerInterval);
virtual void initializeView() = 0;
virtual QList<ServerNodeInstance> setupScene(const CreateSceneCommand &command) = 0;
virtual void setupScene(const CreateSceneCommand &command) = 0;
void loadDummyDataFiles(const QString& directory);
void loadDummyDataContext(const QString& directory);
void loadDummyDataFile(const QFileInfo& fileInfo);
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp
+2 -5
View File
@@ -121,7 +121,7 @@ bool Qt4NodeInstanceServer::nonInstanceChildIsDirty(QGraphicsObject *graphicsObj
return false;
}
QList<ServerNodeInstance> Qt4NodeInstanceServer::setupScene(const CreateSceneCommand &command)
void Qt4NodeInstanceServer::setupScene(const CreateSceneCommand &command)
{
setupFileUrl(command.fileUrl());
setupImports(command.imports());
@@ -129,11 +129,8 @@ QList<ServerNodeInstance> Qt4NodeInstanceServer::setupScene(const CreateSceneCom
static_cast<QGraphicsScenePrivate*>(QObjectPrivate::get(declarativeView()->scene()))->processDirtyItemsEmitted = true;
QList<ServerNodeInstance> instanceList = setupInstances(command);
setupInstances(command);
declarativeView()->scene()->setSceneRect(rootNodeInstance().boundingRect());
return instanceList;
}
void Qt4NodeInstanceServer::refreshBindings()
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.h
+1 -1
View File
@@ -61,7 +61,7 @@ protected:
void resizeCanvasSizeToRootItemSize();
void resetAllItems();
bool nonInstanceChildIsDirty(QGraphicsObject *graphicsObject) const;
QList<ServerNodeInstance> setupScene(const CreateSceneCommand &command);
void setupScene(const CreateSceneCommand &command);
void refreshScreenObject();
private: