Fix koffice Qt4 FTBFS

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

9 files changed, 11 insertions, 11 deletions

diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc
index b7c48b504..d3cce618a 100644
--- a/filters/chalk/png/kis_png_converter.cc
+++ b/filters/chalk/png/kis_png_converter.cc
@@ -154,7 +154,7 @@ KisImageBuilder_Result KisPNGConverter::decode(const KURL& uri)
 {
     kdDebug(41008) << "Start decoding PNG File" << endl;
     // open the file
-    kdDebug(41008) << TQFile::encodeName(uri.path()) << " " << uri.path() << " " << uri << endl;
+    kdDebug(41008) << TQString(TQFile::encodeName(uri.path())) << " " << uri.path() << " " << uri << endl;
     FILE *fp = fopen(TQFile::encodeName(uri.path()), "rb");
     if (!fp)
     {
@@ -438,7 +438,7 @@ KisImageBuilder_Result KisPNGConverter::decode(const KURL& uri)
 
 KisImageBuilder_Result KisPNGConverter::buildImage(const KURL& uri)
 {
-    kdDebug(41008) << TQFile::encodeName(uri.path()) << " " << uri.path() << " " << uri << endl;
+    kdDebug(41008) << TQString(TQFile::encodeName(uri.path())) << " " << uri.path() << " " << uri << endl;
     if (uri.isEmpty())
         return KisImageBuilder_RESULT_NO_URI;
 
diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp
index adfd14f69..f006f913a 100644
--- a/filters/chalk/raw/kis_raw_import.cpp
+++ b/filters/chalk/raw/kis_raw_import.cpp
@@ -458,7 +458,7 @@ void KisRawImport::slotReceivedStdout(KProcess *, char *buffer, int buflen)
     //kdDebug(41008) << "stdout received " << buflen << " bytes on stdout.\n";
     //kdDebug(41008) << TQString::fromAscii(buffer, buflen) << "\n";
     int oldSize = m_data->size();
-    m_data->resize(oldSize + buflen, TQGArray::SpeedOptim);
+    m_data->tqresize(oldSize + buflen, TQGArray::SpeedOptim);
     memcpy(m_data->data() + oldSize, buffer, buflen);
 }
 
@@ -577,7 +577,7 @@ TQSize KisRawImport::determineSize(TQ_UINT32& startOfImageData)
     }
 
     TQString size = TQStringList::split("\n", TQString::fromAscii(m_data->data(), i))[1];
-    kdDebug(41008) << "Header: " << TQString::fromAscii(m_data->data(), i) << "\n";
+    kdDebug(41008) << "Header: " << TQString(TQString::fromAscii(m_data->data(), i)) << "\n";
     TQStringList sizelist = TQStringList::split(" ", size);
     TQ_INT32 w = sizelist[0].toInt();
     TQ_INT32 h = sizelist[1].toInt();
diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cc b/karbon/plugins/flattenpath/flattenpathplugin.cc
index 1cb166588..eff3cebdb 100644
--- a/karbon/plugins/flattenpath/flattenpathplugin.cc
+++ b/karbon/plugins/flattenpath/flattenpathplugin.cc
@@ -34,7 +34,7 @@ typedef KGenericFactory<FlattenPathPlugin, KarbonView> FlattenPathPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_flattenpathplugin, FlattenPathPluginFactory( "karbonflattenpathplugin" ) )
 
 FlattenPathPlugin::FlattenPathPlugin( KarbonView *tqparent, const char* name, const TQStringList & )
-: Plugin( tqparent, name )
+: Plugin( TQT_TQOBJECT(tqparent), name )
 {
 	new KAction(
 		i18n( "&Flatten Path..." ), "14_flatten", 0, this,
diff --git a/karbon/plugins/insertknots/insertknotsplugin.cc b/karbon/plugins/insertknots/insertknotsplugin.cc
index b31d33f9d..9f462179c 100644
--- a/karbon/plugins/insertknots/insertknotsplugin.cc
+++ b/karbon/plugins/insertknots/insertknotsplugin.cc
@@ -33,7 +33,7 @@
 typedef KGenericFactory<InsertKnotsPlugin, KarbonView> InsertKnotsPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_insertknotsplugin, InsertKnotsPluginFactory( "karboninsertknotsplugin" ) )
 
-InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( tqparent, name )
+InsertKnotsPlugin::InsertKnotsPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(tqparent), name )
 {
 	new KAction(
 		i18n( "&Insert Knots..." ), "14_insertknots", 0, this,
diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cc b/karbon/plugins/roundcorners/roundcornersplugin.cc
index cb24087f4..7e18fb123 100644
--- a/karbon/plugins/roundcorners/roundcornersplugin.cc
+++ b/karbon/plugins/roundcorners/roundcornersplugin.cc
@@ -32,7 +32,7 @@
 typedef KGenericFactory<VRoundCornersPlugin, KarbonView> VRoundCornersPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_roundcornersplugin, VRoundCornersPluginFactory( "karbonroundcornersplugin" ) )
 
-VRoundCornersPlugin::VRoundCornersPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( tqparent, name )
+VRoundCornersPlugin::VRoundCornersPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(tqparent), name )
 {
 	new KAction(
 		i18n( "&Round Corners..." ), "14_roundcorners", 0, this,
diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cc b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
index 903f0ee03..7040b0420 100644
--- a/karbon/plugins/shadoweffect/shadoweffectplugin.cc
+++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
@@ -38,7 +38,7 @@ typedef KGenericFactory<ShadowEffectPlugin, KarbonView> ShadowEffectPluginFactor
 K_EXPORT_COMPONENT_FACTORY( karbon_shadoweffectplugin, ShadowEffectPluginFactory( "karbonshadoweffectplugin" ) )
 
 ShadowEffectPlugin::ShadowEffectPlugin( KarbonView *tqparent, const char* name, const TQStringList & )
-: Plugin( tqparent, name )
+: Plugin( TQT_TQOBJECT(tqparent), name )
 {
 	new KAction(
 		i18n( "&Shadow Effect..." ), "shadowRB", 0, this,
diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.cc b/karbon/plugins/whirlpinch/whirlpinchplugin.cc
index f26fd0918..6795f9d60 100644
--- a/karbon/plugins/whirlpinch/whirlpinchplugin.cc
+++ b/karbon/plugins/whirlpinch/whirlpinchplugin.cc
@@ -38,7 +38,7 @@
 typedef KGenericFactory<WhirlPinchPlugin, KarbonView> WhirlPinchPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( karbon_whirlpinchplugin, WhirlPinchPluginFactory( "karbonwhirlpinchplugin" ) )
 
-WhirlPinchPlugin::WhirlPinchPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( tqparent, name )
+WhirlPinchPlugin::WhirlPinchPlugin( KarbonView *tqparent, const char* name, const TQStringList & ) : Plugin( TQT_TQOBJECT(tqparent), name )
 {
 	new KAction(
 		i18n( "&Whirl/Pinch..." ), "14_whirl", 0, this,
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index 259f7c620..ace6c8ce4 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -112,7 +112,7 @@ ShadowPreview::paintEvent( TQPaintEvent* )
 	int a = 360 - m_parent->shadowAngle();
 
 	TQPixmap pm( w, h );
-	VKoPainter p( &pm, w, h );
+	VKoPainter p( TQT_TQPAINTDEVICE(&pm), w, h );
 	VColor color( VColor::rgb );
 
 	VFill fill;
diff --git a/kword/KWFactory.h b/kword/KWFactory.h
index 074683978..c9b735e7d 100644
--- a/kword/KWFactory.h
+++ b/kword/KWFactory.h
@@ -27,7 +27,7 @@ class KAboutData;
 class KWFactory : public KoFactory
 {
     Q_OBJECT
-  TQ_OBJECT
+    TQ_OBJECT
 public:
     KWFactory( TQObject* tqparent = 0, const char* name = 0 );
     ~KWFactory();