summaryrefslogtreecommitdiffstats
path: root/src/base
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
commit1905a36716979889e47bb0fdd7bf33c6204c5a6d (patch)
tree0daef2425269e8053435f4f7e734091d72e27be0 /src/base
parent05768569bc9c8b3eb75c837d305058fc280db63c (diff)
downloadrosegarden-1905a36716979889e47bb0fdd7bf33c6204c5a6d.tar.gz
rosegarden-1905a36716979889e47bb0fdd7bf33c6204c5a6d.zip
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/base')
-rw-r--r--src/base/AnalysisTypes.cpp2
-rw-r--r--src/base/AnalysisTypes.h4
-rw-r--r--src/base/Configuration.cpp2
-rw-r--r--src/base/SegmentNotationHelper.h4
-rw-r--r--src/base/ViewElement.cpp4
-rw-r--r--src/base/ViewElement.h12
6 files changed, 14 insertions, 14 deletions
diff --git a/src/base/AnalysisTypes.cpp b/src/base/AnalysisTypes.cpp
index a07fd96..316c58f 100644
--- a/src/base/AnalysisTypes.cpp
+++ b/src/base/AnalysisTypes.cpp
@@ -234,7 +234,7 @@ ChordLabel::checkMap()
// a pitch class (pitch%12) in a chord. C major has three pitch
// classes, C, E, and G natural; if you take the MIDI pitches
// of those notes modulo 12, you get 0, 4, and 7, so the tqmask for
- // major triads is (1<<0)+(1<<4)+(1<<7). All the tqmasks are for chords
+ // major triads is (1<<0)+(1<<4)+(1<<7). All the masks are for chords
// built on C.
const int basicChordMasks[8] =
diff --git a/src/base/AnalysisTypes.h b/src/base/AnalysisTypes.h
index df3a416..fb99cac 100644
--- a/src/base/AnalysisTypes.h
+++ b/src/base/AnalysisTypes.h
@@ -62,8 +62,8 @@ NoChord = "no-chord",
///////////////////////////////////////////////////////////////////////////
/**
- * ChordLabel names chords and identifies them from their tqmasks. See
- * ChordLabel::checkMap() for details on what the tqmasks are and
+ * ChordLabel names chords and identifies them from their masks. See
+ * ChordLabel::checkMap() for details on what the masks are and
* AnalysisHelper::labelChords() for an example.
*/
diff --git a/src/base/Configuration.cpp b/src/base/Configuration.cpp
index cf633c5..a3d836f 100644
--- a/src/base/Configuration.cpp
+++ b/src/base/Configuration.cpp
@@ -171,7 +171,7 @@ const PropertyName DocumentConfiguration::TransportMode = "transportmode
DocumentConfiguration::DocumentConfiguration()
{
set<Int>(ZoomLevel, 0);
- set<String>(TransportMode, ""); // aptqparently generates an exception if not initialized
+ set<String>(TransportMode, ""); // apparently generates an exception if not initialized
}
DocumentConfiguration::DocumentConfiguration(const DocumentConfiguration &conf):
diff --git a/src/base/SegmentNotationHelper.h b/src/base/SegmentNotationHelper.h
index ed8abf1..5094929 100644
--- a/src/base/SegmentNotationHelper.h
+++ b/src/base/SegmentNotationHelper.h
@@ -188,7 +188,7 @@ public:
*
* @return iterator pointing at the last inserted event. Also
* modifies from to point at the first split event (the original
- * iterator would have been tqinvalidated).
+ * iterator would have been invalidated).
*/
iterator splitIntoTie(iterator &from, iterator to, timeT baseDuration);
@@ -205,7 +205,7 @@ public:
*
* @return iterator pointing at the last inserted event. Also
* modifies i to point at the first split event (the original
- * iterator would have been tqinvalidated).
+ * iterator would have been invalidated).
*/
iterator splitIntoTie(iterator &i, timeT baseDuration);
diff --git a/src/base/ViewElement.cpp b/src/base/ViewElement.cpp
index c62aef5..425bdc1 100644
--- a/src/base/ViewElement.cpp
+++ b/src/base/ViewElement.cpp
@@ -29,8 +29,8 @@ namespace Rosegarden
extern const int MIN_SUBORDERING;
ViewElement::ViewElement(Event *e) :
- m_tqlayoutX(0.0),
- m_tqlayoutY(0.0),
+ m_layoutX(0.0),
+ m_layoutY(0.0),
m_event(e)
{
// nothing
diff --git a/src/base/ViewElement.h b/src/base/ViewElement.h
index f898e51..58d312d 100644
--- a/src/base/ViewElement.h
+++ b/src/base/ViewElement.h
@@ -58,7 +58,7 @@ public:
*
* @see getCanvasX()
*/
- virtual double getLayoutX() const { return m_tqlayoutX; }
+ virtual double getLayoutX() const { return m_layoutX; }
/**
* Returns the Y coordinate of the element, as computed by the
@@ -67,19 +67,19 @@ public:
*
* @see getCanvasY()
*/
- virtual double getLayoutY() const { return m_tqlayoutY; }
+ virtual double getLayoutY() const { return m_layoutY; }
/**
* Sets the X coordinate which was computed by the tqlayout engine
* @see getLayoutX()
*/
- virtual void setLayoutX(double x) { m_tqlayoutX = x; }
+ virtual void setLayoutX(double x) { m_layoutX = x; }
/**
* Sets the Y coordinate which was computed by the tqlayout engine
* @see getLayoutY()
*/
- virtual void setLayoutY(double y) { m_tqlayoutY = y; }
+ virtual void setLayoutY(double y) { m_layoutY = y; }
void dump(std::ostream&) const;
@@ -88,8 +88,8 @@ public:
protected:
ViewElement(Event *);
- double m_tqlayoutX;
- double m_tqlayoutY;
+ double m_layoutX;
+ double m_layoutY;
Event *m_event;
};