Renaming workbenchintegration.h/.cpp to qtcreatorintegration.h/.cpp

share/qtcreator/translations/qtcreator_de.ts

@@ -4381,9 +4381,9 @@ Using gdb 6.7 or later is strongly recommended.</source>
     </message>
 </context>
 <context>
-    <name>Designer::Internal::WorkbenchIntegration</name>
+    <name>Designer::Internal::QtCreatorIntegration</name>
     <message>
-        <location filename="../../../src/plugins/designer/workbenchintegration.cpp" line="+72"/>
+        <location filename="../../../src/plugins/designer/qtcreatorintegration.cpp" line="+72"/>
         <source>The class definition of &apos;%1&apos; could not be found in %2.</source>
         <translation type="unfinished"></translation>
     </message>

share/qtcreator/translations/qtcreator_ja.ts

@@ -4080,9 +4080,9 @@ Using gdb 6.7 or later is strongly recommended.</source>
     </message>
 </context>
 <context>
-    <name>Designer::Internal::WorkbenchIntegration</name>
+    <name>Designer::Internal::QtCreatorIntegration</name>
     <message>
-        <location filename="../../../src/plugins/designer/workbenchintegration.cpp" line="+72"/>
+        <location filename="../../../src/plugins/designer/qtcreatorintegration.cpp" line="+72"/>
         <source>The class definition of &apos;%1&apos; could not be found in %2.</source>
         <translation type="unfinished"></translation>
     </message>

src/plugins/designer/designer.pro

@@ -26,7 +26,7 @@ HEADERS += formeditorplugin.h \
         formwindowfile.h \
         formwindowhost.h \
         formwizard.h \
-        workbenchintegration.h \
+        qtcreatorintegration.h \
         designerconstants.h \
         settingspage.h \
         editorwidget.h \
@@ -41,7 +41,7 @@ SOURCES += formeditorplugin.cpp \
         formwindowfile.cpp \
         formwindowhost.cpp \
         formwizard.cpp \
-        workbenchintegration.cpp \
+        qtcreatorintegration.cpp \
         settingspage.cpp \
         editorwidget.cpp \
         formeditorw.cpp \

src/plugins/designer/formeditorw.cpp

@@ -33,7 +33,7 @@
 #include "settingsmanager.h"
 #include "settingspage.h"
 #include "editorwidget.h"
-#include "workbenchintegration.h"
+#include "qtcreatorintegration.h"
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
@@ -238,7 +238,7 @@ void FormEditorW::fullInit()
     QDesignerComponents::initializePlugins(designerEditor());
     QDesignerComponents::initializeResources();
     initDesignerSubWindows();
-    m_integration = new WorkbenchIntegration(m_formeditor, this);
+    m_integration = new QtCreatorIntegration(m_formeditor, this);
     m_formeditor->setIntegration(m_integration);
 
     /**

src/plugins/designer/qtcreatorintegration.cpp

@@ -28,7 +28,7 @@
 **************************************************************************/
 
 #include "formeditorplugin.h"
-#include "workbenchintegration.h"
+#include "qtcreatorintegration.h"
 #include "formeditorw.h"
 #include "formwindoweditor.h"
 
@@ -69,7 +69,7 @@ static QString msgClassNotFound(const QString &uiClassName, const QList<Document
             files += QLatin1String(", ");
         files += doc->fileName();
     }
-    return WorkbenchIntegration::tr("The class definition of '%1' could not be found in %2.").arg(uiClassName, files);
+    return QtCreatorIntegration::tr("The class definition of '%1' could not be found in %2.").arg(uiClassName, files);
 }
 
 static inline CppTools::CppModelManagerInterface *cppModelManagerInstance()
@@ -78,7 +78,7 @@ static inline CppTools::CppModelManagerInterface *cppModelManagerInstance()
         ->getObject<CppTools::CppModelManagerInterface>();
 }
 
-WorkbenchIntegration::WorkbenchIntegration(QDesignerFormEditorInterface *core, FormEditorW *parent) :
+QtCreatorIntegration::QtCreatorIntegration(QDesignerFormEditorInterface *core, FormEditorW *parent) :
     qdesigner_internal::QDesignerIntegration(core, ::qobject_cast<QObject*>(parent)),
     m_few(parent)
 {
@@ -89,14 +89,14 @@ WorkbenchIntegration::WorkbenchIntegration(QDesignerFormEditorInterface *core, F
             this, SLOT(slotNavigateToSlot(QString, QString, QStringList)));
 }
 
-void WorkbenchIntegration::updateSelection()
+void QtCreatorIntegration::updateSelection()
 {
     if (FormWindowEditor *afww = m_few->activeFormWindow())
         afww->updateFormWindowSelectionHandles(true);
     qdesigner_internal::QDesignerIntegration::updateSelection();
 }
 
-QWidget *WorkbenchIntegration::containerWindow(QWidget * /*widget*/) const
+QWidget *QtCreatorIntegration::containerWindow(QWidget * /*widget*/) const
 {
     FormWindowEditor *fw = m_few->activeFormWindow();
     if (!fw)
@@ -526,7 +526,7 @@ static ClassDocumentPtrPair
     return ClassDocumentPtrPair(0, Document::Ptr());
 }
 
-void WorkbenchIntegration::slotNavigateToSlot(const QString &objectName, const QString &signalSignature,
+void QtCreatorIntegration::slotNavigateToSlot(const QString &objectName, const QString &signalSignature,
         const QStringList &parameterNames)
 {
     QString errorMessage;
@@ -549,7 +549,7 @@ static inline QString uiClassName(QString formObjectName)
 // Goto slot invoked by the designer context menu. Either navigates
 // to an existing slot function or create a new one.
 
-bool WorkbenchIntegration::navigateToSlot(const QString &objectName,
+bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
                                           const QString &signalSignature,
                                           const QStringList &parameterNames,
                                           QString *errorMessage)

src/plugins/designer/qtcreatorintegration.h

@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef WORKBENCHINTEGRATION_H
+#ifndef QTCREATORINTEGRATION_H
-#define WORKBENCHINTEGRATION_H
+#define QTCREATORINTEGRATION_H
 
 #include <cpptools/cppmodelmanagerinterface.h>
 
@@ -39,10 +39,10 @@ namespace Internal {
 
 class FormEditorW;
 
-class WorkbenchIntegration : public qdesigner_internal::QDesignerIntegration {
+class QtCreatorIntegration : public qdesigner_internal::QDesignerIntegration {
     Q_OBJECT
 public:
-    WorkbenchIntegration(QDesignerFormEditorInterface *core, FormEditorW *parent = 0);
+    QtCreatorIntegration(QDesignerFormEditorInterface *core, FormEditorW *parent = 0);
 
     QWidget *containerWindow(QWidget *widget) const;
 
@@ -63,4 +63,4 @@ private:
 } // namespace Internal
 } // namespace Designer
 
-#endif // WORKBENCHINTEGRATION_H
+#endif // QTCREATORINTEGRATION_H