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

diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp
index 56ef997d..cf98b683 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp
@@ -20,9 +20,9 @@
 #include "kexitabledesignerview_p.h"
 #include "kexitabledesignerview.h"
 
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qsplitter.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqsplitter.h>
 
 #include <kiconloader.h>
 #include <kdebug.h>
@@ -109,7 +109,7 @@ KexiTableDesignerViewPrivate::KexiTableDesignerViewPrivate(KexiTableDesignerView
  , slotBeforeCellChanged_enabled(true)
  , tempStoreDataUsingRealAlterTable(false)
 {
-	historyActionCollection = new KActionCollection((QWidget*)0,"");
+	historyActionCollection = new KActionCollection((TQWidget*)0,"");
 	history = new CommandHistory(historyActionCollection, true);
 
 	internalPropertyNames.insert("subType",(char*)1);
@@ -133,10 +133,10 @@ int KexiTableDesignerViewPrivate::generateUniqueId()
 }
 
 void KexiTableDesignerViewPrivate::setPropertyValueIfNeeded( 
-	const KoProperty::Set& set, const QCString& propertyName, 
-	const QVariant& newValue, const QVariant& oldValue, CommandGroup* commandGroup, 
+	const KoProperty::Set& set, const TQCString& propertyName, 
+	const TQVariant& newValue, const TQVariant& oldValue, CommandGroup* commandGroup, 
 	bool forceAddCommand, bool rememberOldValue,
-	QStringList* const slist, QStringList* const nlist)
+	TQStringList* const slist, TQStringList* const nlist)
 {
 	KoProperty::Property& property = set[propertyName];
 
@@ -173,13 +173,13 @@ void KexiTableDesignerViewPrivate::setPropertyValueIfNeeded(
 }
 
 void KexiTableDesignerViewPrivate::setPropertyValueIfNeeded( 
-	const KoProperty::Set& set, const QCString& propertyName, 
-	const QVariant& newValue, CommandGroup* commandGroup, 
+	const KoProperty::Set& set, const TQCString& propertyName, 
+	const TQVariant& newValue, CommandGroup* commandGroup, 
 	bool forceAddCommand, bool rememberOldValue,
-	QStringList* const slist, QStringList* const nlist)
+	TQStringList* const slist, TQStringList* const nlist)
 {
 	KoProperty::Property& property = set[propertyName];
-	QVariant oldValue( property.value() );
+	TQVariant oldValue( property.value() );
 	setPropertyValueIfNeeded( set, propertyName, newValue, property.value(), 
 		commandGroup, forceAddCommand, rememberOldValue, slist, nlist);
 }
@@ -269,26 +269,26 @@ bool KexiTableDesignerViewPrivate::updatePropertiesVisibility(KexiDB::Field::Typ
 	return changed;
 }
 
-QString KexiTableDesignerViewPrivate::messageForSavingChanges(bool &emptyTable, bool skipWarning)
+TQString KexiTableDesignerViewPrivate::messageForSavingChanges(bool &emptyTable, bool skipWarning)
 {
 	KexiDB::Connection *conn = designerView->mainWin()->project()->dbConnection();
 	bool ok;
 	emptyTable = conn->isEmpty( *designerView->tempData()->table, ok ) && ok;
 	return i18n("Do you want to save the design now?")
-	+ ( (emptyTable || skipWarning) ? QString::null :
-		(QString("\n\n") + designerView->part()->i18nMessage(":additional message before saving design", 
-		designerView->parentDialog())) );
+	+ ( (emptyTable || skipWarning) ? TQString() :
+		(TQString("\n\n") + designerView->part()->i18nMessage(":additional message before saving design", 
+		designerView->tqparentDialog())) );
 }
 
 void KexiTableDesignerViewPrivate::updateIconForItem(KexiTableItem &item, KoProperty::Set& set)
 {
-	QVariant icon;
+	TQVariant icon;
 	if (!set["rowSource"].value().toString().isEmpty() && !set["rowSourceType"].value().toString().isEmpty())
 		icon = "combo";
 	//show/hide icon in the table
-	view->data()->clearRowEditBuffer();
-	view->data()->updateRowEditBuffer(&item, COLUMN_ID_ICON, icon);
-	view->data()->saveRowChanges(item, true);
+	view->KexiDataAwareObjectInterface::data()->clearRowEditBuffer();
+	view->KexiDataAwareObjectInterface::data()->updateRowEditBuffer(&item, COLUMN_ID_ICON, icon);
+	view->KexiDataAwareObjectInterface::data()->saveRowChanges(item, true);
 }
 
 #include "kexitabledesignerview_p.moc"