TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 12 insertions, 12 deletions

diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
index 3858101d..9a842dfb 100644
--- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
@@ -61,8 +61,8 @@
 #include "dictmanager.h"
 
 
-PrinterDlgImpl::PrinterDlgImpl(TQWidget* parent, SambaShare* share)
-	: KcmPrinterDlg(parent,"sharedlgimpl")
+PrinterDlgImpl::PrinterDlgImpl(TQWidget* tqparent, SambaShare* share)
+	: KcmPrinterDlg(tqparent,"sharedlgimpl")
 {
   if (!share) {
     kdWarning() << "PrinterDlgImpl::Constructor : share parameter is null!" << endl;
@@ -212,29 +212,29 @@ void PrinterDlgImpl::printersChkToggled(bool b)
     p.drawPixmap(dist+dist/2,2*dist,pix2);
 		p.end();
 
-  	TQBitmap mask(w,h);
+  	TQBitmap tqmask(w,h);
 
-    mask.fill(Qt::black); // everything is transparent
+    tqmask.fill(TQt::black); // everything is transparent
 
-    p.begin(&mask);
+    p.begin(&tqmask);
     
-    p.setRasterOp(Qt::OrROP);
-    p.drawPixmap(dist+dist/2,0,*pix2.mask());
-    p.drawPixmap(dist/2,dist,*pix2.mask());
-    p.drawPixmap(dist+dist/2,2*dist,*pix2.mask());
+    p.setRasterOp(TQt::OrROP);
+    p.drawPixmap(dist+dist/2,0,*pix2.tqmask());
+    p.drawPixmap(dist/2,dist,*pix2.tqmask());
+    p.drawPixmap(dist+dist/2,2*dist,*pix2.tqmask());
 		p.end();
 
-		pix.setMask(mask);
+		pix.setMask(tqmask);
 
     printerPixLbl->setPixmap(pix);
-		pixFrame->layout()->setMargin( 2 );
+		pixFrame->tqlayout()->setMargin( 2 );
   }
 	else
   {
   	shareNameEdit->setEnabled(true);
 		shareNameEdit->setText( _share->getName() );
 		printerPixLbl->setPixmap(DesktopIcon("printer1"));
-		pixFrame->layout()->setMargin( 11 );
+		pixFrame->tqlayout()->setMargin( 11 );
   }
 }