Rename QmlProfilerExtended to QmlProfilerExtension

Change-Id: I90325b264e2a41e9b52d7953c6e96e13c938705a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

plugins/qmlprofilerextended/qmlprofilerextended.pro

@@ -1,23 +0,0 @@
-TARGET = QmlProfilerExtended
-TEMPLATE = lib
-
-PROVIDER = Digia
-include(../../qtcreatorplugin.pri)
-include(qmlprofilerextended_dependencies.pri)
-
-DEFINES += QMLPROFILEREXTENDED_LIBRARY
-
-# QmlProfilerExtended files
-
-SOURCES += qmlprofilerextendedplugin.cpp \
-        scenegraphtimelinemodel.cpp \
-        pixmapcachemodel.cpp
-
-HEADERS += qmlprofilerextendedplugin.h \
-        qmlprofilerextended_global.h \
-        qmlprofilerextendedconstants.h \
-        scenegraphtimelinemodel.h \
-        pixmapcachemodel.h
-
-OTHER_FILES += \
-    QmlProfilerExtended.json

plugins/qmlprofilerextension/QmlProfilerExtension.pluginspec.in

@@ -1,4 +1,4 @@
-<plugin name=\"QmlProfilerExtended\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
+<plugin name=\"QmlProfilerExtension\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
     <vendor>Digia Plc</vendor>
     <copyright>(C) 2013 Digia Plc</copyright>
     <license>
@@ -7,7 +7,7 @@
     Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.
     </license>
     <category>Qt Quick</category>
-    <description>Qml Profiler Extended Plugin</description>
+    <description>Qml Profiler Extension Plugin</description>
     <url>http://www.qt-project.org</url>
     $$dependencyList
 </plugin>

plugins/qmlprofilerextension/pixmapcachemodel.cpp

@@ -22,7 +22,7 @@
 
 #include <QDebug>
 
-namespace QmlProfilerExtended {
+namespace QmlProfilerExtension {
 namespace Internal {
 
 using namespace QmlProfiler::Internal;
@@ -539,4 +539,4 @@ void PixmapCacheModel::PixmapCacheModelPrivate::computeRowCounts()
 
 
 } // namespace Internal
-} // namespace QmlProfilerExtended
+} // namespace QmlProfilerExtension

plugins/qmlprofilerextension/pixmapcachemodel.h

@@ -26,7 +26,7 @@
 #include <QStringList>
 #include <QColor>
 
-namespace QmlProfilerExtended {
+namespace QmlProfilerExtension {
 namespace Internal {
 
 class PixmapCacheModel : public QmlProfiler::AbstractTimelineModel
@@ -116,6 +116,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmlProfilerExtended
+} // namespace QmlProfilerExtension
 
 #endif // PIXMAPCACHEMODEL_H

plugins/qmlprofilerextension/qmlprofilerextension.pro

@@ -0,0 +1,23 @@
+TARGET = QmlProfilerExtension
+TEMPLATE = lib
+
+PROVIDER = Digia
+include(../../qtcreatorplugin.pri)
+include(qmlprofilerextension_dependencies.pri)
+
+DEFINES += QMLPROFILEREXTENSION_LIBRARY
+
+# QmlProfilerExtension files
+
+SOURCES += qmlprofilerextensionplugin.cpp \
+        scenegraphtimelinemodel.cpp \
+        pixmapcachemodel.cpp
+
+HEADERS += qmlprofilerextensionplugin.h \
+        qmlprofilerextension_global.h \
+        qmlprofilerextensionconstants.h \
+        scenegraphtimelinemodel.h \
+        pixmapcachemodel.h
+
+OTHER_FILES += \
+    QmlProfilerExtension.json

plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri

@@ -1,4 +1,4 @@
-QTC_PLUGIN_NAME = QmlProfilerExtended
+QTC_PLUGIN_NAME = QmlProfilerExtension
 #QTC_LIB_DEPENDS += \
 #    qmldebug \
 #    extensionsystem

plugins/qmlprofilerextension/qmlprofilerextension_global.h

@@ -16,16 +16,16 @@
 **
 ****************************************************************************/
 
-#ifndef QMLPROFILEREXTENDED_GLOBAL_H
-#define QMLPROFILEREXTENDED_GLOBAL_H
+#ifndef QMLPROFILEREXTENSION_GLOBAL_H
+#define QMLPROFILEREXTENSION_GLOBAL_H
 
 #include <QtGlobal>
 
-#if defined(QMLPROFILEREXTENDED_LIBRARY)
-#  define QMLPROFILEREXTENDEDSHARED_EXPORT Q_DECL_EXPORT
+#if defined(QMLPROFILEREXTENSION_LIBRARY)
+#  define QMLPROFILEREXTENSIONSHARED_EXPORT Q_DECL_EXPORT
 #else
-#  define QMLPROFILEREXTENDEDSHARED_EXPORT Q_DECL_IMPORT
+#  define QMLPROFILEREXTENSIONSHARED_EXPORT Q_DECL_IMPORT
 #endif
 
-#endif // QMLPROFILEREXTENDED_GLOBAL_H
+#endif // QMLPROFILEREXTENSION_GLOBAL_H
 

plugins/qmlprofilerextension/qmlprofilerextensionconstants.h

@@ -16,17 +16,17 @@
 **
 ****************************************************************************/
 
-#ifndef QMLPROFILEREXTENDEDCONSTANTS_H
-#define QMLPROFILEREXTENDEDCONSTANTS_H
+#ifndef QMLPROFILEREXTENSIONCONSTANTS_H
+#define QMLPROFILEREXTENSIONCONSTANTS_H
 
-namespace QmlProfilerExtended {
+namespace QmlProfilerExtension {
 namespace Constants {
 
-const char ACTION_ID[] = "QmlProfilerExtended.Action";
-const char MENU_ID[] = "QmlProfilerExtended.Menu";
+const char ACTION_ID[] = "QmlProfilerExtension.Action";
+const char MENU_ID[] = "QmlProfilerExtension.Menu";
 
-} // namespace QmlProfilerExtended
+} // namespace QmlProfilerExtension
 } // namespace Constants
 
-#endif // QMLPROFILEREXTENDEDCONSTANTS_H
+#endif // QMLPROFILEREXTENSIONCONSTANTS_H
 

plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp

@@ -16,8 +16,8 @@
 **
 ****************************************************************************/
 
-#include "qmlprofilerextendedplugin.h"
-#include "qmlprofilerextendedconstants.h"
+#include "qmlprofilerextensionplugin.h"
+#include "qmlprofilerextensionconstants.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/icontext.h>
@@ -36,20 +36,20 @@
 #include "scenegraphtimelinemodel.h"
 #include "pixmapcachemodel.h"
 
-using namespace QmlProfilerExtended::Internal;
+using namespace QmlProfilerExtension::Internal;
 
-QmlProfilerExtendedPlugin::QmlProfilerExtendedPlugin()
+QmlProfilerExtensionPlugin::QmlProfilerExtensionPlugin()
 {
     // Create your members
 }
 
-QmlProfilerExtendedPlugin::~QmlProfilerExtendedPlugin()
+QmlProfilerExtensionPlugin::~QmlProfilerExtensionPlugin()
 {
     // Unregister objects from the plugin manager's object pool
     // Delete members
 }
 
-bool QmlProfilerExtendedPlugin::initialize(const QStringList &arguments, QString *errorString)
+bool QmlProfilerExtensionPlugin::initialize(const QStringList &arguments, QString *errorString)
 {
     // Register objects in the plugin manager's object pool
     // Load settings
@@ -67,14 +67,14 @@ bool QmlProfilerExtendedPlugin::initialize(const QStringList &arguments, QString
     return true;
 }
 
-void QmlProfilerExtendedPlugin::extensionsInitialized()
+void QmlProfilerExtensionPlugin::extensionsInitialized()
 {
     // Retrieve objects from the plugin manager's object pool
     // In the extensionsInitialized method, a plugin can be sure that all
     // plugins that depend on it are completely initialized.
 }
 
-ExtensionSystem::IPlugin::ShutdownFlag QmlProfilerExtendedPlugin::aboutToShutdown()
+ExtensionSystem::IPlugin::ShutdownFlag QmlProfilerExtensionPlugin::aboutToShutdown()
 {
     // Save settings
     // Disconnect from signals that are not needed during shutdown
@@ -82,12 +82,12 @@ ExtensionSystem::IPlugin::ShutdownFlag QmlProfilerExtendedPlugin::aboutToShutdow
     return SynchronousShutdown;
 }
 
-void QmlProfilerExtendedPlugin::triggerAction()
+void QmlProfilerExtensionPlugin::triggerAction()
 {
     QMessageBox::information(Core::ICore::mainWindow(),
                              tr("Action triggered"),
-                             tr("This is an action from QmlProfilerExtended."));
+                             tr("This is an action from QmlProfilerExtension."));
 }
 
-Q_EXPORT_PLUGIN2(QmlProfilerExtended, QmlProfilerExtendedPlugin)
+Q_EXPORT_PLUGIN2(QmlProfilerExtension, QmlProfilerExtensionPlugin)
 

plugins/qmlprofilerextension/qmlprofilerextensionplugin.h

@@ -16,24 +16,24 @@
 **
 ****************************************************************************/
 
-#ifndef QMLPROFILEREXTENDED_H
-#define QMLPROFILEREXTENDED_H
+#ifndef QMLPROFILEREXTENSION_H
+#define QMLPROFILEREXTENSION_H
 
-#include "qmlprofilerextended_global.h"
+#include "qmlprofilerextension_global.h"
 
 #include <extensionsystem/iplugin.h>
 
-namespace QmlProfilerExtended {
+namespace QmlProfilerExtension {
 namespace Internal {
 
-class QmlProfilerExtendedPlugin : public ExtensionSystem::IPlugin
+class QmlProfilerExtensionPlugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "QmlProfilerExtended.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "QmlProfilerExtension.json")
 
 public:
-    QmlProfilerExtendedPlugin();
-    ~QmlProfilerExtendedPlugin();
+    QmlProfilerExtensionPlugin();
+    ~QmlProfilerExtensionPlugin();
 
     bool initialize(const QStringList &arguments, QString *errorString);
     void extensionsInitialized();
@@ -44,7 +44,7 @@ private slots:
 };
 
 } // namespace Internal
-} // namespace QmlProfilerExtended
+} // namespace QmlProfilerExtension
 
-#endif // QMLPROFILEREXTENDED_H
+#endif // QMLPROFILEREXTENSION_H
 

plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp

@@ -23,7 +23,7 @@
 #include <QCoreApplication>
 #include <QDebug>
 
-namespace QmlProfilerExtended {
+namespace QmlProfilerExtension {
 namespace Internal {
 
 using namespace QmlProfiler::Internal;
@@ -472,4 +472,4 @@ void SceneGraphTimelineModel::dataChanged()
 
 
 } // namespace Internal
-} // namespace QmlProfilerExtended
+} // namespace QmlProfilerExtension

plugins/qmlprofilerextension/scenegraphtimelinemodel.h

@@ -26,7 +26,7 @@
 #include <QStringList>
 #include <QColor>
 
-namespace QmlProfilerExtended {
+namespace QmlProfilerExtension {
 namespace Internal {
 
 #define timingFieldCount 16
@@ -104,6 +104,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmlProfilerExtended
+} // namespace QmlProfilerExtension
 
 #endif // SCENEGRAPHTIMELINEMODEL_H

qmlprofiler.pro

@@ -3,6 +3,6 @@ CONFIG += ordered
 
 SUBDIRS += libs/qmldebug \
   plugins/qmlprofiler \
-  plugins/qmlprofilerextended
+  plugins/qmlprofilerextension
 
 QMAKE_EXTRA_TARGETS = docs install_docs # dummy targets for consistency