Remove additional unneeded tq method conversions

5 files changed, 20 insertions, 20 deletions

diff --git a/lskat/lskat/lskat.cpp b/lskat/lskat/lskat.cpp
index a1caa748..af0768e9 100644
--- a/lskat/lskat/lskat.cpp
+++ b/lskat/lskat/lskat.cpp
@@ -587,7 +587,7 @@ void LSkatApp::slotStatusNames(){
   if (!doc->IsRunning()) msg=i18n("No game running");
   else
   {
-    msg=i18n("%1 to move...").tqarg(doc->GetName(doc->GetCurrentPlayer()));
+    msg=i18n("%1 to move...").arg(doc->GetName(doc->GetCurrentPlayer()));
   }
   slotStatusMover(msg);
 }
@@ -677,11 +677,11 @@ bool LSkatApp::MakeInputDevice(int no)
           tim=10000;
           if (!host.isEmpty())
           {
-            s=i18n("Remote connection to %1:%2...").tqarg(host).tqarg(port);
+            s=i18n("Remote connection to %1:%2...").arg(host).arg(port);
           }
           else
           {
-            s=i18n("Offering remote connection on port %1...").tqarg(port);
+            s=i18n("Offering remote connection on port %1...").arg(port);
           }
           progress=new TQProgressDialog(s, i18n("Abort"), tim, this,0,true );
           progress->setCaption(i18n("Lieutenant Skat"));
diff --git a/lskat/lskat/lskatdoc.cpp b/lskat/lskat/lskatdoc.cpp
index 18ddb59b..1de66668 100644
--- a/lskat/lskat/lskatdoc.cpp
+++ b/lskat/lskat/lskatdoc.cpp
@@ -135,7 +135,7 @@ void LSkatDoc::slotUpdateAllViews(LSkatView *sender)
     for(w=pViewList->first(); w!=0; w=pViewList->next())
     {
       if(w!=sender)
-        w->tqrepaint();
+        w->repaint();
     }
   }
 }
diff --git a/lskat/lskat/lskatdoc.h b/lskat/lskat/lskatdoc.h
index 062b00be..a90c7ec9 100644
--- a/lskat/lskat/lskatdoc.h
+++ b/lskat/lskat/lskatdoc.h
@@ -216,7 +216,7 @@ public:
   int cardvalues[14];
 	
   public slots:
-    /** calls tqrepaint() on all views connected to the document object and is called by the view by which the document has been changed.
+    /** calls repaint() on all views connected to the document object and is called by the view by which the document has been changed.
      * As this view normally repaints itself, it is excluded from the paintEvent.
      */
     void slotUpdateAllViews(LSkatView *sender);
diff --git a/lskat/lskat/lskatview.cpp b/lskat/lskat/lskatview.cpp
index 4ad9bf92..72b5ffd1 100644
--- a/lskat/lskat/lskatview.cpp
+++ b/lskat/lskat/lskatview.cpp
@@ -403,7 +403,7 @@ void LSkatView::drawFinal(TQPainter *p)
   TQRect brect1_3,brect2_3,brect3_3,brect4_3;
   TQRect brect1_4,brect2_4,brect3_4,brect4_4;
 
-  // Calculate tqgeometry
+  // Calculate geometry
   line1=i18n("Game over");
   rect=p->window();
   //rect1.moveBy(0,FINAL_Y0-24);
@@ -429,11 +429,11 @@ void LSkatView::drawFinal(TQPainter *p)
     }
     else if (sc0>sc1)
     {
-      line2=i18n("Player 1 - %1 won ").tqarg(getDocument()->GetName(0));
+      line2=i18n("Player 1 - %1 won ").arg(getDocument()->GetName(0));
     }
     else
     {
-      line2=i18n("Player 2 - %1 won ").tqarg(getDocument()->GetName(1));
+      line2=i18n("Player 2 - %1 won ").arg(getDocument()->GetName(1));
     }
     int hp=getDocument()->mPixTrump[trump].height()+5;
     rect=TQRect(0,hp>sumrect.height()?hp:sumrect.height(),p->window().width(),p->window().height());
@@ -469,11 +469,11 @@ void LSkatView::drawFinal(TQPainter *p)
     rect=brect3_3|brect3_4;
     ts[2]=ts[1]+rect.width()+30;
 
-    col4_3=i18n("%1 points").tqarg(pt0);
+    col4_3=i18n("%1 points").arg(pt0);
     rect=TQRect(0,0,p->window().width(),p->window().height());
     brect4_3=p->boundingRect(rect,TQt::AlignLeft|TQt::SingleLine|TQt::AlignTop,col4_3);
 
-    col4_4=i18n("%1 points").tqarg(pt1);
+    col4_4=i18n("%1 points").arg(pt1);
     rect=TQRect(0,0,p->window().width(),p->window().height());
     brect4_4=p->boundingRect(rect,TQt::AlignLeft|TQt::SingleLine|TQt::AlignTop,col4_4);
 
@@ -492,7 +492,7 @@ void LSkatView::drawFinal(TQPainter *p)
     p->setFont(font14);
     if (sc0>=120)
     {
-      line5=i18n("%1 won to nil. Congratulations!").tqarg(getDocument()->GetName(0));
+      line5=i18n("%1 won to nil. Congratulations!").arg(getDocument()->GetName(0));
       rect=TQRect(0,sumrect.height()+10,p->window().width(),p->window().height());
       brect5=p->boundingRect(rect,TQt::AlignHCenter|TQt::SingleLine|TQt::AlignTop,line5);
       sumrect|=brect5;
@@ -500,16 +500,16 @@ void LSkatView::drawFinal(TQPainter *p)
     else if (sc0>=90)
     {
       if (sc0==90)
-        line5=i18n("%1 won with 90 points. Super!").tqarg(getDocument()->GetName(0));
+        line5=i18n("%1 won with 90 points. Super!").arg(getDocument()->GetName(0));
       else
-        line5=i18n("%1 won over 90 points. Super!").tqarg(getDocument()->GetName(0));
+        line5=i18n("%1 won over 90 points. Super!").arg(getDocument()->GetName(0));
       rect=TQRect(0,sumrect.height()+10,p->window().width(),p->window().height());
       brect5=p->boundingRect(rect,TQt::AlignHCenter|TQt::SingleLine|TQt::AlignTop,line5);
       sumrect|=brect5;
     }
     if (sc1>=120)
     {
-      line5=i18n("%1 won to nil. Congratulations!").tqarg(getDocument()->GetName(1));
+      line5=i18n("%1 won to nil. Congratulations!").arg(getDocument()->GetName(1));
       rect=TQRect(0,sumrect.height()+10,p->window().width(),p->window().height());
       brect5=p->boundingRect(rect,TQt::AlignHCenter|TQt::SingleLine|TQt::AlignTop,line5);
       sumrect|=brect5;
@@ -517,9 +517,9 @@ void LSkatView::drawFinal(TQPainter *p)
     else if (sc1>=90)
     {
       if (sc1==90)
-        line5=i18n("%1 won with 90 points. Super!").tqarg(getDocument()->GetName(1));
+        line5=i18n("%1 won with 90 points. Super!").arg(getDocument()->GetName(1));
       else
-        line5=i18n("%1 won over 90 points. Super!").tqarg(getDocument()->GetName(1));
+        line5=i18n("%1 won over 90 points. Super!").arg(getDocument()->GetName(1));
       rect=TQRect(0,sumrect.height()+10,p->window().width(),p->window().height());
       brect5=p->boundingRect(rect,TQt::AlignHCenter|TQt::SingleLine|TQt::AlignTop,line5);
       sumrect|=brect5;
@@ -760,7 +760,7 @@ void LSkatView::paintEvent( TQPaintEvent * e)
     TQPixmap pm(this->rect().size());
     TQPainter p;
     TQBrush brush;
-    p.tqbegin(TQT_TQPAINTDEVICE(&pm),this);
+    p.begin(TQT_TQPAINTDEVICE(&pm),this);
      brush.setPixmap( getDocument()->mPixBackground );
     p.fillRect(0,0,this->rect().width(),this->rect().height(),brush);
     drawIntro(&p);
@@ -890,7 +890,7 @@ void LSkatView::introTimerReady()
   }
   else if (introcnt<NO_OF_CARDS)
   {
-    tqrepaint(false);
+    repaint(false);
   }
 }
 
diff --git a/lskat/lskat/networkdlgbase.ui b/lskat/lskat/networkdlgbase.ui
index 70505185..dce143d9 100644
--- a/lskat/lskat/networkdlgbase.ui
+++ b/lskat/lskat/networkdlgbase.ui
@@ -165,7 +165,7 @@
                     <property name="text">
                         <string>Host:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -194,7 +194,7 @@
                     <property name="text">
                         <string>Port:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                     <property name="hAlign" stdset="0">