From 84ace1135cac57993b72fee7105b92def1638d32 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:53 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 97d1732e257f8700488d7ca1660ae7eba8fc6065. --- lskat/lskat/KChildConnect.cpp | 2 +- lskat/lskat/KChildConnect.h | 2 +- lskat/lskat/KConnectEntry.cpp | 8 ++++---- lskat/lskat/KConnectEntry.h | 2 +- lskat/lskat/KEInput.cpp | 6 +++--- lskat/lskat/KEInput.h | 2 +- lskat/lskat/KEMessage.cpp | 2 +- lskat/lskat/KRemoteConnect.cpp | 2 +- lskat/lskat/KRemoteConnect.h | 2 +- lskat/lskat/lskat.cpp | 18 +++++++++--------- lskat/lskat/lskatdoc.cpp | 8 ++++---- lskat/lskat/lskatdoc.h | 6 +++--- lskat/lskat/lskatview.cpp | 36 ++++++++++++++++++------------------ lskat/lskat/lskatview.h | 4 ++-- lskat/lskat/namedlg.cpp | 10 +++++----- lskat/lskat/networkdlg.cpp | 2 +- lskat/lskat/networkdlgbase.ui | 12 ++++++------ lskat/lskatproc/KChildConnect.cpp | 2 +- lskat/lskatproc/KChildConnect.h | 2 +- lskat/lskatproc/KEMessage.cpp | 2 +- 20 files changed, 65 insertions(+), 65 deletions(-) (limited to 'lskat') diff --git a/lskat/lskat/KChildConnect.cpp b/lskat/lskat/KChildConnect.cpp index 35ac9408..b3ecfb18 100644 --- a/lskat/lskat/KChildConnect.cpp +++ b/lskat/lskat/KChildConnect.cpp @@ -30,7 +30,7 @@ KChildConnect::~KChildConnect() { } -KR_STATUS KChildConnect::QueryStatus() +KR_STATUS KChildConnect::QuerytqStatus() { return KR_OK; } diff --git a/lskat/lskat/KChildConnect.h b/lskat/lskat/KChildConnect.h index 8421f722..99ab31b0 100644 --- a/lskat/lskat/KChildConnect.h +++ b/lskat/lskat/KChildConnect.h @@ -42,7 +42,7 @@ class KChildConnect: public TQObject virtual bool SendMsg(KEMessage *msg); virtual bool Send(TQString str); - virtual KR_STATUS QueryStatus(); + virtual KR_STATUS QuerytqStatus(); public slots: diff --git a/lskat/lskat/KConnectEntry.cpp b/lskat/lskat/KConnectEntry.cpp index 870b8cd2..ed926d6d 100644 --- a/lskat/lskat/KConnectEntry.cpp +++ b/lskat/lskat/KConnectEntry.cpp @@ -55,18 +55,18 @@ KInteractiveConnect *KConnectEntry::QueryInteractiveConnect() return connect.i; } -KR_STATUS KConnectEntry::QueryStatus() +KR_STATUS KConnectEntry::QuerytqStatus() { switch(type) { case KG_INPUTTYPE_INTERACTIVE: - return connect.i->QueryStatus(); + return connect.i->QuerytqStatus(); break; case KG_INPUTTYPE_REMOTE: - return connect.r->QueryStatus(); + return connect.r->QuerytqStatus(); break; case KG_INPUTTYPE_PROCESS: - return connect.p->QueryStatus(); + return connect.p->QuerytqStatus(); break; default: return KR_INVALID; diff --git a/lskat/lskat/KConnectEntry.h b/lskat/lskat/KConnectEntry.h index 73619eac..16df7924 100644 --- a/lskat/lskat/KConnectEntry.h +++ b/lskat/lskat/KConnectEntry.h @@ -50,7 +50,7 @@ class KConnectEntry KConnectEntry &operator=(KConnectEntry &entry); bool Exit(); bool Init(KG_INPUTTYPE stype,int id=0,KEMessage *msg=0); - KR_STATUS QueryStatus(); + KR_STATUS QuerytqStatus(); bool SendMsg(KEMessage *msg); }; #endif diff --git a/lskat/lskat/KEInput.cpp b/lskat/lskat/KEInput.cpp index 091bf4e1..b2f53f65 100644 --- a/lskat/lskat/KEInput.cpp +++ b/lskat/lskat/KEInput.cpp @@ -85,14 +85,14 @@ KG_INPUTTYPE KEInput::QueryType(int no) return playerArray[no].QueryType(); } -KR_STATUS KEInput::QueryStatus(int no) +KR_STATUS KEInput::QuerytqStatus(int no) { if (no==-1) no=QueryNext(); if (no>=number_of_inputs || no<0) { return KR_INVALID; } - return playerArray[no].QueryStatus(); + return playerArray[no].QuerytqStatus(); } bool KEInput::SendMsg(KEMessage *msg,int no) { @@ -122,7 +122,7 @@ bool KEInput::SetInputDevice(int no, KG_INPUTTYPE type,KEMessage *msg) result=playerArray[no].Init(type,no,msg); // if (result) // Connect even if remote connection is not yet build - if (result || playerArray[no].QueryStatus()==KR_WAIT_FOR_CLIENT) + if (result || playerArray[no].QuerytqStatus()==KR_WAIT_FOR_CLIENT) { switch(QueryType(no)) { diff --git a/lskat/lskat/KEInput.h b/lskat/lskat/KEInput.h index 7b6eb0ac..4a97e864 100644 --- a/lskat/lskat/KEInput.h +++ b/lskat/lskat/KEInput.h @@ -56,7 +56,7 @@ class KEInput : public TQObject bool IsRemote(int no=-1); int QueryPrevious(); KG_INPUTTYPE QueryType(int no=-1); - KR_STATUS QueryStatus(int no=-1); + KR_STATUS QuerytqStatus(int no=-1); bool IsInput(int no); bool SetInputDevice(int no, KG_INPUTTYPE type, KEMessage *msg=0); bool RemoveInput(int no); diff --git a/lskat/lskat/KEMessage.cpp b/lskat/lskat/KEMessage.cpp index 38cd2e8d..b11a70a5 100644 --- a/lskat/lskat/KEMessage.cpp +++ b/lskat/lskat/KEMessage.cpp @@ -202,7 +202,7 @@ TQString KEMessage::StringToEntry(TQString str,KMessageEntry *entry) cnt=size.toInt(); entry->SetType((KGM_TYPE)type.toInt()); - // I hope this works with unicode strings as well + // I hope this works with tqunicode strings as well p=data.latin1(); q=(char *)calloc(data.length()/2,sizeof(char)); if (!q) return TQString(); diff --git a/lskat/lskat/KRemoteConnect.cpp b/lskat/lskat/KRemoteConnect.cpp index 315d2a96..fd5effc5 100644 --- a/lskat/lskat/KRemoteConnect.cpp +++ b/lskat/lskat/KRemoteConnect.cpp @@ -63,7 +63,7 @@ KRemoteConnect::~KRemoteConnect() printf("DESTGRUCTING KRemoteConenct\n"); } -KR_STATUS KRemoteConnect::QueryStatus() +KR_STATUS KRemoteConnect::QuerytqStatus() { return socketStatus; } diff --git a/lskat/lskat/KRemoteConnect.h b/lskat/lskat/KRemoteConnect.h index a666800f..5669b330 100644 --- a/lskat/lskat/KRemoteConnect.h +++ b/lskat/lskat/KRemoteConnect.h @@ -54,7 +54,7 @@ class KRemoteConnect: public KChildConnect // bool SendMsg(KEMessage *msg); virtual bool Send(TQString str); // void Receive(TQString input); - virtual KR_STATUS QueryStatus(); + virtual KR_STATUS QuerytqStatus(); protected: bool OfferServerSocket(); diff --git a/lskat/lskat/lskat.cpp b/lskat/lskat/lskat.cpp index af0768e9..c6f21ff1 100644 --- a/lskat/lskat/lskat.cpp +++ b/lskat/lskat/lskat.cpp @@ -50,7 +50,7 @@ LSkatApp::LSkatApp() : KMainWindow(0) config=kapp->config(); // localise data file - TQString file=TQString::fromLatin1("lskat/grafix/t1.png"); + TQString file=TQString::tqfromLatin1("lskat/grafix/t1.png"); mGrafix=kapp->dirs()->findResourceDir("data", file); if (mGrafix.isNull()) mGrafix = TQCString("grafix/"); else mGrafix+=TQCString("lskat/grafix/"); @@ -587,7 +587,7 @@ void LSkatApp::slotStatusNames(){ if (!doc->IsRunning()) msg=i18n("No game running"); else { - msg=i18n("%1 to move...").arg(doc->GetName(doc->GetCurrentPlayer())); + msg=i18n("%1 to move...").tqarg(doc->GetName(doc->GetCurrentPlayer())); } slotStatusMover(msg); } @@ -625,14 +625,14 @@ void LSkatApp::NewGame() } // Connected 0 and we are server else if (mInput->QueryType(0)==KG_INPUTTYPE_REMOTE && - mInput->QueryStatus()>0 && doc->IsServer()) + mInput->QuerytqStatus()>0 && doc->IsServer()) { mInput->Unlock(); mInput->Next(doc->GetStartPlayer()); } // Connected 1 and we are server else if (mInput->QueryType(1)==KG_INPUTTYPE_REMOTE && - mInput->QueryStatus()>1 && doc->IsServer()) + mInput->QuerytqStatus()>1 && doc->IsServer()) { mInput->Unlock(); mInput->Next(doc->GetStartPlayer()); @@ -659,7 +659,7 @@ bool LSkatApp::MakeInputDevice(int no) msg=new KEMessage; PrepareGame(msg); // Build new connection - if ( mInput->QueryType(no)!=type || mInput->QueryStatus(no)<=0) + if ( mInput->QueryType(no)!=type || mInput->QuerytqStatus(no)<=0) { OptionsNetwork(); port=doc->QueryPort(); @@ -677,11 +677,11 @@ bool LSkatApp::MakeInputDevice(int no) tim=10000; if (!host.isEmpty()) { - s=i18n("Remote connection to %1:%2...").arg(host).arg(port); + s=i18n("Remote connection to %1:%2...").tqarg(host).tqarg(port); } else { - s=i18n("Offering remote connection on port %1...").arg(port); + s=i18n("Offering remote connection on port %1...").tqarg(port); } progress=new TQProgressDialog(s, i18n("Abort"), tim, this,0,true ); progress->setCaption(i18n("Lieutenant Skat")); @@ -689,7 +689,7 @@ bool LSkatApp::MakeInputDevice(int no) { progress->setProgress( j ); if ( progress->wasCancelled() ) break; - if (mInput->QueryStatus(no)>0) break; + if (mInput->QuerytqStatus(no)>0) break; usleep(100); } // progress.setProgress(tim); @@ -717,7 +717,7 @@ bool LSkatApp::MakeInputDevice(int no) } } delete msg; - if (mInput->QueryStatus(no)>0) + if (mInput->QuerytqStatus(no)>0) { res=true; } diff --git a/lskat/lskat/lskatdoc.cpp b/lskat/lskat/lskatdoc.cpp index 1de66668..cdb51054 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->repaint(); + w->tqrepaint(); } } } @@ -147,7 +147,7 @@ void LSkatDoc::UpdateViews(int mode) { for(w=pViewList->first(); w!=0; w=pViewList->next()) { - if (mode & UPDATE_STATUS) w->updateStatus(); + if (mode & UPDATE_STATUS) w->updatetqStatus(); } } } @@ -528,8 +528,8 @@ int LSkatDoc::WonMove(int c1,int c2) } -int LSkatDoc::GetMoveStatus() {return movestatus;} -void LSkatDoc::SetMoveStatus(int i) { movestatus=i; } +int LSkatDoc::GetMovetqStatus() {return movestatus;} +void LSkatDoc::SetMovetqStatus(int i) { movestatus=i; } int LSkatDoc::GetCurrentPlayer() {return currentplayer;} void LSkatDoc::SetCurrentPlayer(int i) {currentplayer=i;} int LSkatDoc::GetStartPlayer() {return startplayer;} diff --git a/lskat/lskat/lskatdoc.h b/lskat/lskat/lskatdoc.h index a90c7ec9..e4b52c17 100644 --- a/lskat/lskat/lskatdoc.h +++ b/lskat/lskat/lskatdoc.h @@ -97,8 +97,8 @@ class LSkatDoc : public TQObject bool IsRunning(); CCOLOUR GetTrump(); void SetTrump(CCOLOUR i); - int GetMoveStatus(); - void SetMoveStatus(int i); + int GetMovetqStatus(); + void SetMovetqStatus(int i); int GetCurrentPlayer(); void SetCurrentPlayer(int i); int GetStartPlayer(); @@ -216,7 +216,7 @@ public: int cardvalues[14]; public slots: - /** calls repaint() on all views connected to the document object and is called by the view by which the document has been changed. + /** calls tqrepaint() 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 72b5ffd1..1905ad48 100644 --- a/lskat/lskat/lskatview.cpp +++ b/lskat/lskat/lskatview.cpp @@ -206,7 +206,7 @@ void LSkatView::drawMove(TQPainter *p) int card; TQPoint point; - card=getDocument()->GetMoveStatus(); + card=getDocument()->GetMovetqStatus(); if (card>=0) { @@ -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 geometry + // Calculate tqgeometry 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 ").arg(getDocument()->GetName(0)); + line2=i18n("Player 1 - %1 won ").tqarg(getDocument()->GetName(0)); } else { - line2=i18n("Player 2 - %1 won ").arg(getDocument()->GetName(1)); + line2=i18n("Player 2 - %1 won ").tqarg(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").arg(pt0); + col4_3=i18n("%1 points").tqarg(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").arg(pt1); + col4_4=i18n("%1 points").tqarg(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!").arg(getDocument()->GetName(0)); + line5=i18n("%1 won to nil. Congratulations!").tqarg(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!").arg(getDocument()->GetName(0)); + line5=i18n("%1 won with 90 points. Super!").tqarg(getDocument()->GetName(0)); else - line5=i18n("%1 won over 90 points. Super!").arg(getDocument()->GetName(0)); + line5=i18n("%1 won over 90 points. Super!").tqarg(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!").arg(getDocument()->GetName(1)); + line5=i18n("%1 won to nil. Congratulations!").tqarg(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!").arg(getDocument()->GetName(1)); + line5=i18n("%1 won with 90 points. Super!").tqarg(getDocument()->GetName(1)); else - line5=i18n("%1 won over 90 points. Super!").arg(getDocument()->GetName(1)); + line5=i18n("%1 won over 90 points. Super!").tqarg(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; @@ -611,7 +611,7 @@ void LSkatView::drawTabText(TQPainter *p,TQRect rect,TQString s,int *ts) } // Draw the status field at the right side -void LSkatView::drawStatus(TQPainter *p) +void LSkatView::drawtqStatus(TQPainter *p) { TQPoint p1,p2; int trump; @@ -740,7 +740,7 @@ void LSkatView::drawStatus(TQPainter *p) void LSkatView::Paint(TQPainter *p) { // If game is running - drawStatus(p); + drawtqStatus(p); drawDeck(p); if (getDocument()->IsRunning()) { @@ -760,7 +760,7 @@ void LSkatView::paintEvent( TQPaintEvent * e) TQPixmap pm(this->rect().size()); TQPainter p; TQBrush brush; - p.begin(TQT_TQPAINTDEVICE(&pm),this); + p.tqbegin(TQT_TQPAINTDEVICE(&pm),this); brush.setPixmap( getDocument()->mPixBackground ); p.fillRect(0,0,this->rect().width(),this->rect().height(),brush); drawIntro(&p); @@ -793,7 +793,7 @@ void LSkatView::mousePressEvent( TQMouseEvent *mouse ) if (mouse->button()!=Qt::LeftButton) return ; if (!getDocument()->IsRunning()) return ; - if (getDocument()->GetMoveStatus()!=-1) return ; + if (getDocument()->GetMovetqStatus()!=-1) return ; TQPoint point; int mx,my,player; @@ -890,7 +890,7 @@ void LSkatView::introTimerReady() } else if (introcnt #include #include -#include +#include #include #include @@ -45,10 +45,10 @@ NameDlg::NameDlg( TQWidget *parent, const char *name,bool /* modal */, WFlags /* player_names = new TQGroupBox( page, "player_names" ); player_names->setTitle(i18n("Player Names") ); player_names->setColumnLayout(0, Qt::Vertical ); - player_names->layout()->setSpacing( 0 ); - player_names->layout()->setMargin( 0 ); - vbox_2 = new TQVBoxLayout( player_names->layout() ); - vbox_2->setAlignment( TQt::AlignTop ); + player_names->tqlayout()->setSpacing( 0 ); + player_names->tqlayout()->setMargin( 0 ); + vbox_2 = new TQVBoxLayout( player_names->tqlayout() ); + vbox_2->tqsetAlignment( TQt::AlignTop ); vbox_2->setSpacing( 6 ); vbox_2->setMargin( 11 ); diff --git a/lskat/lskat/networkdlg.cpp b/lskat/lskat/networkdlg.cpp index e23e50fe..9fe30baf 100644 --- a/lskat/lskat/networkdlg.cpp +++ b/lskat/lskat/networkdlg.cpp @@ -28,7 +28,7 @@ extern const char* LSKAT_SERVICE; NetworkDlg::NetworkDlg( TQWidget *parent, const char *name ) : NetworkDlgBase( parent, name, TRUE ) { - browser = new DNSSD::ServiceBrowser(TQString::fromLatin1(LSKAT_SERVICE)); + browser = new DNSSD::ServiceBrowser(TQString::tqfromLatin1(LSKAT_SERVICE)); connect(browser,TQT_SIGNAL(finished()),TQT_SLOT(gamesFound())); browser->startBrowse(); } diff --git a/lskat/lskat/networkdlgbase.ui b/lskat/lskat/networkdlgbase.ui index d064c13b..5451289b 100644 --- a/lskat/lskat/networkdlgbase.ui +++ b/lskat/lskat/networkdlgbase.ui @@ -144,7 +144,7 @@ - layout9 + tqlayout9 @@ -165,7 +165,7 @@ Host: - + AlignVCenter|AlignLeft @@ -194,7 +194,7 @@ Port: - + AlignVCenter|AlignLeft @@ -220,7 +220,7 @@ - layout11 + tqlayout11 @@ -236,7 +236,7 @@ Expanding - + 51 20 @@ -261,7 +261,7 @@ Expanding - + 61 20 diff --git a/lskat/lskatproc/KChildConnect.cpp b/lskat/lskatproc/KChildConnect.cpp index 6ea4b973..838847be 100644 --- a/lskat/lskatproc/KChildConnect.cpp +++ b/lskat/lskatproc/KChildConnect.cpp @@ -30,7 +30,7 @@ KChildConnect::~KChildConnect() { } -KR_STATUS KChildConnect::QueryStatus() +KR_STATUS KChildConnect::QuerytqStatus() { return KR_OK; } diff --git a/lskat/lskatproc/KChildConnect.h b/lskat/lskatproc/KChildConnect.h index 8dbacc32..36e9e9a5 100644 --- a/lskat/lskatproc/KChildConnect.h +++ b/lskat/lskatproc/KChildConnect.h @@ -34,7 +34,7 @@ class KChildConnect: public TQObject virtual bool SendMsg(KEMessage *msg); virtual bool Send(TQString str); - virtual KR_STATUS QueryStatus(); + virtual KR_STATUS QuerytqStatus(); public slots: diff --git a/lskat/lskatproc/KEMessage.cpp b/lskat/lskatproc/KEMessage.cpp index ce8985f3..aa88298a 100644 --- a/lskat/lskatproc/KEMessage.cpp +++ b/lskat/lskatproc/KEMessage.cpp @@ -202,7 +202,7 @@ TQString KEMessage::StringToEntry(TQString str,KMessageEntry *entry) cnt=size.toInt(); entry->SetType((KGM_TYPE)type.toInt()); - // I hope this works with unicode strings as well + // I hope this works with tqunicode strings as well p=data.latin1(); q=(char *)calloc(data.length()/2,sizeof(char)); if (!q) return TQString(); -- cgit v1.2.1