2 files changed, 0 insertions, 41 deletions
diff --git a/src/Authoring/Qt3DStudio/Application/StudioApp.cpp b/src/Authoring/Qt3DStudio/Application/StudioApp.cpp
index f5914702..6a0ca70a 100644
--- a/src/Authoring/Qt3DStudio/Application/StudioApp.cpp
+++ b/src/Authoring/Qt3DStudio/Application/StudioApp.cpp
@@ -204,7 +204,6 @@ int main(int argc, char *argv[])
 #include "Qt3DSDMStudioSystem.h"
 #include "Qt3DSDMInspectable.h"
 #include "Qt3DSDMSlides.h"
-#include "Qt3DSDMMaterialInspectable.h"
 #include "Qt3DSDMAnimation.h"
 #include "Qt3DSDMDataCore.h"
 #include "IDirectoryWatchingSystem.h"
@@ -215,17 +214,6 @@ CStudioApp g_StudioApp;
 
 using namespace Q3DStudio;
 
-namespace qt3ds
-{
-void Qt3DSAssert(const char *exp, const char *file, int line, bool *ignore)
-{
-    Q_UNUSED(ignore)
-    g_StudioApp.GetDialogs()->DestroyProgressScreen();
-    g_StudioApp.GetDialogs()->DisplayKnownErrorDialog(exp);
-    qFatal("Assertion thrown %s(%d): %s", file, line, exp);
-}
-}
-
 //=============================================================================
 /**
  * Constructor
@@ -1408,34 +1396,6 @@ void CStudioApp::PlaybackToggle()
         PlaybackPlay();
 }
 
-// TODO: move to more appropriate place (InspectorControlModel.cpp)
-CInspectableBase *CStudioApp::getInspectableFromInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
-{
-    CInspectableBase *inspectableBase = nullptr;
-    CDoc *doc = m_core->GetDoc();
-
-    if (doc->GetDocumentReader().IsInstance(inInstance)) {
-        CClientDataModelBridge *theBridge = doc->GetStudioSystem()->GetClientDataModelBridge();
-        qt3dsdm::Qt3DSDMSlideHandle activeSlide = doc->GetActiveSlide();
-
-        // Slide, scene or component
-        if (inInstance == theBridge->GetOwningComponentInstance(activeSlide)) {
-            Qt3DSDMInstanceHandle activeSlideInstance = doc->GetStudioSystem()->GetSlideSystem()
-                                                           ->GetSlideInstance(activeSlide);
-
-            inspectableBase = new Qt3DSDMInspectable(inInstance, activeSlideInstance);
-        }
-        if (!inspectableBase) {
-            if (theBridge->IsMaterialBaseInstance(inInstance))
-                inspectableBase = new Qt3DSDMMaterialInspectable(inInstance);
-            else
-                inspectableBase = new Qt3DSDMInspectable(inInstance);
-        }
-    }
-
-    return inspectableBase;
-}
-
 void CStudioApp::RegisterGlobalKeyboardShortcuts(CHotKeys *inShortcutHandler,
                                                  QWidget *actionParent)
 {
diff --git a/src/Authoring/Qt3DStudio/Application/StudioApp.h b/src/Authoring/Qt3DStudio/Application/StudioApp.h
index dd4acf5b..522cd6e7 100644
--- a/src/Authoring/Qt3DStudio/Application/StudioApp.h
+++ b/src/Authoring/Qt3DStudio/Application/StudioApp.h
@@ -199,7 +199,6 @@ public:
     void AdvanceUltraBigTime();
     void ReduceUltraBigTime();
     void PlaybackToggle();
-    CInspectableBase *getInspectableFromInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     void RegisterGlobalKeyboardShortcuts(CHotKeys *inShortcutHandler, QWidget *actionParent);
     bool OnSave(bool autosave = false);
     void onProjectSaveAs();