summaryrefslogtreecommitdiffstats
path: root/kwin4
diff options
context:
space:
mode:
Diffstat (limited to 'kwin4')
-rw-r--r--kwin4/index.html2
-rwxr-xr-xkwin4/install-sh2
-rw-r--r--kwin4/kwin4/kspritecache.cpp50
-rw-r--r--kwin4/kwin4/kspritecache.h36
-rw-r--r--kwin4/kwin4/kwin4.cpp56
-rw-r--r--kwin4/kwin4/kwin4.h6
-rw-r--r--kwin4/kwin4/kwin4doc.cpp64
-rw-r--r--kwin4/kwin4/kwin4doc.h9
-rw-r--r--kwin4/kwin4/kwin4player.h1
-rw-r--r--kwin4/kwin4/kwin4proc.cpp18
-rw-r--r--kwin4/kwin4/kwin4proc.h3
-rw-r--r--kwin4/kwin4/kwin4view.cpp26
-rw-r--r--kwin4/kwin4/kwin4view.h5
-rw-r--r--kwin4/kwin4/scorewidget.cpp22
-rw-r--r--kwin4/kwin4/scorewidget.h5
-rw-r--r--kwin4/kwin4/settings.ui50
-rw-r--r--kwin4/kwin4/statistics.ui66
-rw-r--r--kwin4/kwin4/statuswidget.ui54
18 files changed, 242 insertions, 233 deletions
diff --git a/kwin4/index.html b/kwin4/index.html
index ea969510..13d28255 100644
--- a/kwin4/index.html
+++ b/kwin4/index.html
@@ -1,6 +1,6 @@
<HTML>
<HEAD>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html";>
+<META HTTP-ETQUIV="Content-Type" CONTENT="text/html";>
<TITLE>Four wins manual</TITLE>
</HEAD>
diff --git a/kwin4/install-sh b/kwin4/install-sh
index 67c94290..a3789027 100755
--- a/kwin4/install-sh
+++ b/kwin4/install-sh
@@ -113,7 +113,7 @@ else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
+# if $src (and thus $dsttmp) tqcontains '*'.
if [ -f "$src" -o -d "$src" ]
then
diff --git a/kwin4/kwin4/kspritecache.cpp b/kwin4/kwin4/kspritecache.cpp
index d8ab3b9b..342369c9 100644
--- a/kwin4/kwin4/kspritecache.cpp
+++ b/kwin4/kwin4/kspritecache.cpp
@@ -27,8 +27,8 @@
// KSprite
#include <math.h>
-KSpriteCache::KSpriteCache(TQString grafixdir, TQObject* parent,const char * name)
- : TQObject(parent,name)
+KSpriteCache::KSpriteCache(TQString grafixdir, TQObject* tqparent,const char * name)
+ : TQObject(tqparent,name)
{
kdDebug(11002) << "KSpriteCache:: grafixdir=" << grafixdir << endl;
mConfig=0;
@@ -90,7 +90,7 @@ void KSpriteCache::deleteAllItems()
void KSpriteCache::deleteItem(TQString s,int no)
{
TQCanvasItem *item;
- TQString name=s+TQString("_%1").arg(no);
+ TQString name=s+TQString("_%1").tqarg(no);
//kdDebug(11002) << "KSpriteCache::deleteItem name=" << name << endl;
item=mItemDict[name];
if (item)
@@ -122,7 +122,7 @@ void KSpriteCache::deleteItem(TQCanvasItem *item)
TQCanvasItem *KSpriteCache::getItem(TQString name,int no)
{
- TQString dictname=name+TQString("_%1").arg(no);
+ TQString dictname=name+TQString("_%1").tqarg(no);
TQCanvasItem *item=mItemDict[dictname];
//kdDebug(11002) << " -> getItem("<<name<<","<<no<<") =>"<<dictname<<endl;
// Directly found item
@@ -155,7 +155,7 @@ TQCanvasItem *KSpriteCache::getItem(TQString name,int no)
return item;
}
-TQPixmap * KSpriteCache::loadPixmap(TQString file,TQString mask,TQString dir)
+TQPixmap * KSpriteCache::loadPixmap(TQString file,TQString tqmask,TQString dir)
{
TQPixmap *newP=new TQPixmap;
bool result1=false;
@@ -165,21 +165,21 @@ TQPixmap * KSpriteCache::loadPixmap(TQString file,TQString mask,TQString dir)
{
result1=newP->load(dir+file);
}
- if (result1 && !mask.isNull())
+ if (result1 && !tqmask.isNull())
{
- TQBitmap bitmask;
- if (mask==TQString("auto")) // self mask..slow but quick to create
+ TQBitmap bittqmask;
+ if (tqmask==TQString("auto")) // self tqmask..slow but quick to create
{
newP->setMask( newP->createHeuristicMask() );
result2=true;
}
else
{
- result2=bitmask.load(dir+mask);
- if (result2) newP->setMask(bitmask);
+ result2=bittqmask.load(dir+tqmask);
+ if (result2) newP->setMask(bittqmask);
}
}
- //kdDebug(11002) << "KSpriteCache::loadPixmap: file="<<file<<" mask="<<mask<<" result1="<<result1<<" result2="<<result2<<endl;
+ //kdDebug(11002) << "KSpriteCache::loadPixmap: file="<<file<<" tqmask="<<tqmask<<" result1="<<result1<<" result2="<<result2<<endl;
return newP;
}
@@ -197,7 +197,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na
// Append default entry (empty string)
if (operationList.count()==0)
{
- operationList.append(TQString::null);
+ operationList.append(TQString());
}
@@ -221,7 +221,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na
//kdDebug(11002) << " Reading " << number << " frames " << endl;
TQString pixfile=config->readPathEntry(name+"file");
- TQString maskfile=config->readPathEntry(name+"mask");
+ TQString tqmaskfile=config->readPathEntry(name+"tqmask");
// Load a given set of images or replace a %d by a sequence if there are
// less image names than number given
@@ -230,12 +230,12 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na
// Read images
for (unsigned int i=0;i<number;i++)
{
- TQString tmpfile,tmpmask;
+ TQString tmpfile,tmptqmask;
tmpfile.sprintf(pixfile.latin1(),i);
- tmpmask.sprintf(maskfile.latin1(),i);
+ tmptqmask.sprintf(tqmaskfile.latin1(),i);
- pixmap=loadPixmap(tmpfile,tmpmask);
- if (!pixmap) kdError() << "Could not create pixmap="<<tmpfile << " with mask " << tmpmask << endl;
+ pixmap=loadPixmap(tmpfile,tmptqmask);
+ if (!pixmap) kdError() << "Could not create pixmap="<<tmpfile << " with tqmask " << tmptqmask << endl;
else
{
applyFilter(pixmap,config,name);
@@ -255,9 +255,9 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na
double step;
if (number>1) step=(100.0-finalscale)/100.0/(double)(number-1);
else step=1.0;
- //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " mask="<<maskfile<<endl;
+ //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " tqmask="<<tqmaskfile<<endl;
- pixmap=loadPixmap(pixfile,maskfile);
+ pixmap=loadPixmap(pixfile,tqmaskfile);
for (unsigned int j=0;j<(unsigned int)number;j++)
{
TQWMatrix matrix;
@@ -340,7 +340,7 @@ void KSpriteCache::changeHSV(TQPixmap *pixmap,int dh,int ds,int dv)
{
for (int x=0;x<img.width();x++)
{
- QRgb pix=img.pixel(x,y);
+ TQRgb pix=img.pixel(x,y);
TQColor col(pix);
col.hsv(&h,&s,&v);
if (col==black) continue; // speed up?
@@ -348,7 +348,7 @@ void KSpriteCache::changeHSV(TQPixmap *pixmap,int dh,int ds,int dv)
s=((unsigned int)(s+ds)%256);
v=((unsigned int)(v+dv)%256);
col.setHsv(h,s,v);
- img.setPixel(x,y,qRgba(col.red(),col.green(),col.blue(),qAlpha(pix)));
+ img.setPixel(x,y,tqRgba(col.red(),col.green(),col.blue(),tqAlpha(pix)));
}
}
pixmap->convertFromImage(img); // slow
@@ -365,12 +365,12 @@ void KSpriteCache::changeGrey(TQPixmap *pixmap,int lighter)
{
for (int x=0;x<img.width();x++)
{
- QRgb pix=img.pixel(x,y);
- int gray=qGray(qRed(pix),qGreen(pix),qBlue(pix));
+ TQRgb pix=img.pixel(x,y);
+ int gray=tqGray(tqRed(pix),tqGreen(pix),tqBlue(pix));
TQColor col(gray,gray,gray);
if (lighter>0) col=col.light(lighter);
if (lighter<0) col=col.dark(-lighter);
- img.setPixel(x,y,qRgba(col.red(),col.green(),col.blue(),qAlpha(pix)));
+ img.setPixel(x,y,tqRgba(col.red(),col.green(),col.blue(),tqAlpha(pix)));
}
}
pixmap->convertFromImage(img); // slow
@@ -496,7 +496,7 @@ void KSpriteCache::createAnimations(KConfig *config,KSprite *sprite)
if (!sprite) return ;
for (int i=0;i<1000;i++)
{
- TQString anim=TQString("anim%1").arg(i);
+ TQString anim=TQString("anim%1").tqarg(i);
if (config->hasKey(anim))
{
//kdDebug(11002) << "Found animation key " << anim << endl;
diff --git a/kwin4/kwin4/kspritecache.h b/kwin4/kwin4/kspritecache.h
index 9d762a13..94cb83d9 100644
--- a/kwin4/kwin4/kspritecache.h
+++ b/kwin4/kwin4/kspritecache.h
@@ -30,13 +30,14 @@ class KSprite;
* You do not need this directly.
* TODO: Can be part of the KSprite class
**/
- class KSpriteNotify : public QObject
+ class KSpriteNotify : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
KSpriteNotify() :TQObject(0,0) {mRefCnt=0;}
- void emitSignal(TQCanvasItem *parent,int mode) {emit signalNotify(parent,mode);}
+ void emitSignal(TQCanvasItem *tqparent,int mode) {emit signalNotify(tqparent,mode);}
void incRefCnt() {mRefCnt++;}
void decRefCnt() {mRefCnt--;}
int refCnt() {return mRefCnt;}
@@ -66,11 +67,11 @@ class KSprite;
* @author Martin Heni <martin@heni-online.de>
*
*/
-class KSprite : public QCanvasSprite
+class KSprite : public TQCanvasSprite
{
public:
/**
- * Contructs a KSprite object. It is anlogous to the @ref QCanvasSprite
+ * Contructs a KSprite object. It is anlogous to the @ref TQCanvasSprite
* constructor
*
* @param array - the frames of the sprite
@@ -146,7 +147,7 @@ class KSprite : public QCanvasSprite
/**
* Creates a notification object. You can connect to it and it will emit
- * the signal signalNotify(TQCanvasItem *parent, intmode) when a move or
+ * the signal signalNotify(TQCanvasItem *tqparent, intmode) when a move or
* animation is finished.
* Example:
* <pre>
@@ -243,17 +244,17 @@ class KSprite : public QCanvasSprite
*
* Example:
* <pre>
- * # Sprite with three frames and a common mask for them
+ * # Sprite with three frames and a common tqmask for them
* # z position given but x,y set manually in the program
* [arrow]
* file=arrow%d.png
- * mask=arrow_mask.png
+ * tqmask=arrow_tqmask.png
* number=3
* offset=19,5
* rtti=32
* z=9.0
*
- * # Simple sprite which is already positioned correcly. No mask just one file
+ * # Simple sprite which is already positioned correcly. No tqmask just one file
* [board]
* file=board.png
* rtti=32
@@ -266,7 +267,7 @@ class KSprite : public QCanvasSprite
* [star]
* anim0=0,4,2,8
* file=star%d.png
- * mask=star%d_mask.png
+ * tqmask=star%d_tqmask.png
* number=5
* offset=19,20
* rtti=32
@@ -281,9 +282,10 @@ class KSprite : public QCanvasSprite
* @author Martin Heni <martin@heni-online.de>
*
*/
-class KSpriteCache : public QObject
+class KSpriteCache : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -291,7 +293,7 @@ class KSpriteCache : public QObject
*
* @param grafixdir - the directory where the configuration file and the graphics reside
**/
- KSpriteCache(TQString grafixdir, TQObject* parent=0,const char * name=0);
+ KSpriteCache(TQString grafixdir, TQObject* tqparent=0,const char * name=0);
/**
* Delete the sprite cache
@@ -357,7 +359,7 @@ class KSpriteCache : public QObject
*
* @param name - the name of the sprite resp. the secion in the rc file
* @param no - the unique number of the sprite
- * @return sprite - returns the sprite pointer as @ref QCanvasItem
+ * @return sprite - returns the sprite pointer as @ref TQCanvasItem
*
* @todo support call without number argument as single sprite's
* @todo support loading of frame sequence via one big pixmap
@@ -367,10 +369,10 @@ class KSpriteCache : public QObject
/**
* This function loads a pixmap from the given file. Optional you can also
- * provide a mask file. Also optinal you can provide the directory. Default
+ * provide a tqmask file. Also optinal you can provide the directory. Default
* is the directory which is set with this @ref KSpriteCache
**/
- TQPixmap * loadPixmap(TQString file,TQString mask=TQString::null,TQString dir=TQString::null);
+ TQPixmap * loadPixmap(TQString file,TQString tqmask=TQString(),TQString dir=TQString());
/**
* Deletes a item form the sprite cache given as a pointer to it
@@ -389,7 +391,7 @@ class KSpriteCache : public QObject
protected:
/**
- * Loads the default properties for all QCanvasItems from the given config
+ * Loads the default properties for all TQCanvasItems from the given config
* file. This is at the moment
* <pre>
* x=(double)
@@ -400,7 +402,7 @@ class KSpriteCache : public QObject
void configureCanvasItem(KConfig *config,TQCanvasItem *item);
/**
- * Copies the default properties for all QCanvasItems from another sprite.
+ * Copies the default properties for all TQCanvasItems from another sprite.
* Same as above.
**/
void configureCanvasItem(TQCanvasItem *original,TQCanvasItem *item);
@@ -436,7 +438,7 @@ class KSpriteCache : public QObject
* number=(int) : how many frames to generate
* file=(Qstring) : the filename to load (can contain printf format args
* as %d which are replaced, e.g. file=hello_%d.png
- * mask=(TQString) : Same for the mask of the pixmaps
+ * tqmask=(TQString) : Same for the tqmask of the pixmaps
* axis=(int) : (scale only): scale axis (1=x,2=y,3=x+y)
* final=(double) : final scale in percent (default 0.0, i.e. complete scaling)
* colorfilter=1,h,s,v: make a HSV transform of all sprite images
diff --git a/kwin4/kwin4/kwin4.cpp b/kwin4/kwin4/kwin4.cpp
index 16b37da5..84056254 100644
--- a/kwin4/kwin4/kwin4.cpp
+++ b/kwin4/kwin4/kwin4.cpp
@@ -63,8 +63,8 @@
* Constructor for the chat widget. This widget
* is derived from the libkdegames chat widget
*/
-ChatDlg::ChatDlg(KGame *game,TQWidget *parent)
- : KDialogBase(Plain,i18n("Chat Dlg"),Ok,Ok,parent,0,false,true),mChat(0), mChatDlg(0)
+ChatDlg::ChatDlg(KGame *game,TQWidget *tqparent)
+ : KDialogBase(Plain,i18n("Chat Dlg"),Ok,Ok,tqparent,0,false,true),mChat(0), mChatDlg(0)
{
setMinimumSize(TQSize(200,200));
@@ -107,7 +107,7 @@ void ChatDlg::setPlayer(Kwin4Player *p)
/**
* Construct the main application window
*/
-Kwin4App::Kwin4App(TQWidget *parent, const char *name) : KMainWindow(parent,name), view(0), doc(0), mChat(0), mMyChatDlg(0)
+Kwin4App::Kwin4App(TQWidget *tqparent, const char *name) : KMainWindow(tqparent,name), view(0), doc(0), mChat(0), mMyChatDlg(0)
{
initGUI();
initStatusBar();
@@ -138,7 +138,7 @@ Kwin4App::Kwin4App(TQWidget *parent, const char *name) : KMainWindow(parent,name
void Kwin4App::checkMenus(CheckFlags menu)
{
bool localgame=(!doc->isNetwork());
- bool isRunning = (doc->gameStatus()==KGame::Run);
+ bool isRunning = (doc->gametqStatus()==KGame::Run);
if (!menu || (menu&CheckFileMenu))
{
changeAction("hint", !(!isRunning && localgame));
@@ -188,50 +188,50 @@ void Kwin4App::checkMenus(CheckFlags menu)
*/
void Kwin4App::initGUI()
{
- KStdGameAction::gameNew(this, TQT_SLOT(newGame()), actionCollection(), "new_game");
+ KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection(), "new_game");
ACTION("new_game")->setStatusText(i18n("Start a new game"));
- KStdGameAction::load(this, TQT_SLOT(slotOpenGame()), actionCollection(), "open");
+ KStdGameAction::load(TQT_TQOBJECT(this), TQT_SLOT(slotOpenGame()), actionCollection(), "open");
ACTION("open")->setStatusText(i18n("Open a saved game..."));
- KStdGameAction::save(this, TQT_SLOT(slotSaveGame()), actionCollection(), "save");
+ KStdGameAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSaveGame()), actionCollection(), "save");
ACTION("save")->setStatusText(i18n("Save a game..."));
- KStdGameAction::end(this, TQT_SLOT(endGame()), actionCollection(), "end_game");
+ KStdGameAction::end(TQT_TQOBJECT(this), TQT_SLOT(endGame()), actionCollection(), "end_game");
ACTION("end_game")->setStatusText(i18n("Ending the current game..."));
ACTION("end_game")->setWhatsThis(i18n("Aborts a currently played game. No winner will be declared."));
- new KAction(i18n("&Network Configuration..."),0, this, TQT_SLOT(slotInitNetwork()),
+ new KAction(i18n("&Network Configuration..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotInitNetwork()),
actionCollection(), "network_conf");
- new KAction(i18n("Network Chat..."),0, this, TQT_SLOT(slotChat()),
+ new KAction(i18n("Network Chat..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotChat()),
actionCollection(), "network_chat");
if (global_debug>0)
- new KAction(i18n("Debug KGame"), 0, this, TQT_SLOT(slotDebugKGame()),
+ new KAction(i18n("Debug KGame"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugKGame()),
actionCollection(), "file_debug");
- new KAction(i18n("&Show Statistics"),"flag", 0, this,
+ new KAction(i18n("&Show Statistics"),"flag", 0, TQT_TQOBJECT(this),
TQT_SLOT(showStatistics()), actionCollection(), "statistics");
ACTION("statistics")->setStatusText(i18n("Show statistics."));
- KStdGameAction::hint(doc, TQT_SLOT(calcHint()), actionCollection(), "hint");
+ KStdGameAction::hint(TQT_TQOBJECT(doc), TQT_SLOT(calcHint()), actionCollection(), "hint");
ACTION("hint")->setStatusText(i18n("Shows a hint on how to move."));
- KStdGameAction::quit(this, TQT_SLOT(close()), actionCollection(), "game_exit");
+ KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "game_exit");
ACTION("game_exit")->setStatusText(i18n("Quits the program."));
- KStdGameAction::undo(this, TQT_SLOT(slotUndo()), actionCollection(), "edit_undo");
+ KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection(), "edit_undo");
ACTION("edit_undo")->setStatusText(i18n("Undo last move."));
- KStdGameAction::redo(this, TQT_SLOT(slotRedo()), actionCollection(), "edit_redo");
+ KStdGameAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection(), "edit_redo");
ACTION("edit_redo")->setStatusText(i18n("Redo last move."));
actionCollection()->setHighlightingEnabled(true);
connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), TQT_SLOT(slotStatusMsg(const TQString &)));
connect(actionCollection(), TQT_SIGNAL(clearStatusText()), TQT_SLOT(slotClearStatusText()));
- KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection());
+ KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection());
}
/**
@@ -338,11 +338,11 @@ void Kwin4App::slotSaveGame()
void Kwin4App::newGame()
{
// End the intro if it is running
- doc->setGameStatus(Kwin4Doc::End);
+ doc->setGametqStatus(Kwin4Doc::End);
// Init the board and Clear the old game out
- doc->setGameStatus(Kwin4Doc::Init);
+ doc->setGametqStatus(Kwin4Doc::Init);
// Run it
- doc->setGameStatus(Kwin4Doc::Run);
+ doc->setGametqStatus(Kwin4Doc::Run);
}
/**
@@ -360,7 +360,7 @@ void Kwin4App::slotNewGame()
*/
void Kwin4App::endGame()
{
- doc->setGameStatus(Kwin4Doc::Abort);
+ doc->setGametqStatus(Kwin4Doc::Abort);
}
/**
@@ -453,7 +453,7 @@ void Kwin4App::EndGame(TABLE mode)
*/
void Kwin4App::slotStatusNames(){
TQString msg;
- if (!(doc->gameStatus()==KGame::Run))
+ if (!(doc->gametqStatus()==KGame::Run))
msg=i18n("No game ");
else if (doc->QueryCurrentPlayer()==Gelb)
msg=TQString(" ")+doc->QueryName(Gelb)+ i18n(" - Yellow ");
@@ -480,7 +480,7 @@ void Kwin4App::slotNetworkBroken(int /*id*/, int oldstatus ,KGame * /*game */)
doc->getPlayer(doc->QueryCurrentPlayer())->setTurn(true,true);
KMessageBox::information(this,i18n("The network game ended!\n"));
- doc->setGameStatus(oldstatus);
+ doc->setGametqStatus(oldstatus);
}
/**
@@ -509,7 +509,7 @@ void Kwin4App::slotGameOver(int status, KPlayer * p, KGame * /*me*/)
EndGame(TWin);
else
EndGame(TLost);
- TQString msg=i18n("%1 won the game. Please restart next round.").arg(doc->QueryName(((FARBE)p->userId())));
+ TQString msg=i18n("%1 won the game. Please restart next round.").tqarg(doc->QueryName(((FARBE)p->userId())));
slotStatusMsg(msg);
}
else if (status==2) // Abort
@@ -527,7 +527,7 @@ void Kwin4App::slotGameOver(int status, KPlayer * p, KGame * /*me*/)
void Kwin4App::slotInitNetwork()
{
- if (doc->gameStatus()==Kwin4Doc::Intro) doc->setGameStatus(Kwin4Doc::Pause);
+ if (doc->gametqStatus()==Kwin4Doc::Intro) doc->setGametqStatus(Kwin4Doc::Pause);
TQString host = Prefs::host();
int port=Prefs::port();
@@ -539,11 +539,11 @@ void Kwin4App::slotInitNetwork()
dlg.networkConfig()->setDiscoveryInfo("_kwin4._tcp",Prefs::gamename());
TQVBox *box=dlg.configPage(KGameDialog::NetworkConfig);
- TQVBoxLayout *l=(TQVBoxLayout *)(box->layout());
+ TQVBoxLayout *l=(TQVBoxLayout *)(box->tqlayout());
mColorGroup=new TQVButtonGroup(box);
- connect(mColorGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotRemoteChanged(int)));
- connect(dlg.networkConfig(), TQT_SIGNAL(signalServerTypeChanged(int)), this, TQT_SLOT(slotServerTypeChanged(int)));
+ connect(mColorGroup, TQT_SIGNAL(clicked(int)), TQT_TQOBJECT(this), TQT_SLOT(slotRemoteChanged(int)));
+ connect(dlg.networkConfig(), TQT_SIGNAL(signalServerTypeChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotServerTypeChanged(int)));
new TQRadioButton(i18n("Yellow should be played by remote"), mColorGroup);
new TQRadioButton(i18n("Red should be played by remote"), mColorGroup);
diff --git a/kwin4/kwin4/kwin4.h b/kwin4/kwin4/kwin4.h
index a2de5052..e3ab0ebc 100644
--- a/kwin4/kwin4/kwin4.h
+++ b/kwin4/kwin4/kwin4.h
@@ -38,8 +38,9 @@ class KPlayer;
class KDE_EXPORT ChatDlg : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ChatDlg(KGame *game,TQWidget* parent=0);
+ ChatDlg(KGame *game,TQWidget* tqparent=0);
public slots:
void setPlayer(Kwin4Player *p);
@@ -56,9 +57,10 @@ class Kwin4App : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
- Kwin4App(TQWidget *parent=0, const char *name=0);
+ Kwin4App(TQWidget *tqparent=0, const char *name=0);
protected:
void EndGame(TABLE mode);
diff --git a/kwin4/kwin4/kwin4doc.cpp b/kwin4/kwin4/kwin4doc.cpp
index cfc99c63..73ea8520 100644
--- a/kwin4/kwin4/kwin4doc.cpp
+++ b/kwin4/kwin4/kwin4doc.cpp
@@ -17,7 +17,7 @@
#include "kwin4doc.h"
-// include files for Qt
+// include files for TQt
#include <tqdir.h>
#include <tqtimer.h>
@@ -36,16 +36,16 @@
#include "prefs.h"
#include "statuswidget.h"
-Kwin4Doc::Kwin4Doc(TQWidget *parent, const char *) : KGame(1234,parent), pView(0), mHintProcess(0)
+Kwin4Doc::Kwin4Doc(TQWidget *tqparent, const char *) : KGame(1234,TQT_TQOBJECT(tqparent)), pView(0), mHintProcess(0)
{
connect(this,TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase *,KGame *)),
this,TQT_SLOT(slotPropertyChanged(KGamePropertyBase *,KGame *)));
dataHandler()->Debug();
- //kdDebug(12010) << "Property 7 policy=" << dataHandler()->find(7)->policy() << endl;
+ //kdDebug(12010) << "Property 7 policy=" << dataHandler()->tqfind(7)->policy() << endl;
setPolicy(KGame::PolicyDirty,true);
- //kdDebug(12010) << "Property 7 policy=" << dataHandler()->find(7)->policy() << endl;
+ //kdDebug(12010) << "Property 7 policy=" << dataHandler()->tqfind(7)->policy() << endl;
// Game design
setMaxPlayers(2);
@@ -90,13 +90,13 @@ Kwin4Doc::Kwin4Doc(TQWidget *parent, const char *) : KGame(1234,parent), pView(0
// last in init
ResetGame(false);
- setGameStatus(Intro);
+ setGametqStatus(Intro);
// Listen to network
- connect(this,TQT_SIGNAL(signalMessageUpdate(int,Q_UINT32,Q_UINT32)),
- this,TQT_SLOT(slotMessageUpdate(int, Q_UINT32,Q_UINT32)));
- connect(this,TQT_SIGNAL(signalClientJoinedGame(Q_UINT32,KGame *)),
- this,TQT_SLOT(slotClientConnected(Q_UINT32, KGame *)));
+ connect(this,TQT_SIGNAL(signalMessageUpdate(int,TQ_UINT32,TQ_UINT32)),
+ this,TQT_SLOT(slotMessageUpdate(int, TQ_UINT32,TQ_UINT32)));
+ connect(this,TQT_SIGNAL(signalClientJoinedGame(TQ_UINT32,KGame *)),
+ this,TQT_SLOT(slotClientConnected(TQ_UINT32, KGame *)));
// Debug only
connect(this,TQT_SIGNAL(signalGameOver(int, KPlayer *,KGame *)),
@@ -203,7 +203,7 @@ void Kwin4Doc::preparePlayerTurn()
*/
void Kwin4Doc::EndGame(TABLE mode)
{
- setGameStatus(End);
+ setGametqStatus(End);
pView->clearError();
pView->EndGame();
Kwin4Player *yellow=getPlayer(Gelb);
@@ -799,7 +799,7 @@ TQString Kwin4Doc::QueryProcessName()
return empty;
}
-void Kwin4Doc::slotMessageUpdate(int /*id*/,Q_UINT32 /*sender*/,Q_UINT32 /*recv*/)
+void Kwin4Doc::slotMessageUpdate(int /*id*/,TQ_UINT32 /*sender*/,TQ_UINT32 /*recv*/)
{
// kdDebug(12010) << "MSG: id=" << id << " sender=" << sender << " receiver="<<recv<< endl;
}
@@ -932,7 +932,7 @@ void Kwin4Doc::createIO(KPlayer *player,KGameIO::IOMode io)
if (global_debug>1) kdDebug(12010) << "Creating KEYBOARD IO " << endl;
// We want the player to work over keyboard
KGameKeyIO *input;
- input=new KGameKeyIO(pView->parentWidget());
+ input=new KGameKeyIO(pView->tqparentWidget());
// Connect keys input to a function to process the actual input
connect((KGameKeyIO *)input,TQT_SIGNAL(signalKeyEvent(KGameIO *,TQDataStream &,TQKeyEvent *,bool *)),
pView,TQT_SLOT(slotKeyInput(KGameIO *,TQDataStream &,TQKeyEvent *,bool *)));
@@ -954,7 +954,7 @@ void Kwin4Doc::slotPrepareTurn(TQDataStream &stream,bool b,KGameIO *input,bool *
if (!player->myTurn()) return ;
if (!b) return ; // only on setTurn(true)
- Q_INT32 pl;
+ TQ_INT32 pl;
if (global_debug>1) kdDebug(12010) << "slotPrepareComputerTurn for player id= " << player->id() << endl;
pl=player->userId();
@@ -968,23 +968,23 @@ void Kwin4Doc::slotPrepareTurn(TQDataStream &stream,bool b,KGameIO *input,bool *
* Careful: The data needs to be the same than the computer
* player reading on the other side
**/
-void Kwin4Doc::prepareGameMessage(TQDataStream &stream, Q_INT32 pl)
+void Kwin4Doc::prepareGameMessage(TQDataStream &stream, TQ_INT32 pl)
{
if (global_debug>1) kdDebug(12010) << " sending col=" << pl << endl;
stream << pl ;
// This needs to be the same than the computer player reads!
- stream << (Q_INT32)QueryCurrentMove();
- stream << (Q_INT32)QueryCurrentPlayer();
- stream << (Q_INT32)QueryPlayerColour(0);
- stream << (Q_INT32)QueryPlayerColour(1);
- stream << (Q_INT32)Prefs::level();
+ stream << (TQ_INT32)QueryCurrentMove();
+ stream << (TQ_INT32)QueryCurrentPlayer();
+ stream << (TQ_INT32)QueryPlayerColour(0);
+ stream << (TQ_INT32)QueryPlayerColour(1);
+ stream << (TQ_INT32)Prefs::level();
int i,j;
for (i=0;i<FIELD_SIZE_Y;i++)
{
for (j=0;j<FIELD_SIZE_X;j++)
{
- Q_INT8 col;
+ TQ_INT8 col;
col=QueryColour(j,i);
stream << col;
}
@@ -997,12 +997,12 @@ void Kwin4Doc::prepareGameMessage(TQDataStream &stream, Q_INT32 pl)
<< QueryColour(5,i) << " "
<< QueryColour(6,i) << endl;
}
- stream << (Q_INT32)421256;
+ stream << (TQ_INT32)421256;
}
void Kwin4Doc::slotProcessQuery(TQDataStream &in,KGameProcessIO * /*me*/)
{
- Q_INT8 cid;
+ TQ_INT8 cid;
in >> cid;
switch(cid)
{
@@ -1025,7 +1025,7 @@ void Kwin4Doc::slotProcessQuery(TQDataStream &in,KGameProcessIO * /*me*/)
* cid is the id of the client connected. if this is equal
* gameId() WE are the client
*/
-void Kwin4Doc::slotClientConnected(Q_UINT32 cid,KGame *)
+void Kwin4Doc::slotClientConnected(TQ_UINT32 cid,KGame *)
{
if (global_debug>1) kdDebug(12010) << " void Kwin4Doc::slotClientConnected id="<<cid << " we=" <<
gameId() << " we admin=" << isAdmin() << "master)" << isMaster() << endl;
@@ -1107,7 +1107,7 @@ void Kwin4Doc::calcHint()
connect(mHintProcess,TQT_SIGNAL(signalProcessQuery(TQDataStream &,KGameProcessIO *)),
this,TQT_SLOT(slotProcessHint(TQDataStream &,KGameProcessIO *)));
}
- Q_INT32 pl;
+ TQ_INT32 pl;
TQByteArray buffer;
TQDataStream stream(buffer,IO_WriteOnly);
pl=QueryCurrentPlayer();
@@ -1121,14 +1121,14 @@ void Kwin4Doc::calcHint()
**/
void Kwin4Doc::slotProcessHint(TQDataStream &in,KGameProcessIO * /*me*/)
{
- Q_INT8 cid;
+ TQ_INT8 cid;
in >> cid;
switch(cid)
{
case 2: // Hint
{
- Q_INT32 pl;
- Q_INT32 move;
+ TQ_INT32 pl;
+ TQ_INT32 move;
long value;
in >> pl >> move >> value;
if (global_debug>1) kdDebug(12010) << "#### Computer thinks pl=" << pl << " move =" << move << endl;
@@ -1181,20 +1181,20 @@ void Kwin4Doc::slotPropertyChanged(KGamePropertyBase *prop,KGame *)
if (global_debug>1) kdDebug(12010) << "Amzug changed to " << mAmzug.value()<<endl;
pView->scoreWidget()->setTurn(mAmzug);
}
- else if (prop->id()==KGamePropertyBase::IdGameStatus)
+ else if (prop->id()==KGamePropertyBase::IdGametqStatus)
{
- if (gameStatus()==Abort)
+ if (gametqStatus()==Abort)
{
if (global_debug>1) kdDebug(12010) << "PropertyChanged::status signal game abort +++" << endl;
emit signalGameOver(2,getPlayer(QueryCurrentPlayer()),0); // 2 indicates Abort
}
- else if (gameStatus()==Run)
+ else if (gametqStatus()==Run)
{
if (global_debug>1) kdDebug(12010) << "PropertyChanged::status signal game run +++" << endl;
preparePlayerTurn(); // Set the current player to play
emit signalGameRun();
}
- else if (gameStatus()==Init)
+ else if (gametqStatus()==Init)
{
if (global_debug>1) kdDebug(12010) << "PropertyChanged::status signal game INIT +++" << endl;
ResetGame(true);
@@ -1227,7 +1227,7 @@ bool Kwin4Doc::loadgame(TQDataStream &stream,bool network,bool reset)
{
if (global_debug>1)
kdDebug () << "loadgame() network=" << network << " reset="<< reset << endl;
- if (!network) setGameStatus(End);
+ if (!network) setGametqStatus(End);
// Clear out the old game
if (global_debug>1) kdDebug(12010)<<"loadgame wants to reset the game"<<endl;
diff --git a/kwin4/kwin4/kwin4doc.h b/kwin4/kwin4/kwin4doc.h
index 4e77647d..0084b854 100644
--- a/kwin4/kwin4/kwin4doc.h
+++ b/kwin4/kwin4/kwin4doc.h
@@ -48,9 +48,10 @@ typedef enum {GIllMove=-2,GNotAllowed=-1,GNormal=0,GYellowWin=1,GRedWin=2,GRemi
class Kwin4Doc : public KGame
{
Q_OBJECT
+ TQ_OBJECT
public:
- Kwin4Doc(TQWidget *parent, const char *name=0);
+ Kwin4Doc(TQWidget *tqparent, const char *name=0);
~Kwin4Doc();
/** adds a view to the document which represents the document contents. Usually this is your main view. */
@@ -124,7 +125,7 @@ protected:
/** Check whether the field has a game over situation */
int checkGameOver(KPlayer *);
/** Send to the computer player */
- void prepareGameMessage(TQDataStream &stream, Q_INT32 pl);
+ void prepareGameMessage(TQDataStream &stream, TQ_INT32 pl);
/** Main function to do player input */
bool playerInput(TQDataStream &msg,KPlayer *player);
/** Set the IO devices new */
@@ -139,9 +140,9 @@ public slots:
void slotPropertyChanged(KGamePropertyBase *,KGame *);
void slotPlayerPropertyChanged(KGamePropertyBase *,KPlayer *);
void moveDone(TQCanvasItem *,int);
- void slotMessageUpdate(int,Q_UINT32,Q_UINT32);
+ void slotMessageUpdate(int,TQ_UINT32,TQ_UINT32);
void slotPrepareTurn(TQDataStream &stream,bool b,KGameIO *input,bool *eatevent);
- void slotClientConnected(Q_UINT32,KGame *);
+ void slotClientConnected(TQ_UINT32,KGame *);
void slotProcessQuery(TQDataStream &,KGameProcessIO *);
void slotProcessHint(TQDataStream &,KGameProcessIO *);
void slotGameOver(int status, KPlayer * p, KGame * me);
diff --git a/kwin4/kwin4/kwin4player.h b/kwin4/kwin4/kwin4player.h
index d659b3f5..003c80a9 100644
--- a/kwin4/kwin4/kwin4player.h
+++ b/kwin4/kwin4/kwin4player.h
@@ -30,6 +30,7 @@ class KConfig;
class Kwin4Player : public KPlayer
{
Q_OBJECT
+ TQ_OBJECT
signals:
diff --git a/kwin4/kwin4/kwin4proc.cpp b/kwin4/kwin4/kwin4proc.cpp
index 6a655f25..c69071c1 100644
--- a/kwin4/kwin4/kwin4proc.cpp
+++ b/kwin4/kwin4/kwin4proc.cpp
@@ -89,7 +89,7 @@ void KComputer::slotTurn(TQDataStream &in,bool turn)
void KComputer::sendValue(long value)
{
- Q_INT8 cid=1; // notifies our KGameIO that this is a value message
+ TQ_INT8 cid=1; // notifies our KGameIO that this is a value message
int id=KGameMessage::IdProcessQuery;
TQByteArray buffer;
TQDataStream out(buffer,IO_WriteOnly);
@@ -99,9 +99,9 @@ void KComputer::sendValue(long value)
long KComputer::think(TQDataStream &in,TQDataStream &out,bool hint)
{
- Q_INT32 pl;
- Q_INT32 move;
- Q_INT32 tmp;
+ TQ_INT32 pl;
+ TQ_INT32 move;
+ TQ_INT32 tmp;
in >> pl ;
in >> tmp;
aktzug=tmp;
@@ -120,13 +120,13 @@ long KComputer::think(TQDataStream &in,TQDataStream &out,bool hint)
InitField();
- // Field as 42 Q_INT8's
+ // Field as 42 TQ_INT8's
int i,j;
for (i=0;i<=SIZE_Y;i++)
{
for (j=0;j<=SIZE_X;j++)
{
- Q_INT8 col;
+ TQ_INT8 col;
in >> col;
Farbe colour;
if (col<2) colour=(Farbe)(col+1);
@@ -183,9 +183,9 @@ void KComputer::slotCommand(TQDataStream &in,int msgid,int receiver,int sender)
{
case 2: // hint
{
- Q_INT8 cid=2;
- Q_INT32 pl=0;
- Q_INT32 move=3;
+ TQ_INT8 cid=2;
+ TQ_INT32 pl=0;
+ TQ_INT32 move=3;
out << cid;
long value=think(in,out,true);
out << value;
diff --git a/kwin4/kwin4/kwin4proc.h b/kwin4/kwin4/kwin4proc.h
index d18f5bf3..0efea7bf 100644
--- a/kwin4/kwin4/kwin4proc.h
+++ b/kwin4/kwin4/kwin4proc.h
@@ -28,10 +28,11 @@ typedef char FARBE;
#define SIZE_X 6
#define SIZE_Y 5
-class KComputer : public QObject
+class KComputer : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
KComputer();
diff --git a/kwin4/kwin4/kwin4view.cpp b/kwin4/kwin4/kwin4view.cpp
index 1a3e11f9..6877860b 100644
--- a/kwin4/kwin4/kwin4view.cpp
+++ b/kwin4/kwin4/kwin4view.cpp
@@ -101,8 +101,8 @@ private:
};
-Kwin4View::Kwin4View(Kwin4Doc *theDoc, TQWidget *parent, const char *name)
- : TQCanvasView(0,parent, name), doc(theDoc)
+Kwin4View::Kwin4View(Kwin4Doc *theDoc, TQWidget *tqparent, const char *name)
+ : TQCanvasView(0,tqparent, name), doc(theDoc)
{
mLastArrow=-1;
@@ -129,13 +129,13 @@ Kwin4View::Kwin4View(Kwin4Doc *theDoc, TQWidget *parent, const char *name)
//setBackgroundMode(PaletteBase);
setBackgroundColor(TQColor(0,0,128));
- mCanvas=new TQCanvas(parent);
- mCanvas->resize(parent->width(),parent->height());
+ mCanvas=new TQCanvas(TQT_TQOBJECT(tqparent));
+ mCanvas->resize(tqparent->width(),tqparent->height());
mCanvas->setDoubleBuffering(true);
mCanvas->setBackgroundColor(TQColor(0,0,128));
setCanvas(mCanvas);
- mCache=new KSpriteCache(mGrafix,this);
+ mCache=new KSpriteCache(mGrafix,TQT_TQOBJECT(this));
mCache->setCanvas(mCanvas);
KConfig *config=mCache->config();
@@ -200,12 +200,12 @@ void Kwin4View::initView(bool deleteall)
TQPixmap *pixmap=loadPixmap("background.png");
if (pixmap)
- mCanvas->setBackgroundPixmap(*pixmap);
+ mCanvas->tqsetBackgroundPixmap(*pixmap);
else
mCanvas->setBackgroundColor(TQColor(0,0,128));
delete pixmap;
- if (doc->gameStatus()==KGame::Intro)
+ if (doc->gametqStatus()==KGame::Intro)
{
mScoreWidget->hide();
mStatusWidget->hide();
@@ -481,7 +481,7 @@ void Kwin4View::setSprite(int no, int x, int col, bool enable)
{
KSprite *sprite;
sprite=(KSprite *)(mCache->getItem("piece",no));
- if (sprite) sprite->setVisible(enable);
+ if (sprite) sprite->tqsetVisible(enable);
setArrow(x,col);
}
@@ -497,7 +497,7 @@ void Kwin4View::setHint(int x,int y,bool enabled)
sprite->move(x*(sprite->width()+mSpreadX)+mBoardX,
y*(sprite->height()+mSpreadY)+mBoardY);
}
- sprite->setVisible(enabled);
+ sprite->tqsetVisible(enabled);
}
}
@@ -601,7 +601,7 @@ bool Kwin4View::wrongPlayer(KPlayer *player,KGameIO::IOMode io)
clearError();
int rnd=(kapp->random()%4) +1;
TQString m;
- m=TQString("text%1").arg(rnd);
+ m=TQString("text%1").tqarg(rnd);
TQString ms;
if (rnd==1) ms=i18n("Hold on... the other player has not been yet...");
else if (rnd==2) ms=i18n("Hold your horses...");
@@ -650,7 +650,7 @@ void Kwin4View::slotKeyInput(KGameIO *input,TQDataStream &stream,TQKeyEvent *e,b
}
// Create a move
- Q_INT32 move,pl;
+ TQ_INT32 move,pl;
move=code-'1';
pl=player->userId();
stream << pl << move;
@@ -680,7 +680,7 @@ void Kwin4View::slotMouseInput(KGameIO *input,TQDataStream &stream,TQMouseEvent
return;
}
- if (mouse->button()!=LeftButton) return ;
+ if (mouse->button()!=Qt::LeftButton) return ;
//if (!doc->IsRunning()) return ;
TQPoint point;
@@ -696,7 +696,7 @@ void Kwin4View::slotMouseInput(KGameIO *input,TQDataStream &stream,TQMouseEvent
if (x<0 || x>=FIELD_SIZE_X) return;
// Create a move
- Q_INT32 move,pl;
+ TQ_INT32 move,pl;
move=x;
pl=player->userId();
stream << pl << move;
diff --git a/kwin4/kwin4/kwin4view.h b/kwin4/kwin4/kwin4view.h
index 775aee1c..30bcfce6 100644
--- a/kwin4/kwin4/kwin4view.h
+++ b/kwin4/kwin4/kwin4view.h
@@ -29,12 +29,13 @@ class KSpriteCache;
/**
* The Kwin4View class provides the view widget for the Kwin4App instance.
*/
-class Kwin4View : public QCanvasView
+class Kwin4View : public TQCanvasView
{
Q_OBJECT
+ TQ_OBJECT
public:
- Kwin4View(Kwin4Doc *theDoc, TQWidget *parent = 0, const char *name=0);
+ Kwin4View(Kwin4Doc *theDoc, TQWidget *tqparent = 0, const char *name=0);
void initView(bool deleteall=true);
void drawBoard(bool remove=false);
diff --git a/kwin4/kwin4/scorewidget.cpp b/kwin4/kwin4/scorewidget.cpp
index 2d2551e8..ad53f49e 100644
--- a/kwin4/kwin4/scorewidget.cpp
+++ b/kwin4/kwin4/scorewidget.cpp
@@ -31,8 +31,8 @@
#define COL_STATUSDARK TQColor(0,0,65)
#define COL_STATUSLIGHT TQColor(210,210,255)
-ScoreWidget::ScoreWidget( TQWidget* parent, const char* name, WFlags fl )
- : TQFrame( parent, name, fl )
+ScoreWidget::ScoreWidget( TQWidget* tqparent, const char* name, WFlags fl )
+ : TQFrame( tqparent, name, fl )
{
setFrameStyle( TQFrame::Box | TQFrame::Raised );
setLineWidth( 2 );
@@ -52,14 +52,14 @@ ScoreWidget::ScoreWidget( TQWidget* parent, const char* name, WFlags fl )
TextLabel7 = new TQLabel( this, "TextLabel7" );
setPlayer("-----",0);
TextLabel7->setBackgroundColor( COL_STATUSFIELD );
- TextLabel7->setAlignment(Qt::AlignHCenter);
+ TextLabel7->tqsetAlignment(TQt::AlignHCenter);
LayoutB->addMultiCellWidget( TextLabel7, row, row,0,2 );
row++;
TextLabel8 = new TQLabel( this, "TextLabel8" );
TextLabel8->setText( i18n( "vs" ) );
TextLabel8->setBackgroundColor( COL_STATUSFIELD );
- TextLabel8->setAlignment(Qt::AlignHCenter);
+ TextLabel8->tqsetAlignment(TQt::AlignHCenter);
LayoutB->addMultiCellWidget( TextLabel8, row, row,0,2 );
row++;
@@ -68,7 +68,7 @@ ScoreWidget::ScoreWidget( TQWidget* parent, const char* name, WFlags fl )
// TextLabel9->setFrameShape(TQFrame::Box );
// TextLabel9->setLineWidth(5);
TextLabel9->setBackgroundColor( COL_STATUSFIELD );
- TextLabel9->setAlignment(Qt::AlignHCenter);
+ TextLabel9->tqsetAlignment(TQt::AlignHCenter);
LayoutB->addMultiCellWidget( TextLabel9, row, row,0,2 );
row++;
@@ -86,7 +86,7 @@ ScoreWidget::ScoreWidget( TQWidget* parent, const char* name, WFlags fl )
TextLabel4 = new TQLabel( this, "L" );
setLevel(Prefs::level());
- TextLabel4->setAlignment(Qt::AlignRight);
+ TextLabel4->tqsetAlignment(TQt::AlignRight);
TextLabel4->setBackgroundColor( COL_STATUSFIELD );
LayoutB->addWidget( TextLabel4, row, 2 );
@@ -100,7 +100,7 @@ ScoreWidget::ScoreWidget( TQWidget* parent, const char* name, WFlags fl )
TextLabel5 = new TQLabel( this, "M" );
setMove(0);
- TextLabel5->setAlignment(Qt::AlignRight);
+ TextLabel5->tqsetAlignment(TQt::AlignRight);
TextLabel5->setBackgroundColor( COL_STATUSFIELD );
LayoutB->addWidget( TextLabel5, row, 2 );
@@ -114,7 +114,7 @@ ScoreWidget::ScoreWidget( TQWidget* parent, const char* name, WFlags fl )
TextLabel6 = new TQLabel( this, "C" );
setChance(0);
- TextLabel6->setAlignment(Qt::AlignRight);
+ TextLabel6->tqsetAlignment(TQt::AlignRight);
TextLabel6->setBackgroundColor( COL_STATUSFIELD );
LayoutB->addWidget( TextLabel6, row, 2 );
@@ -148,12 +148,12 @@ void ScoreWidget::Paint(TQPainter *p,TQRect /*cliprect*/)
void ScoreWidget::setMove(int i)
{
- TextLabel5->setText( TQString("%1").arg(i));
+ TextLabel5->setText( TQString("%1").tqarg(i));
}
void ScoreWidget::setLevel(int i)
{
- TextLabel4->setText( TQString("%1").arg(i));
+ TextLabel4->setText( TQString("%1").tqarg(i));
}
void ScoreWidget::setChance(int i)
@@ -165,7 +165,7 @@ void ScoreWidget::setChance(int i)
else if (i<=-999)
TextLabel6->setText(i18n("Loser"));
else
- TextLabel6->setText(TQString("%1").arg(i));
+ TextLabel6->setText(TQString("%1").tqarg(i));
}
void ScoreWidget::setPlayer(TQString s,int no)
diff --git a/kwin4/kwin4/scorewidget.h b/kwin4/kwin4/scorewidget.h
index c6e525cd..d6476061 100644
--- a/kwin4/kwin4/scorewidget.h
+++ b/kwin4/kwin4/scorewidget.h
@@ -8,12 +8,13 @@ class TQGridLayout;
class TQGroupBox;
class TQLabel;
-class ScoreWidget : public QFrame
+class ScoreWidget : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
- ScoreWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+ ScoreWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
void setMove(int i);
void setLevel(int i);
void setChance(int i);
diff --git a/kwin4/kwin4/settings.ui b/kwin4/kwin4/settings.ui
index 130ce4ee..6ebd18f3 100644
--- a/kwin4/kwin4/settings.ui
+++ b/kwin4/kwin4/settings.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>Settings</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>Settings</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox" row="0" column="1">
+ <widget class="TQGroupBox" row="0" column="1">
<property name="name">
<cstring>groupBox2</cstring>
</property>
@@ -27,7 +27,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -35,7 +35,7 @@
<string>Player 1:</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel4</cstring>
</property>
@@ -43,19 +43,19 @@
<string>Player 2:</string>
</property>
</widget>
- <widget class="QLineEdit" row="0" column="1">
+ <widget class="TQLineEdit" row="0" column="1">
<property name="name">
<cstring>kcfg_Name1</cstring>
</property>
</widget>
- <widget class="QLineEdit" row="1" column="1">
+ <widget class="TQLineEdit" row="1" column="1">
<property name="name">
<cstring>kcfg_Name2</cstring>
</property>
</widget>
</grid>
</widget>
- <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -66,7 +66,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -74,18 +74,18 @@
<string>Easy</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="1">
+ <widget class="TQLabel" row="1" column="1">
<property name="name">
<cstring>textLabel2</cstring>
</property>
<property name="text">
<string>Hard</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
- <widget class="QSlider" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_level</cstring>
</property>
@@ -113,7 +113,7 @@
</widget>
</grid>
</widget>
- <widget class="QButtonGroup" row="0" column="0">
+ <widget class="TQButtonGroup" row="0" column="0">
<property name="name">
<cstring>kcfg_Colour1</cstring>
</property>
@@ -124,7 +124,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>radioButton1</cstring>
</property>
@@ -135,7 +135,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>radioButton2</cstring>
</property>
@@ -145,7 +145,7 @@
</widget>
</vbox>
</widget>
- <widget class="QButtonGroup" row="1" column="1">
+ <widget class="TQButtonGroup" row="1" column="1">
<property name="name">
<cstring>kcfg_Input2</cstring>
</property>
@@ -156,7 +156,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>radioButton6</cstring>
</property>
@@ -167,7 +167,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>radioButton7</cstring>
</property>
@@ -175,7 +175,7 @@
<string>Computer</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>radioButton8</cstring>
</property>
@@ -185,7 +185,7 @@
</widget>
</vbox>
</widget>
- <widget class="QButtonGroup" row="1" column="0">
+ <widget class="TQButtonGroup" row="1" column="0">
<property name="name">
<cstring>kcfg_Input1</cstring>
</property>
@@ -196,7 +196,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>radioButton3</cstring>
</property>
@@ -207,7 +207,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>radioButton4</cstring>
</property>
@@ -215,7 +215,7 @@
<string>Computer</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>radioButton5</cstring>
</property>
@@ -235,7 +235,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -244,5 +244,5 @@
</spacer>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kwin4/kwin4/statistics.ui b/kwin4/kwin4/statistics.ui
index d6d39c07..6014820c 100644
--- a/kwin4/kwin4/statistics.ui
+++ b/kwin4/kwin4/statistics.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>Statistics</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>Statistics</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -43,19 +43,19 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QLCDNumber" row="4" column="3">
+ <widget class="TQLCDNumber" row="4" column="3">
<property name="name">
<cstring>p2_lost</cstring>
</property>
</widget>
- <widget class="QLabel" row="2" column="0" rowspan="2" colspan="1">
+ <widget class="TQLabel" row="2" column="0" rowspan="2" colspan="1">
<property name="name">
<cstring>p1_name</cstring>
</property>
@@ -63,85 +63,85 @@
<string>Player 1</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>Name</cstring>
</property>
<property name="text">
<string>Name</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>won</cstring>
</property>
<property name="text">
<string>Won</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QLCDNumber" row="4" column="2">
+ <widget class="TQLCDNumber" row="4" column="2">
<property name="name">
<cstring>p2_drawn</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="3">
+ <widget class="TQLabel" row="0" column="3">
<property name="name">
<cstring>lost</cstring>
</property>
<property name="text">
<string>Lost</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QLCDNumber" row="4" column="4">
+ <widget class="TQLCDNumber" row="4" column="4">
<property name="name">
<cstring>p2_aborted</cstring>
</property>
</widget>
- <widget class="QLCDNumber" row="4" column="5">
+ <widget class="TQLCDNumber" row="4" column="5">
<property name="name">
<cstring>p2_sum</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="5">
+ <widget class="TQLabel" row="0" column="5">
<property name="name">
<cstring>sum</cstring>
</property>
<property name="text">
<string>Sum</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QLabel" row="0" column="4">
+ <widget class="TQLabel" row="0" column="4">
<property name="name">
<cstring>aborted</cstring>
</property>
<property name="text">
<string>Aborted</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="6">
+ <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="6">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>pushButton1</cstring>
</property>
@@ -159,14 +159,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>51</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>pushButton2</cstring>
</property>
@@ -176,12 +176,12 @@
</widget>
</hbox>
</widget>
- <widget class="QLCDNumber" row="3" column="1">
+ <widget class="TQLCDNumber" row="3" column="1">
<property name="name">
<cstring>p1_won</cstring>
</property>
</widget>
- <widget class="QLabel" row="4" column="0">
+ <widget class="TQLabel" row="4" column="0">
<property name="name">
<cstring>p2_name</cstring>
</property>
@@ -189,38 +189,38 @@
<string>Player 2</string>
</property>
</widget>
- <widget class="QLCDNumber" row="4" column="1">
+ <widget class="TQLCDNumber" row="4" column="1">
<property name="name">
<cstring>p2_won</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="2">
+ <widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>drawn</cstring>
</property>
<property name="text">
<string>Drawn</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QLCDNumber" row="3" column="2">
+ <widget class="TQLCDNumber" row="3" column="2">
<property name="name">
<cstring>p1_drawn</cstring>
</property>
</widget>
- <widget class="QLCDNumber" row="3" column="3">
+ <widget class="TQLCDNumber" row="3" column="3">
<property name="name">
<cstring>p1_lost</cstring>
</property>
</widget>
- <widget class="QLCDNumber" row="3" column="4">
+ <widget class="TQLCDNumber" row="3" column="4">
<property name="name">
<cstring>p1_aborted</cstring>
</property>
</widget>
- <widget class="QLCDNumber" row="3" column="5">
+ <widget class="TQLCDNumber" row="3" column="5">
<property name="name">
<cstring>p1_sum</cstring>
</property>
@@ -245,5 +245,5 @@
<tabstop>pushButton2</tabstop>
<tabstop>pushButton1</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kwin4/kwin4/statuswidget.ui b/kwin4/kwin4/statuswidget.ui
index 0c9613b5..5dc2a4be 100644
--- a/kwin4/kwin4/statuswidget.ui
+++ b/kwin4/kwin4/statuswidget.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>StatusWidget</class>
-<widget class="QFrame">
+<widget class="TQFrame">
<property name="name">
<cstring>StatusWidget</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -38,7 +38,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>41</height>
@@ -55,69 +55,69 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>90</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>wins</cstring>
</property>
<property name="text">
<string>W</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QLabel" row="0" column="2">
+ <widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>draws</cstring>
</property>
<property name="text">
<string>D</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QLabel" row="0" column="3">
+ <widget class="TQLabel" row="0" column="3">
<property name="name">
<cstring>loses</cstring>
</property>
<property name="text">
<string>L</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QLabel" row="0" column="4">
+ <widget class="TQLabel" row="0" column="4">
<property name="name">
<cstring>num</cstring>
</property>
<property name="text">
<string>No</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QLabel" row="0" column="5">
+ <widget class="TQLabel" row="0" column="5">
<property name="name">
<cstring>bk</cstring>
</property>
<property name="text">
<string>Bk</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>p1_name</cstring>
</property>
@@ -125,7 +125,7 @@
<string>Player 1</string>
</property>
</widget>
- <widget class="QLCDNumber" row="2" column="1">
+ <widget class="TQLCDNumber" row="2" column="1">
<property name="name">
<cstring>p1_w</cstring>
</property>
@@ -136,7 +136,7 @@
<number>2</number>
</property>
</widget>
- <widget class="QLCDNumber" row="2" column="2">
+ <widget class="TQLCDNumber" row="2" column="2">
<property name="name">
<cstring>p1_d</cstring>
</property>
@@ -147,7 +147,7 @@
<number>2</number>
</property>
</widget>
- <widget class="QLCDNumber" row="2" column="3">
+ <widget class="TQLCDNumber" row="2" column="3">
<property name="name">
<cstring>p1_l</cstring>
</property>
@@ -158,7 +158,7 @@
<number>2</number>
</property>
</widget>
- <widget class="QLCDNumber" row="2" column="4">
+ <widget class="TQLCDNumber" row="2" column="4">
<property name="name">
<cstring>p1_n</cstring>
</property>
@@ -169,7 +169,7 @@
<number>2</number>
</property>
</widget>
- <widget class="QLCDNumber" row="2" column="5">
+ <widget class="TQLCDNumber" row="2" column="5">
<property name="name">
<cstring>p1_b</cstring>
</property>
@@ -180,7 +180,7 @@
<number>2</number>
</property>
</widget>
- <widget class="QLCDNumber" row="3" column="2">
+ <widget class="TQLCDNumber" row="3" column="2">
<property name="name">
<cstring>p2_d</cstring>
</property>
@@ -191,7 +191,7 @@
<number>2</number>
</property>
</widget>
- <widget class="QLCDNumber" row="3" column="5">
+ <widget class="TQLCDNumber" row="3" column="5">
<property name="name">
<cstring>p2_b</cstring>
</property>
@@ -202,7 +202,7 @@
<number>2</number>
</property>
</widget>
- <widget class="QLCDNumber" row="3" column="3">
+ <widget class="TQLCDNumber" row="3" column="3">
<property name="name">
<cstring>p2_l</cstring>
</property>
@@ -213,7 +213,7 @@
<number>2</number>
</property>
</widget>
- <widget class="QLCDNumber" row="3" column="4">
+ <widget class="TQLCDNumber" row="3" column="4">
<property name="name">
<cstring>p2_n</cstring>
</property>
@@ -224,7 +224,7 @@
<number>2</number>
</property>
</widget>
- <widget class="QLCDNumber" row="3" column="1">
+ <widget class="TQLCDNumber" row="3" column="1">
<property name="name">
<cstring>p2_w</cstring>
</property>
@@ -235,7 +235,7 @@
<number>2</number>
</property>
</widget>
- <widget class="QLabel" row="3" column="0">
+ <widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>p2_name</cstring>
</property>
@@ -259,5 +259,5 @@
</widget>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 18:44:40 +0000