TQt4 port ktechlab

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktechlab@1238801 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 74 insertions, 74 deletions

diff --git a/src/item.cpp b/src/item.cpp
index 1cbf7e3..e5f7466 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -16,18 +16,18 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <ktextedit.h>
-#include <qbitarray.h>
-#include <qlayout.h>
-#include <qtimer.h>
+#include <tqbitarray.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
 
 const int minPrefixExp = -24;
 const int maxPrefixExp = 24;
 const int numPrefix = int((maxPrefixExp-minPrefixExp)/3)+1;
-const QString SIprefix[] = {"y","z","a","f","p","n",QChar(0xB5),"m","","k","M","G","T","P","E","Z","Y"};
+const TQString SIprefix[] = {"y","z","a","f","p","n",TQChar(0xB5),"m","","k","M","G","T","P","E","Z","Y"};
 
 
-Item::Item( ItemDocument *itemDocument, bool newItem, const QString &id )
-	: QObject(), QCanvasPolygon( itemDocument->canvas() )
+Item::Item( ItemDocument *itemDocument, bool newItem, const TQString &id )
+	: TQObject(), TQCanvasPolygon( itemDocument->canvas() )
 {
 	m_bDynamicContent = false;
 	m_bIsRaised = false;
@@ -37,7 +37,7 @@ Item::Item( ItemDocument *itemDocument, bool newItem, const QString &id )
 	p_itemDocument = itemDocument;
 	m_baseZ = -1;
 	
-	if ( QFontInfo(m_font).pixelSize() > 11 ) // It has to be > 11, not > 12, as (I think) pixelSize() rounds off the actual size
+	if ( TQFontInfo(m_font).pixelSize() > 11 ) // It has to be > 11, not > 12, as (I think) pixelSize() rounds off the actual size
 		m_font.setPixelSize(12);
 	
 	if (newItem)
@@ -56,7 +56,7 @@ Item::~Item()
 	p_itemDocument->requestEvent( ItemDocument::ItemDocumentEvent::ResizeCanvasToItems );
 	p_itemDocument->unregisterUID( id() );
 	
-	QCanvasPolygon::hide();
+	TQCanvasPolygon::hide();
 	
 	const VariantDataMap::iterator variantDataEnd = m_variantData.end();
 	for ( VariantDataMap::iterator it = m_variantData.begin(); it != variantDataEnd; ++it )
@@ -80,7 +80,7 @@ void Item::removeItem()
 
 void Item::moveBy( double dx, double dy )
 {
-	QCanvasPolygon::moveBy(dx,dy);
+	TQCanvasPolygon::moveBy(dx,dy);
 	emit movedBy( dx, dy );
 }
 
@@ -95,7 +95,7 @@ void Item::setChanged()
 }
 
 
-void Item::setItemPoints( const QPointArray & pa, bool setSizeFromPoints )
+void Item::setItemPoints( const TQPointArray & pa, bool setSizeFromPoints )
 {
 	m_itemPoints = pa;
 	if (setSizeFromPoints)
@@ -110,7 +110,7 @@ void Item::itemPointsChanged()
 }
 
 
-void Item::setSize( QRect sizeRect, bool forceItemPoints )
+void Item::setSize( TQRect sizeRect, bool forceItemPoints )
 {
 	if ( m_sizeRect == sizeRect && !forceItemPoints )
 		return;
@@ -122,7 +122,7 @@ void Item::setSize( QRect sizeRect, bool forceItemPoints )
 	m_sizeRect = sizeRect;
 	if ( m_itemPoints.isEmpty() || forceItemPoints )
 	{
-		setItemPoints( QPointArray( m_sizeRect ), false );
+		setItemPoints( TQPointArray( m_sizeRect ), false );
 	}
 	canvas()->setChanged(areaPoints().boundingRect());
 	postResize();
@@ -138,14 +138,14 @@ ItemData Item::itemData() const
 	itemData.x = x();
 	itemData.y = y();
 	
-	if ( !parentItem() )
+	if ( !tqparentItem() )
 		itemData.z = m_baseZ;
 	
 	itemData.size = m_sizeRect;
 	itemData.setSize = canResize();
 	
 	if (p_parentItem)
-		itemData.parentId = p_parentItem->id();
+		itemData.tqparentId = p_parentItem->id();
 	
 	const VariantDataMap::const_iterator end = m_variantData.end();
 	for ( VariantDataMap::const_iterator it = m_variantData.begin(); it != end; ++it )
@@ -212,15 +212,15 @@ void Item::restoreFromItemData( const ItemData &itemData )
 	if ( canResize() )
 		setSize( itemData.size );
 	
-	Item *parentItem = p_itemDocument->itemWithID( itemData.parentId );
-	if (parentItem)
-		setParentItem(parentItem);
+	Item *tqparentItem = p_itemDocument->itemWithID( itemData.tqparentId );
+	if (tqparentItem)
+		setParentItem(tqparentItem);
 	else
 		m_baseZ = itemData.z;
 	
 	//BEGIN Restore data
-	const QStringMap::const_iterator stringEnd = itemData.dataString.end();
-	for ( QStringMap::const_iterator it = itemData.dataString.begin(); it != stringEnd; ++it )
+	const TQStringMap::const_iterator stringEnd = itemData.dataString.end();
+	for ( TQStringMap::const_iterator it = itemData.dataString.begin(); it != stringEnd; ++it )
 	{
 		if ( hasProperty(it.key()) )
 			property( it.key() )->setValue( it.data() );
@@ -233,8 +233,8 @@ void Item::restoreFromItemData( const ItemData &itemData )
 			property( it.key() )->setValue( it.data() );
 	}
 	
-	const QColorMap::const_iterator colorEnd = itemData.dataColor.end();
-	for ( QColorMap::const_iterator it = itemData.dataColor.begin(); it != colorEnd; ++it )
+	const TQColorMap::const_iterator colorEnd = itemData.dataColor.end();
+	for ( TQColorMap::const_iterator it = itemData.dataColor.begin(); it != colorEnd; ++it )
 	{
 		if ( hasProperty(it.key()) )
 			property( it.key() )->setValue( it.data() );
@@ -244,11 +244,11 @@ void Item::restoreFromItemData( const ItemData &itemData )
 	for ( BoolMap::const_iterator it = itemData.dataBool.begin(); it != boolEnd; ++it )
 	{
 		if ( hasProperty(it.key()) )
-			property( it.key() )->setValue( QVariant( it.data(), 0 ) );
+			property( it.key() )->setValue( TQVariant( it.data(), 0 ) );
 	}
 	
-	const QBitArrayMap::const_iterator rawEnd = itemData.dataRaw.end();
-	for ( QBitArrayMap::const_iterator it = itemData.dataRaw.begin(); it != rawEnd; ++it )
+	const TQBitArrayMap::const_iterator rawEnd = itemData.dataRaw.end();
+	for ( TQBitArrayMap::const_iterator it = itemData.dataRaw.begin(); it != rawEnd; ++it )
 	{
 		if ( hasProperty(it.key()) )
 			property( it.key() )->setValue( it.data() );
@@ -288,7 +288,7 @@ bool Item::mouseDoubleClickEvent( const EventInfo &eventInfo )
 {
 	Q_UNUSED(eventInfo);
 	
-	typedef QValueList<Variant*> VarPtrLst;
+	typedef TQValueList<Variant*> VarPtrLst;
 	VarPtrLst list;
 	const VariantDataMap::iterator variantDataEnd = m_variantData.end();
 	for ( VariantDataMap::iterator it = m_variantData.begin(); it != variantDataEnd; ++it )
@@ -309,17 +309,17 @@ bool Item::mouseDoubleClickEvent( const EventInfo &eventInfo )
 	
 	/// @todo Replace this with KInputDialog::getMultiLineText for KDE 3.3
 // 	bool ok;
-// 	QString text = KInputDialog::getMultiLineText( v->caption(), "", v->getValue(), ok );
+// 	TQString text = KInputDialog::getMultiLineText( v->caption(), "", v->getValue(), ok );
 
 	KDialogBase *dlg = new KDialogBase( 0l, "", true, v->editorCaption(), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::User1, KDialogBase::Ok, false, KStdGuiItem::clear() );
-	QFrame *frame = dlg->makeMainWidget();
-	QVBoxLayout *layout = new QVBoxLayout( frame, 0, dlg->spacingHint() );
+	TQFrame *frame = dlg->makeMainWidget();
+	TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, dlg->spacingHint() );
 	KTextEdit *textEdit = new KTextEdit( frame );
 	textEdit->setTextFormat( PlainText );
 	textEdit->setText( v->value().toString() );
-	layout->addWidget( textEdit, 10 );
+	tqlayout->addWidget( textEdit, 10 );
 	textEdit->setFocus();
-	connect( dlg, SIGNAL( user1Clicked() ), textEdit, SLOT( clear() ) );
+	connect( dlg, TQT_SIGNAL( user1Clicked() ), textEdit, TQT_SLOT( clear() ) );
 	dlg->setMinimumWidth( 600 );
 	if ( dlg->exec() == KDialogBase::Accepted )
 	{
@@ -338,7 +338,7 @@ void Item::setSelected( bool yes )
 	if ( isSelected() == yes ) {
 		return;
 	}
-	QCanvasPolygon::setSelected(yes);
+	TQCanvasPolygon::setSelected(yes);
 	yes ? (emit selected(this)) : (emit unselected(this));
 }
 
@@ -353,17 +353,17 @@ void Item::setParentItem( Item *newParentItem )
 	
 	if (oldParentItem)
 	{
-		disconnect( oldParentItem, SIGNAL(removed(Item*)), this, SLOT(removeItem()) );
+		disconnect( oldParentItem, TQT_SIGNAL(removed(Item*)), this, TQT_SLOT(removeItem()) );
 		oldParentItem->removeChild(this);
 	}
 	
 	if (newParentItem)
 	{
-		if ( newParentItem->contains(this) );
+		if ( newParentItem->tqcontains(this) );
 // 			kdError() << k_funcinfo << "Already a child of " << newParentItem << endl;
 		else
 		{
-			connect( newParentItem, SIGNAL(removed(Item*)), this, SLOT(removeItem()) );
+			connect( newParentItem, TQT_SIGNAL(removed(Item*)), this, TQT_SLOT(removeItem()) );
 			newParentItem->addChild(this);
 		}
 	}
@@ -381,22 +381,22 @@ int Item::level() const
 }
 
 
-ItemList Item::children( bool includeGrandChildren ) const
+ItemList Item::tqchildren( bool includeGrandChildren ) const
 {
 	if (!includeGrandChildren)
-		return m_children;
+		return m_tqchildren;
 	
-	ItemList children = m_children;
-	ItemList::const_iterator end = m_children.end();
-	for ( ItemList::const_iterator it = m_children.begin(); it != end; ++it )
+	ItemList tqchildren = m_tqchildren;
+	ItemList::const_iterator end = m_tqchildren.end();
+	for ( ItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it )
 	{
 		if (!*it)
 			continue;
 		
-		children += (*it)->children(true);
+		tqchildren += (*it)->tqchildren(true);
 	}
 	
-	return children;
+	return tqchildren;
 }
 
 
@@ -405,20 +405,20 @@ void Item::addChild( Item *child )
 	if ( !child )
 		return;
 	
-	if ( child->contains(this) )
+	if ( child->tqcontains(this) )
 	{
-// 		kdError() << k_funcinfo << "Attempting to add a child to this item that is already a parent of this item. Incest results in stack overflow." << endl;
+// 		kdError() << k_funcinfo << "Attempting to add a child to this item that is already a tqparent of this item. Incest results in stack overflow." << endl;
 		return;
 	}
 	
-	if ( contains( child, true ) )
+	if ( tqcontains( child, true ) )
 	{
 // 		kdError() << k_funcinfo << "Already have child " << child << endl;
 		return;
 	}
 	
-	m_children.append(child);
-	connect( child, SIGNAL(removed(Item* )), this, SLOT(removeChild(Item* )) );
+	m_tqchildren.append(child);
+	connect( child, TQT_SIGNAL(removed(Item* )), this, TQT_SLOT(removeChild(Item* )) );
 	
 	child->setParentItem(this);
 	childAdded(child);
@@ -428,23 +428,23 @@ void Item::addChild( Item *child )
 
 void Item::removeChild( Item *child )
 {
-	if ( !child || !m_children.contains(child) )
+	if ( !child || !m_tqchildren.tqcontains(child) )
 		return;
 	
-	m_children.remove(child);
-	disconnect( child, SIGNAL(removed(Item* )), this, SLOT(removeChild(Item* )) );
+	m_tqchildren.remove(child);
+	disconnect( child, TQT_SIGNAL(removed(Item* )), this, TQT_SLOT(removeChild(Item* )) );
 	
 	childRemoved(child);
 	p_itemDocument->slotUpdateZOrdering();
 }
 
 
-bool Item::contains( Item *item, bool direct ) const
+bool Item::tqcontains( Item *item, bool direct ) const
 {
-	const ItemList::const_iterator end = m_children.end();
-	for ( ItemList::const_iterator it = m_children.begin(); it != end; ++it )
+	const ItemList::const_iterator end = m_tqchildren.end();
+	for ( ItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it )
 	{
-		if ( (Item*)*it == item || ( !direct && (*it)->contains( item, false ) ) )
+		if ( (Item*)*it == item || ( !direct && (*it)->tqcontains( item, false ) ) )
 			return true;
 	}
 	return false;
@@ -468,8 +468,8 @@ void Item::updateZ( int baseZ )
 	
 	setZ(z);
 	
-	const ItemList::const_iterator end = m_children.end();
-	for ( ItemList::const_iterator it = m_children.begin(); it != end; ++it )
+	const ItemList::const_iterator end = m_tqchildren.end();
+	for ( ItemList::const_iterator it = m_tqchildren.begin(); it != end; ++it )
 	{
 		if (*it)
 			(*it)->updateZ(baseZ+1);
@@ -482,7 +482,7 @@ int Item::getNumberPre( double num )
 	return (int)(num/getMultiplier(num));
 }
 
-QString Item::getNumberMag( double num )
+TQString Item::getNumberMag( double num )
 {
 	if ( num == 0. ) return "";
 	const double exp_n = std::log10(std::abs(num));
@@ -497,12 +497,12 @@ double Item::getMultiplier( double num )
 	else return std::pow( 10, 3*std::floor(std::log10(std::abs(num))/3) );
 }
 
-double Item::getMultiplier( const QString &_mag )
+double Item::getMultiplier( const TQString &_mag )
 {
-	QString mag;
+	TQString mag;
 	// Allow the user to enter in "u" instead of mu, as unfortunately many keyboards don't have the mu key
 	if ( _mag == "u" )
-		mag = QChar(0xB5);
+		mag = TQChar(0xB5);
 	else
 		mag = _mag;
 	
@@ -522,57 +522,57 @@ double Item::getMultiplier( const QString &_mag )
 
 
 //BEGIN Data stuff
-double Item::dataDouble( const QString & id ) const
+double Item::dataDouble( const TQString & id ) const
 {
 	Variant * variant = property(id);
 	return variant ? variant->value().toDouble() : 0.0;
 }
 
 
-int Item::dataInt( const QString & id ) const
+int Item::dataInt( const TQString & id ) const
 {
 	Variant * variant = property(id);
 	return variant ? variant->value().toInt() : 0;
 }
 
 
-bool Item::dataBool( const QString & id ) const
+bool Item::dataBool( const TQString & id ) const
 {
 	Variant * variant = property(id);
 	return variant ? variant->value().toBool() : false;
 }
 
 
-QString Item::dataString( const QString & id ) const
+TQString Item::dataString( const TQString & id ) const
 {
 	Variant * variant = property(id);
-	return variant ? variant->value().toString() : QString::null;
+	return variant ? variant->value().toString() : TQString();
 }
 
 
-QColor Item::dataColor( const QString & id ) const
+TQColor Item::dataColor( const TQString & id ) const
 {
 	Variant * variant = property(id);
-	return variant ? variant->value().toColor() : Qt::black;
+	return variant ? variant->value().toColor() : TQt::black;
 }
 
 
-Variant * Item::createProperty( const QString & id, Variant::Type::Value type )
+Variant * Item::createProperty( const TQString & id, Variant::Type::Value type )
 {
-	if ( !m_variantData.contains(id) )
+	if ( !m_variantData.tqcontains(id) )
 	{
 		m_variantData[id] = new Variant(type);
 		if (m_bDoneCreation)
-			connect( m_variantData[id], SIGNAL(valueChanged(QVariant,QVariant)), this, SLOT(dataChanged()) );
+			connect( m_variantData[id], TQT_SIGNAL(valueChanged(TQVariant,TQVariant)), this, TQT_SLOT(dataChanged()) );
 	}
 	
 	return m_variantData[id];
 }
 
 
-Variant * Item::property( const QString & id ) const
+Variant * Item::property( const TQString & id ) const
 {
-	if ( m_variantData.contains(id) )
+	if ( m_variantData.tqcontains(id) )
 		return m_variantData[id];
 	
 	kdError() << k_funcinfo << " No such property with id " << id << endl;
@@ -580,9 +580,9 @@ Variant * Item::property( const QString & id ) const
 }
 
 
-bool Item::hasProperty( const QString & id ) const
+bool Item::hasProperty( const TQString & id ) const
 {
-	return m_variantData.contains(id);
+	return m_variantData.tqcontains(id);
 }
 
 
@@ -591,7 +591,7 @@ void Item::finishedCreation( )
 	m_bDoneCreation = true;
 	const VariantDataMap::iterator end = m_variantData.end();
 	for ( VariantDataMap::iterator it = m_variantData.begin(); it != end; ++it )
-		connect( it.data(), SIGNAL(valueChanged(QVariant,QVariant)), this, SLOT(dataChanged()) );
+		connect( it.data(), TQT_SIGNAL(valueChanged(TQVariant,TQVariant)), this, TQT_SLOT(dataChanged()) );
 	dataChanged();
 }
 //END Data stuff