Rename IMsBuildProperty to MSBuildPropertyBase

This is not an interface and not even an abstract class, the 'I' prefix
is misleading

Change-Id: Iac15d67e0e43ddff76d37b132ad420a03c87f25f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

8 files changed, 29 insertions, 29 deletions

diff --git a/src/lib/msbuild/msbuild.pro b/src/lib/msbuild/msbuild.pro
index 432169129..f724df793 100644
--- a/src/lib/msbuild/msbuild.pro
+++ b/src/lib/msbuild/msbuild.pro
@@ -8,7 +8,6 @@ HEADERS += \
     msbuild/imsbuildgroup.h \
     msbuild/imsbuildnode.h \
     msbuild/imsbuildnodevisitor.h \
-    msbuild/imsbuildproperty.h \
     msbuild/items/msbuildclcompile.h \
     msbuild/items/msbuildclinclude.h \
     msbuild/items/msbuildfileitem.h \
@@ -23,6 +22,7 @@ HEADERS += \
     msbuild/msbuilditemmetadata.h \
     msbuild/msbuildproject.h \
     msbuild/msbuildproperty.h \
+    msbuild/msbuildpropertybase.h \
     msbuild/msbuildpropertygroup.h \
     solution/ivisualstudiosolutionproject.h \
     solution/visualstudiosolution.h \
@@ -35,7 +35,6 @@ SOURCES += \
     io/visualstudiosolutionwriter.cpp \
     msbuild/imsbuildgroup.cpp \
     msbuild/imsbuildnode.cpp \
-    msbuild/imsbuildproperty.cpp \
     msbuild/items/msbuildclcompile.cpp \
     msbuild/items/msbuildclinclude.cpp \
     msbuild/items/msbuildfileitem.cpp \
@@ -50,6 +49,7 @@ SOURCES += \
     msbuild/msbuilditemmetadata.cpp \
     msbuild/msbuildproject.cpp \
     msbuild/msbuildproperty.cpp \
+    msbuild/msbuildpropertybase.cpp \
     msbuild/msbuildpropertygroup.cpp \
     solution/ivisualstudiosolutionproject.cpp \
     solution/visualstudiosolution.cpp \
diff --git a/src/lib/msbuild/msbuild.qbs b/src/lib/msbuild/msbuild.qbs
index 5e69c28e4..897960303 100644
--- a/src/lib/msbuild/msbuild.qbs
+++ b/src/lib/msbuild/msbuild.qbs
@@ -35,8 +35,6 @@ QbsStaticLibrary {
             "imsbuildnode.cpp",
             "imsbuildnode.h",
             "imsbuildnodevisitor.h",
-            "imsbuildproperty.cpp",
-            "imsbuildproperty.h",
             "msbuildimport.cpp",
             "msbuildimport.h",
             "msbuildimportgroup.cpp",
@@ -53,6 +51,8 @@ QbsStaticLibrary {
             "msbuildproject.h",
             "msbuildproperty.cpp",
             "msbuildproperty.h",
+            "msbuildpropertybase.cpp",
+            "msbuildpropertybase.h",
             "msbuildpropertygroup.cpp",
             "msbuildpropertygroup.h",
         ]
diff --git a/src/lib/msbuild/msbuild/msbuilditemmetadata.cpp b/src/lib/msbuild/msbuild/msbuilditemmetadata.cpp
index daaa4c6b3..2f315287c 100644
--- a/src/lib/msbuild/msbuild/msbuilditemmetadata.cpp
+++ b/src/lib/msbuild/msbuild/msbuilditemmetadata.cpp
@@ -36,7 +36,7 @@
 namespace qbs {
 
 MSBuildItemMetadata::MSBuildItemMetadata(MSBuildItem *parent)
-    : IMSBuildProperty(parent)
+    : MSBuildPropertyBase(parent)
 {
 }
 
diff --git a/src/lib/msbuild/msbuild/msbuilditemmetadata.h b/src/lib/msbuild/msbuild/msbuilditemmetadata.h
index 09da2649c..cfde125bb 100644
--- a/src/lib/msbuild/msbuild/msbuilditemmetadata.h
+++ b/src/lib/msbuild/msbuild/msbuilditemmetadata.h
@@ -31,8 +31,8 @@
 #ifndef MSBUILDITEMMETADATA_H
 #define MSBUILDITEMMETADATA_H
 
-#include "imsbuildproperty.h"
 #include "imsbuildnode.h"
+#include "msbuildpropertybase.h"
 
 namespace qbs {
 
@@ -43,7 +43,7 @@ class MSBuildItem;
  *
  * https://msdn.microsoft.com/en-us/library/ms164284.aspx
  */
-class MSBuildItemMetadata : public IMSBuildProperty, public IMSBuildNode
+class MSBuildItemMetadata : public MSBuildPropertyBase, public IMSBuildNode
 {
     Q_OBJECT
     Q_DISABLE_COPY(MSBuildItemMetadata)
diff --git a/src/lib/msbuild/msbuild/msbuildproperty.cpp b/src/lib/msbuild/msbuild/msbuildproperty.cpp
index 410e2a694..fd6942d0c 100644
--- a/src/lib/msbuild/msbuild/msbuildproperty.cpp
+++ b/src/lib/msbuild/msbuild/msbuildproperty.cpp
@@ -36,7 +36,7 @@
 namespace qbs {
 
 MSBuildProperty::MSBuildProperty(MSBuildPropertyGroup *parent)
-    : IMSBuildProperty(parent)
+    : MSBuildPropertyBase(parent)
 {
 }
 
diff --git a/src/lib/msbuild/msbuild/msbuildproperty.h b/src/lib/msbuild/msbuild/msbuildproperty.h
index de2c52394..4fd36b275 100644
--- a/src/lib/msbuild/msbuild/msbuildproperty.h
+++ b/src/lib/msbuild/msbuild/msbuildproperty.h
@@ -31,8 +31,8 @@
 #ifndef MSBUILDPROPERTY_H
 #define MSBUILDPROPERTY_H
 
-#include "imsbuildproperty.h"
 #include "imsbuildnode.h"
+#include "msbuildpropertybase.h"
 
 namespace qbs {
 
@@ -43,7 +43,7 @@ class MSBuildPropertyGroup;
  *
  * https://msdn.microsoft.com/en-us/library/ms164288.aspx
  */
-class MSBuildProperty : public IMSBuildProperty, public IMSBuildNode
+class MSBuildProperty : public MSBuildPropertyBase, public IMSBuildNode
 {
     Q_OBJECT
 public:
diff --git a/src/lib/msbuild/msbuild/imsbuildproperty.cpp b/src/lib/msbuild/msbuild/msbuildpropertybase.cpp
index be18f1a5b..3a8affd3f 100644
--- a/src/lib/msbuild/msbuild/imsbuildproperty.cpp
+++ b/src/lib/msbuild/msbuild/msbuildpropertybase.cpp
@@ -28,11 +28,11 @@
 **
 ****************************************************************************/
 
-#include "imsbuildproperty.h"
+#include "msbuildpropertybase.h"
 
 namespace qbs {
 
-class IMSBuildPropertyPrivate
+class MSBuildPropertyBasePrivate
 {
 public:
     QString condition;
@@ -40,40 +40,40 @@ public:
     QVariant value;
 };
 
-IMSBuildProperty::IMSBuildProperty(QObject *parent)
+MSBuildPropertyBase::MSBuildPropertyBase(QObject *parent)
     : QObject(parent)
-    , d(new IMSBuildPropertyPrivate)
+    , d(new MSBuildPropertyBasePrivate)
 {
 }
 
-IMSBuildProperty::~IMSBuildProperty() = default;
+MSBuildPropertyBase::~MSBuildPropertyBase() = default;
 
-QString IMSBuildProperty::condition() const
+QString MSBuildPropertyBase::condition() const
 {
     return d->condition;
 }
 
-void IMSBuildProperty::setCondition(const QString &condition)
+void MSBuildPropertyBase::setCondition(const QString &condition)
 {
     d->condition = condition;
 }
 
-QString IMSBuildProperty::name() const
+QString MSBuildPropertyBase::name() const
 {
     return d->name;
 }
 
-void IMSBuildProperty::setName(const QString &name)
+void MSBuildPropertyBase::setName(const QString &name)
 {
     d->name = name;
 }
 
-QVariant IMSBuildProperty::value() const
+QVariant MSBuildPropertyBase::value() const
 {
     return d->value;
 }
 
-void IMSBuildProperty::setValue(const QVariant &value)
+void MSBuildPropertyBase::setValue(const QVariant &value)
 {
     d->value = value;
 }
diff --git a/src/lib/msbuild/msbuild/imsbuildproperty.h b/src/lib/msbuild/msbuild/msbuildpropertybase.h
index 13f26f070..b4d25f827 100644
--- a/src/lib/msbuild/msbuild/imsbuildproperty.h
+++ b/src/lib/msbuild/msbuild/msbuildpropertybase.h
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/
 
-#ifndef IMSBUILDPROPERTY_H
-#define IMSBUILDPROPERTY_H
+#ifndef MSBUILDPROPERTYBASE_H
+#define MSBUILDPROPERTYBASE_H
 
 #include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
@@ -38,16 +38,16 @@
 
 namespace qbs {
 
-class IMSBuildPropertyPrivate;
+class MSBuildPropertyBasePrivate;
 
-class IMSBuildProperty : public QObject
+class MSBuildPropertyBase : public QObject
 {
     Q_OBJECT
 protected:
-    explicit IMSBuildProperty(QObject *parent = nullptr);
+    explicit MSBuildPropertyBase(QObject *parent = nullptr);
 
 public:
-    ~IMSBuildProperty() override;
+    ~MSBuildPropertyBase() override;
 
     QString condition() const;
     void setCondition(const QString &condition);
@@ -59,9 +59,9 @@ public:
     void setValue(const QVariant &value);
 
 private:
-    std::unique_ptr<IMSBuildPropertyPrivate> d;
+    std::unique_ptr<MSBuildPropertyBasePrivate> d;
 };
 
 } // namespace qbs
 
-#endif // IMSBUILDPROPERTY_H
+#endif // MSBUILDPROPERTYBASE_H