Clean up import hierarchy

PythonExtension.QtCreator.*
  -> QtCreator.*
PythonExtension.PluginInstance
  -> QtCreator.PythonExtensions

Also enables imports of the form "from QtCreator import Core" it is no
longer necessary to write QtCreator.Core....

Change-Id: Ib9b433868dcc3fc7d1d534c6023bae7bf6d05fec
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/plugins/pythonextensions/pythonextensionsplugin.cpp b/plugins/pythonextensions/pythonextensionsplugin.cpp
index 893819c..59b32a1 100644
--- a/plugins/pythonextensions/pythonextensionsplugin.cpp
+++ b/plugins/pythonextensions/pythonextensionsplugin.cpp
@@ -188,13 +188,13 @@ void PythonExtensionsPlugin::initializePythonBindings()
         QDir().mkpath(pythonPackagePath());
     PyUtil::addToSysPath(pythonPackagePath().toStdString());
     // Initialize the Python context and register global Qt Creator variable
-    if (!PyUtil::bindShibokenModuleObject("PythonExtension", "QtCreator")) {
+    if (!PyUtil::bindCoreModules()) {
         qWarning() << "Python bindings could not be initialized";
         Core::MessageManager::write(Constants::MESSAGE_MANAGER_PREFIX + tr("Python bindings could not be initialized"));
         return;
     }
     // Bind the plugin instance
-    PyUtil::bindObject("PythonExtension", "PluginInstance", PyUtil::PythonExtensionsPluginType, this);
+    PyUtil::bindObject("QtCreator", "PythonExtensions", PyUtil::PythonExtensionsPluginType, this);
 }
 
 void PythonExtensionsPlugin::initializeOptionalBindings()