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

diff --git a/kexi/widget/kexidbdrivercombobox.cpp b/kexi/widget/kexidbdrivercombobox.cpp
index e3431531..8026106d 100644
--- a/kexi/widget/kexidbdrivercombobox.cpp
+++ b/kexi/widget/kexidbdrivercombobox.cpp
@@ -19,17 +19,17 @@
 
 #include "kexidbdrivercombobox.h"
 
-#include <qlistbox.h>
+#include <tqlistbox.h>
 
 #include <kiconloader.h>
 
-KexiDBDriverComboBox::KexiDBDriverComboBox(QWidget* parent, const KexiDB::Driver::InfoMap& driversInfo, 
+KexiDBDriverComboBox::KexiDBDriverComboBox(TQWidget* tqparent, const KexiDB::Driver::InfoMap& driversInfo, 
 	Options options)
- : KComboBox(parent, "KexiDBDriverComboBox")
+ : KComboBox(tqparent, "KexiDBDriverComboBox")
 {
 	//retrieve list of drivers and sort it: file-based first, then server-based
-	QStringList captionsForFileBasedDrivers, captionsForServerBasedDrivers;
-	QMap<QString,QString> fileBasedDriversDict, serverBasedDriversDict; //a map from caption to name
+	TQStringList captionsForFileBasedDrivers, captionsForServerBasedDrivers;
+	TQMap<TQString,TQString> fileBasedDriversDict, serverBasedDriversDict; //a map from caption to name
 	foreach(KexiDB::Driver::InfoMap::ConstIterator, it, driversInfo) {
 		if (it.data().fileBased) {
 			captionsForFileBasedDrivers += it.data().caption;
@@ -44,7 +44,7 @@ KexiDBDriverComboBox::KexiDBDriverComboBox(QWidget* parent, const KexiDB::Driver
 	captionsForServerBasedDrivers.sort();
 	//insert file-based
 	if (options & ShowFileDrivers) {
-		foreach(QStringList::ConstIterator, it, captionsForFileBasedDrivers) {
+		foreach(TQStringList::ConstIterator, it, captionsForFileBasedDrivers) {
 			const KexiDB::Driver::Info& info = driversInfo[ fileBasedDriversDict[ *it ] ];
 			//! @todo change this if better icon is available
 			insertItem( SmallIcon("gear"), info.caption );
@@ -53,7 +53,7 @@ KexiDBDriverComboBox::KexiDBDriverComboBox(QWidget* parent, const KexiDB::Driver
 	}
 	//insert server-based
 	if (options & ShowServerDrivers) {
-		foreach(QStringList::ConstIterator, it, captionsForServerBasedDrivers) {
+		foreach(TQStringList::ConstIterator, it, captionsForServerBasedDrivers) {
 			const KexiDB::Driver::Info& info = driversInfo[ serverBasedDriversDict[ *it ] ];
 			//! @todo change this if better icon is available
 			insertItem( SmallIcon("gear"), info.caption );
@@ -72,17 +72,17 @@ KexiDBDriverComboBox::~KexiDBDriverComboBox()
 {
 }
 
-QString KexiDBDriverComboBox::selectedDriverName() const
+TQString KexiDBDriverComboBox::selectedDriverName() const
 {
-	QMapConstIterator<QString,QString> it( m_driversMap.find( text( currentItem() ) ) );
+	TQMapConstIterator<TQString,TQString> it( m_driversMap.tqfind( text( currentItem() ) ) );
 	if (it==m_driversMap.constEnd())
-		return QString::null;
+		return TQString();
 	return it.data();
 }
 
-void KexiDBDriverComboBox::setDriverName(const QString& driverName)
+void KexiDBDriverComboBox::setDriverName(const TQString& driverName)
 {
-	int index = m_driverNames.findIndex( driverName.lower() );
+	int index = m_driverNames.tqfindIndex( driverName.lower() );
 	if (index==-1) {
 		return;
 	}