summaryrefslogtreecommitdiffstats
path: root/lskat
diff options
context:
space:
mode:
Diffstat (limited to 'lskat')
-rw-r--r--lskat/lskat/KChildConnect.cpp2
-rw-r--r--lskat/lskat/KChildConnect.h2
-rw-r--r--lskat/lskat/KConnectEntry.cpp8
-rw-r--r--lskat/lskat/KConnectEntry.h2
-rw-r--r--lskat/lskat/KEInput.cpp6
-rw-r--r--lskat/lskat/KEInput.h2
-rw-r--r--lskat/lskat/KRemoteConnect.cpp2
-rw-r--r--lskat/lskat/KRemoteConnect.h2
-rw-r--r--lskat/lskat/lskat.cpp12
-rw-r--r--lskat/lskat/lskatdoc.cpp6
-rw-r--r--lskat/lskat/lskatdoc.h4
-rw-r--r--lskat/lskat/lskatview.cpp10
-rw-r--r--lskat/lskat/lskatview.h4
-rw-r--r--lskat/lskat/namedlg.cpp2
-rw-r--r--lskat/lskat/networkdlg.cpp2
-rw-r--r--lskat/lskat/networkdlgbase.ui4
-rw-r--r--lskat/lskatproc/KChildConnect.cpp2
-rw-r--r--lskat/lskatproc/KChildConnect.h2
18 files changed, 37 insertions, 37 deletions
diff --git a/lskat/lskat/KChildConnect.cpp b/lskat/lskat/KChildConnect.cpp
index b3ecfb18..35ac9408 100644
--- a/lskat/lskat/KChildConnect.cpp
+++ b/lskat/lskat/KChildConnect.cpp
@@ -30,7 +30,7 @@ KChildConnect::~KChildConnect()
{
}
-KR_STATUS KChildConnect::QuerytqStatus()
+KR_STATUS KChildConnect::QueryStatus()
{
return KR_OK;
}
diff --git a/lskat/lskat/KChildConnect.h b/lskat/lskat/KChildConnect.h
index 99ab31b0..8421f722 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 QuerytqStatus();
+ virtual KR_STATUS QueryStatus();
public slots:
diff --git a/lskat/lskat/KConnectEntry.cpp b/lskat/lskat/KConnectEntry.cpp
index ed926d6d..870b8cd2 100644
--- a/lskat/lskat/KConnectEntry.cpp
+++ b/lskat/lskat/KConnectEntry.cpp
@@ -55,18 +55,18 @@ KInteractiveConnect *KConnectEntry::QueryInteractiveConnect()
return connect.i;
}
-KR_STATUS KConnectEntry::QuerytqStatus()
+KR_STATUS KConnectEntry::QueryStatus()
{
switch(type)
{
case KG_INPUTTYPE_INTERACTIVE:
- return connect.i->QuerytqStatus();
+ return connect.i->QueryStatus();
break;
case KG_INPUTTYPE_REMOTE:
- return connect.r->QuerytqStatus();
+ return connect.r->QueryStatus();
break;
case KG_INPUTTYPE_PROCESS:
- return connect.p->QuerytqStatus();
+ return connect.p->QueryStatus();
break;
default:
return KR_INVALID;
diff --git a/lskat/lskat/KConnectEntry.h b/lskat/lskat/KConnectEntry.h
index 16df7924..73619eac 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 QuerytqStatus();
+ KR_STATUS QueryStatus();
bool SendMsg(KEMessage *msg);
};
#endif
diff --git a/lskat/lskat/KEInput.cpp b/lskat/lskat/KEInput.cpp
index b2f53f65..091bf4e1 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::QuerytqStatus(int no)
+KR_STATUS KEInput::QueryStatus(int no)
{
if (no==-1) no=QueryNext();
if (no>=number_of_inputs || no<0)
{
return KR_INVALID;
}
- return playerArray[no].QuerytqStatus();
+ return playerArray[no].QueryStatus();
}
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].QuerytqStatus()==KR_WAIT_FOR_CLIENT)
+ if (result || playerArray[no].QueryStatus()==KR_WAIT_FOR_CLIENT)
{
switch(QueryType(no))
{
diff --git a/lskat/lskat/KEInput.h b/lskat/lskat/KEInput.h
index 4a97e864..7b6eb0ac 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 QuerytqStatus(int no=-1);
+ KR_STATUS QueryStatus(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/KRemoteConnect.cpp b/lskat/lskat/KRemoteConnect.cpp
index fd5effc5..315d2a96 100644
--- a/lskat/lskat/KRemoteConnect.cpp
+++ b/lskat/lskat/KRemoteConnect.cpp
@@ -63,7 +63,7 @@ KRemoteConnect::~KRemoteConnect()
printf("DESTGRUCTING KRemoteConenct\n");
}
-KR_STATUS KRemoteConnect::QuerytqStatus()
+KR_STATUS KRemoteConnect::QueryStatus()
{
return socketStatus;
}
diff --git a/lskat/lskat/KRemoteConnect.h b/lskat/lskat/KRemoteConnect.h
index 5669b330..a666800f 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 QuerytqStatus();
+ virtual KR_STATUS QueryStatus();
protected:
bool OfferServerSocket();
diff --git a/lskat/lskat/lskat.cpp b/lskat/lskat/lskat.cpp
index c6f21ff1..a1caa748 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::tqfromLatin1("lskat/grafix/t1.png");
+ TQString file=TQString::fromLatin1("lskat/grafix/t1.png");
mGrafix=kapp->dirs()->findResourceDir("data", file);
if (mGrafix.isNull()) mGrafix = TQCString("grafix/");
else mGrafix+=TQCString("lskat/grafix/");
@@ -625,14 +625,14 @@ void LSkatApp::NewGame()
}
// Connected 0 and we are server
else if (mInput->QueryType(0)==KG_INPUTTYPE_REMOTE &&
- mInput->QuerytqStatus()>0 && doc->IsServer())
+ mInput->QueryStatus()>0 && doc->IsServer())
{
mInput->Unlock();
mInput->Next(doc->GetStartPlayer());
}
// Connected 1 and we are server
else if (mInput->QueryType(1)==KG_INPUTTYPE_REMOTE &&
- mInput->QuerytqStatus()>1 && doc->IsServer())
+ mInput->QueryStatus()>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->QuerytqStatus(no)<=0)
+ if ( mInput->QueryType(no)!=type || mInput->QueryStatus(no)<=0)
{
OptionsNetwork();
port=doc->QueryPort();
@@ -689,7 +689,7 @@ bool LSkatApp::MakeInputDevice(int no)
{
progress->setProgress( j );
if ( progress->wasCancelled() ) break;
- if (mInput->QuerytqStatus(no)>0) break;
+ if (mInput->QueryStatus(no)>0) break;
usleep(100);
}
// progress.setProgress(tim);
@@ -717,7 +717,7 @@ bool LSkatApp::MakeInputDevice(int no)
}
}
delete msg;
- if (mInput->QuerytqStatus(no)>0)
+ if (mInput->QueryStatus(no)>0)
{
res=true;
}
diff --git a/lskat/lskat/lskatdoc.cpp b/lskat/lskat/lskatdoc.cpp
index cdb51054..18ddb59b 100644
--- a/lskat/lskat/lskatdoc.cpp
+++ b/lskat/lskat/lskatdoc.cpp
@@ -147,7 +147,7 @@ void LSkatDoc::UpdateViews(int mode)
{
for(w=pViewList->first(); w!=0; w=pViewList->next())
{
- if (mode & UPDATE_STATUS) w->updatetqStatus();
+ if (mode & UPDATE_STATUS) w->updateStatus();
}
}
}
@@ -528,8 +528,8 @@ int LSkatDoc::WonMove(int c1,int c2)
}
-int LSkatDoc::GetMovetqStatus() {return movestatus;}
-void LSkatDoc::SetMovetqStatus(int i) { movestatus=i; }
+int LSkatDoc::GetMoveStatus() {return movestatus;}
+void LSkatDoc::SetMoveStatus(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 e4b52c17..062b00be 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 GetMovetqStatus();
- void SetMovetqStatus(int i);
+ int GetMoveStatus();
+ void SetMoveStatus(int i);
int GetCurrentPlayer();
void SetCurrentPlayer(int i);
int GetStartPlayer();
diff --git a/lskat/lskat/lskatview.cpp b/lskat/lskat/lskatview.cpp
index 1905ad48..4ad9bf92 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()->GetMovetqStatus();
+ card=getDocument()->GetMoveStatus();
if (card>=0)
{
@@ -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::drawtqStatus(TQPainter *p)
+void LSkatView::drawStatus(TQPainter *p)
{
TQPoint p1,p2;
int trump;
@@ -740,7 +740,7 @@ void LSkatView::drawtqStatus(TQPainter *p)
void LSkatView::Paint(TQPainter *p)
{
// If game is running
- drawtqStatus(p);
+ drawStatus(p);
drawDeck(p);
if (getDocument()->IsRunning())
{
@@ -793,7 +793,7 @@ void LSkatView::mousePressEvent( TQMouseEvent *mouse )
if (mouse->button()!=Qt::LeftButton) return ;
if (!getDocument()->IsRunning()) return ;
- if (getDocument()->GetMovetqStatus()!=-1) return ;
+ if (getDocument()->GetMoveStatus()!=-1) return ;
TQPoint point;
int mx,my,player;
@@ -925,7 +925,7 @@ void LSkatView::moveTimerReady()
}
}
-void LSkatView::updatetqStatus()
+void LSkatView::updateStatus()
{
update(status_rect1);
update(status_rect2);
diff --git a/lskat/lskat/lskatview.h b/lskat/lskat/lskatview.h
index 20fe80a7..b08f1eea 100644
--- a/lskat/lskat/lskatview.h
+++ b/lskat/lskat/lskatview.h
@@ -54,13 +54,13 @@ class LSkatView : public TQWidget
void paintEvent( TQPaintEvent * p);
void Paint(TQPainter *p);
void InitMove(int player,int x,int y);
- void updatetqStatus();
+ void updateStatus();
protected:
void drawDeck(TQPainter *p);
void drawIntro(TQPainter *p);
void drawMove(TQPainter *p);
- void drawtqStatus(TQPainter *p);
+ void drawStatus(TQPainter *p);
void drawFinal(TQPainter *p);
void drawBorder(TQPainter *p,TQRect rect,int offset,int width,int mode);
TQPoint calcCardPos(int x,int y);
diff --git a/lskat/lskat/namedlg.cpp b/lskat/lskat/namedlg.cpp
index 8267d4ea..6067619c 100644
--- a/lskat/lskat/namedlg.cpp
+++ b/lskat/lskat/namedlg.cpp
@@ -48,7 +48,7 @@ NameDlg::NameDlg( TQWidget *parent, const char *name,bool /* modal */, WFlags /*
player_names->tqlayout()->setSpacing( 0 );
player_names->tqlayout()->setMargin( 0 );
vbox_2 = new TQVBoxLayout( player_names->tqlayout() );
- vbox_2->tqsetAlignment( TQt::AlignTop );
+ vbox_2->setAlignment( TQt::AlignTop );
vbox_2->setSpacing( 6 );
vbox_2->setMargin( 11 );
diff --git a/lskat/lskat/networkdlg.cpp b/lskat/lskat/networkdlg.cpp
index 9fe30baf..e23e50fe 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::tqfromLatin1(LSKAT_SERVICE));
+ browser = new DNSSD::ServiceBrowser(TQString::fromLatin1(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 5451289b..70505185 100644
--- a/lskat/lskat/networkdlgbase.ui
+++ b/lskat/lskat/networkdlgbase.ui
@@ -236,7 +236,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -261,7 +261,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
diff --git a/lskat/lskatproc/KChildConnect.cpp b/lskat/lskatproc/KChildConnect.cpp
index 838847be..6ea4b973 100644
--- a/lskat/lskatproc/KChildConnect.cpp
+++ b/lskat/lskatproc/KChildConnect.cpp
@@ -30,7 +30,7 @@ KChildConnect::~KChildConnect()
{
}
-KR_STATUS KChildConnect::QuerytqStatus()
+KR_STATUS KChildConnect::QueryStatus()
{
return KR_OK;
}
diff --git a/lskat/lskatproc/KChildConnect.h b/lskat/lskatproc/KChildConnect.h
index 36e9e9a5..8dbacc32 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 QuerytqStatus();
+ virtual KR_STATUS QueryStatus();
public slots:
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 04:21:33 +0000