summaryrefslogtreecommitdiffstats
path: root/lib/kotext
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kotext')
-rw-r--r--lib/kotext/KoParagDia.cpp4
-rw-r--r--lib/kotext/KoRichText.cpp6
-rw-r--r--lib/kotext/KoTextBookmark.h2
3 files changed, 1 insertions, 11 deletions
diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp
index b62a148fd..5e038a98f 100644
--- a/lib/kotext/KoParagDia.cpp
+++ b/lib/kotext/KoParagDia.cpp
@@ -616,9 +616,7 @@ void KPagePreview2::drawContents( TQPainter* p )
}
switch ( align ) {
-#ifndef USE_QT4
case TQt::AlignAuto:
-#endif // USE_QT4
case TQt::AlignLeft:
__x = _x + 6;
break;
@@ -1278,9 +1276,7 @@ void KoParagAlignWidget::display( const KoParagLayout & lay )
clearAligns();
switch ( align ) {
-#ifndef USE_QT4
case TQt::AlignAuto: // see KoView::setAlign
-#endif // USE_QT4
case TQt::AlignLeft:
rLeft->setChecked( true );
break;
diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp
index 5d3e99d11..b6787b25e 100644
--- a/lib/kotext/KoRichText.cpp
+++ b/lib/kotext/KoRichText.cpp
@@ -1243,11 +1243,6 @@ void KoTextString::checkBidi() const
const KoTextStringChar *end = start + length;
// determines the properties we need for layouting
-#ifdef USE_QT4
- #warning "KoTextString::checkBidi() for Qt4 partially implemented"
- printf("[WARNING] KoTextString::checkBidi() partially implemented\n");
- fflush(stdout);
-#else
TQTextEngine textEngine( toString(), 0 );
textEngine.direction = (TQChar::Direction) dir;
textEngine.itemize(TQTextEngine::SingleLine);
@@ -1286,7 +1281,6 @@ void KoTextString::checkBidi() const
} else {
that->rightToLeft = (textEngine.direction == TQChar::DirR);
}
-#endif // USE_QT4
}
TQMemArray<KoTextStringChar> KoTextString::subString( int start, int len ) const
diff --git a/lib/kotext/KoTextBookmark.h b/lib/kotext/KoTextBookmark.h
index eff1a3533..10cfde278 100644
--- a/lib/kotext/KoTextBookmark.h
+++ b/lib/kotext/KoTextBookmark.h
@@ -33,7 +33,7 @@ class KoTextDocument;
*/
class KOTEXT_EXPORT KoTextBookmark {
public:
- KoTextBookmark( const TQString& name = TQString() /*for TQValueList; remove default value when going TQt4*/ );
+ KoTextBookmark( const TQString& name = TQString() );
KoTextBookmark( const TQString& name,
KoTextParag* startParag, KoTextParag* endParag,
int start, int end );