diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
| commit | 560378aaca1784ba19806a0414a32b20c744de39 (patch) | |
| tree | ce0dfd7c3febf2a1adc7603d1019a8be2083c415 /khtml/rendering/render_text.h | |
| parent | d4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff) | |
| download | tdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip | |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/rendering/render_text.h')
| -rw-r--r-- | khtml/rendering/render_text.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/khtml/rendering/render_text.h b/khtml/rendering/render_text.h index d91782b47..f5356b6c7 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 unicode value. +// Define a constant for soft hyphen's tqunicode value. #define SOFT_HYPHEN 173 const int cNoTruncation = -1; @@ -154,7 +154,7 @@ public: InlineTextBox* first(); - int findFirstMatching( Item ) const; + int tqfindFirstMatching( Item ) const; virtual int compareItems( Item, Item ); }; @@ -183,7 +183,7 @@ public: virtual InlineBox* createInlineBox(bool, bool); - virtual void layout() {assert(false);} + virtual void tqlayout() {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 containsOnlyWhitespace(unsigned int from, unsigned int len) const; + bool tqcontainsOnlyWhitespace(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 repaint(Priority p=NormalPriority); + virtual void tqrepaint(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 * findInlineTextBox( int offset, int &pos, + InlineTextBox * tqfindInlineTextBox( int offset, int &pos, bool checkFirstLetter = false ); protected: // members |