diff options
Diffstat (limited to 'kspaceduel')
| -rw-r--r-- | kspaceduel/dialogs.cpp | 10 | ||||
| -rw-r--r-- | kspaceduel/general.ui | 2 | ||||
| -rw-r--r-- | kspaceduel/mainview.cpp | 6 | ||||
| -rw-r--r-- | kspaceduel/playerinfo.cpp | 6 | ||||
| -rw-r--r-- | kspaceduel/topwidget.cpp | 12 |
5 files changed, 18 insertions, 18 deletions
diff --git a/kspaceduel/dialogs.cpp b/kspaceduel/dialogs.cpp index 34194ad0..8d4faf26 100644 --- a/kspaceduel/dialogs.cpp +++ b/kspaceduel/dialogs.cpp @@ -3,7 +3,7 @@ #include <tqtabwidget.h> #include <tqslider.h> #include <tqlcdnumber.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> @@ -130,7 +130,7 @@ ConfigSetup::ConfigSetup(SConfig *custom,TQWidget *parent,const char *name) //box=new TQGroupBox(i18n("Config"),this); //setMainWidget( box ); - TQVBoxLayout *boxtqlayout = new TQVBoxLayout( this, 6 ); + TQVBoxLayout *boxlayout = new TQVBoxLayout( this, 6 ); tabs=new TQTabWidget(this); for(i=0;i<TabNum;i++) @@ -157,9 +157,9 @@ ConfigSetup::ConfigSetup(SConfig *custom,TQWidget *parent,const char *name) configCombo->insertItem(i18n(predefinedConfigName[i])); configCombo->insertItem(i18n("Custom")); - boxtqlayout->addSpacing( 2 * 6 ); - boxtqlayout->addWidget(configCombo); - boxtqlayout->addWidget(tabs); + boxlayout->addSpacing( 2 * 6 ); + boxlayout->addWidget(configCombo); + boxlayout->addWidget(tabs); for(i=0;i<EditNum;i++) { diff --git a/kspaceduel/general.ui b/kspaceduel/general.ui index 05d5ba83..db120dd0 100644 --- a/kspaceduel/general.ui +++ b/kspaceduel/general.ui @@ -154,7 +154,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>91</height> diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp index 3f17605a..5b02fc75 100644 --- a/kspaceduel/mainview.cpp +++ b/kspaceduel/mainview.cpp @@ -27,7 +27,7 @@ MyMainView::MyMainView(TQWidget *parent) setMinimumSize(600,400); random.setSeed(0); TQPixmap backgr(locate("appdata", MV_BACKGROUND)); - field.tqsetBackgroundPixmap(backgr); + field.setBackgroundPixmap(backgr); view.setResizePolicy(TQScrollView::AutoOne); view.setHScrollBarMode(TQScrollView::AlwaysOff); @@ -492,7 +492,7 @@ void MyMainView::newRound() field.update(); TQString str = i18n("Press %1 to start") - .tqarg(KShortcut(GAME_START_SHORTCUT).toString()); + .arg(KShortcut(GAME_START_SHORTCUT).toString()); emit(setStatusText(str,IDS_MAIN)); emit( setStatusText( "", IDS_PAUSE ) ); stop( ); @@ -557,7 +557,7 @@ void MyMainView::timerEvent(TQTimerEvent *event) emit(wins(0,w)); } TQString str = i18n("Press %1 for new round") - .tqarg(KShortcut(GAME_START_SHORTCUT).toString()); + .arg(KShortcut(GAME_START_SHORTCUT).toString()); emit(setStatusText(str,IDS_MAIN)); stop( ); } diff --git a/kspaceduel/playerinfo.cpp b/kspaceduel/playerinfo.cpp index dbb5728d..2e1ef91d 100644 --- a/kspaceduel/playerinfo.cpp +++ b/kspaceduel/playerinfo.cpp @@ -34,9 +34,9 @@ PlayerInfo::PlayerInfo(int pnr,TQWidget *parent,const char *name) for(i=0;i<4;i++) { - str = TQString::tqfromLatin1("sprites/playerinfo/ship%1%2.pnm") - .tqarg(pnr+1) - .tqarg(i); + str = TQString::fromLatin1("sprites/playerinfo/ship%1%2.pnm") + .arg(pnr+1) + .arg(i); pix[i]=new TQPixmap(locate("appdata", str)); } diff --git a/kspaceduel/topwidget.cpp b/kspaceduel/topwidget.cpp index 999f546b..fff04d1f 100644 --- a/kspaceduel/topwidget.cpp +++ b/kspaceduel/topwidget.cpp @@ -3,7 +3,7 @@ #include <kkeydialog.h> #include <kaction.h> #include <kstdgameaction.h> -#include <tqlayout.h> +#include <layout.h> #include <kstatusbar.h> #include "topwidget.h" @@ -25,11 +25,11 @@ void MyTopLevelWidget::initGameWidgets( ){ playerinfo[1]=new PlayerInfo(1,w); playfield=new MyMainView(w); - TQBoxLayout *toptqlayout=new TQHBoxLayout(w); - toptqlayout->addWidget(playerinfo[0]); - toptqlayout->addWidget(playfield); - toptqlayout->addWidget(playerinfo[1]); - toptqlayout->activate(); + TQBoxLayout *toplayout=new TQHBoxLayout(w); + toplayout->addWidget(playerinfo[0]); + toplayout->addWidget(playfield); + toplayout->addWidget(playerinfo[1]); + toplayout->activate(); playfield->setFocusPolicy(TQ_StrongFocus); playfield->setFocus(); |