TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 149 insertions, 149 deletions

diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp
index 701f4ad2b..915ef4f79 100644
--- a/lib/kotext/KoSearchDia.cpp
+++ b/lib/kotext/KoSearchDia.cpp
@@ -33,19 +33,19 @@
 #include <klocale.h>
 #include <kseparator.h>
 
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qradiobutton.h>
-#include <qregexp.h>
-#include <qspinbox.h>
-#include <qlayout.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqradiobutton.h>
+#include <tqregexp.h>
+#include <tqspinbox.h>
+#include <tqlayout.h>
 
 KoSearchContext::KoSearchContext()
 {
     m_family = "times";
-    m_color = Qt::black;
-    m_backGroundColor = Qt::black;
+    m_color = TQt::black;
+    m_backGroundColor = TQt::black;
 
     m_size = 12;
     m_vertAlign = KoTextFormat::AlignNormal;
@@ -54,7 +54,7 @@ KoSearchContext::KoSearchContext()
     m_underline = KoTextFormat::U_NONE;
     m_strikeOut = KoTextFormat::S_NONE;
     m_attribute = KoTextFormat::ATT_NONE;
-    m_language = QString::null;
+    m_language = TQString();
 }
 
 KoSearchContext::~KoSearchContext()
@@ -62,14 +62,14 @@ KoSearchContext::~KoSearchContext()
 }
 
 
-KoSearchContextUI::KoSearchContextUI( KoSearchContext *ctx, QWidget *parent )
-    : QObject(parent), m_ctx(ctx), m_parent(parent)
+KoSearchContextUI::KoSearchContextUI( KoSearchContext *ctx, TQWidget *tqparent )
+    : TQObject(tqparent), m_ctx(ctx), m_parent(tqparent)
 {
     m_bOptionsShown = false;
-    m_btnShowOptions = new QPushButton( i18n("Show Formatting Options"), parent );
-    connect( m_btnShowOptions, SIGNAL( clicked() ), SLOT( slotShowOptions() ) );
+    m_btnShowOptions = new TQPushButton( i18n("Show Formatting Options"), tqparent );
+    connect( m_btnShowOptions, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowOptions() ) );
 
-    m_grid = new QGridLayout( m_parent, 1, 1, 0, 6 );
+    m_grid = new TQGridLayout( m_parent, 1, 1, 0, 6 );
     m_grid->addWidget( m_btnShowOptions, 0, 0 );
     m_btnShowOptions->setEnabled( true );
 }
@@ -95,16 +95,16 @@ void KoSearchContextUI::setCtxOptions( long options )
     m_ctx->m_options = options;
 }
 
-void KoSearchContextUI::setCtxHistory( const QStringList & history )
+void KoSearchContextUI::setCtxHistory( const TQStringList & history )
 {
     m_ctx->m_strings = history;
 }
 
-KoSearchDia::KoSearchDia( QWidget * parent,const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor )
-    : KFindDialog( parent, name, find->m_options, find->m_strings )
+KoSearchDia::KoSearchDia( TQWidget * tqparent,const char *name, KoSearchContext *tqfind, bool hasSelection, bool hasCursor )
+    : KFindDialog( tqparent, name, tqfind->m_options, tqfind->m_strings )
 {
     // The dialog extension.
-    m_findUI = new KoSearchContextUI( find, findExtension() );
+    m_findUI = new KoSearchContextUI( tqfind, findExtension() );
     setHasSelection(hasSelection);
     setHasCursor(hasCursor);
 }
@@ -119,12 +119,12 @@ void KoSearchDia::slotOk()
     m_findUI->setCtxHistory( findHistory() );
 }
 
-KoReplaceDia::KoReplaceDia( QWidget *parent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor )
-    : KReplaceDialog( parent, name, find->m_options, find->m_strings, replace->m_strings )
+KoReplaceDia::KoReplaceDia( TQWidget *tqparent, const char *name, KoSearchContext *tqfind, KoSearchContext *tqreplace, bool hasSelection, bool hasCursor )
+    : KReplaceDialog( tqparent, name, tqfind->m_options, tqfind->m_strings, tqreplace->m_strings )
 {
     // The dialog extension.
-    m_findUI = new KoSearchContextUI( find, findExtension() );
-    m_replaceUI = new KoSearchContextUI( replace, replaceExtension() );
+    m_findUI = new KoSearchContextUI( tqfind, findExtension() );
+    m_replaceUI = new KoSearchContextUI( tqreplace, replaceExtension() );
     // Look whether we have a selection, and/or a cursor
     setHasSelection(hasSelection);
     setHasCursor(hasCursor);
@@ -146,9 +146,9 @@ void KoReplaceDia::slotOk()
 
 
 
-KoFindReplace::KoFindReplace( QWidget * parent, KoSearchDia * dialog, const QValueList<KoTextObject *> & lstObject, KoTextView* textView )
-    : m_find( new KoTextFind( dialog->pattern(), dialog->options(), this, parent ) ),
-      m_replace( 0L ),
+KoFindReplace::KoFindReplace( TQWidget * tqparent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView )
+    : m_tqfind( new KoTextFind( dialog->pattern(), dialog->options(), this, tqparent ) ),
+      m_tqreplace( 0L ),
       m_searchContext( *dialog->searchContext() ),
       m_replaceContext(),
       m_searchContextEnabled( dialog->optionSelected() ),
@@ -158,12 +158,12 @@ KoFindReplace::KoFindReplace( QWidget * parent, KoSearchDia * dialog, const QVal
       m_textIterator( lstObject, textView, dialog->options() ),
       m_lastTextObjectHighlighted( 0 )
 {
-    connectFind( m_find );
+    connectFind( m_tqfind );
 }
 
-KoFindReplace::KoFindReplace( QWidget * parent, KoReplaceDia * dialog, const QValueList<KoTextObject *> & lstObject, KoTextView* textView )
-    : m_find( 0L ),
-      m_replace( new KoTextReplace( dialog->pattern(), dialog->replacement(), dialog->options(), this, parent ) ),
+KoFindReplace::KoFindReplace( TQWidget * tqparent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView )
+    : m_tqfind( 0L ),
+      m_tqreplace( new KoTextReplace( dialog->pattern(), dialog->replacement(), dialog->options(), this, tqparent ) ),
       m_searchContext( *dialog->searchContext() ),
       m_replaceContext( *dialog->replaceContext() ),
       m_searchContextEnabled( dialog->optionFindSelected() ),
@@ -173,39 +173,39 @@ KoFindReplace::KoFindReplace( QWidget * parent, KoReplaceDia * dialog, const QVa
       m_textIterator( lstObject, textView, dialog->options() ),
       m_lastTextObjectHighlighted( 0 )
 {
-    connectFind( m_replace );
-    connect( m_replace, SIGNAL( replace( const QString &, int , int, int ) ),
-             this, SLOT( replace( const QString &, int , int,int ) ) );
+    connectFind( m_tqreplace );
+    connect( m_tqreplace, TQT_SIGNAL( tqreplace( const TQString &, int , int, int ) ),
+             this, TQT_SLOT( tqreplace( const TQString &, int , int,int ) ) );
 }
 
-void KoFindReplace::connectFind( KFind* find )
+void KoFindReplace::connectFind( KFind* tqfind )
 {
-    connect( find, SIGNAL( optionsChanged() ),
-             this, SLOT( optionsChanged() ) );
-    connect( find, SIGNAL( dialogClosed() ),
-             this, SLOT( dialogClosed() ) );
+    connect( tqfind, TQT_SIGNAL( optionsChanged() ),
+             this, TQT_SLOT( optionsChanged() ) );
+    connect( tqfind, TQT_SIGNAL( dialogClosed() ),
+             this, TQT_SLOT( dialogClosed() ) );
     // Connect highlight signal to code which handles highlighting
     // of found text.
-    connect( find, SIGNAL( highlight( const QString &, int, int ) ),
-             this, SLOT( highlight( const QString &, int, int ) ) );
+    connect( tqfind, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
+             this, TQT_SLOT( highlight( const TQString &, int, int ) ) );
     // Connect findNext signal - called when pressing the button in the dialog
-    connect( find, SIGNAL( findNext() ),
-             this, SLOT( slotFindNext() ) );
+    connect( tqfind, TQT_SIGNAL( findNext() ),
+             this, TQT_SLOT( slotFindNext() ) );
     m_bInit = true;
     m_currentParagraphModified = false;
     m_matchingIndex = -1;
 
     // Also connect to the textiterator
-    connect( &m_textIterator, SIGNAL( currentParagraphModified( int, int, int ) ),
-             this, SLOT( slotCurrentParagraphModified( int, int, int ) ) );
+    connect( &m_textIterator, TQT_SIGNAL( currentParagraphModified( int, int, int ) ),
+             this, TQT_SLOT( slotCurrentParagraphModified( int, int, int ) ) );
 }
 
 KoFindReplace::~KoFindReplace()
 {
     removeHighlight();
     //kdDebug(32500) << "KoFindReplace::~KoFindReplace" << endl;
-    delete m_find;
-    delete m_replace;
+    delete m_tqfind;
+    delete m_tqreplace;
 }
 
 void KoFindReplace::optionsChanged()
@@ -261,7 +261,7 @@ bool KoFindReplace::findNext()
                     break;
             }
             m_bInit = false;
-            QPair<int, QString> c = m_textIterator.currentTextAndIndex();
+            TQPair<int, TQString> c = m_textIterator.currentTextAndIndex();
             m_offset = c.first;
             if ( !m_currentParagraphModified )
                 setData( c.second );
@@ -270,11 +270,11 @@ bool KoFindReplace::findNext()
             m_currentParagraphModified = false;
         }
 
-        if ( m_find )
+        if ( m_tqfind )
             // Let KFind inspect the text fragment, and display a dialog if a match is found
-            res = m_find->find();
+            res = m_tqfind->find();
         else
-            res = m_replace->replace();
+            res = m_tqreplace->replace();
     }
 
     //kdDebug(32500) << k_funcinfo << "we're done. res=" << res << endl;
@@ -286,17 +286,17 @@ bool KoFindReplace::findNext()
             m_textIterator.setOptions( m_textIterator.options() & ~KFindDialog::FromCursor );
             m_textIterator.restart();
             m_bInit = true;
-            if ( m_find )
-                m_find->resetCounts();
+            if ( m_tqfind )
+                m_tqfind->resetCounts();
             else
-                m_replace->resetCounts();
+                m_tqreplace->resetCounts();
             return findNext();
         }
         else { // done, close the 'find next' dialog
-            if ( m_find )
-                m_find->closeFindNextDialog();
+            if ( m_tqfind )
+                m_tqfind->closeFindNextDialog();
             else
-                m_replace->closeReplaceNextDialog();
+                m_tqreplace->closeReplaceNextDialog();
         }
         return false;
     }
@@ -327,15 +327,15 @@ bool KoFindReplace::findPrevious()
 
 long KoFindReplace::options() const
 {
-    return m_find ? m_find->options() : m_replace->options();
+    return m_tqfind ? m_tqfind->options() : m_tqreplace->options();
 }
 
 void KoFindReplace::setOptions(long opt)
 {
-    if ( m_find )
-        m_find->setOptions(opt);
+    if ( m_tqfind )
+        m_tqfind->setOptions(opt);
     else
-        m_replace->setOptions(opt);
+        m_tqreplace->setOptions(opt);
     m_textIterator.setOptions( opt );
 }
 
@@ -347,26 +347,26 @@ void KoFindReplace::slotCurrentParagraphModified( int, int pos, int )
 }
 
 // slot connected to the 'highlight' signal
-void KoFindReplace::highlight( const QString &, int matchingIndex, int matchingLength )
+void KoFindReplace::highlight( const TQString &, int matchingIndex, int matchingLength )
 {
     m_matchingIndex = matchingIndex;
     if ( m_lastTextObjectHighlighted )
         m_lastTextObjectHighlighted->removeHighlight(true);
     m_lastTextObjectHighlighted = m_textIterator.currentTextObject();
     //kdDebug(32500) << "KoFindReplace::highlight " << matchingIndex << "," << matchingLength << endl;
-    KDialogBase* dialog = m_find ? m_find->findNextDialog() : m_replace->replaceNextDialog();
+    KDialogBase* dialog = m_tqfind ? m_tqfind->findNextDialog() : m_tqreplace->replaceNextDialog();
     highlightPortion(m_textIterator.currentParag(), m_offset + matchingIndex, matchingLength, m_lastTextObjectHighlighted->textDocument(), dialog );
 }
 
-// slot connected to the 'replace' signal
-void KoFindReplace::replace( const QString &text, int matchingIndex,
+// slot connected to the 'tqreplace' signal
+void KoFindReplace::tqreplace( const TQString &text, int matchingIndex,
                              int replacementLength, int matchedLength )
 {
     //kdDebug(32500) << "KoFindReplace::replace m_offset=" << m_offset << " matchingIndex=" << matchingIndex << " matchedLength=" << matchedLength << " options=" << options() << endl;
     m_matchingIndex = matchingIndex;
     int index = m_offset + matchingIndex;
 
-    // highlight might not have happened (if 'prompt on replace' is off)
+    // highlight might not have happened (if 'prompt on tqreplace' is off)
     if ( (options() & KReplaceDialog::PromptOnReplace) == 0 )
         highlight( text, matchingIndex, matchedLength );
 
@@ -382,23 +382,23 @@ void KoFindReplace::replace( const QString &text, int matchingIndex,
     {
         replaceWithAttribut( &cursor, index );
     }
-    // Don't repaint if we're doing batch changes
-    bool repaint = options() & KReplaceDialog::PromptOnReplace;
+    // Don't tqrepaint if we're doing batch changes
+    bool tqrepaint = options() & KReplaceDialog::PromptOnReplace;
 
     // Grab replacement string
-    QString rep = text.mid( matchingIndex, replacementLength );
+    TQString rep = text.mid( matchingIndex, replacementLength );
 
     // Don't let the replacement set the paragraph to "modified by user"
-    disconnect( &m_textIterator, SIGNAL( currentParagraphModified( int, int, int ) ),
-                this, SLOT( slotCurrentParagraphModified( int, int, int ) ) );
+    disconnect( &m_textIterator, TQT_SIGNAL( currentParagraphModified( int, int, int ) ),
+                this, TQT_SLOT( slotCurrentParagraphModified( int, int, int ) ) );
 
     KCommand *cmd = currentTextObj->replaceSelectionCommand(
-        &cursor, rep, QString::null,
+        &cursor, rep, TQString(),
         KoTextDocument::HighlightSelection,
-        repaint ? KoTextObject::DefaultInsertFlags : KoTextObject::DoNotRepaint );
+        tqrepaint ? KoTextObject::DefaultInsertFlags : KoTextObject::DoNotRepaint );
 
-    connect( &m_textIterator, SIGNAL( currentParagraphModified( int, int, int ) ),
-             this, SLOT( slotCurrentParagraphModified( int, int, int ) ) );
+    connect( &m_textIterator, TQT_SIGNAL( currentParagraphModified( int, int, int ) ),
+             this, TQT_SLOT( slotCurrentParagraphModified( int, int, int ) ) );
 
     if( cmd )
         macroCommand()->addCommand(cmd);
@@ -461,9 +461,9 @@ void KoFindReplace::replaceWithAttribut( KoTextCursor * cursor, int index )
         flags |= KoTextFormat::ShadowText;
         // If shadow has been selected, we set a shadow (any shadow) in the new format
         if ( m_replaceContext.m_options & KoSearchContext::Shadow )
-            newFormat->setShadow( 1, 1, Qt::gray );
+            newFormat->setShadow( 1, 1, TQt::gray );
         else
-            newFormat->setShadow( 0, 0, QColor() );
+            newFormat->setShadow( 0, 0, TQColor() );
     }
     if (m_replaceContext.m_optionsMask & KoSearchContext::WordByWord)
     {
@@ -493,25 +493,25 @@ KMacroCommand* KoFindReplace::macroCommand()
 
 void KoFindReplace::setActiveWindow()
 {
-    KDialogBase* dialog = m_find ? m_find->findNextDialog() : m_replace->replaceNextDialog();
+    KDialogBase* dialog = m_tqfind ? m_tqfind->findNextDialog() : m_tqreplace->replaceNextDialog();
     if ( dialog )
         dialog->setActiveWindow();
 }
 
 /*int KoFindReplace::numMatches() const
 {
-    return m_find->numMatches();
+    return m_tqfind->numMatches();
 }
 
 int KoFindReplace::numReplacements() const
 {
-    return m_replace->numReplacements();
+    return m_tqreplace->numReplacements();
 }*/
 
 ////
 
-KoTextFind::KoTextFind( const QString &pattern, long options, KoFindReplace *_findReplace, QWidget *parent )
-    : KFind( pattern, options, parent),
+KoTextFind::KoTextFind( const TQString &pattern, long options, KoFindReplace *_findReplace, TQWidget *tqparent )
+    : KFind( pattern, options, tqparent),
       m_findReplace( _findReplace)
 {
 }
@@ -520,13 +520,13 @@ KoTextFind::~KoTextFind()
 {
 }
 
-bool KoTextFind::validateMatch( const QString &text, int index, int matchedlength )
+bool KoTextFind::validateMatch( const TQString &text, int index, int matchedlength )
 {
     return m_findReplace->validateMatch( text, index, matchedlength );
 }
 
-KoTextReplace::KoTextReplace(const QString &pattern, const QString &replacement, long options, KoFindReplace *_findReplace, QWidget *parent )
-    : KReplace( pattern, replacement, options, parent),
+KoTextReplace::KoTextReplace(const TQString &pattern, const TQString &replacement, long options, KoFindReplace *_findReplace, TQWidget *tqparent )
+    : KReplace( pattern, replacement, options, tqparent),
       m_findReplace( _findReplace)
 {
 }
@@ -535,64 +535,64 @@ KoTextReplace::~KoTextReplace()
 {
 }
 
-bool KoTextReplace::validateMatch( const QString &text, int index, int matchedlength )
+bool KoTextReplace::validateMatch( const TQString &text, int index, int matchedlength )
 {
     return m_findReplace->validateMatch( text, index, matchedlength );
 }
 
-KoFormatDia::KoFormatDia( QWidget* parent, const QString & _caption, KoSearchContext *_ctx ,  const char* name)
-    : KDialogBase( parent, name, true, _caption, Ok|Cancel|User1 |User2 ),
+KoFormatDia::KoFormatDia( TQWidget* tqparent, const TQString & _caption, KoSearchContext *_ctx ,  const char* name)
+    : KDialogBase( tqparent, name, true, _caption, Ok|Cancel|User1 |User2 ),
       m_ctx(_ctx)
 {
-    QWidget *page = new QWidget( this );
+    TQWidget *page = new TQWidget( this );
     setMainWidget(page);
     setButtonText( KDialogBase::User1, i18n("Reset") );
     setButtonText( KDialogBase::User2, i18n("Clear") );
 
-    connect( this, SIGNAL( user1Clicked() ), this, SLOT(slotReset()));
-    connect( this, SIGNAL( user2Clicked() ), this, SLOT(slotClear()));
-
-    QGridLayout *m_grid = new QGridLayout( page, 15, 2, 0, 6 );
-    m_checkFamily = new QCheckBox( i18n( "Family:" ),page  );
-    m_checkSize = new QCheckBox( i18n( "Size:" ), page );
-    m_checkColor = new QCheckBox( i18n( "Color:" ), page );
-    m_checkBgColor = new QCheckBox( i18n( "Background color:" ), page );
-    m_checkBold = new QCheckBox( i18n( "Bold:" ), page );
-    m_checkItalic = new QCheckBox( i18n( "Italic:" ),page );
-    m_checkShadow = new QCheckBox( i18n( "Shadow:" ), page );
-    m_checkWordByWord = new QCheckBox( i18n( "Word by word:" ), page );
-
-    m_checkUnderline = new QCheckBox( i18n( "Underline:" ), page);
-    m_underlineItem = new QComboBox( page );
+    connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotReset()));
+    connect( this, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT(slotClear()));
+
+    TQGridLayout *m_grid = new TQGridLayout( page, 15, 2, 0, 6 );
+    m_checkFamily = new TQCheckBox( i18n( "Family:" ),page  );
+    m_checkSize = new TQCheckBox( i18n( "Size:" ), page );
+    m_checkColor = new TQCheckBox( i18n( "Color:" ), page );
+    m_checkBgColor = new TQCheckBox( i18n( "Background color:" ), page );
+    m_checkBold = new TQCheckBox( i18n( "Bold:" ), page );
+    m_checkItalic = new TQCheckBox( i18n( "Italic:" ),page );
+    m_checkShadow = new TQCheckBox( i18n( "Shadow:" ), page );
+    m_checkWordByWord = new TQCheckBox( i18n( "Word by word:" ), page );
+
+    m_checkUnderline = new TQCheckBox( i18n( "Underline:" ), page);
+    m_underlineItem = new TQComboBox( page );
     // This has to be the type list, not the style list (we need the "no underline" case).
     // Of course we could even have both...
     m_underlineItem->insertStringList( KoTextFormat::underlineTypeList() );
     m_underlineItem->setCurrentItem( (int)m_ctx->m_underline );
 
-    m_checkStrikeOut= new QCheckBox( i18n( "Strikeout:" ), page);
+    m_checkStrikeOut= new TQCheckBox( i18n( "Strikeout:" ), page);
 
-    m_strikeOutItem = new QComboBox( page );
+    m_strikeOutItem = new TQComboBox( page );
     m_strikeOutItem->insertStringList( KoTextFormat::strikeOutTypeList() );
     m_strikeOutItem->setCurrentItem( (int)m_ctx->m_strikeOut );
 
 
-    m_checkFontAttribute = new QCheckBox( i18n( "Capitalization:" ), page);
-    m_fontAttributeItem = new QComboBox( page );
+    m_checkFontAttribute = new TQCheckBox( i18n( "Capitalization:" ), page);
+    m_fontAttributeItem = new TQComboBox( page );
     m_fontAttributeItem->insertStringList( KoTextFormat::fontAttributeList() );
     m_fontAttributeItem->setCurrentItem( (int)m_ctx->m_attribute );
 
-    m_checkLanguage = new QCheckBox( i18n( "Language:" ), page);
-    m_languageItem = new QComboBox( page );
+    m_checkLanguage = new TQCheckBox( i18n( "Language:" ), page);
+    m_languageItem = new TQComboBox( page );
     m_languageItem->insertStringList( KoGlobal::listOfLanguages() );
     m_languageItem->setCurrentText( KoGlobal::languageFromTag( m_ctx->m_language ) );
 
 
-    m_checkVertAlign = new QCheckBox( i18n( "Vertical alignment:" ), page );
+    m_checkVertAlign = new TQCheckBox( i18n( "Vertical tqalignment:" ), page );
 
     m_familyItem = new KFontCombo(page);
     m_familyItem->setCurrentFont(m_ctx->m_family);
 
-    m_sizeItem = new QSpinBox( 4, 100, 1, page );
+    m_sizeItem = new TQSpinBox( 4, 100, 1, page );
     m_sizeItem->setValue( m_ctx->m_size );
 
     m_colorItem = new KColorButton( page );
@@ -603,32 +603,32 @@ KoFormatDia::KoFormatDia( QWidget* parent, const QString & _caption, KoSearchCon
 
 
 
-    QButtonGroup *grpBold = new QButtonGroup( 1, QGroupBox::Vertical, page );
+    TQButtonGroup *grpBold = new TQButtonGroup( 1, Qt::Vertical, page );
     grpBold->setRadioButtonExclusive( TRUE );
-    grpBold->layout();
-    m_boldYes=new QRadioButton( i18n("Yes"), grpBold );
-    m_boldNo=new QRadioButton( i18n("No"), grpBold );
+    grpBold->tqlayout();
+    m_boldYes=new TQRadioButton( i18n("Yes"), grpBold );
+    m_boldNo=new TQRadioButton( i18n("No"), grpBold );
 
-    QButtonGroup *grpItalic = new QButtonGroup( 1, QGroupBox::Vertical, page );
+    TQButtonGroup *grpItalic = new TQButtonGroup( 1, Qt::Vertical, page );
     grpItalic->setRadioButtonExclusive( TRUE );
-    grpItalic->layout();
-    m_italicYes=new QRadioButton( i18n("Yes"), grpItalic );
-    m_italicNo=new QRadioButton( i18n("No"), grpItalic );
+    grpItalic->tqlayout();
+    m_italicYes=new TQRadioButton( i18n("Yes"), grpItalic );
+    m_italicNo=new TQRadioButton( i18n("No"), grpItalic );
 
-    QButtonGroup *grpShadow = new QButtonGroup( 1, QGroupBox::Vertical, page );
+    TQButtonGroup *grpShadow = new TQButtonGroup( 1, Qt::Vertical, page );
     grpShadow->setRadioButtonExclusive( TRUE );
-    grpShadow->layout();
-    m_shadowYes=new QRadioButton( i18n("Yes"), grpShadow );
-    m_shadowNo=new QRadioButton( i18n("No"), grpShadow );
+    grpShadow->tqlayout();
+    m_shadowYes=new TQRadioButton( i18n("Yes"), grpShadow );
+    m_shadowNo=new TQRadioButton( i18n("No"), grpShadow );
 
-    QButtonGroup *grpWordByWord = new QButtonGroup( 1, QGroupBox::Vertical, page );
+    TQButtonGroup *grpWordByWord = new TQButtonGroup( 1, Qt::Vertical, page );
     grpWordByWord->setRadioButtonExclusive( TRUE );
-    grpWordByWord->layout();
-    m_wordByWordYes=new QRadioButton( i18n("Yes"), grpWordByWord );
-    m_wordByWordNo=new QRadioButton( i18n("No"), grpWordByWord );
+    grpWordByWord->tqlayout();
+    m_wordByWordYes=new TQRadioButton( i18n("Yes"), grpWordByWord );
+    m_wordByWordNo=new TQRadioButton( i18n("No"), grpWordByWord );
 
 
-    m_vertAlignItem = new QComboBox( false, page );
+    m_vertAlignItem = new TQComboBox( false, page );
     m_vertAlignItem->insertItem( i18n( "Normal" ), -1 );
     m_vertAlignItem->insertItem( i18n( "Subscript" ), -1 );
     m_vertAlignItem->insertItem( i18n( "Superscript" ), -1 );
@@ -670,29 +670,29 @@ KoFormatDia::KoFormatDia( QWidget* parent, const QString & _caption, KoSearchCon
     m_grid->addMultiCellWidget( tmpSep, 14, 14, 0, 1 );
 
     // signals and slots connections
-    QObject::connect( m_checkFamily, SIGNAL( toggled( bool ) ), m_familyItem, SLOT( setEnabled( bool ) ) );
-    QObject::connect( m_checkSize, SIGNAL( toggled( bool ) ), m_sizeItem, SLOT( setEnabled( bool ) ) );
-    QObject::connect( m_checkColor, SIGNAL( toggled( bool ) ), m_colorItem, SLOT( setEnabled( bool ) ) );
-    QObject::connect( m_checkBgColor, SIGNAL( toggled( bool ) ), m_bgColorItem, SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkFamily, TQT_SIGNAL( toggled( bool ) ), m_familyItem, TQT_SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkSize, TQT_SIGNAL( toggled( bool ) ), m_sizeItem, TQT_SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkColor, TQT_SIGNAL( toggled( bool ) ), m_colorItem, TQT_SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkBgColor, TQT_SIGNAL( toggled( bool ) ), m_bgColorItem, TQT_SLOT( setEnabled( bool ) ) );
 
-    QObject::connect( m_checkBold, SIGNAL( toggled( bool ) ), m_boldYes, SLOT( setEnabled( bool ) ) );
-    QObject::connect( m_checkItalic, SIGNAL( toggled( bool ) ), m_italicYes, SLOT( setEnabled( bool ) ) );
-    QObject::connect( m_checkStrikeOut, SIGNAL( toggled( bool ) ), m_strikeOutItem, SLOT( setEnabled( bool ) ) );
-    QObject::connect( m_checkShadow, SIGNAL( toggled( bool ) ), m_shadowYes, SLOT( setEnabled( bool ) ) );
-    QObject::connect( m_checkWordByWord, SIGNAL( toggled( bool ) ), m_wordByWordYes, SLOT( setEnabled( bool ) ) );
-    QObject::connect( m_checkFontAttribute, SIGNAL( toggled( bool ) ), m_fontAttributeItem, SLOT( setEnabled( bool ) ) );
-    QObject::connect( m_checkLanguage, SIGNAL( toggled( bool ) ), m_languageItem, SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkBold, TQT_SIGNAL( toggled( bool ) ), m_boldYes, TQT_SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkItalic, TQT_SIGNAL( toggled( bool ) ), m_italicYes, TQT_SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkStrikeOut, TQT_SIGNAL( toggled( bool ) ), m_strikeOutItem, TQT_SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkShadow, TQT_SIGNAL( toggled( bool ) ), m_shadowYes, TQT_SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkWordByWord, TQT_SIGNAL( toggled( bool ) ), m_wordByWordYes, TQT_SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkFontAttribute, TQT_SIGNAL( toggled( bool ) ), m_fontAttributeItem, TQT_SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkLanguage, TQT_SIGNAL( toggled( bool ) ), m_languageItem, TQT_SLOT( setEnabled( bool ) ) );
 
 
-    QObject::connect( m_checkBold, SIGNAL( toggled( bool ) ), m_boldNo, SLOT( setEnabled( bool ) ) );
-    QObject::connect( m_checkItalic, SIGNAL( toggled( bool ) ), m_italicNo, SLOT( setEnabled( bool ) ) );
-    QObject::connect( m_checkShadow, SIGNAL( toggled( bool ) ), m_shadowNo, SLOT( setEnabled( bool ) ) );
-    QObject::connect( m_checkWordByWord, SIGNAL( toggled( bool ) ), m_wordByWordNo, SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkBold, TQT_SIGNAL( toggled( bool ) ), m_boldNo, TQT_SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkItalic, TQT_SIGNAL( toggled( bool ) ), m_italicNo, TQT_SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkShadow, TQT_SIGNAL( toggled( bool ) ), m_shadowNo, TQT_SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkWordByWord, TQT_SIGNAL( toggled( bool ) ), m_wordByWordNo, TQT_SLOT( setEnabled( bool ) ) );
 
 
-    QObject::connect( m_checkVertAlign, SIGNAL( toggled( bool ) ), m_vertAlignItem, SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkVertAlign, TQT_SIGNAL( toggled( bool ) ), m_vertAlignItem, TQT_SLOT( setEnabled( bool ) ) );
 
-    QObject::connect( m_checkUnderline, SIGNAL( toggled( bool ) ), m_underlineItem, SLOT( setEnabled( bool ) ) );
+    TQObject::connect( m_checkUnderline, TQT_SIGNAL( toggled( bool ) ), m_underlineItem, TQT_SLOT( setEnabled( bool ) ) );
 
     slotReset();
 }
@@ -831,7 +831,7 @@ void KoFormatDia::ctxOptions( )
 }
 
 
-bool KoFindReplace::validateMatch( const QString & /*text*/, int index, int matchedlength )
+bool KoFindReplace::validateMatch( const TQString & /*text*/, int index, int matchedlength )
 {
     if ( !m_searchContextEnabled || !m_searchContext.m_optionsMask )
         return true;
@@ -921,10 +921,10 @@ bool KoFindReplace::validateMatch( const QString & /*text*/, int index, int matc
 
 bool KoFindReplace::shouldRestart()
 {
-    if ( m_find )
-        return m_find->shouldRestart( true /*since text is editable*/, m_doCounting );
+    if ( m_tqfind )
+        return m_tqfind->shouldRestart( true /*since text is editable*/, m_doCounting );
     else
-        return m_replace->shouldRestart( true /*since text is editable*/, m_doCounting );
+        return m_tqreplace->shouldRestart( true /*since text is editable*/, m_doCounting );
 }
 
 #include "KoSearchDia.moc"