summaryrefslogtreecommitdiffstats
path: root/tdehtml/rendering
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-02-09 15:14:56 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-02-09 15:14:56 +0900
commit6b4be5f2df2da8986fa68a5de11d509cc37d44cb (patch)
tree4f22ca0f4708e3befcba96f1d3f47661acc5f02b /tdehtml/rendering
parentca0e1f81a7dbae8c609b1332e04db5ac7d6fe7df (diff)
downloadtdelibs-6b4be5f2df2da8986fa68a5de11d509cc37d44cb.tar.gz
tdelibs-6b4be5f2df2da8986fa68a5de11d509cc37d44cb.zip
Fix -tdehtml-* rename regression. This resolves bugs 1825 and 1692
Diffstat (limited to 'tdehtml/rendering')
-rw-r--r--tdehtml/rendering/bidi.cpp18
-rw-r--r--tdehtml/rendering/render_block.cpp10
-rw-r--r--tdehtml/rendering/render_generated.cpp2
-rw-r--r--tdehtml/rendering/render_object.cpp4
4 files changed, 17 insertions, 17 deletions
diff --git a/tdehtml/rendering/bidi.cpp b/tdehtml/rendering/bidi.cpp
index d9991c501..7916a9c4f 100644
--- a/tdehtml/rendering/bidi.cpp
+++ b/tdehtml/rendering/bidi.cpp
@@ -877,7 +877,7 @@ bool RenderBlock::clearLineOfPageBreaks(InlineFlowBox* lineBox)
lineBox->verticallyAlignBoxes(m_height);
}
#ifdef PAGE_DEBUG
- kdDebug(6040) << "Cleared line " << lineBox->yPos() << "px" << endl;
+ kdDebug(6040) << "Cleared line " << lineBox->yPos() - oldYPos << "px" << endl;
#endif
setContainsPageBreak(true);
}
@@ -1254,8 +1254,8 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
}
#if BIDI_DEBUG > 0
-// kdDebug(6041) << "reached end of line current=" << current.obj << "/" << current.pos
-// << ", eor=" << eor.obj << "/" << eor.pos << endl;
+ kdDebug(6041) << "reached end of line current=" << current.obj << "/" << current.pos
+ << ", eor=" << eor.obj << "/" << eor.pos << endl;
#endif
if ( !emptyRun && bidi.sor != bidi.current ) {
bidi.eor = bidi.last;
@@ -1286,10 +1286,10 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
#if BIDI_DEBUG > 0
kdDebug(6041) << "lineLow = " << (uint)levelLow << ", lineHigh = " << (uint)levelHigh << endl;
kdDebug(6041) << "logical order is:" << endl;
-// TQPtrListIterator<BidiRun> it2(runs);
-// BidiRun *r2;
-// for ( ; (r2 = it2.current()); ++it2 )
-// kdDebug(6041) << " " << r2 << " start=" << r2->start << " stop=" << r2->stop << " level=" << (uint)r2->level << endl;
+ TQPtrListIterator<BidiRun> it2(runs);
+ BidiRun *r2;
+ for ( ; (r2 = it2.current()); ++it2 )
+ kdDebug(6041) << " " << r2 << " start=" << r2->start << " stop=" << r2->stop << " level=" << (uint)r2->level << endl;
#endif
int count = sBidiRunCount - 1;
@@ -1318,8 +1318,8 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
#if BIDI_DEBUG > 0
kdDebug(6041) << "visual order is:" << endl;
-// for (BidiRun* curr = sFirstRun; curr; curr = curr->nextRun)
-// kdDebug(6041) << " " << curr << endl;
+ for (BidiRun* curr = sFirstRun; curr; curr = curr->nextRun)
+ kdDebug(6041) << " " << curr << endl;
#endif
}
diff --git a/tdehtml/rendering/render_block.cpp b/tdehtml/rendering/render_block.cpp
index 593d5d8c0..82d99cf41 100644
--- a/tdehtml/rendering/render_block.cpp
+++ b/tdehtml/rendering/render_block.cpp
@@ -26,11 +26,11 @@
*
*/
-// #define DEBUG
-// #define DEBUG_LAYOUT
-// #define BOX_DEBUG
-// #define FLOAT_DEBUG
-// #define PAGE_DEBUG
+//#define DEBUG
+//#define DEBUG_LAYOUT
+//#define BOX_DEBUG
+//#define FLOAT_DEBUG
+//#define PAGE_DEBUG
#include <kdebug.h>
#include "rendering/render_text.h"
diff --git a/tdehtml/rendering/render_generated.cpp b/tdehtml/rendering/render_generated.cpp
index d8e7a1be1..3f8d6e8f0 100644
--- a/tdehtml/rendering/render_generated.cpp
+++ b/tdehtml/rendering/render_generated.cpp
@@ -259,7 +259,7 @@ void RenderQuote::generateContent()
visual = true;
if (!m_counterNode)
- m_counterNode = getCounter("-tdehtml-quotes", visual, false);
+ m_counterNode = getCounter("-khtml-quotes", visual, false);
int value = m_counterNode->count();
if (m_counterNode->isReset()) value = m_counterNode->value();
diff --git a/tdehtml/rendering/render_object.cpp b/tdehtml/rendering/render_object.cpp
index a979e1dc1..eacbb4d16 100644
--- a/tdehtml/rendering/render_object.cpp
+++ b/tdehtml/rendering/render_object.cpp
@@ -2077,7 +2077,7 @@ bool RenderObject::hasCounter(const TQString& counter) const
element()->id() == ID_DIR))
return true;
} else
- if (counter == "-tdehtml-quotes" && isQuote()) {
+ if (counter == "-khtml-quotes" && isQuote()) {
return (static_cast<const RenderQuote*>(this)->quoteCount() != 0);
}
return false;
@@ -2146,7 +2146,7 @@ CounterNode* RenderObject::getCounter(const TQString& counter, bool view, bool c
// kdDebug( 6040 ) << renderName() << " counter-reset: " << counter << " " << val << endl;
}
}
- else if (counter == "-tdehtml-quotes" && isQuote()) {
+ else if (counter == "-khtml-quotes" && isQuote()) {
i = new CounterNode(this);
val = static_cast<RenderQuote*>(this)->quoteCount();
}