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

diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp
index 85f7f04af..c9b78f364 100644
--- a/kexi/main/kexinamedialog.cpp
+++ b/kexi/main/kexinamedialog.cpp
@@ -19,26 +19,26 @@
 
 #include "kexinamedialog.h"
 
-KexiNameDialog::KexiNameDialog(const QString& message, 
-	QWidget * parent, const char * name)
- : KDialogBase(KDialogBase::Plain, QString::null,
+KexiNameDialog::KexiNameDialog(const TQString& message, 
+	TQWidget * tqparent, const char * name)
+ : KDialogBase(KDialogBase::Plain, TQString(),
 	KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Help,
 	KDialogBase::Ok,
-	parent, name)
+	tqparent, name)
 {
-//	QHBox ( QWidget * parent = 0, const char * name = 0, WFlags f = 0 )
+//	TQHBox ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 )
 	m_widget= new KexiNameWidget(message, plainPage(), "KexiNameWidget");
 	init();
 }
 
-KexiNameDialog::KexiNameDialog(const QString& message, 
-	const QString& nameLabel, const QString& nameText, 
-	const QString& captionLabel, const QString& captionText, 
-	QWidget * parent, const char * name)
- : KDialogBase(KDialogBase::Plain, QString::null,
+KexiNameDialog::KexiNameDialog(const TQString& message, 
+	const TQString& nameLabel, const TQString& nameText, 
+	const TQString& captionLabel, const TQString& captionText, 
+	TQWidget * tqparent, const char * name)
+ : KDialogBase(KDialogBase::Plain, TQString(),
 	KDialogBase::Ok|KDialogBase::Cancel,
 	KDialogBase::Ok,
-	parent, name)
+	tqparent, name)
 {
 	m_widget= new KexiNameWidget(message, nameLabel, nameText,
 		captionLabel, captionText, plainPage(), "KexiNameWidget");
@@ -51,31 +51,31 @@ KexiNameDialog::~KexiNameDialog()
 
 void KexiNameDialog::init()
 {
-	QGridLayout *lyr = new QGridLayout(plainPage(), 2, 3);
-	m_icon = new QLabel( plainPage(), "icon" );
-	m_icon->setAlignment( int( AlignTop | AlignLeft ) );
-	m_icon->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred,1,0));
+	TQGridLayout *lyr = new TQGridLayout(plainPage(), 2, 3);
+	m_icon = new TQLabel( plainPage(), "icon" );
+	m_icon->tqsetAlignment( int( AlignTop | AlignLeft ) );
+	m_icon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0));
 	m_icon->setFixedWidth(50);
 	lyr->addWidget(m_icon,0,0);
 
-	m_widget->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred,1,0));
+	m_widget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0));
 	lyr->addWidget(m_widget,0,1);
-	lyr->addItem(new QSpacerItem( 25, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 2);
-	lyr->addItem(new QSpacerItem( 5, 10, QSizePolicy::Minimum, QSizePolicy::Expanding ), 1, 1);
+	lyr->addItem(new TQSpacerItem( 25, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ), 0, 2);
+	lyr->addItem(new TQSpacerItem( 5, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 1, 1);
 //	m_widget->captionLineEdit()->selectAll();
 //	m_widget->captionLineEdit()->setFocus();
-	connect(m_widget,SIGNAL(messageChanged()),this, SLOT(updateSize()));
+	connect(m_widget,TQT_SIGNAL(messageChanged()),this, TQT_SLOT(updateSize()));
 	updateSize();
 	enableButtonOK( true );
 	slotTextChanged();
-	connect(m_widget, SIGNAL(textChanged()), this, SLOT(slotTextChanged()));
+	connect(m_widget, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()));
 }
 
 void KexiNameDialog::updateSize()
 {
-//	resize( QSize(400, 140 + (m_widget->lbl_message->isVisible()?m_widget->lbl_message->height():0) )
-	resize( QSize(400, 140 + (!m_widget->lbl_message->text().isEmpty()?m_widget->lbl_message->height():0) )
-		.expandedTo(minimumSizeHint()) );
+//	resize( TQSize(400, 140 + (m_widget->lbl_message->isVisible()?m_widget->lbl_message->height():0) )
+	resize( TQSize(400, 140 + (!m_widget->lbl_message->text().isEmpty()?m_widget->lbl_message->height():0) )
+		.expandedTo(tqminimumSizeHint()) );
 //	updateGeometry();
 }
 
@@ -95,7 +95,7 @@ void KexiNameDialog::accept()
 	KDialogBase::accept();
 }
 
-void KexiNameDialog::setDialogIcon(const QPixmap& icon)
+void KexiNameDialog::setDialogIcon(const TQPixmap& icon)
 {
 	m_icon->setPixmap(icon);
 }