Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


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

5 files changed, 56 insertions, 56 deletions

diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp
index 7fd6cacf5..fcc1a8a0a 100644
--- a/ktnef/gui/attachpropertydialog.cpp
+++ b/ktnef/gui/attachpropertydialog.cpp
@@ -178,7 +178,7 @@ TQPixmap loadRenderingPixmap( KTNEFPropertySet *pSet, const TQColor& bgColor )
 			{
 				pix.resize( w, h );
 				pix.fill( bgColor );
-				wmfLoader.paint( &pix );
+				wmfLoader.paint( &TQT_TQPAINTDEVICE_OBJECT(pix) );
 			}
 			wmfBuffer.close();
 		}
diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp
index fd9438e6c..d6781770e 100644
--- a/ktnef/gui/ktnefmain.cpp
+++ b/ktnef/gui/ktnefmain.cpp
@@ -85,19 +85,19 @@ KTNEFMain::~KTNEFMain()
 void KTNEFMain::setupActions()
 {
 	// File menu
-	KStdAction::open(this, TQT_SLOT(openFile()), actionCollection());
-	KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+	KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openFile()), actionCollection());
+	KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
 
 	// Action menu
-	new KAction(i18n("View"), TQString("viewmag"), 0, this, TQT_SLOT(viewFile()), actionCollection(), "view_file");
-	new KAction(i18n("View With..."), TQString("package_applications"), 0, this, TQT_SLOT(viewFileAs()), actionCollection(), "view_file_as");
-	new KAction(i18n("Extract"), 0, this, TQT_SLOT(extractFile()), actionCollection(), "extract_file");
-	new KAction(i18n("Extract To..."), TQString("ktnef_extract_to"), 0, this, TQT_SLOT(extractFileTo()), actionCollection(), "extract_file_to");
-	new KAction(i18n("Extract All To..."), TQString("ktnef_extract_all_to"), 0, this, TQT_SLOT(extractAllFiles()), actionCollection(), "extract_all_files");
-	new KAction( i18n( "Message Properties" ), "help", 0, this, TQT_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" );
-	new KAction(i18n("Properties"), TQString("contents"), 0, this, TQT_SLOT(propertiesFile()), actionCollection(), "properties_file");
-	new KAction( i18n( "Show Message Text" ), "mail_generic", 0, this, TQT_SLOT( slotShowMessageText() ), actionCollection(), "msg_text" );
-	new KAction( i18n( "Save Message Text As..." ), "filesave", 0, this, TQT_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" );
+	new KAction(i18n("View"), TQString("viewmag"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewFile()), actionCollection(), "view_file");
+	new KAction(i18n("View With..."), TQString("package_applications"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewFileAs()), actionCollection(), "view_file_as");
+	new KAction(i18n("Extract"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractFile()), actionCollection(), "extract_file");
+	new KAction(i18n("Extract To..."), TQString("ktnef_extract_to"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractFileTo()), actionCollection(), "extract_file_to");
+	new KAction(i18n("Extract All To..."), TQString("ktnef_extract_all_to"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractAllFiles()), actionCollection(), "extract_all_files");
+	new KAction( i18n( "Message Properties" ), "help", 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" );
+	new KAction(i18n("Properties"), TQString("contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(propertiesFile()), actionCollection(), "properties_file");
+	new KAction( i18n( "Show Message Text" ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowMessageText() ), actionCollection(), "msg_text" );
+	new KAction( i18n( "Save Message Text As..." ), "filesave", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" );
 	actionCollection()->action("view_file")->setEnabled(false);
 	actionCollection()->action("view_file_as")->setEnabled(false);
 	actionCollection()->action("extract_file")->setEnabled(false);
@@ -106,12 +106,12 @@ void KTNEFMain::setupActions()
 	actionCollection()->action("properties_file")->setEnabled(false);
 
 	// Option menu
-	new KAction(i18n("Default Folder..."), TQString("folder_open"), 0, this, TQT_SLOT(optionDefaultDir()), actionCollection(), "options_default_dir");
+	new KAction(i18n("Default Folder..."), TQString("folder_open"), 0, TQT_TQOBJECT(this), TQT_SLOT(optionDefaultDir()), actionCollection(), "options_default_dir");
 
 	createStandardStatusBarAction();
 	setStandardToolBarMenuEnabled(true);
-	KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection());
-        KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys() ), actionCollection() );
+	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
+        KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() );
 
 	createGUI();
 }
@@ -230,7 +230,7 @@ void KTNEFMain::extractAllFiles()
 		for (;it.current();++it)
 			if (!parser_->extractFileTo(it.current()->name(), dir))
 			{
-				TQString	msg = i18n( "Unable to extract file \"%1\"" ).arg( it.current()->name() );
+				TQString	msg = i18n( "Unable to extract file \"%1\"" ).tqarg( it.current()->name() );
 				TQMessageBox::critical(this,i18n("Error"),msg,TQMessageBox::Ok|TQMessageBox::Default,0);
 				return;
 			}
@@ -301,7 +301,7 @@ void KTNEFMain::extractTo(const TQString& dirname)
 	for (;it.current();++it)
 		if (!parser_->extractFileTo(it.current()->name(), dir))
 		{
-			TQString	msg = i18n("Unable to extract file \"%1\"").arg( it.current()->name() );
+			TQString	msg = i18n("Unable to extract file \"%1\"").tqarg( it.current()->name() );
 			TQMessageBox::critical(this,i18n("Error"),msg,TQMessageBox::Ok|TQMessageBox::Default,0);
 			return;
 		}
diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp
index 8f8cd4d28..d60d661d3 100644
--- a/ktnef/gui/qwmf.cpp
+++ b/ktnef/gui/qwmf.cpp
@@ -136,13 +136,13 @@ bool TQWinMetaFile::load( const TQString &filename )
 
     if ( !file.exists() )
     {
-        kdDebug() << "File " << TQFile::encodeName(filename) << " does not exist" << endl;
+        kdDebug() << TQString("File ") << TQString(TQFile::encodeName(filename)) << TQString(" does not exist") << endl;
         return false;
     }
 
     if ( !file.open( IO_ReadOnly ) )
     {
-        kdDebug() << "Cannot open file " << TQFile::encodeName(filename) << endl;
+        kdDebug() << TQString("Cannot open file ") << TQString(TQFile::encodeName(filename)) << endl;
         return false;
     }
 
@@ -348,7 +348,7 @@ bool TQWinMetaFile::paint( const TQPaintDevice* aTarget, bool absolute )
     mWinding = false;
     mAbsoluteCoord = absolute;
 
-    mPainter.begin( aTarget );
+    mPainter.begin( TQT_TQPAINTDEVICE(const_cast<TQPaintDevice*>(aTarget)) );
     if ( TQWMF_DEBUG )  {
         kdDebug() << "Bounding box : " << mBBox.left()
         << " " << mBBox.top() << " " << mBBox.right() << " " << mBBox.bottom() << endl;
@@ -482,7 +482,7 @@ void TQWinMetaFile::polygon( long, short* parm )
     TQPointArray* pa;
 
     pa = pointArray( parm[ 0 ], &parm[ 1 ] );
-    mPainter.drawPolygon( *pa, mWinding );
+    mPainter.tqdrawPolygon( *pa, mWinding );
 }
 
 
@@ -620,8 +620,8 @@ void TQWinMetaFile::setBkColor( long, short* parm )
 //-----------------------------------------------------------------------------
 void TQWinMetaFile::setBkMode( long, short* parm )
 {
-    if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( TQt::TransparentMode );
-    else mPainter.setBackgroundMode( TQt::OpaqueMode );
+    if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( Qt::TransparentMode );
+    else mPainter.setBackgroundMode( Qt::OpaqueMode );
 }
 
 
@@ -925,26 +925,26 @@ void TQWinMetaFile::createEmptyObject( long, short* )
 //-----------------------------------------------------------------------------
 void TQWinMetaFile::createBrushIndirect( long, short* parm )
 {
-    static TQt::BrushStyle hatchedStyleTab[] =
+    static Qt::BrushStyle hatchedStyleTab[] =
     {
-        TQt::HorPattern,
-        TQt::FDiagPattern,
-        TQt::BDiagPattern,
-        TQt::CrossPattern,
-        TQt::DiagCrossPattern
+        Qt::HorPattern,
+        Qt::FDiagPattern,
+        Qt::BDiagPattern,
+        Qt::CrossPattern,
+        Qt::DiagCrossPattern
     };
-    static TQt::BrushStyle styleTab[] =
-    { TQt::SolidPattern,
-      TQt::NoBrush,
-      TQt::FDiagPattern,   /* hatched */
-      TQt::Dense4Pattern,  /* should be custom bitmap pattern */
-      TQt::HorPattern,     /* should be BS_INDEXED (?) */
-      TQt::VerPattern,     /* should be tqdevice-independent bitmap */
-      TQt::Dense6Pattern,  /* should be tqdevice-independent packed-bitmap */
-      TQt::Dense2Pattern,  /* should be BS_PATTERN8x8 */
-      TQt::Dense3Pattern   /* should be tqdevice-independent BS_DIBPATTERN8x8 */
+    static Qt::BrushStyle styleTab[] =
+    { Qt::SolidPattern,
+      Qt::NoBrush,
+      Qt::FDiagPattern,   /* hatched */
+      Qt::Dense4Pattern,  /* should be custom bitmap pattern */
+      Qt::HorPattern,     /* should be BS_INDEXED (?) */
+      Qt::VerPattern,     /* should be tqdevice-independent bitmap */
+      Qt::Dense6Pattern,  /* should be tqdevice-independent packed-bitmap */
+      Qt::Dense2Pattern,  /* should be BS_PATTERN8x8 */
+      Qt::Dense3Pattern   /* should be tqdevice-independent BS_DIBPATTERN8x8 */
     };
-    TQt::BrushStyle style;
+    Qt::BrushStyle style;
     short arg;
     WinObjBrushHandle* handle = new WinObjBrushHandle;
     addHandle( handle );
@@ -957,7 +957,7 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm )
         else
         {
             kdDebug() << "TQWinMetaFile::createBrushIndirect: invalid hatched brush " << arg << endl;
-            style = TQt::SolidPattern;
+            style = Qt::SolidPattern;
         }
     }
     else if ( arg>=0 && arg<9 )
@@ -965,7 +965,7 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm )
     else
     {
         kdDebug() << "TQWinMetaFile::createBrushIndirect: invalid brush " << arg << endl;
-        style = TQt::SolidPattern;
+        style = Qt::SolidPattern;
     }
     handle->brush.setStyle( style );
     handle->brush.setColor( color( parm+1 ) );
@@ -975,10 +975,10 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm )
 //-----------------------------------------------------------------------------
 void TQWinMetaFile::createPenIndirect( long, short* parm )
 {
-    static TQt::PenStyle styleTab[] =
-    { TQt::SolidLine, TQt::DashLine, TQt::DotLine, TQt::DashDotLine, TQt::DashDotDotLine,
-      TQt::NoPen, TQt::SolidLine };
-    TQt::PenStyle style;
+    static Qt::PenStyle styleTab[] =
+    { Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine,
+      Qt::NoPen, Qt::SolidLine };
+    Qt::PenStyle style;
     WinObjPenHandle* handle = new WinObjPenHandle;
     addHandle( handle );
 
@@ -986,12 +986,12 @@ void TQWinMetaFile::createPenIndirect( long, short* parm )
     else
     {
         kdDebug() << "TQWinMetaFile::createPenIndirect: invalid pen " << parm[ 0 ] << endl;
-        style = TQt::SolidLine;
+        style = Qt::SolidLine;
     }
 
     handle->pen.setStyle( style );
     handle->pen.setColor( color( parm+3 ) );
-    handle->pen.setCapStyle( TQt::RoundCap );
+    handle->pen.setCapStyle( Qt::RoundCap );
 
     //int width = 0;
     // TODO : width of pen proportional to tqdevice context width
diff --git a/ktnef/lib/ktnefmessage.cpp b/ktnef/lib/ktnefmessage.cpp
index 8a8bf0655..202f080a1 100644
--- a/ktnef/lib/ktnefmessage.cpp
+++ b/ktnef/lib/ktnefmessage.cpp
@@ -76,7 +76,7 @@ TQString KTNEFMessage::rtfString()
 		TQByteArray rtf;
 		TQBuffer input( prop.asByteArray() ), output( rtf );
 		if ( input.open( IO_ReadOnly ) && output.open( IO_WriteOnly ) )
-			lzfu_decompress( &input, &output );
+			lzfu_decompress( &TQT_TQIODEVICE_OBJECT(input), &TQT_TQIODEVICE_OBJECT(output) );
 		return TQString( rtf );
 	}
 }
diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp
index cd0063466..41bb2b687 100644
--- a/ktnef/lib/ktnefparser.cpp
+++ b/ktnef/lib/ktnefparser.cpp
@@ -162,7 +162,7 @@ bool KTNEFParser::decodeMessage()
 				readMAPIProperties( d->message_->properties(), 0 );
 				d->tqdevice_->at( i2 );
 				kdDebug() << "Properties: " << d->message_->properties().count() << endl;
-				value = TQString( "< %1 properties >" ).arg( d->message_->properties().count() - nProps );
+				value = TQString( "< %1 properties >" ).tqarg( d->message_->properties().count() - nProps );
 			}
 			break;
 		case attTNEFVERSION:
@@ -275,7 +275,7 @@ bool KTNEFParser::decodeAttachment()
 		   d->current_->setSize( i );
 		   d->current_->setOffset( d->tqdevice_->at() );
 		   d->tqdevice_->at( d->tqdevice_->at() + i );
-		   value = TQString( "< size=%1 >" ).arg( i );
+		   value = TQString( "< size=%1 >" ).tqarg( i );
 		   kdDebug() << "Attachment Data: size=" << i << endl;
 		   break;
 	   case attATTACHMENT:	// try to get attachment info
@@ -292,7 +292,7 @@ bool KTNEFParser::decodeAttachment()
 		   if ( !str.isEmpty() )
 			   d->current_->setMimeTag( str );
 		   d->current_->setExtension( d->current_->property( MAPI_TAG_EXTENSION ).toString() );
-		   value = TQString( "< %1 properties >" ).arg( d->current_->properties().count() );
+		   value = TQString( "< %1 properties >" ).tqarg( d->current_->properties().count() );
 		   break;
 	   case attATTACHMODDATE:
 		   value = readTNEFDate( d->stream_ );
@@ -304,7 +304,7 @@ bool KTNEFParser::decodeAttachment()
 		   break;
 	   case attATTACHMETAFILE:
 		   kdDebug() << "Attachment Metafile: size=" << i << endl;
-		   //value = TQString( "< size=%1 >" ).arg( i );
+		   //value = TQString( "< size=%1 >" ).tqarg( i );
 		   //d->tqdevice_->at( d->tqdevice_->at()+i );
 		   value = readTNEFData( d->stream_, i );
 		   break;
@@ -447,7 +447,7 @@ bool KTNEFParser::openFile(const TQString& filename)
 	deleteDevice();
 	delete d->message_;
 	d->message_ = new KTNEFMessage();
-	d->tqdevice_ = new TQFile( filename );
+	d->tqdevice_ = TQT_TQIODEVICE(new TQFile( filename ));
 	d->deleteDevice_ = true;
 	return parseDevice();
 }
@@ -814,7 +814,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt
 					ALIGN( len, 4 )
 					attach->setSize( len );
 					attach->setOffset( d->tqdevice_->at() - len );
-					attach->addAttribute( attATTACHDATA, atpBYTE, TQString( "< size=%1 >" ).arg( len ), false );
+					attach->addAttribute( attATTACHDATA, atpBYTE, TQString( "< size=%1 >" ).tqarg( len ), false );
 				}
 			}
 			kdDebug().form( "MAPI data: size=%d\n", mapi.value.toByteArray().size() );
@@ -827,7 +827,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt
 					if ( mapi.name.type == 0 )
 						mapiname = TQString().sprintf( " [name = 0x%04x]", mapi.name.value.toUInt() );
 					else
-						mapiname = TQString( " [name = %1]" ).arg( mapi.name.value.toString() );
+						mapiname = TQString( " [name = %1]" ).tqarg( mapi.name.value.toString() );
 				}
 				switch ( mapi.type & 0x0FFF )
 				{