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

diff --git a/src/drawparts/drawpart.cpp b/src/drawparts/drawpart.cpp
index 6d9708d..d16e669 100644
--- a/src/drawparts/drawpart.cpp
+++ b/src/drawparts/drawpart.cpp
@@ -14,7 +14,7 @@
 #include "variant.h"
 
 #include <klocale.h>
-#include <qbitarray.h>
+#include <tqbitarray.h>
 
 DrawPart::DrawPart( ItemDocument *itemDocument, bool newItem, const char *id )
 	: Item( itemDocument, newItem, id )
@@ -34,11 +34,11 @@ int DrawPart::rtti() const
 }
 
 
-Variant * DrawPart::createProperty( const QString & id, Variant::Type::Value type )
+Variant * DrawPart::createProperty( const TQString & id, Variant::Type::Value type )
 {
 	if ( type == Variant::Type::PenStyle )
 	{
-		QStringList penStyles;
+		TQStringList penStyles;
 		penStyles << DrawPart::penStyleToName(Qt::SolidLine) << DrawPart::penStyleToName(Qt::DashLine)
 				<< DrawPart::penStyleToName(Qt::DotLine) << DrawPart::penStyleToName(Qt::DashDotLine)
 				<< DrawPart::penStyleToName(Qt::DashDotDotLine);
@@ -51,7 +51,7 @@ Variant * DrawPart::createProperty( const QString & id, Variant::Type::Value typ
 	
 	if ( type == Variant::Type::PenCapStyle )
 	{
-		QStringList penCapStyles;
+		TQStringList penCapStyles;
 		penCapStyles << DrawPart::penCapStyleToName(Qt::FlatCap) << DrawPart::penCapStyleToName(Qt::SquareCap)
 				<< DrawPart::penCapStyleToName(Qt::RoundCap);
 		
@@ -65,19 +65,19 @@ Variant * DrawPart::createProperty( const QString & id, Variant::Type::Value typ
 }
 
 
-Qt::PenStyle DrawPart::getDataPenStyle( const QString & id )
+Qt::PenStyle DrawPart::getDataPenStyle( const TQString & id )
 {
 	return nameToPenStyle( dataString(id) );
 }
-Qt::PenCapStyle DrawPart::getDataPenCapStyle( const QString & id )
+Qt::PenCapStyle DrawPart::getDataPenCapStyle( const TQString & id )
 {
 	return nameToPenCapStyle( dataString(id) );
 }
-void DrawPart::setDataPenStyle( const QString & id, Qt::PenStyle value )
+void DrawPart::setDataPenStyle( const TQString & id, Qt::PenStyle value )
 {
 	property(id)->setValue( penStyleToName(value) );
 }
-void DrawPart::setDataPenCapStyle( const QString & id, Qt::PenCapStyle value )
+void DrawPart::setDataPenCapStyle( const TQString & id, Qt::PenCapStyle value )
 {
 	property(id)->setValue( penCapStyleToName(value) );
 }
@@ -127,10 +127,10 @@ void DrawPart::restoreFromItemData( const ItemData &itemData )
 {
 	Item::restoreFromItemData(itemData);
 	
-	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 )
 	{
-		VariantDataMap::iterator vit = m_variantData.find(it.key());
+		VariantDataMap::iterator vit = m_variantData.tqfind(it.key());
 		if ( vit == m_variantData.end() )
 			continue;
 		
@@ -144,7 +144,7 @@ void DrawPart::restoreFromItemData( const ItemData &itemData )
 
 
 
-QString DrawPart::penStyleToID( Qt::PenStyle style )
+TQString DrawPart::penStyleToID( Qt::PenStyle style )
 {
 	switch (style)
 	{
@@ -165,7 +165,7 @@ QString DrawPart::penStyleToID( Qt::PenStyle style )
 			return ""; // ?!
 	}
 }
-Qt::PenStyle DrawPart::idToPenStyle( const QString & id )
+Qt::PenStyle DrawPart::idToPenStyle( const TQString & id )
 {
 	if ( id == "NoPen" )
 		return Qt::NoPen;
@@ -179,7 +179,7 @@ Qt::PenStyle DrawPart::idToPenStyle( const QString & id )
 		return Qt::DashDotDotLine;
 	return Qt::SolidLine;
 }
-QString DrawPart::penCapStyleToID( Qt::PenCapStyle style )
+TQString DrawPart::penCapStyleToID( Qt::PenCapStyle style )
 {
 	switch (style)
 	{
@@ -194,7 +194,7 @@ QString DrawPart::penCapStyleToID( Qt::PenCapStyle style )
 			return ""; // ?!
 	}
 }
-Qt::PenCapStyle DrawPart::idToPenCapStyle( const QString & id )
+Qt::PenCapStyle DrawPart::idToPenCapStyle( const TQString & id )
 {
 	if ( id == "SquareCap" )
 		return Qt::SquareCap;
@@ -203,7 +203,7 @@ Qt::PenCapStyle DrawPart::idToPenCapStyle( const QString & id )
 	return Qt::FlatCap;
 }
 
-QString DrawPart::penStyleToName( Qt::PenStyle style )
+TQString DrawPart::penStyleToName( Qt::PenStyle style )
 {
 	switch (style)
 	{
@@ -224,7 +224,7 @@ QString DrawPart::penStyleToName( Qt::PenStyle style )
 			return ""; // ?!
 	}
 }
-Qt::PenStyle DrawPart::nameToPenStyle( const QString & name )
+Qt::PenStyle DrawPart::nameToPenStyle( const TQString & name )
 {
 	if ( name == i18n("None") )
 		return Qt::NoPen;
@@ -238,7 +238,7 @@ Qt::PenStyle DrawPart::nameToPenStyle( const QString & name )
 		return Qt::DashDotDotLine;
 	return Qt::SolidLine;
 }
-QString DrawPart::penCapStyleToName( Qt::PenCapStyle style )
+TQString DrawPart::penCapStyleToName( Qt::PenCapStyle style )
 {
 	switch (style)
 	{
@@ -253,7 +253,7 @@ QString DrawPart::penCapStyleToName( Qt::PenCapStyle style )
 			return ""; // ?!
 	}
 }
-Qt::PenCapStyle DrawPart::nameToPenCapStyle( const QString & name )
+Qt::PenCapStyle DrawPart::nameToPenCapStyle( const TQString & name )
 {
 	if ( name == i18n("Square") )
 		return Qt::SquareCap;