[Ktutorial-commits] SF.net SVN: ktutorial:[148] trunk/ktutorial/ktutorial-editor

[<dan...@us...>]

Revision: 148
          http://ktutorial.svn.sourceforge.net/ktutorial/?rev=148&view=rev
Author:   danxuliu
Date:     2010-03-12 17:05:56 +0000 (Fri, 12 Mar 2010)

Log Message:
-----------
Rename objectName to emitterName to avoid clashing with QObject:objectName().

Modified Paths:
--------------
    trunk/ktutorial/ktutorial-editor/src/WaitForSignal.cpp
    trunk/ktutorial/ktutorial-editor/src/WaitForSignal.h
    trunk/ktutorial/ktutorial-editor/tests/unit/WaitForSignalTest.cpp

Modified: trunk/ktutorial/ktutorial-editor/src/WaitForSignal.cpp
===================================================================
--- trunk/ktutorial/ktutorial-editor/src/WaitForSignal.cpp	2010-03-12 00:08:24 UTC (rev 147)
+++ trunk/ktutorial/ktutorial-editor/src/WaitForSignal.cpp	2010-03-12 17:05:56 UTC (rev 148)
@@ -23,12 +23,12 @@
 WaitForSignal::WaitForSignal(QObject* parent): WaitFor(parent) {
 }
 
-QString WaitForSignal::objectName() const {
-    return mObjectName;
+QString WaitForSignal::emitterName() const {
+    return mEmitterName;
 }
 
-void WaitForSignal::setObjectName(const QString& objectName) {
-    mObjectName = objectName;
+void WaitForSignal::setEmitterName(const QString& emitterName) {
+    mEmitterName = emitterName;
 
     emit dataChanged(this);
 }

Modified: trunk/ktutorial/ktutorial-editor/src/WaitForSignal.h
===================================================================
--- trunk/ktutorial/ktutorial-editor/src/WaitForSignal.h	2010-03-12 00:08:24 UTC (rev 147)
+++ trunk/ktutorial/ktutorial-editor/src/WaitForSignal.h	2010-03-12 17:05:56 UTC (rev 148)
@@ -41,15 +41,15 @@
      */
     WaitForSignal(QObject* parent = 0);
 
-    QString objectName() const;
-    void setObjectName(const QString& objectName);
+    QString emitterName() const;
+    void setEmitterName(const QString& emitterName);
 
     QString signalName() const;
     void setSignalName(const QString& signalName);
 
 private:
 
-    QString mObjectName;
+    QString mEmitterName;
     QString mSignalName;
 
 };

Modified: trunk/ktutorial/ktutorial-editor/tests/unit/WaitForSignalTest.cpp
===================================================================
--- trunk/ktutorial/ktutorial-editor/tests/unit/WaitForSignalTest.cpp	2010-03-12 00:08:24 UTC (rev 147)
+++ trunk/ktutorial/ktutorial-editor/tests/unit/WaitForSignalTest.cpp	2010-03-12 17:05:56 UTC (rev 148)
@@ -29,7 +29,7 @@
 
     void testConstructor();
 
-    void testSetObjectName();
+    void testSetEmitterName();
 
     void testSetSignalName();
 
@@ -54,14 +54,14 @@
     QCOMPARE(waitForSignal->parent(), &parent);
 }
 
-void WaitForSignalTest::testSetObjectName() {
+void WaitForSignalTest::testSetEmitterName() {
     WaitForSignal waitForSignal;
 
     QSignalSpy dataChangedSpy(&waitForSignal, SIGNAL(dataChanged(WaitFor*)));
 
-    waitForSignal.setObjectName("The object name");
+    waitForSignal.setEmitterName("The emitter name");
 
-    QCOMPARE(waitForSignal.objectName(), QString("The object name"));
+    QCOMPARE(waitForSignal.emitterName(), QString("The emitter name"));
     QCOMPARE(dataChangedSpy.count(), 1);
     assertWaitForSignal(dataChangedSpy, 0, &waitForSignal);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.