TQt4 port kdeutils

This enables compilation under both Qt3 and Qt4


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

2 files changed, 20 insertions, 17 deletions

diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp
index fdda6bd..260ad8e 100644
--- a/ksim/monitors/mail/ksimmail.cpp
+++ b/ksim/monitors/mail/ksimmail.cpp
@@ -66,13 +66,13 @@ void MailPlugin::showAbout()
 	KAboutApplication( &about ).exec();
 }
 
-MailView::MailView( KSim::PluginObject* parent, const char* name )
-	: KSim::PluginView( parent, name )
+MailView::MailView( KSim::PluginObject* tqparent, const char* name )
+	: KSim::PluginView( tqparent, name )
 {
-	TQVBoxLayout* layout = new TQVBoxLayout( this );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
 
 	MailLabel* label = new MailLabel( this );
-	layout->addWidget( label, 0, AlignHCenter );
+	tqlayout->addWidget( label, 0, AlignHCenter );
 }
 
 MailView::~MailView()
@@ -87,8 +87,8 @@ void MailView::updateDisplay()
 {
 }
 
-MailLabel::MailLabel( TQWidget* parent )
-	: KSim::Label( KSim::Types::Mail, parent )
+MailLabel::MailLabel( TQWidget* tqparent )
+	: KSim::Label( KSim::Types::Mail, tqparent )
 {
 //	label->setPixmap( KSim::ThemeLoader::self().current().krellMail() );
 	configureObject( false );
@@ -101,7 +101,7 @@ MailLabel::~MailLabel()
 {
 }
 
-void MailLabel::configureObject( bool repaint )
+void MailLabel::configureObject( bool tqrepaint )
 {
 	m_envelope.load( themeLoader().current().mailPixmap() );
 	m_frames = themeLoader().current().mailFrames();
@@ -112,7 +112,7 @@ void MailLabel::configureObject( bool repaint )
 
 	setPixmap( frame( m_envelope, 1 ) );
 
-	KSim::Label::configureObject( repaint );
+	KSim::Label::configureObject( tqrepaint );
 }
 
 void MailLabel::paintEvent( TQPaintEvent* e )
@@ -131,17 +131,17 @@ TQPixmap MailLabel::frame( const TQPixmap& source, int number ) const
 {
 	TQPixmap result( source.width(), source.height() / m_frames );
 	bitBlt( &result, 0, 0, &source, 0, number * source.height() / m_frames );
-	if ( source.mask() )
+	if ( source.tqmask() )
 	{
-		TQBitmap mask( result.size() );
-		bitBlt( &mask, 0, 0, source.mask(), 0, number * source.height() / m_frames );
-		result.setMask( mask );
+		TQBitmap tqmask( result.size() );
+		bitBlt( &tqmask, 0, 0, source.tqmask(), 0, number * source.height() / m_frames );
+		result.setMask( tqmask );
 	}
 	return result;
 }
 
-MailConfig::MailConfig( KSim::PluginObject* parent, const char* name )
-	: KSim::PluginPage( parent, name )
+MailConfig::MailConfig( KSim::PluginObject* tqparent, const char* name )
+	: KSim::PluginPage( tqparent, name )
 {
 }
 
diff --git a/ksim/monitors/mail/ksimmail.h b/ksim/monitors/mail/ksimmail.h
index f5a42d7..776d574 100644
--- a/ksim/monitors/mail/ksimmail.h
+++ b/ksim/monitors/mail/ksimmail.h
@@ -39,8 +39,9 @@ public:
 class MailView : public KSim::PluginView
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	MailView( KSim::PluginObject* parent, const char* name );
+	MailView( KSim::PluginObject* tqparent, const char* name );
 	~MailView();
 
 	virtual void reparseConfig();
@@ -52,8 +53,9 @@ private slots:
 class MailLabel : public KSim::Label
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	MailLabel( TQWidget* parent );
+	MailLabel( TQWidget* tqparent );
 	virtual ~MailLabel();
 
 	virtual void configureObject( bool );
@@ -77,8 +79,9 @@ private:
 class MailConfig : public KSim::PluginPage
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	MailConfig( KSim::PluginObject* parent, const char* name );
+	MailConfig( KSim::PluginObject* tqparent, const char* name );
 	~MailConfig();
 
 	virtual void saveConfig();