summaryrefslogtreecommitdiffstats
path: root/kspaceduel
diff options
context:
space:
mode:
Diffstat (limited to 'kspaceduel')
-rw-r--r--kspaceduel/dialogs.cpp8
-rw-r--r--kspaceduel/dialogs.h4
-rw-r--r--kspaceduel/mainview.cpp18
-rw-r--r--kspaceduel/mainview.h2
-rw-r--r--kspaceduel/playerinfo.cpp2
-rw-r--r--kspaceduel/playerinfo.h2
-rw-r--r--kspaceduel/topwidget.cpp28
-rw-r--r--kspaceduel/topwidget.h2
8 files changed, 33 insertions, 33 deletions
diff --git a/kspaceduel/dialogs.cpp b/kspaceduel/dialogs.cpp
index bf4b7c3e..396d7dfe 100644
--- a/kspaceduel/dialogs.cpp
+++ b/kspaceduel/dialogs.cpp
@@ -145,14 +145,14 @@ ConfigSetup::ConfigSetup(SConfig *custom,TQWidget *parent,const char *name)
slider[i]=new TQSlider(EditVal[i][0]*EditDiv[i],EditVal[i][1]*EditDiv[i],
(EditVal[i][1]-EditVal[i][0])/10,
EditVal[i][2]*EditDiv[i],
- Qt::Horizontal,configWidgets[Parent[i]]);
- connect(slider[i],TQT_SIGNAL(valueChanged(int)),TQT_SLOT(sliderChanged(int)));
+ TQt::Horizontal,configWidgets[Parent[i]]);
+ connect(slider[i],TQ_SIGNAL(valueChanged(int)),TQ_SLOT(sliderChanged(int)));
value[i]=new TQLCDNumber(LCDLen,configWidgets[Parent[i]]);
value[i]->setFrameStyle(TQFrame::NoFrame);
}
configCombo=new TQComboBox(false,this);
- connect(configCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(configSelected(int)));
+ connect(configCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(configSelected(int)));
for(i=0;i<predefinedConfigNum;i++)
configCombo->insertItem(i18n(predefinedConfigName[i]));
configCombo->insertItem(i18n("Custom"));
@@ -396,7 +396,7 @@ SettingsDialog::SettingsDialog(SConfig *customConfig, TQWidget *parent, const ch
cs = new ConfigSetup(customConfig);
addPage(cs, i18n("Game"), "kspaceduel", i18n("Game Settings"));
- connect(cs, TQT_SIGNAL(changed()), this, TQT_SLOT(updateButtons()));
+ connect(cs, TQ_SIGNAL(changed()), this, TQ_SLOT(updateButtons()));
// resize(600,400);
}
diff --git a/kspaceduel/dialogs.h b/kspaceduel/dialogs.h
index 4b1fc884..19bb353a 100644
--- a/kspaceduel/dialogs.h
+++ b/kspaceduel/dialogs.h
@@ -17,7 +17,7 @@ class TQCheckBox;
class ConfigSetup:public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ConfigSetup(SConfig *custom,TQWidget *parent=0,const char* name=0);
@@ -79,7 +79,7 @@ private:
class SettingsDialog : public TDEConfigDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
SettingsDialog(SConfig *customConfig, TQWidget *parent=0, const char *name=0);
diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp
index a2645087..4050f5ef 100644
--- a/kspaceduel/mainview.cpp
+++ b/kspaceduel/mainview.cpp
@@ -8,7 +8,7 @@
#include <tdeapplication.h>
#include <tdeaction.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <kiconloader.h>
@@ -99,7 +99,7 @@ MyMainView::MyMainView(TQWidget *parent)
MyMainView::~MyMainView()
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
writeConfig();
}
@@ -110,7 +110,7 @@ void MyMainView::setActionCollection(TDEActionCollection *a)
void MyMainView::readConfig()
{
- TDEConfig *cfg = kapp->config();
+ TDEConfig *cfg = tdeApp->config();
int i;
cfg->setGroup("Game");
@@ -186,7 +186,7 @@ void MyMainView::readConfig()
void MyMainView::writeConfig()
{
TDEConfig *cfg;
- cfg=TDEApplication::kApplication()->config();
+ cfg=tdeApp->config();
cfg->setGroup("Game");
cfg->writeEntry("gravity",customConfig.gravity);
@@ -340,7 +340,7 @@ void MyMainView::pause()
pauseAction->setChecked( true );
waitForStart=true;
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
emit setStatusText(i18n(" paused "), IDS_PAUSE);
}
}
@@ -375,7 +375,7 @@ void MyMainView::stop()
pauseAction->setEnabled( false );
pauseAction->setChecked( false );
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
waitForStart = true;
}
@@ -444,7 +444,7 @@ void MyMainView::newRound()
timeToNextPowerup=random.getDouble() * config.powerupRefreshTime;
powerups.clear();
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
mx=width()/2.0;
my=height()/2.0;
ship[0]->move(mx+config.startPosX,my+config.startPosY);
@@ -517,7 +517,7 @@ void MyMainView::timerEvent(TQTimerEvent *event)
if(event->timerId()==timerID)
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
if(gameEnd>0.0)
{
gameEnd-=1.0;
@@ -990,7 +990,7 @@ void MyMainView::gameSetup()
return;
SettingsDialog *settings=new SettingsDialog(&customConfig,this,"settings");
- connect(settings, TQT_SIGNAL(settingsUpdated()),this,TQT_SLOT(closeSettings()));
+ connect(settings, TQ_SIGNAL(settingsUpdated()),this,TQ_SLOT(closeSettings()));
settings->show();
}
diff --git a/kspaceduel/mainview.h b/kspaceduel/mainview.h
index f39e3134..0515dfc7 100644
--- a/kspaceduel/mainview.h
+++ b/kspaceduel/mainview.h
@@ -18,7 +18,7 @@ class Ai;
class MyMainView:public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
MyMainView(TQWidget *parent=0);
diff --git a/kspaceduel/playerinfo.cpp b/kspaceduel/playerinfo.cpp
index 1308feaf..f32e361e 100644
--- a/kspaceduel/playerinfo.cpp
+++ b/kspaceduel/playerinfo.cpp
@@ -2,7 +2,7 @@
#include <tqpixmap.h>
#include <tqtooltip.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
PlayerInfo::PlayerInfo(int pnr,TQWidget *parent,const char *name)
diff --git a/kspaceduel/playerinfo.h b/kspaceduel/playerinfo.h
index 780a974f..5668889e 100644
--- a/kspaceduel/playerinfo.h
+++ b/kspaceduel/playerinfo.h
@@ -9,7 +9,7 @@ class TQPixmap;
class PlayerInfo:public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
PlayerInfo(int pnr,TQWidget *parent=0,const char *name=0);
diff --git a/kspaceduel/topwidget.cpp b/kspaceduel/topwidget.cpp
index cd8fd8dc..a8a3b5ab 100644
--- a/kspaceduel/topwidget.cpp
+++ b/kspaceduel/topwidget.cpp
@@ -31,16 +31,16 @@ void MyTopLevelWidget::initGameWidgets( ){
toplayout->addWidget(playerinfo[1]);
toplayout->activate();
- playfield->setFocusPolicy(TQ_StrongFocus);
+ playfield->setFocusPolicy(TQWidget::StrongFocus);
playfield->setFocus();
- TQT_BASE_OBJECT_NAME::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(energy(int,int)),
- TQT_SLOT(energy(int,int)));
- TQT_BASE_OBJECT_NAME::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(hitPoints(int,int)),
- TQT_SLOT(hitPoints(int,int)));
- TQT_BASE_OBJECT_NAME::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(wins(int,int)),TQT_SLOT(wins(int,int)));
- TQT_BASE_OBJECT_NAME::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(setStatusText(const TQString &,int)),
- TQT_SLOT(setStatusText(const TQString &,int)));
+ TQObject::connect(playfield,TQ_SIGNAL(energy(int,int)),
+ TQ_SLOT(energy(int,int)));
+ TQObject::connect(playfield,TQ_SIGNAL(hitPoints(int,int)),
+ TQ_SLOT(hitPoints(int,int)));
+ TQObject::connect(playfield,TQ_SIGNAL(wins(int,int)),TQ_SLOT(wins(int,int)));
+ TQObject::connect(playfield,TQ_SIGNAL(setStatusText(const TQString &,int)),
+ TQ_SLOT(setStatusText(const TQString &,int)));
setCentralWidget(w);
}
@@ -62,18 +62,18 @@ void MyTopLevelWidget::wins(int pn,int w)
void MyTopLevelWidget::initActions( )
{
- KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
- KStdGameAction::gameNew(TQT_TQOBJECT(playfield), TQT_SLOT(newGame()), actionCollection());
+ KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection());
+ KStdGameAction::gameNew(playfield, TQ_SLOT(newGame()), actionCollection());
( void )new TDEAction( i18n( "&New Round" ), "spnewround",
- CTRL + Key_R, TQT_TQOBJECT(playfield), TQT_SLOT( newRound( ) ),
+ CTRL + Key_R, playfield, TQ_SLOT( newRound( ) ),
actionCollection( ), "new_round" );
MyMainView::pauseAction =
- KStdGameAction::pause(TQT_TQOBJECT(playfield), TQT_SLOT(togglePause()), actionCollection());
+ KStdGameAction::pause(playfield, TQ_SLOT(togglePause()), actionCollection());
MyMainView::pauseAction->setChecked( false );
TDEAction* gameStart = new TDEAction( i18n( "Start" ), GAME_START_SHORTCUT,
- TQT_TQOBJECT(playfield), TQT_SLOT( start( ) ), actionCollection( ), "game_start" );
+ playfield, TQ_SLOT( start( ) ), actionCollection( ), "game_start" );
- KStdAction::preferences(TQT_TQOBJECT(playfield), TQT_SLOT(gameSetup()), actionCollection());
+ KStdAction::preferences(playfield, TQ_SLOT(gameSetup()), actionCollection());
TDEAccel* acc = new TDEAccel(this);
gameStart->plugAccel(acc);
diff --git a/kspaceduel/topwidget.h b/kspaceduel/topwidget.h
index 6b3c475f..0042a8de 100644
--- a/kspaceduel/topwidget.h
+++ b/kspaceduel/topwidget.h
@@ -8,7 +8,7 @@ class MyMainView;
class MyTopLevelWidget:public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
MyTopLevelWidget();
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-13 10:59:58 +0000