TQt4 convert kmyfirewall

This enables compilation under both Qt3 and Qt4


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

1 files changed, 36 insertions, 36 deletions

diff --git a/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp
index 627d48f..70c25db 100644
--- a/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp
@@ -12,9 +12,9 @@
 #include "kmfnetworkwidget.h"
 
 // QT includes
-#include <qlabel.h>
-#include <qtextedit.h>
-#include <qevent.h>
+#include <tqlabel.h>
+#include <tqtextedit.h>
+#include <tqevent.h>
 
 // KDE includes
 #include <kdebug.h>
@@ -26,23 +26,23 @@
 
 
 namespace KMF {
-KMFNetworkWidget::KMFNetworkWidget(QWidget *parent, const char *name)
-		: KMyFirewallNetworkWidget(parent, name) {
+KMFNetworkWidget::KMFNetworkWidget(TQWidget *tqparent, const char *name)
+		: KMyFirewallNetworkWidget(tqparent, name) {
 	m_allowEdit = true;
-	connect( m_sb_from_1,SIGNAL( valueChanged( const QString& ) ),
-		this,SLOT( slotAddressChanged( const QString& ) ) );
-	connect( m_sb_from_2,SIGNAL( valueChanged( const QString& ) ),
-		this,SLOT( slotAddressChanged( const QString& ) ) );
-	connect( m_sb_from_3,SIGNAL( valueChanged( const QString& ) ),
-		this,SLOT( slotAddressChanged( const QString& ) ) );
-	connect( m_sb_from_4,SIGNAL( valueChanged( const QString& ) ),
-		this,SLOT( slotAddressChanged( const QString& ) ) );
+	connect( m_sb_from_1,TQT_SIGNAL( valueChanged( const TQString& ) ),
+		this,TQT_SLOT( slotAddressChanged( const TQString& ) ) );
+	connect( m_sb_from_2,TQT_SIGNAL( valueChanged( const TQString& ) ),
+		this,TQT_SLOT( slotAddressChanged( const TQString& ) ) );
+	connect( m_sb_from_3,TQT_SIGNAL( valueChanged( const TQString& ) ),
+		this,TQT_SLOT( slotAddressChanged( const TQString& ) ) );
+	connect( m_sb_from_4,TQT_SIGNAL( valueChanged( const TQString& ) ),
+		this,TQT_SLOT( slotAddressChanged( const TQString& ) ) );
 	
-	connect( m_sb_mask,SIGNAL( valueChanged( int ) ),
-		this,SLOT( slotShortMaskChanged( int ) ) );
+	connect( m_sb_tqmask,TQT_SIGNAL( valueChanged( int ) ),
+		this,TQT_SLOT( slotShortMaskChanged( int ) ) );
 		
-	connect( m_txt_desc,SIGNAL( textChanged() ),
-		this,SLOT( slotDescriptionChanged() ) );
+	connect( m_txt_desc,TQT_SIGNAL( textChanged() ),
+		this,TQT_SLOT( slotDescriptionChanged() ) );
 
 }
 
@@ -57,29 +57,29 @@ void KMFNetworkWidget::loadZone( KMFNetZone* zone ) {
 	setEnabled( true );
 	blockAllSignals( true );	
 	m_zone = zone;
-	connect( m_zone, SIGNAL( destroyed() ), this, SLOT ( slotZoneDeleted() ) );
+	connect( m_zone, TQT_SIGNAL( destroyed() ), this, TQT_SLOT ( slotZoneDeleted() ) );
 	
 	m_sb_from_1->setEnabled( true );
 	m_sb_from_2->setEnabled( true );
 	m_sb_from_3->setEnabled( true );
 	m_sb_from_4->setEnabled( true );
-	m_sb_mask->setEnabled( true );
+	m_sb_tqmask->setEnabled( true );
 	
 	m_sb_from_1->setValue( zone->address()->getDigit( 0 ) );
 	m_sb_from_2->setValue( zone->address()->getDigit( 1 ) );
 	m_sb_from_3->setValue( zone->address()->getDigit( 2 ) );
 	m_sb_from_4->setValue( zone->address()->getDigit( 3 ) );
 
-	lbl_mask->setText( zone->mask()->toString() );
+	lbl_tqmask->setText( zone->tqmask()->toString() );
 	if ( zone->description() != m_txt_desc->text().simplifyWhiteSpace() ) {
 		m_txt_desc->setText( zone->description() );
 	}
-	m_sb_mask->setValue( IPAddress::calcLenthToMask( *zone->mask() ) );
+	m_sb_tqmask->setValue( IPAddress::calcLenthToMask( *zone->tqmask() ) );
 	blockAllSignals( false );	
 }
 
-void KMFNetworkWidget::slotAddressChanged( const QString& ) {
-	kdDebug() << "void KMFNetworkWidget::slotAddressChanged( const QString& )" << endl;
+void KMFNetworkWidget::slotAddressChanged( const TQString& ) {
+	kdDebug() << "void KMFNetworkWidget::slotAddressChanged( const TQString& )" << endl;
 	if ( ! m_zone ) {
 		return;
 	}
@@ -87,7 +87,7 @@ void KMFNetworkWidget::slotAddressChanged( const QString& ) {
 	blockAllSignals( true );
 	if ( m_allowEdit ) {
 		
-		const QString& newAddr =	m_sb_from_1->text() +"."+ 
+		const TQString& newAddr =	m_sb_from_1->text() +"."+ 
 									m_sb_from_2->text() +"."+
 									m_sb_from_3->text() +"."+
 									m_sb_from_4->text();
@@ -97,7 +97,7 @@ void KMFNetworkWidget::slotAddressChanged( const QString& ) {
 		}
 		KMFUndoEngine::instance()->startTransaction(
 			m_zone->rootZone(),
-			i18n( "Change address of Zone: %1" ).arg( m_zone->guiName() )
+			i18n( "Change address of Zone: %1" ).tqarg( m_zone->guiName() )
 		);
 		
 		m_zone->address()->setAddress( m_sb_from_1->value(), m_sb_from_2->value(), m_sb_from_3->value(), m_sb_from_4->value() );
@@ -110,14 +110,14 @@ void KMFNetworkWidget::slotAddressChanged( const QString& ) {
 }
 
 void KMFNetworkWidget::slotShortMaskChanged( int len ) {
-	kdDebug() << "void KMFNetworkWidget::slotShortMaskChanged( const QString& )" << endl;
+	kdDebug() << "void KMFNetworkWidget::slotShortMaskChanged( const TQString& )" << endl;
 	IPAddress addr = IPAddress::calcNetworkMaskFromLength( len );
 	blockAllSignals( true );
-	lbl_mask->setText( addr.toString() );
-	if ( m_allowEdit && m_zone->maskLength() != len ) {
+	lbl_tqmask->setText( addr.toString() );
+	if ( m_allowEdit && m_zone->tqmaskLength() != len ) {
 		KMFUndoEngine::instance()->startTransaction(
 			m_zone->rootZone(),
-			i18n( "Change mask length of Zone: %1" ).arg( m_zone->guiName() )
+			i18n( "Change tqmask length of Zone: %1" ).tqarg( m_zone->guiName() )
 		);
 		m_zone->setMaskLength( len );
 		m_zone->rootZone()->refreshNetworkTree();
@@ -128,16 +128,16 @@ void KMFNetworkWidget::slotShortMaskChanged( int len ) {
 }
 
 void KMFNetworkWidget::slotDescriptionChanged() {
-	kdDebug() << "void KMFNetworkWidget::slotDescriptionChanged( const QString& )" << endl;
+	kdDebug() << "void KMFNetworkWidget::slotDescriptionChanged( const TQString& )" << endl;
 	if ( ! m_zone ) {
 		return;
 	}
-	QString newTxt = m_txt_desc->text().simplifyWhiteSpace();
+	TQString newTxt = m_txt_desc->text().simplifyWhiteSpace();
 	if ( m_allowEdit && newTxt != m_zone->description() ) {
 		blockAllSignals( true );
 		KMFUndoEngine::instance()->startTransaction(
 			m_zone,
-			i18n( "Change documentation of Zone: %1" ).arg( m_zone->guiName() )
+			i18n( "Change documentation of Zone: %1" ).tqarg( m_zone->guiName() )
 		);
 		m_zone->setDescription( newTxt );
 		KMFUndoEngine::instance()->endTransaction();
@@ -146,8 +146,8 @@ void KMFNetworkWidget::slotDescriptionChanged() {
 	}
 }
 
-void KMFNetworkWidget::focusOutEvent( QFocusEvent * e ) {
-    kdDebug() << "void KMFNetworkWidget::focusOutEvent( QFocusEvent * e )" << endl;
+void KMFNetworkWidget::focusOutEvent( TQFocusEvent * e ) {
+    kdDebug() << "void KMFNetworkWidget::focusOutEvent( TQFocusEvent * e )" << endl;
     if ( e->lostFocus() && m_txt_desc->text().simplifyWhiteSpace() != m_zone->description() ) {
     	slotDescriptionChanged();
     }
@@ -159,7 +159,7 @@ void KMFNetworkWidget::blockAllSignals( bool onOff ) {
 	m_sb_from_3->blockSignals( onOff );
 	m_sb_from_4->blockSignals( onOff );
 	m_txt_desc->blockSignals( onOff );
-	m_sb_mask->blockSignals( onOff );
+	m_sb_tqmask->blockSignals( onOff );
 }	
 
 void KMFNetworkWidget::allowEdit( bool allow ) {
@@ -169,7 +169,7 @@ void KMFNetworkWidget::allowEdit( bool allow ) {
 	m_sb_from_3->setEnabled( allow );
 	m_sb_from_4->setEnabled( allow );
 	m_txt_desc->setEnabled( allow );
-	m_sb_mask->setEnabled( allow );
+	m_sb_tqmask->setEnabled( allow );
 }
 
 }