TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


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

1 files changed, 30 insertions, 30 deletions

diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp
index 58cc554d..e5b39340 100644
--- a/kommander/editor/tableeditorimpl.cpp
+++ b/kommander/editor/tableeditorimpl.cpp
@@ -1,5 +1,5 @@
 #include "tableeditorimpl.h"
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #endif
 #include "formwindow.h"
@@ -21,15 +21,15 @@
 
 #include <klocale.h>
 
-TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl )
-    : TableEditorBase( parent, name, modal, fl ),
-#ifndef QT_NO_TABLE
+TableEditor::TableEditor( TQWidget* tqparent,  TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl )
+    : TableEditorBase( tqparent, name, modal, fl ),
+#ifndef TQT_NO_TABLE
     editTable( (TQTable*)editWidget ),
 #endif
     formWindow( fw )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     labelColumnPixmap->setText( "" );
     labelRowPixmap->setText( "" );
 
@@ -39,7 +39,7 @@ TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *f
 	labelTable->hide();
 	labelTableValue->hide();
     }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) {
 	// ## why does this behave weird?
 	//	TabWidget->removePage( rows_tab );
@@ -93,7 +93,7 @@ void TableEditor::columnTextChanged( const TQString &s )
     listColumns->blockSignals( true );
     listColumns->changeItem( s, listColumns->currentItem() );
     listColumns->blockSignals( false );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     if ( table->horizontalHeader()->iconSet( listColumns->currentItem() ) )
 	table->horizontalHeader()->setLabel( listColumns->currentItem(),
 					     *table->horizontalHeader()->iconSet( listColumns->currentItem() ), s );
@@ -130,13 +130,13 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i )
 	labelColumnPixmap->setText( "" );
     editColumnText->blockSignals( false );
 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) {
-	TQString s = *fieldMap.find( listColumns->index( i ) );
+	TQString s = *fieldMap.tqfind( listColumns->index( i ) );
 	if ( s.isEmpty() )
 	    comboFields->setCurrentItem( 0 );
-	else if ( comboFields->listBox()->findItem( s ) )
-	    comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->findItem( s ) ) );
+	else if ( comboFields->listBox()->tqfindItem( s ) )
+	    comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->tqfindItem( s ) ) );
 	else
 	    comboFields->lineEdit()->setText( s );
     }
@@ -173,7 +173,7 @@ void TableEditor::deleteColumnClicked()
 {
     if ( listColumns->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumCols( table->numCols() - 1 );
     delete listColumns->item( listColumns->currentItem() );
     readColumns();
@@ -188,7 +188,7 @@ void TableEditor::deleteRowClicked()
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumRows( table->numRows() - 1 );
     delete listRows->item( listRows->currentItem() );
     readRows();
@@ -201,14 +201,14 @@ void TableEditor::deleteRowClicked()
 
 void TableEditor::newColumnClicked()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumCols( table->numCols() + 1 );
     TQMap<TQString, bool> m;
     for ( int i = 0; i < table->numCols() - 1; ++i )
 	m.insert( table->horizontalHeader()->label( i ), true );
     int n = table->numCols() - 1;
     TQString t = TQString::number( n );
-    while ( m.find( t ) != m.end() )
+    while ( m.tqfind( t ) != m.end() )
 	t = TQString::number( ++n );
     table->horizontalHeader()->setLabel( table->numCols() - 1, t );
     listColumns->insertItem( t );
@@ -226,14 +226,14 @@ void TableEditor::newColumnClicked()
 
 void TableEditor::newRowClicked()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumRows( table->numRows() + 1 );
     TQMap<TQString, bool> m;
     for ( int i = 0; i < table->numRows() - 1; ++i )
 	m.insert( table->verticalHeader()->label( i ), true );
     int n = table->numRows() - 1;
     TQString t = TQString::number( n );
-    while ( m.find( t ) != m.end() )
+    while ( m.tqfind( t ) != m.end() )
 	t = TQString::number( ++n );
     table->verticalHeader()->setLabel( table->numRows() - 1, t );
     listRows->insertItem( t );
@@ -267,7 +267,7 @@ void TableEditor::rowTextChanged( const TQString &s )
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     listRows->changeItem( s, listRows->currentItem() );
     if ( table->verticalHeader()->iconSet( listRows->currentItem() ) )
 	table->verticalHeader()->setLabel( listRows->currentItem(),
@@ -296,13 +296,13 @@ void TableEditor::applyClicked()
     TQValueList<PopulateTableCommand::Column> cols;
 
     int i = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( i = 0; i < table->horizontalHeader()->count(); ++i ) {
 	PopulateTableCommand::Column col;
 	col.text = table->horizontalHeader()->label( i );
 	if ( table->horizontalHeader()->iconSet( i ) )
 	    col.pix = table->horizontalHeader()->iconSet( i )->pixmap();
-	col.field = *fieldMap.find( i );
+	col.field = *fieldMap.tqfind( i );
 	cols.append( col );
     }
     for ( i = 0; i < table->verticalHeader()->count(); ++i ) {
@@ -312,7 +312,7 @@ void TableEditor::applyClicked()
 	    row.pix = table->verticalHeader()->iconSet( i )->pixmap();
 	rows.append( row );
     }
-    PopulateTableCommand *cmd = new PopulateTableCommand( i18n("Edit Rows and Columns of '%1' " ).arg( editTable->name() ),
+    PopulateTableCommand *cmd = new PopulateTableCommand( i18n("Edit Rows and Columns of '%1' " ).tqarg( editTable->name() ),
 							  formWindow, editTable, rows, cols );
     cmd->execute();
     formWindow->commandHistory()->addCommand( cmd );
@@ -332,7 +332,7 @@ void TableEditor::chooseRowPixmapClicked()
     if ( pix.isNull() )
 	return;
 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->verticalHeader()->setLabel( listRows->currentItem(), pix, table->verticalHeader()->label( listRows->currentItem() ) );
     listRows->changeItem( pix, listRows->currentText(), listRows->currentItem() );
 #endif
@@ -342,7 +342,7 @@ void TableEditor::deleteRowPixmapClicked()
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->verticalHeader()->setLabel( listRows->currentItem(), TQPixmap(), table->verticalHeader()->label( listRows->currentItem() ) );
     listRows->changeItem( listRows->currentText(), listRows->currentItem() );
 #endif
@@ -360,7 +360,7 @@ void TableEditor::chooseColPixmapClicked()
 
     if ( pix.isNull() )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->horizontalHeader()->setLabel( listColumns->currentItem(), pix, table->horizontalHeader()->label( listColumns->currentItem() ) );
     listColumns->changeItem( pix, listColumns->currentText(), listColumns->currentItem() );
 #endif
@@ -370,7 +370,7 @@ void TableEditor::deleteColPixmapClicked()
 {
     if ( listColumns->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->horizontalHeader()->setLabel( listColumns->currentItem(), TQPixmap(), table->horizontalHeader()->label( listColumns->currentItem() ) );
     listColumns->changeItem( listColumns->currentText(), listColumns->currentItem() );
 #endif
@@ -378,10 +378,10 @@ void TableEditor::deleteColPixmapClicked()
 
 void TableEditor::readFromTable()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQHeader *cols = editTable->horizontalHeader();
     table->setNumCols( cols->count() );
-    TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( editTable );
+    TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(editTable) );
     for ( int i = 0; i < cols->count(); ++i ) {
 	if ( editTable->horizontalHeader()->iconSet( i ) ) {
 	    table->horizontalHeader()->setLabel( i, *editTable->horizontalHeader()->iconSet( i ),
@@ -392,7 +392,7 @@ void TableEditor::readFromTable()
 	    table->horizontalHeader()->setLabel( i, editTable->horizontalHeader()->label( i ) );
 	    listColumns->insertItem( editTable->horizontalHeader()->label( i ) );
 	}
-	TQString cf = *columnFields.find( editTable->horizontalHeader()->label( i ) );
+	TQString cf = *columnFields.tqfind( editTable->horizontalHeader()->label( i ) );
 	fieldMap.insert( i, cf );
     }
 
@@ -425,7 +425,7 @@ void TableEditor::readFromTable()
 void TableEditor::readColumns()
 {
     int j = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( TQListBoxItem *i = listColumns->firstItem(); i; i = i->next(), ++j ) {
 	if ( i->pixmap() )
 	    table->horizontalHeader()->setLabel( j, *i->pixmap(), i->text() );
@@ -438,7 +438,7 @@ void TableEditor::readColumns()
 void TableEditor::readRows()
 {
     int j = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( TQListBoxItem *i = listRows->firstItem(); i; i = i->next(), ++j ) {
 	if ( i->pixmap() )
 	    table->verticalHeader()->setLabel( j, *i->pixmap(), i->text() );