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

diff --git a/kword/KWDeleteDia.cpp b/kword/KWDeleteDia.cpp
index ab447cc6..cb64b61b 100644
--- a/kword/KWDeleteDia.cpp
+++ b/kword/KWDeleteDia.cpp
@@ -23,17 +23,17 @@
 #include "KWView.h"
 
 #include <klocale.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
 
-KWDeleteDia::KWDeleteDia( KWView *parent, KWTableFrameSet *table, DeleteType type, QValueList<uint> remove)
-    : KDialogBase( Plain, (type==deleteRow?i18n("Delete Row") : i18n("Delete Column")), Ok | Cancel, Ok, parent, "Delete Table items dialog", true )
+KWDeleteDia::KWDeleteDia( KWView *tqparent, KWTableFrameSet *table, DeleteType type, TQValueList<uint> remove)
+    : KDialogBase( Plain, (type==deleteRow?i18n("Delete Row") : i18n("Delete Column")), Ok | Cancel, Ok, tqparent, "Delete Table items dialog", true )
 {
     Q_ASSERT(type == deleteRow || type == deleteColumn);
     m_type = type;
     m_table = table;
     m_toRemove = remove;
-    m_view = parent;
+    m_view = tqparent;
 
     setupTab1();
     setButtonOK( KGuiItem(
@@ -43,12 +43,12 @@ KWDeleteDia::KWDeleteDia( KWView *parent, KWTableFrameSet *table, DeleteType typ
 }
 
 void KWDeleteDia::setupTab1() {
-    QWidget *tab1 = plainPage();
-    QGridLayout *grid1 = new QGridLayout( tab1, 4, 1, 0, spacingHint() );
+    TQWidget *tab1 = plainPage();
+    TQGridLayout *grid1 = new TQGridLayout( tab1, 4, 1, 0, spacingHint() );
     unsigned int count = m_toRemove.count();
     Q_ASSERT(count > 0);
 
-    QString message;
+    TQString message;
     if ( count == ( (m_type == deleteRow) ? m_table->getRows() : m_table->getColumns() ) )
         // all the columns are selected and the user asked to remove columns or the same with rows
         // => we want to delete the whole table
@@ -58,24 +58,24 @@ void KWDeleteDia::setupTab1() {
         message = m_type == deleteRow ? i18n("Delete all selected rows?") : i18n("Delete all selected cells?");
     else if ( count == 1 ) {
         message = m_type == deleteRow ? i18n( "Delete row number %1?" ) : i18n( "Delete column number %1?" );
-        message = message.arg( m_toRemove.first() + 1 ); // +1 because humans count from 1
+        message = message.tqarg( m_toRemove.first() + 1 ); // +1 because humans count from 1
     }
     else {
         message = m_type == deleteRow ? i18n( "Delete rows: %1 ?" ) : i18n( "Delete columns: %1 ?" );
 
-        QValueListIterator<uint> items = m_toRemove.begin();
-        QString rows;
+        TQValueListIterator<uint> items = m_toRemove.begin();
+        TQString rows;
         for(;items != m_toRemove.end(); ++items) {
             if(! rows.isEmpty())
                 rows += ", ";
-            rows += QString().setNum((*items) +1);
+            rows += TQString().setNum((*items) +1);
         }
-        message = message.arg( rows );
+        message = message.tqarg( rows );
     }
 
-    QLabel *rc = new QLabel( message , tab1 );
-    rc->resize( rc->sizeHint() );
-    rc->setAlignment( AlignLeft | AlignBottom );
+    TQLabel *rc = new TQLabel( message , tab1 );
+    rc->resize( rc->tqsizeHint() );
+    rc->tqsetAlignment( AlignLeft | AlignBottom );
     grid1->addWidget( rc, 1, 0 );
 }