diff options
Diffstat (limited to 'libksirtet')
53 files changed, 219 insertions, 219 deletions
diff --git a/libksirtet/base/board.cpp b/libksirtet/base/board.cpp index f29bdb15..74643374 100644 --- a/libksirtet/base/board.cpp +++ b/libksirtet/base/board.cpp @@ -54,7 +54,7 @@ BaseBoard::BaseBoard(bool graphic, TQWidget *parent) _next = new BlockInfo(*sequences); setBlockInfo(main, _next); - connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); Piece::info().loadColors(); KZoomMainWindow::addWidget(this); @@ -299,8 +299,8 @@ bool BaseBoard::timeout() Q_ASSERT( graphic() ); if ( state==GameOver ) return true; switch (state) { - case BeforeRemove: _beforeRemove(FALSE); break; - case AfterRemove: _afterRemove(FALSE); break; + case BeforeRemove: _beforeRemove(false); break; + case AfterRemove: _afterRemove(false); break; default: return false; } main->update(); diff --git a/libksirtet/base/board.h b/libksirtet/base/board.h index 76cbf729..f38fbf41 100644 --- a/libksirtet/base/board.h +++ b/libksirtet/base/board.h @@ -6,15 +6,15 @@ #include "gtetris.h" -#include <kdemacros.h> +#include <tdemacros.h> class SequenceArray; class BlockInfo; //----------------------------------------------------------------------------- -class KDE_EXPORT FixedCanvasView : public TQCanvasView +class TDE_EXPORT FixedCanvasView : public TQCanvasView { - Q_OBJECT + TQ_OBJECT public: FixedCanvasView(TQWidget *parent = 0, const char *name = 0); @@ -26,9 +26,9 @@ public slots: }; //----------------------------------------------------------------------------- -class KDE_EXPORT BaseBoard : public FixedCanvasView, public GenericTetris +class TDE_EXPORT BaseBoard : public FixedCanvasView, public GenericTetris { - Q_OBJECT + TQ_OBJECT public: enum Direction { Left = 1, Right = 2, Up = 4, Down = 8, Nb_Direction = 4 }; diff --git a/libksirtet/base/factory.cpp b/libksirtet/base/factory.cpp index d76da791..b5e09661 100644 --- a/libksirtet/base/factory.cpp +++ b/libksirtet/base/factory.cpp @@ -35,7 +35,7 @@ void BaseFactory::init(int argc, char **argv) BaseFactory::~BaseFactory() { - delete kapp; + delete tdeApp; delete _aboutData; Q_ASSERT(_self); _self = 0; diff --git a/libksirtet/base/factory.h b/libksirtet/base/factory.h index d51c78fe..2bd96bfb 100644 --- a/libksirtet/base/factory.h +++ b/libksirtet/base/factory.h @@ -3,7 +3,7 @@ #include <tqglobal.h> -#include <kdemacros.h> +#include <tdemacros.h> struct MainData { const char *appName, *trName, *description, *homepage, *removedLabel, @@ -31,7 +31,7 @@ class TDEAboutData; #define bfactory BaseFactory::self() -class KDE_EXPORT BaseFactory +class TDE_EXPORT BaseFactory { public: BaseFactory(const MainData &, const BaseBoardInfo &); diff --git a/libksirtet/base/field.cpp b/libksirtet/base/field.cpp index f443c96c..e750b67f 100644 --- a/libksirtet/base/field.cpp +++ b/libksirtet/base/field.cpp @@ -90,9 +90,9 @@ void BaseField::setMessage(const TQString &label, ButtonType type) if ( type!=NoButton ) { _button = new TQPushButton(i18n(BUTTON_TEXTS[type]), board); _button->setFocus(); - const char *slot = (type==ResumeButton ? TQT_SLOT(pause()) - : TQT_SLOT(start())); - _button->connect(_button, TQT_SIGNAL(clicked()), + const char *slot = (type==ResumeButton ? TQ_SLOT(pause()) + : TQ_SLOT(start())); + _button->connect(_button, TQ_SIGNAL(clicked()), _widget->parent(), slot); _boardLayout->addWidget(_button, 0, TQt::AlignCenter); _button->show(); diff --git a/libksirtet/base/field.h b/libksirtet/base/field.h index 217eea5b..fcdebdd8 100644 --- a/libksirtet/base/field.h +++ b/libksirtet/base/field.h @@ -3,7 +3,7 @@ #include <highscore/kexthighscore.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQVBoxLayout; class TQGridLayout; @@ -15,7 +15,7 @@ class TQButton; class GTInitData; class KCanvasRootPixmap; -class KDE_EXPORT BaseField +class TDE_EXPORT BaseField { public: BaseField(TQWidget *widget); diff --git a/libksirtet/base/gtetris.h b/libksirtet/base/gtetris.h index b0f990b9..78388e40 100644 --- a/libksirtet/base/gtetris.h +++ b/libksirtet/base/gtetris.h @@ -96,7 +96,7 @@ #include <krandomsequence.h> #include <kgrid2d.h> -#include <kdemacros.h> +#include <tdemacros.h> class Piece; class BlockInfo; @@ -107,7 +107,7 @@ struct GTInitData { uint initLevel; }; -class KDE_EXPORT GenericTetris +class TDE_EXPORT GenericTetris { public: GenericTetris(uint width, uint height, bool withPieces, bool graphic); diff --git a/libksirtet/base/highscores.h b/libksirtet/base/highscores.h index 0ed91c54..cf8d94a1 100644 --- a/libksirtet/base/highscores.h +++ b/libksirtet/base/highscores.h @@ -2,9 +2,9 @@ #define BASE_HIGHSCORES_H #include <highscore/kexthighscore.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT BaseHighscores : public KExtHighscore::Manager +class TDE_EXPORT BaseHighscores : public KExtHighscore::Manager { public: BaseHighscores(); diff --git a/libksirtet/base/kzoommainwindow.cpp b/libksirtet/base/kzoommainwindow.cpp index 758d73d6..a9bb2004 100644 --- a/libksirtet/base/kzoommainwindow.cpp +++ b/libksirtet/base/kzoommainwindow.cpp @@ -30,11 +30,11 @@ KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step, const char *name { installEventFilter(this); - _zoomInAction = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(zoomIn()), actionCollection()); + _zoomInAction = KStdAction::zoomIn(this, TQ_SLOT(zoomIn()), actionCollection()); _zoomOutAction = - KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(zoomOut()), actionCollection()); + KStdAction::zoomOut(this, TQ_SLOT(zoomOut()), actionCollection()); _menu = - KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenubar()), actionCollection()); + KStdAction::showMenubar(this, TQ_SLOT(toggleMenubar()), actionCollection()); } void KZoomMainWindow::init(const char *popupName) @@ -63,7 +63,7 @@ void KZoomMainWindow::addWidget(TQWidget *widget) static_cast<KZoomMainWindow *>(tlw->tqt_cast("KZoomMainWindow")); Q_ASSERT(zm); zm->_widgets.append(widget); - connect(widget, TQT_SIGNAL(destroyed()), zm, TQT_SLOT(widgetDestroyed())); + connect(widget, TQ_SIGNAL(destroyed()), zm, TQ_SLOT(widgetDestroyed())); } void KZoomMainWindow::widgetDestroyed() diff --git a/libksirtet/base/kzoommainwindow.h b/libksirtet/base/kzoommainwindow.h index a15344c8..a649b71f 100644 --- a/libksirtet/base/kzoommainwindow.h +++ b/libksirtet/base/kzoommainwindow.h @@ -21,7 +21,7 @@ #define KZOOMMAINWINDOW_H #include <tdemainwindow.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEToggleAction; @@ -41,9 +41,9 @@ class TDEToggleAction; * This class also has a "show/hide menubar" action and allows the use * of a context popup menu (useful to restore the menubar when hidden). */ -class KDE_EXPORT KZoomMainWindow : public TDEMainWindow +class TDE_EXPORT KZoomMainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** Constructor. */ diff --git a/libksirtet/base/main.cpp b/libksirtet/base/main.cpp index e9f576f1..3916afc2 100644 --- a/libksirtet/base/main.cpp +++ b/libksirtet/base/main.cpp @@ -24,20 +24,20 @@ BaseMainWindow::BaseMainWindow() KNotifyClient::startDaemon(); // File & Popup - KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(start()), actionCollection()); - _pause = KStdGameAction::pause(TQT_TQOBJECT(this), TQT_SLOT(pause()), actionCollection()); + KStdGameAction::gameNew(this, TQ_SLOT(start()), actionCollection()); + _pause = KStdGameAction::pause(this, TQ_SLOT(pause()), actionCollection()); _pause->setEnabled(false); - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighscores()), + KStdGameAction::highscores(this, TQ_SLOT(showHighscores()), actionCollection()); - KStdGameAction::quit(TQT_TQOBJECT(tqApp), TQT_SLOT(quit()), actionCollection()); + KStdGameAction::quit(tqApp, TQ_SLOT(quit()), actionCollection()); // Settings - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configureSettings()), + KStdAction::preferences(this, TQ_SLOT(configureSettings()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), actionCollection()); - KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()), + KStdAction::keyBindings(this, TQ_SLOT(configureKeys()), actionCollection()); + KStdAction::configureNotifications(this, TQ_SLOT(configureNotifications()), actionCollection()); - KStdGameAction::configureHighscores(TQT_TQOBJECT(this), TQT_SLOT(configureHighscores()), + KStdGameAction::configureHighscores(this, TQ_SLOT(configureHighscores()), actionCollection()); _inter = bfactory->createInterface(this); @@ -89,7 +89,7 @@ void BaseMainWindow::configureSettings() if (w) dialog->addPage(w, i18n("Colors"), "colorize"); // dialog->addPage(new BackgroundConfigWidget, i18n("Background"), "background"); addConfig(dialog); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_SIGNAL(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), TQ_SIGNAL(settingsChanged())); dialog->show(); } diff --git a/libksirtet/base/main.h b/libksirtet/base/main.h index 2c48439b..92a3e2e3 100644 --- a/libksirtet/base/main.h +++ b/libksirtet/base/main.h @@ -3,16 +3,16 @@ #include "kzoommainwindow.h" -#include <kdemacros.h> +#include <tdemacros.h> class BaseInterface; class TDEToggleAction; class KKeyDialog; class TDEConfigDialog; -class KDE_EXPORT BaseMainWindow : public KZoomMainWindow +class TDE_EXPORT BaseMainWindow : public KZoomMainWindow { - Q_OBJECT + TQ_OBJECT public: BaseMainWindow(); diff --git a/libksirtet/base/piece.cpp b/libksirtet/base/piece.cpp index 061088fb..27d704bd 100644 --- a/libksirtet/base/piece.cpp +++ b/libksirtet/base/piece.cpp @@ -74,9 +74,9 @@ void SequenceArray::setBlockSize(uint bsize) _size = bsize; const GPieceInfo &pinfo = Piece::info(); TQPtrList<TQPixmap> pixmaps; - pixmaps.setAutoDelete(TRUE); + pixmaps.setAutoDelete(true); TQPtrList<TQPoint> points; - points.setAutoDelete(TRUE); + points.setAutoDelete(true); uint nm = pinfo.nbBlockModes(); for (uint i=0; i<size(); i++) { for (uint k=0; k<2; k++) diff --git a/libksirtet/base/settings.h b/libksirtet/base/settings.h index b0859e3f..c141a829 100644 --- a/libksirtet/base/settings.h +++ b/libksirtet/base/settings.h @@ -10,7 +10,7 @@ class TQGridLayout; //----------------------------------------------------------------------------- class BaseAppearanceConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: BaseAppearanceConfig(); @@ -23,7 +23,7 @@ protected: //----------------------------------------------------------------------------- class ColorConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ColorConfig(); diff --git a/libksirtet/common/ai.cpp b/libksirtet/common/ai.cpp index d201d9fd..35d9d89f 100644 --- a/libksirtet/common/ai.cpp +++ b/libksirtet/common/ai.cpp @@ -89,7 +89,7 @@ AI::AI(uint tTime, uint oTime, const Data *DATA) : timer(this), thinkTime(tTime), orderTime(oTime), stopped(false), board(0) { - connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); for (uint i=0; DATA[i].name; i++) { Element element; diff --git a/libksirtet/common/ai.h b/libksirtet/common/ai.h index 6cec5093..fb8575a1 100644 --- a/libksirtet/common/ai.h +++ b/libksirtet/common/ai.h @@ -40,7 +40,7 @@ class LIBKSIRTET_EXPORT AIPiece //----------------------------------------------------------------------------- class LIBKSIRTET_EXPORT AI : public TQObject { - Q_OBJECT + TQ_OBJECT public: struct Data { @@ -106,7 +106,7 @@ class LIBKSIRTET_EXPORT AI : public TQObject //----------------------------------------------------------------------------- class LIBKSIRTET_EXPORT AIConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AIConfig(const TQValueVector<AI::Element> &elements); diff --git a/libksirtet/common/board.h b/libksirtet/common/board.h index be3cf80c..ff50841f 100644 --- a/libksirtet/common/board.h +++ b/libksirtet/common/board.h @@ -10,7 +10,7 @@ class AI; class LIBKSIRTET_EXPORT Board : public BaseBoard { - Q_OBJECT + TQ_OBJECT public: Board(bool graphic, GiftPool *, TQWidget *parent); diff --git a/libksirtet/common/field.cpp b/libksirtet/common/field.cpp index f1b9cbc9..85b16fd6 100644 --- a/libksirtet/common/field.cpp +++ b/libksirtet/common/field.cpp @@ -85,9 +85,9 @@ Field::Field(TQWidget *parent) vbl->addWidget(showNext, 0); vbl->addStretch(4); - connect(board, TQT_SIGNAL(scoreUpdated()), TQT_SLOT(scoreUpdatedSlot())); - connect(board, TQT_SIGNAL(levelUpdated()), TQT_SLOT(levelUpdated())); - connect(board, TQT_SIGNAL(removedUpdated()), TQT_SLOT(removedUpdated())); + connect(board, TQ_SIGNAL(scoreUpdated()), TQ_SLOT(scoreUpdatedSlot())); + connect(board, TQ_SIGNAL(levelUpdated()), TQ_SLOT(levelUpdated())); + connect(board, TQ_SIGNAL(removedUpdated()), TQ_SLOT(removedUpdated())); initVariableGUI(); } diff --git a/libksirtet/common/field.h b/libksirtet/common/field.h index 0b754d97..6708f953 100644 --- a/libksirtet/common/field.h +++ b/libksirtet/common/field.h @@ -17,7 +17,7 @@ class KGameLCDClock; class LIBKSIRTET_EXPORT Field : public MPSimpleBoard, public BaseField { - Q_OBJECT + TQ_OBJECT public: Field(TQWidget *parent); diff --git a/libksirtet/common/highscores.cpp b/libksirtet/common/highscores.cpp index 78eb8b2b..afb1bd3e 100644 --- a/libksirtet/common/highscores.cpp +++ b/libksirtet/common/highscores.cpp @@ -20,7 +20,7 @@ CommonHighscores::CommonHighscores() void CommonHighscores::convertLegacy(uint) { - TDEConfigGroupSaver cg(kapp->config(), "High Scores"); + TDEConfigGroupSaver cg(tdeApp->config(), "High Scores"); for (uint i=0; i<10; i++) { TQString name = cg.config()->readEntry(TQString("name%1").arg(i), TQString()); diff --git a/libksirtet/common/inter.cpp b/libksirtet/common/inter.cpp index cc9a86ed..ac574b91 100644 --- a/libksirtet/common/inter.cpp +++ b/libksirtet/common/inter.cpp @@ -12,17 +12,17 @@ const ActionData Interface::ACTION_DATA[Nb_Actions] = { - { I18N_NOOP("Move Left"), "move left", TQT_SLOT(moveLeft()), 0 }, - { I18N_NOOP("Move Right"), "move right", TQT_SLOT(moveRight()), 0 }, - { I18N_NOOP("Drop Down"), "drop down", TQT_SLOT(dropDownStart()), - TQT_SLOT(dropDownStop()) }, - { I18N_NOOP("One Line Down"), "one line down", TQT_SLOT(oneLineDown()), 0 }, - { I18N_NOOP("Rotate Left"), "rotate left", TQT_SLOT(rotateLeft()), 0 }, - { I18N_NOOP("Rotate Right"), "rotate right", TQT_SLOT(rotateRight()), 0 }, + { I18N_NOOP("Move Left"), "move left", TQ_SLOT(moveLeft()), 0 }, + { I18N_NOOP("Move Right"), "move right", TQ_SLOT(moveRight()), 0 }, + { I18N_NOOP("Drop Down"), "drop down", TQ_SLOT(dropDownStart()), + TQ_SLOT(dropDownStop()) }, + { I18N_NOOP("One Line Down"), "one line down", TQ_SLOT(oneLineDown()), 0 }, + { I18N_NOOP("Rotate Left"), "rotate left", TQ_SLOT(rotateLeft()), 0 }, + { I18N_NOOP("Rotate Right"), "rotate right", TQ_SLOT(rotateRight()), 0 }, { I18N_NOOP("Move to Left Column"), "move left total", - TQT_SLOT(moveLeftTotal()), 0 }, + TQ_SLOT(moveLeftTotal()), 0 }, { I18N_NOOP("Move to Right Column"), "move right total", - TQT_SLOT(moveRightTotal()), 0 } + TQ_SLOT(moveRightTotal()), 0 } }; const int Interface::KEYCODE_ONE[Nb_Actions] = { @@ -45,7 +45,7 @@ MPBoard *Interface::newBoard(uint i) { Field *f = static_cast<Field *>(cfactory->createField(this)); f->settingsChanged(); - connect(this, TQT_SIGNAL(settingsChanged()), f, TQT_SLOT(settingsChanged())); + connect(this, TQ_SIGNAL(settingsChanged()), f, TQ_SLOT(settingsChanged())); if ( i==0 ) _firstField = f; return f; } @@ -122,7 +122,7 @@ uint Interface::next(uint i) const void Interface::_treatInit() { ServerInitData sid; - sid.seed = kapp->random(); + sid.seed = tdeApp->random(); sid.initLevel = CommonPrefs::initialGameLevel(); for (uint i=0; i<nbPlayers(); i++) { sid.prevName = playerName(prev(i)); diff --git a/libksirtet/common/inter.h b/libksirtet/common/inter.h index fbf78c77..cbca7e8f 100644 --- a/libksirtet/common/inter.h +++ b/libksirtet/common/inter.h @@ -14,7 +14,7 @@ class Field; class LIBKSIRTET_EXPORT Interface : public MPSimpleInterface, public BaseInterface { - Q_OBJECT + TQ_OBJECT public: Interface(const MPGameInfo &, TQWidget *parent); diff --git a/libksirtet/common/libksirtet2.kcfg b/libksirtet/common/libksirtet2.kcfg index 27ee72e3..88498ced 100644 --- a/libksirtet/common/libksirtet2.kcfg +++ b/libksirtet/common/libksirtet2.kcfg @@ -17,7 +17,7 @@ <default>false</default> </entry> <entry name="InitialGameLevel" type="Int" key="init level" min="1" max="20"> - <label>The inital level of new games.</label> + <label>The initial level of new games.</label> <default>1</default> <min>1</min> <max>20</max> diff --git a/libksirtet/common/main.cpp b/libksirtet/common/main.cpp index ec6ec658..0d0a75cb 100644 --- a/libksirtet/common/main.cpp +++ b/libksirtet/common/main.cpp @@ -20,27 +20,27 @@ void MainWindow::init() { Interface *inter = static_cast<Interface *>(_inter); inter->normalGame(); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); // Modes bool ama = ( bfactory->bbi.nbArcadeStages!=0 ); TQString s = (ama ? i18n("&Single Human (Normal)") : i18n("&Single Human")); - (void)new TDEAction(s, 0, TQT_TQOBJECT(inter), TQT_SLOT(normalGame()), + (void)new TDEAction(s, 0, inter, TQ_SLOT(normalGame()), actionCollection(), "mp_single_human"); if (ama) (void)new TDEAction(i18n("&Single Human (Arcade)"), 0, - TQT_TQOBJECT(inter), TQT_SLOT(arcadeGame()), + inter, TQ_SLOT(arcadeGame()), actionCollection(), "mp_arcade"); - (void)new TDEAction(i18n("Human vs &Human"), 0, TQT_TQOBJECT(inter), TQT_SLOT(humanVsHuman()), + (void)new TDEAction(i18n("Human vs &Human"), 0, inter, TQ_SLOT(humanVsHuman()), actionCollection(), "mp_human_vs_human"); (void)new TDEAction(i18n("Human vs &Computer"), 0, - TQT_TQOBJECT(inter), TQT_SLOT(humanVsComputer()), + inter, TQ_SLOT(humanVsComputer()), actionCollection(), "mp_human_vs_computer"); - (void)new TDEAction(i18n("&More..."), 0, TQT_TQOBJECT(inter), TQT_SLOT(dialog()), + (void)new TDEAction(i18n("&More..."), 0, inter, TQ_SLOT(dialog()), actionCollection(), "mp_more"); buildGUI(inter); - connect(this, TQT_SIGNAL(settingsChanged()), - inter, TQT_SLOT(settingsChangedSlot())); + connect(this, TQ_SIGNAL(settingsChanged()), + inter, TQ_SLOT(settingsChangedSlot())); } void MainWindow::addKeys(KKeyDialog &d) diff --git a/libksirtet/common/main.h b/libksirtet/common/main.h index daafca74..e22d8f59 100644 --- a/libksirtet/common/main.h +++ b/libksirtet/common/main.h @@ -7,7 +7,7 @@ class LIBKSIRTET_EXPORT MainWindow : public BaseMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow() {} diff --git a/libksirtet/common/misc_ui.cpp b/libksirtet/common/misc_ui.cpp index 376c0c57..ec40700e 100644 --- a/libksirtet/common/misc_ui.cpp +++ b/libksirtet/common/misc_ui.cpp @@ -38,7 +38,7 @@ Shadow::Shadow(BaseBoard *board, TQWidget *parent) _board(board), _show(false) { KZoomMainWindow::addWidget(this); - connect(board, TQT_SIGNAL(updatePieceConfigSignal()), TQT_SLOT(update())); + connect(board, TQ_SIGNAL(updatePieceConfigSignal()), TQ_SLOT(update())); } TQSize Shadow::sizeHint() const @@ -82,14 +82,14 @@ class Led : public TQWidget { public: Led(const TQColor &c, TQWidget *parent) - : TQWidget(parent), col(c), _on(FALSE) {} + : TQWidget(parent), col(c), _on(false) {} TQSizePolicy sizePolicy() const { return TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); } TQSize sizeHint() const { return TQSize(LED_WIDTH, LED_HEIGHT); } - void on() { if (!_on) { _on = TRUE; repaint(); } } - void off() { if (_on) {_on = FALSE; repaint(); } } + void on() { if (!_on) { _on = true; repaint(); } } + void off() { if (_on) {_on = false; repaint(); } } void setColor(const TQColor &c) { if (c!=col) { col = c; repaint(); } } protected: @@ -130,7 +130,7 @@ void GiftPool::put(uint n) if ( n==0 ) return; if ( nb==0 && !ready ) TQTimer::singleShot(cfactory->cbi.giftPoolTimeout, - this, TQT_SLOT(timeout())); + this, TQ_SLOT(timeout())); uint e = TQMIN(nb+n, leds.size()); for (uint i=nb; i<e; i++) leds[i]->on(); uint f = TQMIN(nb+n-e, leds.size()); @@ -161,7 +161,7 @@ uint GiftPool::take() void GiftPool::reset() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); ready = false; nb = 0; for (uint i=0; i<leds.size(); i++) { @@ -173,7 +173,7 @@ void GiftPool::reset() //----------------------------------------------------------------------------- PlayerProgress::PlayerProgress(BaseBoard *board, TQWidget *parent, const char *name) - : KGameProgress(0, board->matrix().height(), 0, Qt::Vertical, + : KGameProgress(0, board->matrix().height(), 0, TQt::Vertical, parent, name), _board(board) { setBackgroundColor(lightGray); diff --git a/libksirtet/common/misc_ui.h b/libksirtet/common/misc_ui.h index 7ec97345..fb2fd02a 100644 --- a/libksirtet/common/misc_ui.h +++ b/libksirtet/common/misc_ui.h @@ -13,7 +13,7 @@ /*****************************************************************************/ class LIBKSIRTET_EXPORT ShowNextPiece : public FixedCanvasView { - Q_OBJECT + TQ_OBJECT public: ShowNextPiece(BaseBoard *, TQWidget *parent); @@ -22,7 +22,7 @@ class LIBKSIRTET_EXPORT ShowNextPiece : public FixedCanvasView /*****************************************************************************/ class LIBKSIRTET_EXPORT Shadow : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Shadow(BaseBoard *, TQWidget *parent); @@ -44,7 +44,7 @@ class Led; class LIBKSIRTET_EXPORT GiftPool : public TQHBox { - Q_OBJECT + TQ_OBJECT public: GiftPool(TQWidget *parent); @@ -70,7 +70,7 @@ class LIBKSIRTET_EXPORT GiftPool : public TQHBox /*****************************************************************************/ class LIBKSIRTET_EXPORT PlayerProgress : public KGameProgress { - Q_OBJECT + TQ_OBJECT public: PlayerProgress(BaseBoard *board, TQWidget *parent = 0, const char *name = 0); diff --git a/libksirtet/common/settings.h b/libksirtet/common/settings.h index eaa7b2fe..156386ac 100644 --- a/libksirtet/common/settings.h +++ b/libksirtet/common/settings.h @@ -9,7 +9,7 @@ //----------------------------------------------------------------------------- class LIBKSIRTET_EXPORT AppearanceConfig : public BaseAppearanceConfig { - Q_OBJECT + TQ_OBJECT public: AppearanceConfig(); @@ -18,7 +18,7 @@ public: //----------------------------------------------------------------------------- class LIBKSIRTET_EXPORT GameConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: GameConfig(); diff --git a/libksirtet/lib/internal.cpp b/libksirtet/lib/internal.cpp index a3f07cbb..b5ea3881 100644 --- a/libksirtet/lib/internal.cpp +++ b/libksirtet/lib/internal.cpp @@ -39,12 +39,12 @@ void Local::writeData(bool inverse) void Local::treatData() { - readData(TRUE); + readData(true); interface->treatData(); // check reading stream for (uint i=0; i<ios.size(); i++) if ( !ios[i]->reading.readOk() ) DATA_ERROR(i); - writeData(TRUE); + writeData(true); } //----------------------------------------------------------------------------- @@ -61,7 +61,7 @@ void Server::congestion() void Server::serverTimeout() { - ctimer.start(2*interval, TRUE); + ctimer.start(2*interval, true); timeout(); } @@ -75,9 +75,9 @@ Network::Network(MPInterface *_interface, TQPtrListIterator<RemoteHostData> it(rhd); for (; it.current(); ++it) { rd.socket = it.current()->socket; - rd.socket->notifier()->setEnabled(TRUE); - connect(rd.socket->notifier(), TQT_SIGNAL(activated(int)), - TQT_SLOT(notifier(int))); + rd.socket->notifier()->setEnabled(true); + connect(rd.socket->notifier(), TQ_SIGNAL(activated(int)), + TQ_SLOT(notifier(int))); uint nb = it.current()->bds.count(); Q_ASSERT( nb>=1 ); rd.array = new BufferArray(nb); @@ -122,7 +122,7 @@ IOBuffer *Network::ioBuffer(uint i) const if ( i<remotes[k].array->size() ) return (*remotes[k].array)[i]; i -= remotes[k].array->size(); } - Q_ASSERT(FALSE); + Q_ASSERT(false); return 0; } @@ -155,8 +155,8 @@ LocalServer::LocalServer(MPInterface *_interface, uint _interval) : Local(_interface, _boards), Server(_interval) { - connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeoutSlot())); - connect(&ctimer, TQT_SIGNAL(timeout()), TQT_SLOT(congestionTimeoutSlot())); + connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeoutSlot())); + connect(&ctimer, TQ_SIGNAL(timeout()), TQ_SLOT(congestionTimeoutSlot())); serverTimeout(); } @@ -167,10 +167,10 @@ NetworkServer::NetworkServer(MPInterface *_interface, : Network(_interface, _boards, rhd), Server(_interval), nbReceived(remotes.count()) { - connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeoutSlot())); - connect(&ctimer, TQT_SIGNAL(timeout()), TQT_SLOT(congestionTimeoutSlot())); + connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeoutSlot())); + connect(&ctimer, TQ_SIGNAL(timeout()), TQ_SLOT(congestionTimeoutSlot())); // to catch unexpected data - for (uint i=0; i<remotes.count(); i++) remotes[i].received = TRUE; + for (uint i=0; i<remotes.count(); i++) remotes[i].received = true; nbReceived = remotes.count(); // let the client the time to create itself ... // serverTimeout(); @@ -180,7 +180,7 @@ void NetworkServer::timeout() { if ( nbReceived<remotes.count() ) LAG_ERROR; nbReceived = 0; - for (uint i=0; i<remotes.count(); i++) remotes[i].received = FALSE; + for (uint i=0; i<remotes.count(); i++) remotes[i].received = false; // send MF_ASK : asking for data from clients for (uint i=0; i<remotes.count(); i++) { remotes[i].socket->writingStream() << MF_Ask; @@ -202,7 +202,7 @@ void NetworkServer::notifier(int fd) case 0: BROKE_ERROR(i); } - remotes[i].received = TRUE; + remotes[i].received = true; nbReceived++; ReadingStream &s = remotes[i].socket->readingStream(); @@ -256,7 +256,7 @@ void Client::notifier(int) case MF_Ask: // write data from local boards to server socket (cleaning // of writing stream is done in write()) - readData(FALSE); + readData(false); remotes[0].socket->writingStream() << ios; // debug("CLIENT : send ios (size=%i)", // remotes[0].socket->writingStream().size()); @@ -270,7 +270,7 @@ void Client::notifier(int) interface->dataFromServer(s); // debug("CLIENT : after dataFromServer (at=%i)", s.device()->at()); if ( !s.readOk() ) DATA_ERROR(0); - writeData(FALSE); + writeData(false); break; default: DATA_ERROR(0); } diff --git a/libksirtet/lib/internal.h b/libksirtet/lib/internal.h index f2e752c3..30e4c7b3 100644 --- a/libksirtet/lib/internal.h +++ b/libksirtet/lib/internal.h @@ -58,7 +58,7 @@ class Server //----------------------------------------------------------------------------- class Network : public TQObject, public Local { - Q_OBJECT + TQ_OBJECT public: @@ -93,7 +93,7 @@ class Network : public TQObject, public Local //----------------------------------------------------------------------------- class LocalServer : public TQObject, public Local, public Server { - Q_OBJECT + TQ_OBJECT public: @@ -113,7 +113,7 @@ class LocalServer : public TQObject, public Local, public Server //----------------------------------------------------------------------------- class NetworkServer : public Network, public Server { - Q_OBJECT + TQ_OBJECT public: @@ -139,7 +139,7 @@ class NetworkServer : public Network, public Server //----------------------------------------------------------------------------- class Client : public Network { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/keys.cpp b/libksirtet/lib/keys.cpp index 5d250680..b6cc99cd 100644 --- a/libksirtet/lib/keys.cpp +++ b/libksirtet/lib/keys.cpp @@ -49,7 +49,7 @@ void KeyData::createActionCollection(uint index, TQWidget *receiver) TQString name = TQString("%2 %3").arg(index+1).arg(_data[k].name); const char *slot = (_data[k].slotRelease ? 0 : _data[k].slot); TDEAction *a = new TDEAction(label, _keycodes[_cols.size()-1][index][k], - TQT_TQOBJECT(receiver), slot, _cols[index], name.utf8()); + receiver, slot, _cols[index], name.utf8()); a->setEnabled(false); if ( slot==0 ) { SpecialData data; diff --git a/libksirtet/lib/keys.h b/libksirtet/lib/keys.h index 9b7ecd82..9ab735bd 100644 --- a/libksirtet/lib/keys.h +++ b/libksirtet/lib/keys.h @@ -9,7 +9,7 @@ class KeyData : public TQObject { - Q_OBJECT + TQ_OBJECT public: KeyData(uint maxNb, uint nbActions, const ActionData *, diff --git a/libksirtet/lib/libksirtet_export.h b/libksirtet/lib/libksirtet_export.h index 819e0029..7d2c610c 100644 --- a/libksirtet/lib/libksirtet_export.h +++ b/libksirtet/lib/libksirtet_export.h @@ -22,11 +22,11 @@ #define _LIBKEXIF_EXPORT_H #ifdef KDEMACROS_USABLE -#include <kdemacros.h> +#include <tdemacros.h> #endif -#ifdef KDE_EXPORT -#define LIBKSIRTET_EXPORT KDE_EXPORT +#ifdef TDE_EXPORT +#define LIBKSIRTET_EXPORT TDE_EXPORT #else #define LIBKSIRTET_EXPORT #endif diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp index 88203601..a0df2404 100644 --- a/libksirtet/lib/meeting.cpp +++ b/libksirtet/lib/meeting.cpp @@ -18,10 +18,10 @@ NetMeeting::NetMeeting(const cId &_id, Socket *socket, : KDialogBase(Plain, i18n("Network Meeting"), (_server ? Ok|Cancel|Help : Cancel|Help), (_server ? Ok : Cancel), parent, name), - server(_server), ow(option), id(_id), socketRemoved(FALSE) + server(_server), ow(option), id(_id), socketRemoved(false) { sm.append(socket, SocketManager::ReadWrite); - sm[0]->notifier()->setEnabled(TRUE); + sm[0]->notifier()->setEnabled(true); /* top layout */ TQVBoxLayout *top = new TQVBoxLayout(plainPage(), spacingHint()); @@ -49,13 +49,13 @@ NetMeeting::NetMeeting(const cId &_id, Socket *socket, top->addWidget(status); // buttons - enableButtonSeparator(TRUE); + enableButtonSeparator(true); if (server) { setButtonOK(i18n("Start Game")); - enableButtonOK(FALSE); + enableButtonOK(false); } setButtonCancel(server ? i18n("Abort") : i18n("Quit")); - enableButton(Help, FALSE); + enableButton(Help, false); } NetMeeting::~NetMeeting() @@ -65,13 +65,13 @@ void NetMeeting::appendLine(const MeetingLineData &pld, bool server) { MeetingLine *pl; pl = new MeetingLine(pld.own, server, false, wl); - if (pld.own) connect(pl, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(textChanged(const TQString &))); + if (pld.own) connect(pl, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(textChanged(const TQString &))); else message(i18n("A new client has just arrived (#%1)") .arg(wl->size()+1)); pl->setData(pld.ed); - connect(pl, TQT_SIGNAL(typeChanged(MeetingCheckBox::Type)), - TQT_SLOT(typeChanged(MeetingCheckBox::Type))); + connect(pl, TQ_SIGNAL(typeChanged(MeetingCheckBox::Type)), + TQ_SLOT(typeChanged(MeetingCheckBox::Type))); wl->append(pl); waiting(); } @@ -115,7 +115,7 @@ bool NetMeeting::ready() const for(uint k=0; k<wl->size(); k++) { switch ( wl->widget(k)->type() ) { case MeetingCheckBox::Ready : nbReady++; break; - case MeetingCheckBox::NotReady : return FALSE; + case MeetingCheckBox::NotReady : return false; default : break; } } @@ -163,7 +163,7 @@ void NetMeeting::readData(uint i) default: dataError(i); } - if (socketRemoved) socketRemoved = FALSE; + if (socketRemoved) socketRemoved = false; else if ( !sm[i]->readingStream().atEnd() ) readData(i); // more pending data } @@ -214,19 +214,19 @@ void NetMeeting::message(const TQString &str) ServerNetMeeting::ServerNetMeeting(const cId &id, const RemoteHostData &r, MPOptionWidget *option, TQPtrList<RemoteHostData> &arhd, TQWidget *parent, const char * name) -: NetMeeting(id, r.socket, option, TRUE, parent, name), rhd(arhd) +: NetMeeting(id, r.socket, option, true, parent, name), rhd(arhd) { - connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)), TQT_SLOT(newHost(int))); + connect(sm[0]->notifier(), TQ_SIGNAL(activated(int)), TQ_SLOT(newHost(int))); players.append(Accepted); // server // set server line ExtData ed(r.bds, "", MeetingCheckBox::Ready); spl->setData(ed); - connect(spl, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(textChanged(const TQString &))); + connect(spl, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(textChanged(const TQString &))); // options signal - if (ow) connect(ow, TQT_SIGNAL(changed()), TQT_SLOT(optionsChanged())); + if (ow) connect(ow, TQ_SIGNAL(changed()), TQ_SLOT(optionsChanged())); } void ServerNetMeeting::writeToAll(uint i) @@ -247,7 +247,7 @@ void ServerNetMeeting::netError(uint i, const TQString &type) void ServerNetMeeting::disconnectHost(uint i, const TQString &str) { sm.remove(i, true); - socketRemoved = TRUE; + socketRemoved = true; if ( players[i]==Accepted ) { removeLine(i-1); @@ -271,9 +271,9 @@ void ServerNetMeeting::newHost(int) players.append(NewPlayer); Socket *socket = new Socket(s, true); uint i = sm.append(socket, SocketManager::ReadWrite); - connect(sm[i]->notifier(), TQT_SIGNAL(activated(int)), - TQT_SLOT(readNotifier(int))); - sm[i]->notifier()->setEnabled(TRUE); + connect(sm[i]->notifier(), TQ_SIGNAL(activated(int)), + TQ_SLOT(readNotifier(int))); + sm[i]->notifier()->setEnabled(true); } void ServerNetMeeting::idFlag(uint i) @@ -314,10 +314,10 @@ void ServerNetMeeting::newFlag(uint i) CHECK_READ(i); // complete the MeetingLineData struct with initial values - pld.own = FALSE; // client line + pld.own = false; // client line pld.ed.type = MeetingCheckBox::NotReady; // not ready by default pld.ed.text = ""; // empty line to begin with - appendLine(pld, TRUE); + appendLine(pld, true); // send to the new client already present lines including its own // (New flag + MeetingLineData struct) @@ -332,7 +332,7 @@ void ServerNetMeeting::newFlag(uint i) // send to all other clients the new line (New flag + MeetingLineData struct) wl->widget(i-1)->data(pld.ed); - pld.own = FALSE; + pld.own = false; sm.commonWritingStream() << NewFlag << pld; writeToAll(i); } @@ -407,12 +407,12 @@ void ServerNetMeeting::accept() ExtData ed; bool willPlay; for (uint k=1; k<players.count(); k++) { - willPlay = FALSE; + willPlay = false; if ( players[k]==Accepted ) { // client with lines wl->widget(k-1)->data(ed); if ( ed.type==MeetingCheckBox::Ready ) { - willPlay = TRUE; + willPlay = true; RemoteHostData *r = new RemoteHostData; r->socket = sm[0]; r->bds = ed.bds; @@ -449,10 +449,10 @@ void ServerNetMeeting::optionsChanged() ClientNetMeeting::ClientNetMeeting(const cId &id, const RemoteHostData &rhd, MPOptionWidget *option, TQWidget *parent, const char * name) -: NetMeeting(id, rhd.socket, option, FALSE, parent, name), bds(rhd.bds) +: NetMeeting(id, rhd.socket, option, false, parent, name), bds(rhd.bds) { - connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)), - TQT_SLOT(readNotifier(int))); + connect(sm[0]->notifier(), TQ_SIGNAL(activated(int)), + TQ_SLOT(readNotifier(int))); players.append(NewPlayer); // server player // Send id to server (Id flag + Id struct) @@ -499,7 +499,7 @@ void ClientNetMeeting::newFlag(uint) } else { MeetingLineData pld; sm[0]->readingStream() >> pld; - appendLine(pld, FALSE); + appendLine(pld, false); } CHECK_READ(0); } diff --git a/libksirtet/lib/meeting.h b/libksirtet/lib/meeting.h index a99dd72c..779d06a4 100644 --- a/libksirtet/lib/meeting.h +++ b/libksirtet/lib/meeting.h @@ -12,7 +12,7 @@ class MPOptionWidget; /** Internal class : net meeting. */ class NetMeeting : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -77,7 +77,7 @@ class NetMeeting : public KDialogBase class ServerNetMeeting : public NetMeeting { - Q_OBJECT + TQ_OBJECT public: @@ -109,7 +109,7 @@ class ServerNetMeeting : public NetMeeting class ClientNetMeeting : public NetMeeting { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/miscui.cpp b/libksirtet/lib/miscui.cpp index 97a7bfa4..7be010ee 100644 --- a/libksirtet/lib/miscui.cpp +++ b/libksirtet/lib/miscui.cpp @@ -16,12 +16,12 @@ MeetingCheckBox::MeetingCheckBox(Type type, bool owner, bool server, _ready = new TQCheckBox(i18n("Ready"), this); vbox->addWidget(_ready); _ready->setEnabled(owner); - connect(_ready, TQT_SIGNAL(clicked()), TQT_SLOT(changedSlot())); + connect(_ready, TQ_SIGNAL(clicked()), TQ_SLOT(changedSlot())); _excluded = new TQCheckBox(i18n("Excluded"), this); vbox->addWidget(_excluded); _excluded->setEnabled(server); - connect(_excluded, TQT_SIGNAL(clicked()), TQT_SLOT(changedSlot())); + connect(_excluded, TQ_SIGNAL(clicked()), TQ_SLOT(changedSlot())); setType(type); } @@ -54,5 +54,5 @@ PlayerComboBox::PlayerComboBox(Type type, bool canBeEmpty, bool acceptAI, if (canBeEmpty) insertItem(i18n("None")); setCurrentItem(type); - connect(this, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed(int))); + connect(this, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed(int))); } diff --git a/libksirtet/lib/miscui.h b/libksirtet/lib/miscui.h index f781fbea..36f6a75a 100644 --- a/libksirtet/lib/miscui.h +++ b/libksirtet/lib/miscui.h @@ -8,7 +8,7 @@ //----------------------------------------------------------------------------- class MeetingCheckBox : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum Type { Ready, NotReady, Excluded }; @@ -30,7 +30,7 @@ class MeetingCheckBox : public TQWidget //----------------------------------------------------------------------------- class PlayerComboBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: enum Type { Human = 0, AI, None }; diff --git a/libksirtet/lib/mp_board.h b/libksirtet/lib/mp_board.h index 9368a3ab..ca40df56 100644 --- a/libksirtet/lib/mp_board.h +++ b/libksirtet/lib/mp_board.h @@ -9,7 +9,7 @@ */ class MPBoard : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -19,9 +19,9 @@ class MPBoard : public TQWidget /** * This method is called once at the board creation. - * @param AI is TRUE if the player is not human. - * @param multiplayers is TRUE if the game is not a single player game. - * @param first is TRUE if this board is the first local one. + * @param AI is true if the player is not human. + * @param multiplayers is true if the game is not a single player game. + * @param first is true if this board is the first local one. */ virtual void init(bool AI, bool multiplayers, bool server, bool first, const TQString &name) = 0; diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp index 1ad8a572..ce341c24 100644 --- a/libksirtet/lib/mp_interface.cpp +++ b/libksirtet/lib/mp_interface.cpp @@ -29,7 +29,7 @@ MPInterface::MPInterface(const MPGameInfo &_gameInfo, hbl = new TQHBoxLayout(this, 0, 5); hbl->setResizeMode( TQLayout::Fixed ); - _keyData = new KeyData(gameInfo.maxNbLocalPlayers, nbActions, data, TQT_TQOBJECT(this)); + _keyData = new KeyData(gameInfo.maxNbLocalPlayers, nbActions, data, this); } MPInterface::~MPInterface() @@ -64,9 +64,9 @@ void MPInterface::dialog() // net meeting TQPtrList<RemoteHostData> rhd; - rhd.setAutoDelete(TRUE); + rhd.setAutoDelete(true); if (cd.network) { - cId id(kapp->name(), gameInfo.gameId); + cId id(tdeApp->name(), gameInfo.gameId); MPOptionWidget *ow = newOptionWidget(); NetMeeting *nm; if (cd.server) nm = new ServerNetMeeting(id, cd.rhd, ow, rhd, this); @@ -95,7 +95,7 @@ void MPInterface::specialLocalGame(uint nbHumans, uint nbAIs) ConnectionData cd; BoardData bd; PlayerComboBox::Type t; - TDEConfigGroupSaver cg(kapp->config(), MP_GROUP); + TDEConfigGroupSaver cg(tdeApp->config(), MP_GROUP); for (uint i=0; i<(nbHumans+nbAIs); i++) { bd.type = (i<nbHumans ? PlayerComboBox::Human : PlayerComboBox::AI); bd.name = TQString(); @@ -110,8 +110,8 @@ void MPInterface::specialLocalGame(uint nbHumans, uint nbAIs) : i18n("AI %1").arg(i-nbHumans+1)); cd.rhd.bds += bd; } - cd.server = TRUE; - cd.network = FALSE; + cd.server = true; + cd.network = false; Q_ASSERT( (nbHumans+nbAIs)<=gameInfo.maxNbLocalPlayers ); Q_ASSERT( gameInfo.AIAllowed || nbAIs==0 ); @@ -155,7 +155,7 @@ void MPInterface::createLocalGame(const ConnectionData &cd) d.ptr = newBoard(i); hbl->addWidget(d.ptr); d.ptr->show(); - connect(d.ptr, TQT_SIGNAL(enableKeys(bool)), TQT_SLOT(enableKeys(bool))); + connect(d.ptr, TQ_SIGNAL(enableKeys(bool)), TQ_SLOT(enableKeys(bool))); boards += d; } @@ -255,15 +255,15 @@ void MPInterface::hostDisconnected(uint, const TQString &msg) errorBox(msg, TQString(), this); if ( !disconnected ) { // to avoid multiple calls - disconnected = TRUE; + disconnected = true; // the zero timer is used to be outside the "internal" class - TQTimer::singleShot(0, this, TQT_SLOT(singleHumanSlot())); + TQTimer::singleShot(0, this, TQ_SLOT(singleHumanSlot())); } } void MPInterface::singleHumanSlot() { - disconnected = FALSE; + disconnected = false; singleHuman(); } diff --git a/libksirtet/lib/mp_interface.h b/libksirtet/lib/mp_interface.h index 3ae8a0bc..968d3408 100644 --- a/libksirtet/lib/mp_interface.h +++ b/libksirtet/lib/mp_interface.h @@ -75,7 +75,7 @@ typedef struct { */ class MPInterface : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/mp_option.h b/libksirtet/lib/mp_option.h index dc4bbd15..adf78125 100644 --- a/libksirtet/lib/mp_option.h +++ b/libksirtet/lib/mp_option.h @@ -34,7 +34,7 @@ */ class MPOptionWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/mp_simple_board.cpp b/libksirtet/lib/mp_simple_board.cpp index c0828f1e..a7e7ab64 100644 --- a/libksirtet/lib/mp_simple_board.cpp +++ b/libksirtet/lib/mp_simple_board.cpp @@ -49,19 +49,19 @@ void MPSimpleBoard::pauseFlag() void MPSimpleBoard::gameOverFlag() { Q_ASSERT( BS_Play ); - _stop(TRUE); + _stop(true); state = BS_Stop; } void MPSimpleBoard::stopFlag() { - _stop(FALSE); + _stop(false); state = BS_Standby; } void MPSimpleBoard::_stop(bool gameover) { - if ( state==BS_Pause ) _pauseFlag(FALSE); + if ( state==BS_Pause ) _pauseFlag(false); emit enableKeys(false); _stopFlag(gameover); } diff --git a/libksirtet/lib/mp_simple_board.h b/libksirtet/lib/mp_simple_board.h index f261b30d..b1782bb9 100644 --- a/libksirtet/lib/mp_simple_board.h +++ b/libksirtet/lib/mp_simple_board.h @@ -4,11 +4,11 @@ #include "mp_board.h" #include "mp_simple_types.h" -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT MPSimpleBoard : public MPBoard +class TDE_EXPORT MPSimpleBoard : public MPBoard { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp index 7058b8eb..831d9daa 100644 --- a/libksirtet/lib/mp_simple_interface.cpp +++ b/libksirtet/lib/mp_simple_interface.cpp @@ -21,7 +21,7 @@ void MPSimpleInterface::init() { if ( server() ) { state = SS_Standby; - first_init = TRUE; + first_init = true; } _init(); } @@ -73,7 +73,7 @@ void MPSimpleInterface::dataFromServer(TQDataStream &s) switch (scf.value()) { case SC_Flag::Stop: KMessageBox::information(this, i18n("Server has left game!")); - TQTimer::singleShot(0, this, TQT_SLOT(singleHuman())); + TQTimer::singleShot(0, this, TQ_SLOT(singleHuman())); return; case SC_Flag::GameOver: _readGameOverData(s); @@ -90,8 +90,8 @@ void MPSimpleInterface::treatData() case SS_Pause: break; case SS_Stop: treatStop(); break; case SS_Standby: break; - case SS_PauseAsked: treatPause(TRUE); break; - case SS_UnpauseAsked: treatPause(FALSE); break; + case SS_PauseAsked: treatPause(true); break; + case SS_UnpauseAsked: treatPause(false); break; } } @@ -101,7 +101,7 @@ void MPSimpleInterface::treatInit() if (first_init) { _firstInit(); - first_init = FALSE; + first_init = false; } IO_Flag f(IO_Flag::Init); diff --git a/libksirtet/lib/mp_simple_interface.h b/libksirtet/lib/mp_simple_interface.h index 94f568d6..e2ab4430 100644 --- a/libksirtet/lib/mp_simple_interface.h +++ b/libksirtet/lib/mp_simple_interface.h @@ -6,7 +6,7 @@ class MPSimpleInterface : public MPInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/pline.cpp b/libksirtet/lib/pline.cpp index f685181a..587f1f2f 100644 --- a/libksirtet/lib/pline.cpp +++ b/libksirtet/lib/pline.cpp @@ -20,8 +20,8 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, /* TriCheckBox */ tcb = new MeetingCheckBox(MeetingCheckBox::Ready, isOwner, serverIsReader, this); - if ( !XOR(isOwner, serverIsReader) ) tcb->setEnabled(FALSE); - else connect(tcb, TQT_SIGNAL(changed(int)), TQT_SLOT(_typeChanged(int))); + if ( !XOR(isOwner, serverIsReader) ) tcb->setEnabled(false); + else connect(tcb, TQ_SIGNAL(changed(int)), TQ_SLOT(_typeChanged(int))); hbl->addWidget(tcb); /* Name */ @@ -31,7 +31,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, lname->setLineWidth(2); lname->setMidLineWidth(3); TQFont f = lname->font(); - f.setBold(TRUE); + f.setBold(true); lname->setFont(f); lname->setFixedSize(lname->fontMetrics().maxWidth()*NAME_MAX_LENGTH, lname->sizeHint().height()); @@ -52,8 +52,8 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine, qle->setFont( TQFont("fixed", 12, TQFont::Bold) ); qle->setFixedSize(qle->fontMetrics().maxWidth()*TALKER_MAX_LENGTH, qle->sizeHint().height()); - connect(qle, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(_textChanged(const TQString &))); + connect(qle, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(_textChanged(const TQString &))); qle->setEnabled(isOwner); hbl->addWidget(qle); } @@ -95,7 +95,7 @@ PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt, /* CheckBox */ pcb = new PlayerComboBox(type, canBeEmpty, acceptAI, this); - connect(pcb, TQT_SIGNAL(changed(int)), TQT_SLOT(typeChangedSlot(int))); + connect(pcb, TQ_SIGNAL(changed(int)), TQ_SLOT(typeChangedSlot(int))); hbl->addWidget(pcb); /* Name */ @@ -107,7 +107,7 @@ PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt, /* settings button */ setting = new TQPushButton(i18n("Settings"), this); - connect(setting, TQT_SIGNAL(clicked()), TQT_SLOT(setSlot())); + connect(setting, TQ_SIGNAL(clicked()), TQ_SLOT(setSlot())); hbl->addWidget(setting); typeChangedSlot(type); @@ -131,7 +131,7 @@ void PlayerLine::setSlot() GWidgetList::GWidgetList(uint interval, TQWidget *parent, const char * name) : TQWidget(parent, name), vbl(this, interval) { - widgets.setAutoDelete(TRUE); + widgets.setAutoDelete(true); } void GWidgetList::append(TQWidget *wi) diff --git a/libksirtet/lib/pline.h b/libksirtet/lib/pline.h index 4fcbf028..0a214e72 100644 --- a/libksirtet/lib/pline.h +++ b/libksirtet/lib/pline.h @@ -15,7 +15,7 @@ class TQPushButton; /** Internal class : display a "player line" in netmeeting. */ class MeetingLine : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -51,7 +51,7 @@ class MeetingLine : public TQFrame class PlayerLine : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -82,7 +82,7 @@ class PlayerLine : public TQFrame /** Internal class : scrolable list of widgets. */ class GWidgetList : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/libksirtet/lib/smanager.h b/libksirtet/lib/smanager.h index 59dd0edb..3c050a6c 100644 --- a/libksirtet/lib/smanager.h +++ b/libksirtet/lib/smanager.h @@ -57,10 +57,10 @@ class SocketManager */ void remove(uint i, bool deleteSocket); - /** @return TRUE if it is possible to write to all the writeable sockets. */ + /** @return true if it is possible to write to all the writeable sockets. */ bool canWriteAll(uint sec = 0, uint usec = 0); - /** @return TRUE if it is possible to write to the specified socket. */ + /** @return true if it is possible to write to the specified socket. */ bool canWrite(uint i, uint sec = 0, uint usec = 0); Stream &commonWritingStream() { return writing; } diff --git a/libksirtet/lib/socket.cpp b/libksirtet/lib/socket.cpp index 6defc94b..0298645c 100644 --- a/libksirtet/lib/socket.cpp +++ b/libksirtet/lib/socket.cpp @@ -28,7 +28,7 @@ Socket::Socket(KExtendedSocket *s, bool createNotifier, if (createNotifier) { _notifier = new TQSocketNotifier(s->fd(), TQSocketNotifier::Read, parent, name); - _notifier->setEnabled(FALSE); + _notifier->setEnabled(false); } } diff --git a/libksirtet/lib/socket.h b/libksirtet/lib/socket.h index 01dac726..f6e3f3be 100644 --- a/libksirtet/lib/socket.h +++ b/libksirtet/lib/socket.h @@ -11,7 +11,7 @@ class Socket { public: - Socket(KExtendedSocket *, bool createNotifier = FALSE, + Socket(KExtendedSocket *, bool createNotifier = false, TQObject *parent = 0, const char *name = 0); /** close the socket */ @@ -33,7 +33,7 @@ class Socket /** * Write data contained in the writing stream to the socket. * It clears the stream. - * @return TRUE if all was written without error. + * @return true if all was written without error. */ bool write(); bool write(const TQByteArray &a); diff --git a/libksirtet/lib/types.cpp b/libksirtet/lib/types.cpp index ae91c4d5..e6c3e836 100644 --- a/libksirtet/lib/types.cpp +++ b/libksirtet/lib/types.cpp @@ -169,25 +169,25 @@ Stream::Stream(int _mode) { setDevice(&buf); Q_ASSERT( _mode==IO_ReadOnly || _mode==IO_WriteOnly ); - buf.open((TQIODevice_OpenModeFlag)_mode); + buf.open(_mode); } void Stream::clear() { buf.close(); - buf.open((TQIODevice_OpenModeFlag)(mode | IO_Truncate)); + buf.open(mode | IO_Truncate); } void Stream::setArray(TQByteArray a) { buf.close(); buf.setBuffer(a); - buf.open((TQIODevice_OpenModeFlag)mode); + buf.open(mode); } bool ReadingStream::readOk() { - return ( TQT_TQIODEVICE(&buf)->status()==IO_Ok ); + return ( buf.status()==IO_Ok ); } void ReadingStream::clearRead() diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp index 68537602..5098938a 100644 --- a/libksirtet/lib/wizard.cpp +++ b/libksirtet/lib/wizard.cpp @@ -33,7 +33,7 @@ MPWizard::MPWizard(const MPGameInfo &gi, ConnectionData &_cd, TQWidget *parent, const char *name) -: KWizard(parent, name, TRUE), cd(_cd) +: KWizard(parent, name, true), cd(_cd) { // setupTypePage(); // #### REMOVE NETWORK GAMES UNTIL FIXED type = Local; @@ -43,13 +43,13 @@ MPWizard::MPWizard(const MPGameInfo &gi, ConnectionData &_cd, //----------------------------------------------------------------------------- void MPWizard::setupTypePage() { - TDEConfigGroupSaver cg(kapp->config(), MP_GROUP); + TDEConfigGroupSaver cg(tdeApp->config(), MP_GROUP); typePage = new TQVBox(this); typePage->setMargin(KDialogBase::marginHint()); TQVButtonGroup *vbg = new TQVButtonGroup(typePage); - connect(vbg, TQT_SIGNAL(clicked(int)), TQT_SLOT(typeChanged(int))); + connect(vbg, TQ_SIGNAL(clicked(int)), TQ_SLOT(typeChanged(int))); TQRadioButton *b; b = new TQRadioButton(i18n("Create a local game"), vbg); b = new TQRadioButton(i18n("Create a network game"), vbg); @@ -70,7 +70,7 @@ void MPWizard::setupTypePage() eport->setRange(MIN_USER_PORT, MAX_USER_PORT, 1, false); addPage(typePage, i18n("Choose Game Type")); - setHelpEnabled(typePage, FALSE); + setHelpEnabled(typePage, false); typeChanged(type); } @@ -81,13 +81,13 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi) localPage->setMargin(KDialogBase::marginHint()); wl = new WidgetList<PlayerLine>(5, localPage); - TQSignalMapper *husm = new TQSignalMapper(TQT_TQOBJECT(this)); - if (gi.humanSettingSlot) connect(husm, TQT_SIGNAL(mapped(int)), + TQSignalMapper *husm = new TQSignalMapper(this); + if (gi.humanSettingSlot) connect(husm, TQ_SIGNAL(mapped(int)), gi.humanSettingSlot); - TQSignalMapper *aism = new TQSignalMapper(TQT_TQOBJECT(this)); - if (gi.AISettingSlot) connect(aism, TQT_SIGNAL(mapped(int)), gi.AISettingSlot); + TQSignalMapper *aism = new TQSignalMapper(this); + if (gi.AISettingSlot) connect(aism, TQ_SIGNAL(mapped(int)), gi.AISettingSlot); - TDEConfigGroupSaver cg(kapp->config(), MP_GROUP); + TDEConfigGroupSaver cg(tdeApp->config(), MP_GROUP); TQString n; PlayerComboBox::Type type; PlayerLine *pl; @@ -101,21 +101,21 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi) pl = new PlayerLine(type, n, gi.humanSettingSlot, gi.AISettingSlot, i!=0, gi.AIAllowed, wl); - connect(pl, TQT_SIGNAL(typeChanged(int)), TQT_SLOT(lineTypeChanged(int))); - husm->setMapping(TQT_TQOBJECT(pl), i); - connect(pl, TQT_SIGNAL(setHuman()), husm, TQT_SLOT(map())); - aism->setMapping(TQT_TQOBJECT(pl), i); - connect(pl, TQT_SIGNAL(setAI()), aism, TQT_SLOT(map())); + connect(pl, TQ_SIGNAL(typeChanged(int)), TQ_SLOT(lineTypeChanged(int))); + husm->setMapping(pl, i); + connect(pl, TQ_SIGNAL(setHuman()), husm, TQ_SLOT(map())); + aism->setMapping(pl, i); + connect(pl, TQ_SIGNAL(setAI()), aism, TQ_SLOT(map())); wl->append(pl); } ((TQVBox *)localPage)->setSpacing(KDialogBase::spacingHint()); // keys = new TQPushButton(i18n("Configure Keys..."), localPage); -// connect(keys, TQT_SIGNAL(clicked()), TQT_SLOT(configureKeysSlot())); +// connect(keys, TQ_SIGNAL(clicked()), TQ_SLOT(configureKeysSlot())); addPage(localPage, i18n("Local Player's Settings")); - setHelpEnabled(localPage, FALSE); + setHelpEnabled(localPage, false); lineTypeChanged(0); } @@ -135,7 +135,7 @@ void MPWizard::typeChanged(int t) str = "localhost"; lserver->setText(i18n("Hostname:")); } else { - TDEConfigGroupSaver cg(kapp->config(), MP_GROUP); + TDEConfigGroupSaver cg(tdeApp->config(), MP_GROUP); str = cg.config()->readEntry(MP_SERVER_ADDRESS, i18n("the.server.address")); lserver->setText(i18n("Server address:")); @@ -148,10 +148,10 @@ void MPWizard::typeChanged(int t) void MPWizard::lineTypeChanged(int) { - bool b = FALSE; + bool b = false; for (uint i=0; i<wl->size(); i++) if ( wl->widget(i)->type()==PlayerComboBox::Human ) { - b = TRUE; + b = true; break; } // keys->setEnabled(b); @@ -159,7 +159,7 @@ void MPWizard::lineTypeChanged(int) void MPWizard::accept() { - TDEConfigGroupSaver cg(kapp->config(), MP_GROUP); + TDEConfigGroupSaver cg(tdeApp->config(), MP_GROUP); cd.network = ( type!=Local ); cd.server = ( type!=Client ); @@ -216,7 +216,7 @@ void MPWizard::accept() void MPWizard::showPage(TQWidget *page) { - if ( page==localPage ) setFinishEnabled(localPage, TRUE); + if ( page==localPage ) setFinishEnabled(localPage, true); KWizard::showPage(page); } diff --git a/libksirtet/lib/wizard.h b/libksirtet/lib/wizard.h index 42a1b871..9a74ae21 100644 --- a/libksirtet/lib/wizard.h +++ b/libksirtet/lib/wizard.h @@ -18,7 +18,7 @@ class ConnectionData; class MPWizard : public KWizard { - Q_OBJECT + TQ_OBJECT public: |