[PATCH 3/4] rename ClassType() to classType.

Floris Ruijter flo.ruijt at hotmail.com
Sun Feb 6 22:29:49 UTC 2011


---
 languages/cpp/cppduchain/ptrtomembertype.cpp    |    4 ++--
 languages/cpp/cppduchain/ptrtomembertype.h      |    4 ++--
 languages/cpp/cppduchain/tests/test_duchain.cpp |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/languages/cpp/cppduchain/ptrtomembertype.cpp b/languages/cpp/cppduchain/ptrtomembertype.cpp
index d7b6b3e..f0f1af3 100644
--- a/languages/cpp/cppduchain/ptrtomembertype.cpp
+++ b/languages/cpp/cppduchain/ptrtomembertype.cpp
@@ -91,7 +91,7 @@ void PtrToMemberType::exchangeTypes ( TypeExchanger* exchanger ) {
 PtrToMemberType::~PtrToMemberType() {
 }
 
-AbstractType::Ptr PtrToMemberType::ClassType() const {
+AbstractType::Ptr PtrToMemberType::classType() const {
   return d_func()->m_classType.abstractType();
 }
 
@@ -101,7 +101,7 @@ void PtrToMemberType::setClassType ( AbstractType::Ptr type ) {
 
 QString PtrToMemberType::toString() const {
   QString baseString  = ( baseType()  ? baseType()->toString()  : "<notype>" );
-  QString classString = ( ClassType() ? ClassType()->toString() : "<notype>" );
+  QString classString = ( classType() ? classType()->toString() : "<notype>" );
   return QString ( "%1 %2::*" ).arg ( baseString,classString ) + AbstractType::toString ( true );
 }
 
diff --git a/languages/cpp/cppduchain/ptrtomembertype.h b/languages/cpp/cppduchain/ptrtomembertype.h
index e82869c..202aa48 100644
--- a/languages/cpp/cppduchain/ptrtomembertype.h
+++ b/languages/cpp/cppduchain/ptrtomembertype.h
@@ -48,7 +48,7 @@ class KDEVCPPDUCHAIN_EXPORT PtrToMemberType : public KDevelop::PointerType
       */
     void setClassType(AbstractType::Ptr type);
     
-    AbstractType::Ptr ClassType () const;
+    AbstractType::Ptr classType () const;
     
     virtual QString toString() const;
     
@@ -63,7 +63,7 @@ class KDEVCPPDUCHAIN_EXPORT PtrToMemberType : public KDevelop::PointerType
     virtual void exchangeTypes( KDevelop::TypeExchanger* exchanger );
     
     enum {
-        Identity = 42 ///TODO check uniqueness
+        Identity = 42 
       };
       
       typedef PtrToMemberTypeData Data;
diff --git a/languages/cpp/cppduchain/tests/test_duchain.cpp b/languages/cpp/cppduchain/tests/test_duchain.cpp
index 87308e6..1ad4865 100644
--- a/languages/cpp/cppduchain/tests/test_duchain.cpp
+++ b/languages/cpp/cppduchain/tests/test_duchain.cpp
@@ -5884,7 +5884,7 @@ void TestDUChain::testPointerToMember()
     Declaration* dec = ctx->localDeclarations().first();
     PtrToMemberType::Ptr type = dec->abstractType().cast<PtrToMemberType>();
     QVERIFY(type);
-    StructureType::Ptr structType = type->ClassType().cast<StructureType>();
+    StructureType::Ptr structType = type->classType().cast<StructureType>();
     QVERIFY(structType);
     QCOMPARE(structType->qualifiedIdentifier().toString(), QString("AA"));
   }
@@ -5895,7 +5895,7 @@ void TestDUChain::testPointerToMember()
 
     {
       QVERIFY(type);
-      StructureType::Ptr structType = type->ClassType().cast<StructureType>();
+      StructureType::Ptr structType = type->classType().cast<StructureType>();
       QVERIFY(structType);
       QCOMPARE(structType->qualifiedIdentifier().toString(), QString("BB"));
     }
@@ -5903,7 +5903,7 @@ void TestDUChain::testPointerToMember()
     PtrToMemberType::Ptr ptype = type->baseType().cast<PtrToMemberType>();
     {
       QVERIFY(ptype);
-      StructureType::Ptr structType = ptype->ClassType().cast<StructureType>();
+      StructureType::Ptr structType = ptype->classType().cast<StructureType>();
       QVERIFY(structType);
       QCOMPARE(structType->qualifiedIdentifier().toString(), QString("AA"));
     }
-- 
1.7.2.3


--=-YJ6GuBAZyr1K7+YjIxxv
Content-Disposition: attachment; filename*0=0004-fix-trailing-white-spaces-and-remove-previously-comm.pat; filename*1=ch
Content-Type: text/x-patch; name="0004-fix-trailing-white-spaces-and-remove-previously-comm.patch"; charset="UTF-8"
Content-Transfer-Encoding: 7bit



More information about the KDevelop-devel mailing list