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

diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 11c0cff01..931eab730 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -30,9 +30,9 @@
 #include <kexiutils/utils.h>
 #include <widget/kexicharencodingcombobox.h>
 
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qclipboard.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
+#include <tqclipboard.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -44,8 +44,8 @@
 
 
 KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
-	KexiMainWindow* mainWin, QWidget * parent, const char * name )
- : KWizard(parent, name)
+	KexiMainWindow* mainWin, TQWidget * tqparent, const char * name )
+ : KWizard(tqparent, name)
  , m_options(options)
 // , m_mode(mode)
 // , m_itemId(itemId)
@@ -65,7 +65,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 	}
 	helpButton()->hide();
 
-	QString infoLblFromText;
+	TQString infoLblFromText;
 	KexiGUIMessageHandler msgh(this);
 	m_tableOrQuery = new KexiDB::TableOrQuerySchema(
 		m_mainWin->project()->dbConnection(), m_options.itemId);
@@ -109,13 +109,13 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 		m_fileSavePage->setAdditionalFilters( csvMimeTypes() );
 		m_fileSavePage->setDefaultExtension("csv");
 		m_fileSavePage->setLocationText( KexiUtils::stringToFileName(m_tableOrQuery->captionOrName()) );
-		connect(m_fileSavePage, SIGNAL(rejected()), this, SLOT(reject()));
+		connect(m_fileSavePage, TQT_SIGNAL(rejected()), this, TQT_SLOT(reject()));
 		addPage(m_fileSavePage, i18n("Enter Name of File You Want to Save Data To"));
 	}
 
 	// 2. Export options
-	m_exportOptionsPage = new QWidget(this, "m_exportOptionsPage");
-	QGridLayout *exportOptionsLyr = new QGridLayout( m_exportOptionsPage, 6, 3,
+	m_exportOptionsPage = new TQWidget(this, "m_exportOptionsPage");
+	TQGridLayout *exportOptionsLyr = new TQGridLayout( m_exportOptionsPage, 6, 3,
 		KDialogBase::marginHint(), KDialogBase::spacingHint(), "exportOptionsLyr");
 	m_infoLblFrom = new KexiCSVInfoLabel( infoLblFromText, m_exportOptionsPage );
 	KexiPart::Info *partInfo = Kexi::partManager().infoForMimeType(
@@ -135,18 +135,18 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 
 	m_showOptionsButton = new KPushButton(KGuiItem(i18n("Show Options >>"), "configure"),
 		m_exportOptionsPage);
-	connect(m_showOptionsButton, SIGNAL(clicked()), this, SLOT(slotShowOptionsButtonClicked()));
+	connect(m_showOptionsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowOptionsButtonClicked()));
 	exportOptionsLyr->addMultiCellWidget(m_showOptionsButton, 2, 2, 0, 0);
-	m_showOptionsButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+	m_showOptionsButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 
 	// -<options section>
-	m_exportOptionsSection = new QGroupBox(1, Vertical, i18n("Options"), m_exportOptionsPage,
+	m_exportOptionsSection = new TQGroupBox(1,Qt::Vertical, i18n("Options"), m_exportOptionsPage,
 		"m_exportOptionsSection");
-	m_exportOptionsSection->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+	m_exportOptionsSection->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 	exportOptionsLyr->addMultiCellWidget(m_exportOptionsSection, 3, 3, 0, 1);
-	QWidget *exportOptionsSectionWidget
-		= new QWidget(m_exportOptionsSection, "exportOptionsSectionWidget");
-	QGridLayout *exportOptionsSectionLyr = new QGridLayout( exportOptionsSectionWidget, 5, 2,
+	TQWidget *exportOptionsSectionWidget
+		= new TQWidget(m_exportOptionsSection, "exportOptionsSectionWidget");
+	TQGridLayout *exportOptionsSectionLyr = new TQGridLayout( exportOptionsSectionWidget, 5, 2,
 		0, KDialogBase::spacingHint(), "exportOptionsLyr");
 
 	// -delimiter
@@ -154,35 +154,35 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 		exportOptionsSectionWidget);
 	m_delimiterWidget->setDelimiter(defaultDelimiter());
 	exportOptionsSectionLyr->addWidget( m_delimiterWidget, 0, 1 );
-	QLabel *delimiterLabel = new QLabel(m_delimiterWidget, i18n("Delimiter:"), exportOptionsSectionWidget);
+	TQLabel *delimiterLabel = new TQLabel(m_delimiterWidget, i18n("Delimiter:"), exportOptionsSectionWidget);
 	exportOptionsSectionLyr->addWidget( delimiterLabel, 0, 0 );
 
 	// -text quote
-	QWidget *textQuoteWidget = new QWidget(exportOptionsSectionWidget);
-	QHBoxLayout *textQuoteLyr = new QHBoxLayout(textQuoteWidget);
+	TQWidget *textQuoteWidget = new TQWidget(exportOptionsSectionWidget);
+	TQHBoxLayout *textQuoteLyr = new TQHBoxLayout(textQuoteWidget);
 	exportOptionsSectionLyr->addWidget(textQuoteWidget, 1, 1);
 	m_textQuote = new KexiCSVTextQuoteComboBox( textQuoteWidget );
 	m_textQuote->setTextQuote(defaultTextQuote());
 	textQuoteLyr->addWidget( m_textQuote );
 	textQuoteLyr->addStretch(0);
-	QLabel *textQuoteLabel = new QLabel(m_textQuote, i18n("Text quote:"), exportOptionsSectionWidget);
+	TQLabel *textQuoteLabel = new TQLabel(m_textQuote, i18n("Text quote:"), exportOptionsSectionWidget);
 	exportOptionsSectionLyr->addWidget( textQuoteLabel, 1, 0 );
 
 	// - character encoding
 	m_characterEncodingCombo = new KexiCharacterEncodingComboBox( exportOptionsSectionWidget );
-	m_characterEncodingCombo->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+	m_characterEncodingCombo->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 	exportOptionsSectionLyr->addWidget( m_characterEncodingCombo, 2, 1 );
-	QLabel *characterEncodingLabel = new QLabel(m_characterEncodingCombo, i18n("Text encoding:"),
+	TQLabel *characterEncodingLabel = new TQLabel(m_characterEncodingCombo, i18n("Text encoding:"),
 		exportOptionsSectionWidget);
 	exportOptionsSectionLyr->addWidget( characterEncodingLabel, 2, 0 );
 
 	// - checkboxes
-	m_addColumnNamesCheckBox = new QCheckBox(i18n("Add column names as the first row"),
+	m_addColumnNamesCheckBox = new TQCheckBox(i18n("Add column names as the first row"),
 		exportOptionsSectionWidget);
 	m_addColumnNamesCheckBox->setChecked(true);
 	exportOptionsSectionLyr->addWidget( m_addColumnNamesCheckBox, 3, 1 );
 //! @todo 1.1: for copying use "Always use above options for copying" string
-	m_alwaysUseCheckBox = new QCheckBox(i18n("Always use above options for exporting"),
+	m_alwaysUseCheckBox = new TQCheckBox(i18n("Always use above options for exporting"),
 		m_exportOptionsPage);
 	exportOptionsLyr->addMultiCellWidget(m_alwaysUseCheckBox, 4, 4, 0, 1);
 //	exportOptionsSectionLyr->addWidget( m_alwaysUseCheckBox, 4, 1 );
@@ -192,7 +192,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 
 //	exportOptionsLyr->setColStretch(3, 1);
 	exportOptionsLyr->addMultiCell(
-		new QSpacerItem( 0, 0, QSizePolicy::Preferred, QSizePolicy::MinimumExpanding), 5, 5, 0, 1 );
+		new TQSpacerItem( 0, 0, TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding), 5, 5, 0, 1 );
 
 //	addPage(m_exportOptionsPage, i18n("Set Export Options"));
 	addPage(m_exportOptionsPage, m_options.mode==KexiCSVExport::Clipboard ? i18n("Copying") : i18n("Exporting"));
@@ -207,7 +207,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 	if (readBoolEntry("StoreOptionsForCSVExportDialog", false)) {
 		// load defaults:
 		m_alwaysUseCheckBox->setChecked(true);
-		QString s = readEntry("DefaultDelimiterForExportingCSVFiles", defaultDelimiter());
+		TQString s = readEntry("DefaultDelimiterForExportingCSVFiles", defaultDelimiter());
 		if (!s.isEmpty())
 			m_delimiterWidget->setDelimiter(s);
 		s = readEntry("DefaultTextQuoteForExportingCSVFiles", defaultTextQuote());
@@ -222,8 +222,8 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 	updateGeometry();
 
 	// -keep widths equal on page #2:
-	int width = QMAX( m_infoLblFrom->leftLabel()->sizeHint().width(),
-		m_infoLblTo->leftLabel()->sizeHint().width());
+	int width = TQMAX( m_infoLblFrom->leftLabel()->tqsizeHint().width(),
+		m_infoLblTo->leftLabel()->tqsizeHint().width());
 	m_infoLblFrom->leftLabel()->setFixedWidth(width);
 	m_infoLblTo->leftLabel()->setFixedWidth(width);
 }
@@ -238,7 +238,7 @@ bool KexiCSVExportWizard::cancelled() const
 	return m_cancelled;
 }
 
-void KexiCSVExportWizard::showPage ( QWidget * page )
+void KexiCSVExportWizard::showPage ( TQWidget * page )
 {
 	if (page == m_fileSavePage) {
 		m_fileSavePage->setFocus();
@@ -246,7 +246,7 @@ void KexiCSVExportWizard::showPage ( QWidget * page )
 	else if (page==m_exportOptionsPage) {
 		if (m_options.mode==KexiCSVExport::File)
 			m_infoLblTo->setFileName( m_fileSavePage->currentFileName() );
-		QString text = m_tableOrQuery->captionOrName();
+		TQString text = m_tableOrQuery->captionOrName();
 		if (!m_rowCountDetermined) {
 			//do this costly operation only once
 			m_rowCount = KexiDB::rowCount(*m_tableOrQuery);
@@ -255,11 +255,11 @@ void KexiCSVExportWizard::showPage ( QWidget * page )
 		int columns = KexiDB::fieldCount(*m_tableOrQuery);
 		text += "\n";
 		if (m_rowCount>0)
-			text += i18n("(rows: %1, columns: %2)").arg(m_rowCount).arg(columns);
+			text += i18n("(rows: %1, columns: %2)").tqarg(m_rowCount).tqarg(columns);
 		else
-			text += i18n("(columns: %1)").arg(columns);
+			text += i18n("(columns: %1)").tqarg(columns);
 		m_infoLblFrom->setLabelText(text);
-		QFontMetrics fm(m_infoLblFrom->fileNameLabel()->font());
+		TQFontMetrics fm(m_infoLblFrom->fileNameLabel()->font());
 		m_infoLblFrom->fileNameLabel()->setFixedHeight( fm.height() * 2 + fm.lineSpacing() );
 		if (m_defaultsBtn)
 			m_defaultsBtn->show();
@@ -287,7 +287,7 @@ void KexiCSVExportWizard::next()
 
 void KexiCSVExportWizard::done(int result)
 {
-	if (QDialog::Accepted == result) {
+	if (TQDialog::Accepted == result) {
 		if (m_fileSavePage)
 			m_options.fileName = m_fileSavePage->currentFileName();
 		m_options.delimiter = m_delimiterWidget->delimiter();
@@ -296,7 +296,7 @@ void KexiCSVExportWizard::done(int result)
 		if (!KexiCSVExport::exportData(*m_tableOrQuery, m_options))
 			return;
 	}
-	else if (QDialog::Rejected == result) {
+	else if (TQDialog::Rejected == result) {
 		//nothing to do
 	}
 
@@ -346,23 +346,23 @@ void KexiCSVExportWizard::slotShowOptionsButtonClicked()
 	}
 }
 
-void KexiCSVExportWizard::layOutButtonRow( QHBoxLayout * layout )
+void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * tqlayout )
 {
-	QWizard::layOutButtonRow( layout );
+	TQWizard::layOutButtonRow( tqlayout );
 
-	//find the last sublayout
-	QLayout *l = 0;
-	for (QLayoutIterator lit( layout->iterator() ); lit.current(); ++lit)
-		l = lit.current()->layout();
-	if (dynamic_cast<QBoxLayout*>(l)) {
+	//find the last subtqlayout
+	TQLayout *l = 0;
+	for (TQLayoutIterator lit( tqlayout->iterator() ); lit.current(); ++lit)
+		l = lit.current()->tqlayout();
+	if (dynamic_cast<TQBoxLayout*>(l)) {
 		if (!m_defaultsBtn) {
 			m_defaultsBtn = new KPushButton(i18n("Defaults"), this);
-			QWidget::setTabOrder(backButton(), m_defaultsBtn);
-			connect(m_defaultsBtn, SIGNAL(clicked()), this, SLOT(slotDefaultsButtonClicked()));
+			TQWidget::setTabOrder(backButton(), m_defaultsBtn);
+			connect(m_defaultsBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefaultsButtonClicked()));
 		}
 		if (!m_exportOptionsSection->isVisible())
 			m_defaultsBtn->hide();
-		dynamic_cast<QBoxLayout*>(l)->insertWidget(0, m_defaultsBtn);
+		dynamic_cast<TQBoxLayout*>(l)->insertWidget(0, m_defaultsBtn);
 	}
 }
 
@@ -374,13 +374,13 @@ void KexiCSVExportWizard::slotDefaultsButtonClicked()
 	m_characterEncodingCombo->selectDefaultEncoding();
 }
 
-static QString convertKey(const char *key, KexiCSVExport::Mode mode)
+static TQString convertKey(const char *key, KexiCSVExport::Mode mode)
 {
-	QString _key(QString::fromLatin1(key));
+	TQString _key(TQString::tqfromLatin1(key));
 	if (mode == KexiCSVExport::Clipboard) {
-		_key.replace("Exporting", "Copying");
-		_key.replace("Export", "Copy");
-		_key.replace("CSVFiles", "CSVToClipboard");
+		_key.tqreplace("Exporting", "Copying");
+		_key.tqreplace("Export", "Copy");
+		_key.tqreplace("CSVFiles", "CSVToClipboard");
 	}
 	return _key;
 }
@@ -390,12 +390,12 @@ bool KexiCSVExportWizard::readBoolEntry(const char *key, bool defaultValue)
 	return kapp->config()->readBoolEntry(convertKey(key, m_options.mode), defaultValue);
 }
 
-QString KexiCSVExportWizard::readEntry(const char *key, const QString& defaultValue)
+TQString KexiCSVExportWizard::readEntry(const char *key, const TQString& defaultValue)
 {
 	return kapp->config()->readEntry(convertKey(key, m_options.mode), defaultValue);
 }
 
-void KexiCSVExportWizard::writeEntry(const char *key, const QString& value)
+void KexiCSVExportWizard::writeEntry(const char *key, const TQString& value)
 {
 	kapp->config()->writeEntry(convertKey(key, m_options.mode), value);
 }
@@ -410,7 +410,7 @@ void KexiCSVExportWizard::deleteEntry(const char *key)
 	kapp->config()->deleteEntry(convertKey(key, m_options.mode));
 }
 
-QString KexiCSVExportWizard::defaultDelimiter() const
+TQString KexiCSVExportWizard::defaultDelimiter() const
 {
 	if (m_options.mode==KexiCSVExport::Clipboard) {
 		if (!m_options.forceDelimiter.isEmpty())
@@ -421,11 +421,11 @@ QString KexiCSVExportWizard::defaultDelimiter() const
 	return KEXICSV_DEFAULT_FILE_DELIMITER;
 }
 
-QString KexiCSVExportWizard::defaultTextQuote() const
+TQString KexiCSVExportWizard::defaultTextQuote() const
 {
 	if (m_options.mode==KexiCSVExport::Clipboard)
-		return KEXICSV_DEFAULT_CLIPBOARD_TEXT_QUOTE;
-	return KEXICSV_DEFAULT_FILE_TEXT_QUOTE;
+		return KEXICSV_DEFAULT_CLIPBOARD_TEXT_TQUOTE;
+	return KEXICSV_DEFAULT_FILE_TEXT_TQUOTE;
 }
 
 #include "kexicsvexportwizard.moc"