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/widget/kexicustompropertyfactory_p.cpp b/kexi/widget/kexicustompropertyfactory_p.cpp
index 0e0a054d7..f5fbb90a8 100644
--- a/kexi/widget/kexicustompropertyfactory_p.cpp
+++ b/kexi/widget/kexicustompropertyfactory_p.cpp
@@ -19,7 +19,7 @@
 
 #include "kexicustompropertyfactory_p.h"
 
-#include <qlineedit.h>
+#include <tqlineedit.h>
 #include <kdebug.h>
 #include <koproperty/property.h>
 #include <kexiutils/identifier.h>
@@ -27,8 +27,8 @@
 using namespace KoProperty;
 
 KexiImagePropertyEdit::KexiImagePropertyEdit(
-	Property *property, QWidget *parent, const char *name)
- : PixmapEdit(property, parent, name)
+	Property *property, TQWidget *tqparent, const char *name)
+ : PixmapEdit(property, tqparent, name)
  , m_id(0)
 {
 }
@@ -39,7 +39,7 @@ KexiImagePropertyEdit::~KexiImagePropertyEdit()
 
 void KexiImagePropertyEdit::selectPixmap()
 {
-	QString fileName( PixmapEdit::selectPixmapFileName() );
+	TQString fileName( PixmapEdit::selectPixmapFileName() );
 	if (fileName.isEmpty())
 		return;
 	KexiBLOBBuffer::Handle h(KexiBLOBBuffer::self()->insertPixmap( KURL(fileName) ));
@@ -49,28 +49,28 @@ void KexiImagePropertyEdit::selectPixmap()
 		return;
 
 	ObjectTreeItem *item = m_manager->activeForm()->objectTree()->lookup(m_manager->activeForm()->selectedWidget()->name());
-	QString name = item ? item->pixmapName(property()->name()) : "";
-	PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, topLevelWidget() );
-	if(dialog.exec() == QDialog::Accepted) {
+	TQString name = item ? item->pixmapName(property()->name()) : "";
+	PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, tqtopLevelWidget() );
+	if(dialog.exec() == TQDialog::Accepted) {
 		setValue(dialog.pixmap(), true);
 		item->setPixmapName(property()->name(), dialog.pixmapName());
 	}
 #endif
 }
 
-QVariant KexiImagePropertyEdit::value() const
+TQVariant KexiImagePropertyEdit::value() const
 {
 	return (uint)/*! @todo unsafe*/m_id;
 }
 
-void KexiImagePropertyEdit::setValue(const QVariant &value, bool emitChange)
+void KexiImagePropertyEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_id = value.toInt();
 	PixmapEdit::setValue(KexiBLOBBuffer::self()->objectForId(m_id).pixmap(), emitChange);
 }
 
-void KexiImagePropertyEdit::drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, 
-	const QVariant &value)
+void KexiImagePropertyEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, 
+	const TQVariant &value)
 {
 	KexiBLOBBuffer::Handle h( KexiBLOBBuffer::self()->objectForId(value.toInt()) );
 	PixmapEdit::drawViewer(p, cg, r, h.pixmap());
@@ -79,29 +79,29 @@ void KexiImagePropertyEdit::drawViewer(QPainter *p, const QColorGroup &cg, const
 //----------------------------------------------------------------
 
 KexiIdentifierPropertyEdit::KexiIdentifierPropertyEdit(
-	Property *property, QWidget *parent, const char *name)
- : StringEdit(property, parent, name)
+	Property *property, TQWidget *tqparent, const char *name)
+ : StringEdit(property, tqparent, name)
 {
 	m_edit->setValidator( 
-		new KexiUtils::IdentifierValidator(m_edit, "KexiIdentifierPropertyEdit Validator") );
+		new KexiUtils::IdentifierValidator(TQT_TQOBJECT(m_edit), "KexiIdentifierPropertyEdit Validator") );
 }
 
 KexiIdentifierPropertyEdit::~KexiIdentifierPropertyEdit()
 {
 }
 
-void KexiIdentifierPropertyEdit::setValue(const QVariant &value, bool emitChange)
+void KexiIdentifierPropertyEdit::setValue(const TQVariant &value, bool emitChange)
 {
-	QString string(value.toString());
+	TQString string(value.toString());
 	if (string.isEmpty()) {
 		kdWarning() << "KexiIdentifierPropertyEdit::setValue(): "
 			"Value cannot be empty. This call has no effect." << endl;
 		return;
 	}
-	QString identifier( KexiUtils::string2Identifier(string) );
+	TQString identifier( KexiUtils::string2Identifier(string) );
 	if (identifier!=string)
-		kdDebug() << QString("KexiIdentifierPropertyEdit::setValue(): "
-			"String \"%1\" converted to identifier \"%2\".").arg(string).arg(identifier) << endl;
+		kdDebug() << TQString("KexiIdentifierPropertyEdit::setValue(): "
+			"String \"%1\" converted to identifier \"%2\".").tqarg(string).tqarg(identifier) << endl;
 	StringEdit::setValue( identifier, emitChange );
 }