From 817b69fd4f2dde7429fd26013decd1885018927e Mon Sep 17 00:00:00 2001 From: -f Date: Wed, 12 Feb 2014 16:11:12 +0100 Subject: [PATCH] Scene objects no more indexed --- src/adaptors/UBSvgSubsetAdaptor.h | 1 - src/domain/UBGraphicsScene.cpp | 7 +------ src/domain/UBGraphicsScene.h | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/adaptors/UBSvgSubsetAdaptor.h b/src/adaptors/UBSvgSubsetAdaptor.h index e8089abc..5835f8e0 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.h +++ b/src/adaptors/UBSvgSubsetAdaptor.h @@ -86,7 +86,6 @@ class UBSvgSubsetAdaptor static const QString sFontWeightPrefix; static const QString sFontStylePrefix; - static QString readTeacherGuideNode(int sceneIndex); private: static UBGraphicsScene* loadScene(UBDocumentProxy* proxy, const QByteArray& pArray); diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 192c21e5..e6e1859b 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -307,7 +307,6 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent, bool enableUndoRedoSta , mArcPolygonItem(0) , mRenderingContext(Screen) , mCurrentStroke(0) - , mShouldUseOMP(true) , mItemCount(0) , mUndoRedoStackEnabled(enableUndoRedoStack) , magniferControlViewWidget(0) @@ -318,11 +317,7 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent, bool enableUndoRedoSta , mSelectionFrame(0) { UBCoreGraphicsScene::setObjectName("BoardScene"); -#ifdef __ppc__ - mShouldUseOMP = false; -#elif defined(Q_WS_MAC) - mShouldUseOMP = QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5; -#endif + setItemIndexMethod(NoIndex); setUuid(QUuid::createUuid()); setDocument(parent); diff --git a/src/domain/UBGraphicsScene.h b/src/domain/UBGraphicsScene.h index 7a59512c..af489271 100644 --- a/src/domain/UBGraphicsScene.h +++ b/src/domain/UBGraphicsScene.h @@ -413,13 +413,10 @@ public slots: UBGraphicsStroke* mCurrentStroke; - bool mShouldUseOMP; - int mItemCount; QList mFastAccessItems; // a local copy as QGraphicsScene::items() is very slow in Qt 4.6 - //int mMesure1Ms, mMesure2Ms; bool mHasCache; // tmp stub for divide addings scene objects from undo mechanism implementation