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, 29 insertions, 29 deletions

diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp
index 0f4b4dd5..f2860cf1 100644
--- a/lib/kotext/KoCompletionDia.cpp
+++ b/lib/kotext/KoCompletionDia.cpp
@@ -25,23 +25,23 @@
 #include <kcompletion.h>
 #include <kconfig.h>
 #include <kdebug.h>
-#include <qlayout.h>
-#include <qvbox.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qcombobox.h>
-#include <qgroupbox.h>
-#include <qwhatsthis.h>
-
-KoCompletionDia::KoCompletionDia( QWidget *parent, const char *name, KoAutoFormat * autoFormat )
-    : KDialogBase( parent, name , true, i18n( "Completion" ), Ok|Cancel|User1,
+#include <tqlayout.h>
+#include <tqvbox.h>
+#include <tqcheckbox.h>
+#include <tqpushbutton.h>
+#include <tqspinbox.h>
+#include <tqcombobox.h>
+#include <tqgroupbox.h>
+#include <tqwhatsthis.h>
+
+KoCompletionDia::KoCompletionDia( TQWidget *tqparent, const char *name, KoAutoFormat * autoFormat )
+    : KDialogBase( tqparent, name , true, i18n( "Completion" ), Ok|Cancel|User1,
       Ok, true, KGuiItem( i18n( "&Reset" ), "undo" ) )
 {
-    QVBox *page = makeVBoxMainWidget();
+    TQVBox *page = makeVBoxMainWidget();
     m_widget = new KoCompletion(page, autoFormat);
-    m_widget->layout()->setMargin(0);
-    connect( this, SIGNAL( user1Clicked() ), m_widget, SLOT(slotResetConf()));
+    m_widget->tqlayout()->setMargin(0);
+    connect( this, TQT_SIGNAL( user1Clicked() ), m_widget, TQT_SLOT(slotResetConf()));
     setButtonWhatsThis(Ok,i18n("This will save your options."));
     setButtonWhatsThis(Cancel,i18n("This will abort all changes."));
     setButtonWhatsThis(User1,i18n("This will reset to the state after you clicked on the Make Default button."));
@@ -53,12 +53,12 @@ void KoCompletionDia::slotOk()
     KDialogBase::slotOk();
 }
 
-KoCompletion::KoCompletion(QWidget *parent, KoAutoFormat *autoFormat) : KoCompletionBase(parent),
+KoCompletion::KoCompletion(TQWidget *tqparent, KoAutoFormat *autoFormat) : KoCompletionBase(tqparent),
       m_autoFormat( *autoFormat ),
       m_docAutoFormat( autoFormat )
 {
-    connect(cbAllowCompletion, SIGNAL(toggled ( bool )), this, SLOT( changeButtonStatus()));
-    QStringList lst;
+    connect(cbAllowCompletion, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( changeButtontqStatus()));
+    TQStringList lst;
     lst << i18n( "Enter" );
     lst << i18n( "Tab" );
     lst << i18n( "Space" );
@@ -66,18 +66,18 @@ KoCompletion::KoCompletion(QWidget *parent, KoAutoFormat *autoFormat) : KoComple
     lst << i18n( "Right" );
     m_completionKeyAction->insertStringList( lst );
 
-    connect( m_lbListCompletion, SIGNAL( selected ( const QString & ) ), this, SLOT( slotCompletionWordSelected( const QString & )));
-    connect( m_lbListCompletion, SIGNAL( highlighted ( const QString & ) ), this, SLOT( slotCompletionWordSelected( const QString & )));
+    connect( m_lbListCompletion, TQT_SIGNAL( selected ( const TQString & ) ), this, TQT_SLOT( slotCompletionWordSelected( const TQString & )));
+    connect( m_lbListCompletion, TQT_SIGNAL( highlighted ( const TQString & ) ), this, TQT_SLOT( slotCompletionWordSelected( const TQString & )));
 
-    connect( pbAddCompletionEntry, SIGNAL( clicked() ), this, SLOT( slotAddCompletionEntry()));
-    connect( pbRemoveCompletionEntry, SIGNAL( clicked() ), this, SLOT( slotRemoveCompletionEntry()));
-    connect( pbSaveCompletionEntry, SIGNAL( clicked() ), this, SLOT( slotSaveCompletionEntry()));
+    connect( pbAddCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCompletionEntry()));
+    connect( pbRemoveCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveCompletionEntry()));
+    connect( pbSaveCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSaveCompletionEntry()));
 
     slotResetConf(); // aka load config
-    changeButtonStatus();
+    changeButtontqStatus();
 }
 
-void KoCompletion::changeButtonStatus() {
+void KoCompletion::changeButtontqStatus() {
     bool state = cbAllowCompletion->isChecked();
 
     completionBox->setEnabled( state);
@@ -122,15 +122,15 @@ void KoCompletion::slotResetConf() {
     default:
         m_completionKeyAction->setCurrentItem( 0 );
     }
-    changeButtonStatus();
+    changeButtontqStatus();
 }
 
 void KoCompletion::slotAddCompletionEntry() {
     bool ok;
-    QString const newWord = KInputDialog::getText( i18n("Add Completion Entry"), i18n("Enter entry:"), QString::null, &ok, this ).lower();
+    TQString const newWord = KInputDialog::getText( i18n("Add Completion Entry"), i18n("Enter entry:"), TQString(), &ok, this ).lower();
     if ( ok )
     {
-        if ( !m_listCompletion.contains( newWord ))
+        if ( !m_listCompletion.tqcontains( newWord ))
         {
             m_listCompletion.append( newWord );
             m_lbListCompletion->insertItem( newWord );
@@ -142,7 +142,7 @@ void KoCompletion::slotAddCompletionEntry() {
 }
 
 void KoCompletion::slotRemoveCompletionEntry() {
-    QString text = m_lbListCompletion->currentText();
+    TQString text = m_lbListCompletion->currentText();
     if( !text.isEmpty() )
     {
         m_listCompletion.remove( text );
@@ -152,7 +152,7 @@ void KoCompletion::slotRemoveCompletionEntry() {
     }
 }
 
-void KoCompletion::slotCompletionWordSelected( const QString & word) {
+void KoCompletion::slotCompletionWordSelected( const TQString & word) {
     pbRemoveCompletionEntry->setEnabled( !word.isEmpty() );
 }