summaryrefslogtreecommitdiffstats
path: root/khtml/rendering/render_text.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /khtml/rendering/render_text.h
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/rendering/render_text.h')
-rw-r--r--khtml/rendering/render_text.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/khtml/rendering/render_text.h b/khtml/rendering/render_text.h
index f5356b6c7..d91782b47 100644
--- a/khtml/rendering/render_text.h
+++ b/khtml/rendering/render_text.h
@@ -36,7 +36,7 @@
class TQPainter;
class TQFontMetrics;
-// Define a constant for soft hyphen's tqunicode value.
+// Define a constant for soft hyphen's unicode value.
#define SOFT_HYPHEN 173
const int cNoTruncation = -1;
@@ -154,7 +154,7 @@ public:
InlineTextBox* first();
- int tqfindFirstMatching( Item ) const;
+ int findFirstMatching( Item ) const;
virtual int compareItems( Item, Item );
};
@@ -183,7 +183,7 @@ public:
virtual InlineBox* createInlineBox(bool, bool);
- virtual void tqlayout() {assert(false);}
+ virtual void layout() {assert(false);}
virtual bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inBox);
@@ -217,7 +217,7 @@ public:
short& beginMaxW, short& endMaxW,
short& minW, short& maxW, bool& stripFrontSpaces);
- bool tqcontainsOnlyWhitespace(unsigned int from, unsigned int len) const;
+ bool containsOnlyWhitespace(unsigned int from, unsigned int len) const;
ushort startMin() const { return m_startMin; }
ushort endMin() const { return m_endMin; }
@@ -247,7 +247,7 @@ public:
virtual short marginLeft() const { return style()->marginLeft().minWidth(0); }
virtual short marginRight() const { return style()->marginRight().minWidth(0); }
- virtual void tqrepaint(Priority p=NormalPriority);
+ virtual void repaint(Priority p=NormalPriority);
bool hasBreakableChar() const { return m_hasBreakableChar; }
const TQFontMetrics &metrics(bool firstLine) const;
@@ -285,7 +285,7 @@ public:
* boxes, if available.
* @return the text box, or 0 if no match has been found
*/
- InlineTextBox * tqfindInlineTextBox( int offset, int &pos,
+ InlineTextBox * findInlineTextBox( int offset, int &pos,
bool checkFirstLetter = false );
protected: // members