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

diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp
index fcbb8f17..7e0386cd 100644
--- a/kexi/core/kexiinternalpart.cpp
+++ b/kexi/core/kexiinternalpart.cpp
@@ -24,8 +24,8 @@
 #include "kexiviewbase.h"
 #include "keximainwindow.h"
 
-#include <qasciidict.h>
-#include <qdialog.h>
+#include <tqasciidict.h>
+#include <tqdialog.h>
 
 #include <kdebug.h>
 #include <klibloader.h>
@@ -48,13 +48,13 @@ class KexiInternalPartManager
 		{
 			KexiInternalPart *part = m_parts[partName];
 			if (!part) {
-				QCString fullname("kexihandler_");
-				fullname += QCString(partName).lower();
+				TQCString fullname("kexihandler_");
+				fullname += TQCString(partName).lower();
 				part = KParts::ComponentFactory::createInstanceFromLibrary<KexiInternalPart>(
 					fullname, 0, fullname);
 				if (!part) {
 					if (msgHdr)
-						msgHdr->showErrorMessage(i18n("Could not load \"%1\" plugin.").arg(partName));
+						msgHdr->showErrorMessage(i18n("Could not load \"%1\" plugin.").tqarg(partName));
 				}
 				else
 					m_parts.insert(partName, part);
@@ -64,15 +64,15 @@ class KexiInternalPartManager
 	
 	private:
 		
-		QAsciiDict<KexiInternalPart> m_parts;
+		TQAsciiDict<KexiInternalPart> m_parts;
 };
 
 KexiInternalPartManager internalPartManager;
 
 //----------------------------------------------
 
-KexiInternalPart::KexiInternalPart(QObject *parent, const char *name, const QStringList &)
- : QObject(parent, name)
+KexiInternalPart::KexiInternalPart(TQObject *tqparent, const char *name, const TQStringList &)
+ : TQObject(tqparent, name)
  , m_uniqueDialog(true)
  , m_cancelled(false)
 {
@@ -90,21 +90,21 @@ KexiInternalPart::part(KexiDB::MessageHandler *msgHdr, const char* partName)
 }
 
 //static
-QWidget* KexiInternalPart::createWidgetInstance(const char* partName, 
+TQWidget* KexiInternalPart::createWidgetInstance(const char* partName, 
 	const char* widgetClass, KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, 
-	QWidget *parent, const char *objName, QMap<QString,QString>* args)
+	TQWidget *tqparent, const char *objName, TQMap<TQString,TQString>* args)
 {
 	KexiInternalPart *part = internalPartManager.findPart(msgHdr, partName);
 	if (!part)
 		return 0; //fatal!
-	return part->createWidget(widgetClass, mainWin, parent, objName ? objName : partName, args);
+	return part->createWidget(widgetClass, mainWin, tqparent, objName ? objName : partName, args);
 }
 
 KexiDialogBase* KexiInternalPart::findOrCreateKexiDialog(
 	KexiMainWindow* mainWin, const char *objName)
 {
 	if (m_uniqueDialog && !m_uniqueWidget.isNull())
-		return dynamic_cast<KexiDialogBase*>((QWidget*)m_uniqueWidget);
+		return dynamic_cast<KexiDialogBase*>((TQWidget*)m_uniqueWidget);
 //	KexiDialogBase *dlg = createDialog(mainWin, objName);
 	KexiDialogBase * dlg = new KexiDialogBase(mainWin, "");
 	KexiViewBase *view = createView(mainWin, 0, objName);
@@ -118,8 +118,8 @@ KexiDialogBase* KexiInternalPart::findOrCreateKexiDialog(
 	dlg->addView(view);
 	dlg->setCaption( view->caption() );
 	dlg->setTabCaption( view->caption() );
-	dlg->resize(view->sizeHint());
-	dlg->setMinimumSize(view->minimumSizeHint().width(),view->minimumSizeHint().height());
+	dlg->resize(view->tqsizeHint());
+	dlg->setMinimumSize(view->tqminimumSizeHint().width(),view->tqminimumSizeHint().height());
 	dlg->setId( mainWin->generatePrivateID() );
 	dlg->registerDialog();
 	return dlg;
@@ -139,25 +139,25 @@ KexiDialogBase* KexiInternalPart::createKexiDialogInstance(
 }
 
 //static
-QDialog* KexiInternalPart::createModalDialogInstance(const char* partName, 
+TQDialog* KexiInternalPart::createModalDialogInstance(const char* partName, 
 	const char* dialogClass, KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, 
-	const char *objName, QMap<QString,QString>* args)
+	const char *objName, TQMap<TQString,TQString>* args)
 {
 	KexiInternalPart *part = internalPartManager.findPart(msgHdr, partName);
 	if (!part) {
 		kdDebug() << "KexiInternalPart::createDialogInstance() !part" << endl;
 		return 0; //fatal!
 	}
-	QWidget *w;
+	TQWidget *w;
 	if (part->uniqueDialog() && !part->m_uniqueWidget.isNull())
 		w = part->m_uniqueWidget;
 	else
 		w = part->createWidget(dialogClass, mainWin, mainWin, objName ? objName : partName, args);
 
-	if (dynamic_cast<QDialog*>(w)) {
+	if (dynamic_cast<TQDialog*>(w)) {
 		if (part->uniqueDialog())
 			part->m_uniqueWidget = w;
-		return dynamic_cast<QDialog*>(w);
+		return dynamic_cast<TQDialog*>(w);
 	}
 	//sanity
 	if (! (part->uniqueDialog() && !part->m_uniqueWidget.isNull()))
@@ -167,7 +167,7 @@ QDialog* KexiInternalPart::createModalDialogInstance(const char* partName,
 
 //static 
 bool KexiInternalPart::executeCommand(const char* partName, 
-	KexiMainWindow* mainWin, const char* commandName, QMap<QString,QString>* args)
+	KexiMainWindow* mainWin, const char* commandName, TQMap<TQString,TQString>* args)
 {
 	KexiInternalPart *part = internalPartManager.findPart(0, partName);
 	if (!part) {
@@ -177,28 +177,28 @@ bool KexiInternalPart::executeCommand(const char* partName,
 	return part->executeCommand(mainWin, commandName, args);
 }
 
-QWidget* KexiInternalPart::createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
-	QWidget * parent, const char * objName, QMap<QString,QString>* args)
+TQWidget* KexiInternalPart::createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
+	TQWidget * tqparent, const char * objName, TQMap<TQString,TQString>* args)
 {
 	Q_UNUSED(widgetClass);
 	Q_UNUSED(mainWin);
-	Q_UNUSED(parent);
+	Q_UNUSED(tqparent);
 	Q_UNUSED(objName);
 	Q_UNUSED(args);
 	return 0;
 }
 
-KexiViewBase* KexiInternalPart::createView(KexiMainWindow* mainWin, QWidget * parent,
+KexiViewBase* KexiInternalPart::createView(KexiMainWindow* mainWin, TQWidget * tqparent,
  const char * objName)
 {
 	Q_UNUSED(mainWin);
-	Q_UNUSED(parent);
+	Q_UNUSED(tqparent);
 	Q_UNUSED(objName);
 	return 0;
 }
 
 bool KexiInternalPart::executeCommand(KexiMainWindow* mainWin, const char* commandName, 
-	QMap<QString,QString>* args)
+	TQMap<TQString,TQString>* args)
 {
 	Q_UNUSED(mainWin);
 	Q_UNUSED(commandName);