Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/kotext/KoComplexText.h b/lib/kotext/KoComplexText.h
index 8a22d152..72abfbed 100644
--- a/lib/kotext/KoComplexText.h
+++ b/lib/kotext/KoComplexText.h
@@ -62,8 +62,8 @@
 #ifndef TQT_NO_COMPLEXTEXT
 
 // bidi helper classes. Internal to TQt
-struct TQ_EXPORT KoBidiStatus {
-    KoBidiStatus() {
+struct TQ_EXPORT KoBiditqStatus {
+    KoBiditqStatus() {
 	eor = TQChar::DirON;
 	lastStrong = TQChar::DirON;
 	last = TQChar:: DirON;
@@ -87,12 +87,12 @@ struct TQ_EXPORT KoBidiContext : public TQShared {
 
 struct TQ_EXPORT KoBidiControl {
     KoBidiControl() { context = 0; }
-    KoBidiControl( KoBidiContext *c, KoBidiStatus s)
+    KoBidiControl( KoBidiContext *c, KoBiditqStatus s)
     { context = c; if( context ) context->ref(); status = s; }
     ~KoBidiControl() { if ( context && context->deref() ) delete context; }
     void setContext( KoBidiContext *c ) { if ( context == c ) return; if ( context && context->deref() ) delete context; context = c; context->ref(); }
     KoBidiContext *context;
-    KoBidiStatus status;
+    KoBiditqStatus status;
 };
 
 struct TQ_EXPORT KoTextRun {
@@ -115,8 +115,8 @@ public:
     static Shape glyphVariant( const TQString &str, int pos);
     static Shape glyphVariantLogical( const TQString &str, int pos);
 
-    static TQString shapedString( const TQString &str, int from = 0, int len = -1, TQPainter::TextDirection dir = TQPainter::Auto, const TQFontMetrics *fm = 0);
-    static TQChar shapedCharacter(const TQString &str, int pos, const TQFontMetrics *fm = 0);
+    static TQString tqshapedString( const TQString &str, int from = 0, int len = -1, TQPainter::TextDirection dir = TQPainter::Auto, const TQFontMetrics *fm = 0);
+    static TQChar tqshapedCharacter(const TQString &str, int pos, const TQFontMetrics *fm = 0);
 
     // positions non spacing marks relative to the base character at position pos.
     //static TQPointArray positionMarks( TQFontPrivate *f, const TQString &str, int pos, TQRect *boundingRect = 0 );