diff options
Diffstat (limited to 'libtdegames')
67 files changed, 334 insertions, 338 deletions
diff --git a/libtdegames/Makefile.am b/libtdegames/Makefile.am index 7fec27d4..67fbed02 100644 --- a/libtdegames/Makefile.am +++ b/libtdegames/Makefile.am @@ -18,6 +18,6 @@ METASOURCES = AUTO SUBDIRS = carddecks highscore kgame pics messages: - $(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/libtdegames.pot + $(XGETTEXT) `find . -name \*.h -o -name \*.cpp` -o $(podir)/libtdegames.pot include ../admin/Doxyfile.am diff --git a/libtdegames/TODO b/libtdegames/TODO index 136c4fdd..5acd38a6 100644 --- a/libtdegames/TODO +++ b/libtdegames/TODO @@ -5,6 +5,6 @@ - 10.07.2001: global decks/carddirs need extensive testing -These pertain to the highscore widget -The Ok button when adding a name should be enabled when the lineedit is filled with a QString of length() > 0 +The Ok button when adding a name should be enabled when the lineedit is filled with a TQString of length() > 0 The lineedit by default should come up with the user name that is loged in. diff --git a/libtdegames/highscore/kexthighscore.h b/libtdegames/highscore/kexthighscore.h index e4412fe6..fc8c1a25 100644 --- a/libtdegames/highscore/kexthighscore.h +++ b/libtdegames/highscore/kexthighscore.h @@ -40,42 +40,42 @@ extern ManagerPrivate *internal; /** * Get the current game type. */ -KDE_EXPORT uint gameType(); +TDE_EXPORT uint gameType(); /** * Set the current game type. */ -KDE_EXPORT void setGameType(uint gameType); +TDE_EXPORT void setGameType(uint gameType); /** * Configure the highscores. * @return true if the configuration has been modified and saved */ -KDE_EXPORT bool configure(TQWidget *parent); +TDE_EXPORT bool configure(TQWidget *parent); /** * Show the highscores lists. */ -KDE_EXPORT void show(TQWidget *parent); +TDE_EXPORT void show(TQWidget *parent); /** * Submit a score. See @ref Manager for usage example. * * @param widget a widget used as parent for error message box. */ -KDE_EXPORT void submitScore(const Score &score, TQWidget *widget); +TDE_EXPORT void submitScore(const Score &score, TQWidget *widget); /** * @return the last score in the local list of highscores. The worst possible * score if there are less items than the maximum number. */ -KDE_EXPORT Score lastScore(); +TDE_EXPORT Score lastScore(); /** * @return the first score in the local list of highscores (the worst possible * score if there is no entry). */ -KDE_EXPORT Score firstScore(); +TDE_EXPORT Score firstScore(); /** * This class manages highscores and players entries (several players can @@ -136,7 +136,7 @@ KDE_EXPORT Score firstScore(); * and the value of the items that you have optionnally added * with Score::setData() ; player name and date are set automatically. */ -class KDE_EXPORT Manager +class TDE_EXPORT Manager { public: /** @@ -195,7 +195,7 @@ class KDE_EXPORT Manager /** @obsolete */ // KDE4 remove this - void showStatistics(bool show) KDE_DEPRECATED; + void showStatistics(bool show) TDE_DEPRECATED; /** * @since 3.3 diff --git a/libtdegames/highscore/kexthighscore_gui.cpp b/libtdegames/highscore/kexthighscore_gui.cpp index 5b7e08c0..286fb97a 100644 --- a/libtdegames/highscore/kexthighscore_gui.cpp +++ b/libtdegames/highscore/kexthighscore_gui.cpp @@ -130,7 +130,7 @@ HighscoresWidget::HighscoresWidget(TQWidget *parent) TQVBoxLayout *vbox = new TQVBoxLayout(this, KDialogBase::spacingHint()); _tw = new TQTabWidget(this); - connect(_tw, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(tabChanged())); + connect(_tw, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(tabChanged())); vbox->addWidget(_tw); // scores tab @@ -160,15 +160,15 @@ HighscoresWidget::HighscoresWidget(TQWidget *parent) KURL url = internal->queryURL(ManagerPrivate::Scores); _scoresUrl = new KURLLabel(url.url(), i18n("View world-wide highscores"), this); - connect(_scoresUrl, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(showURL(const TQString &))); + connect(_scoresUrl, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(showURL(const TQString &))); vbox->addWidget(_scoresUrl); url = internal->queryURL(ManagerPrivate::Players); _playersUrl = new KURLLabel(url.url(), i18n("View world-wide players"), this); - connect(_playersUrl, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(showURL(const TQString &))); + connect(_playersUrl, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(showURL(const TQString &))); vbox->addWidget(_playersUrl); } } @@ -215,8 +215,8 @@ HighscoresDialog::HighscoresDialog(int rank, TQWidget *parent) if ( i==internal->gameType() ) createPage(w); } - connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget *)), - TQT_SLOT(createPage(TQWidget *))); + connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget *)), + TQ_SLOT(createPage(TQWidget *))); showPage(internal->gameType()); } else { TQVBoxLayout *vbox = new TQVBoxLayout(plainPage()); @@ -234,7 +234,7 @@ void HighscoresDialog::createPage(TQWidget *page) int i = (several ? pageIndex(page) : 0); if ( _widgets[i]==0 ) { _widgets[i] = new HighscoresWidget(page); - connect(_widgets[i], TQT_SIGNAL(tabChanged(int)), TQT_SLOT(tabChanged(int))); + connect(_widgets[i], TQ_SIGNAL(tabChanged(int)), TQ_SLOT(tabChanged(int))); } uint type = internal->gameType(); if (several) internal->setGameType(i); @@ -376,10 +376,10 @@ ConfigDialog::ConfigDialog(TQWidget *parent) TQLabel *label = new TQLabel(i18n("Nickname:"), page); pageTop->addWidget(label, 0, 0); _nickname = new TQLineEdit(page); - connect(_nickname, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(modifiedSlot())); - connect(_nickname, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(nickNameChanged(const TQString &))); + connect(_nickname, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(modifiedSlot())); + connect(_nickname, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(nickNameChanged(const TQString &))); _nickname->setMaxLength(16); pageTop->addWidget(_nickname, 0, 1); @@ -387,16 +387,16 @@ ConfigDialog::ConfigDialog(TQWidget *parent) label = new TQLabel(i18n("Comment:"), page); pageTop->addWidget(label, 1, 0); _comment = new TQLineEdit(page); - connect(_comment, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(modifiedSlot())); + connect(_comment, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(modifiedSlot())); _comment->setMaxLength(50); pageTop->addWidget(_comment, 1, 1); if (tab) { _WWHEnabled = new TQCheckBox(i18n("World-wide highscores enabled"), page); - connect(_WWHEnabled, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(modifiedSlot())); + connect(_WWHEnabled, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(modifiedSlot())); pageTop->addMultiCellWidget(_WWHEnabled, 2, 2, 0, 1); // advanced tab @@ -421,7 +421,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent) KGuiItem gi = KStdGuiItem::clear(); gi.setText(i18n("Remove")); _removeButton = new KPushButton(gi, grid); - connect(_removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeSlot())); + connect(_removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeSlot())); } load(); @@ -533,7 +533,7 @@ AskNameDialog::AskNameDialog(TQWidget *parent) hbox->addWidget(label); _edit = new TQLineEdit(plainPage()); _edit->setFocus(); - connect(_edit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(nameChanged())); + connect(_edit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(nameChanged())); hbox->addWidget(_edit); top->addSpacing(spacingHint()); diff --git a/libtdegames/highscore/kexthighscore_gui.h b/libtdegames/highscore/kexthighscore_gui.h index 0749d682..d0f742f1 100644 --- a/libtdegames/highscore/kexthighscore_gui.h +++ b/libtdegames/highscore/kexthighscore_gui.h @@ -57,7 +57,7 @@ class ShowItem : public TDEListViewItem class ScoresList : public TDEListView { - Q_OBJECT + TQ_OBJECT public: ScoresList(TQWidget *parent); @@ -76,7 +76,7 @@ class ScoresList : public TDEListView //----------------------------------------------------------------------------- class HighscoresList : public ScoresList { - Q_OBJECT + TQ_OBJECT public: HighscoresList(TQWidget *parent); @@ -89,7 +89,7 @@ class HighscoresList : public ScoresList class HighscoresWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: HighscoresWidget(TQWidget *parent); @@ -115,7 +115,7 @@ class HighscoresWidget : public TQWidget class HighscoresDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: HighscoresDialog(int rank, TQWidget *parent); @@ -135,7 +135,7 @@ class HighscoresDialog : public KDialogBase //----------------------------------------------------------------------------- class LastMultipleScoresList : public ScoresList { - Q_OBJECT + TQ_OBJECT public: LastMultipleScoresList(const TQValueVector<Score> &, TQWidget *parent); @@ -150,7 +150,7 @@ private: class TotalMultipleScoresList : public ScoresList { - Q_OBJECT + TQ_OBJECT public: TotalMultipleScoresList(const TQValueVector<Score> &, TQWidget *parent); @@ -166,7 +166,7 @@ private: //----------------------------------------------------------------------------- class ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ConfigDialog(TQWidget *parent); @@ -194,7 +194,7 @@ class ConfigDialog : public KDialogBase //----------------------------------------------------------------------------- class AskNameDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AskNameDialog(TQWidget *parent); diff --git a/libtdegames/highscore/kexthighscore_item.h b/libtdegames/highscore/kexthighscore_item.h index ac24ef83..72a5911b 100644 --- a/libtdegames/highscore/kexthighscore_item.h +++ b/libtdegames/highscore/kexthighscore_item.h @@ -37,7 +37,7 @@ namespace KExtHighscore * a highscore element (such as the score, the date, ...) or a player * info (such as the player name, the best score, ...). */ -class KDE_EXPORT Item +class TDE_EXPORT Item { public: /** @@ -172,7 +172,7 @@ enum ScoreType { Won = 0, Lost = -1, Draw = -2 }; * This class contains data for a score. You should not inherit from * this class but reimplement the methods in Highscores. */ -class KDE_EXPORT Score +class TDE_EXPORT Score { public: Score(ScoreType type = Won); @@ -241,8 +241,8 @@ class KDE_EXPORT Score friend TQDataStream &operator >>(TQDataStream &stream, Score &score); }; -KDE_EXPORT TQDataStream &operator <<(TQDataStream &stream, const Score &score); -KDE_EXPORT TQDataStream &operator >>(TQDataStream &stream, Score &score); +TDE_EXPORT TQDataStream &operator <<(TQDataStream &stream, const Score &score); +TDE_EXPORT TQDataStream &operator >>(TQDataStream &stream, Score &score); /** * This class is used to store and show scores for multiplayer games. @@ -264,7 +264,7 @@ KDE_EXPORT TQDataStream &operator >>(TQDataStream &stream, Score &score); * ms.addScore(1, score); * </pre> */ -class KDE_EXPORT MultiplayerScores +class TDE_EXPORT MultiplayerScores { public: MultiplayerScores(); @@ -309,8 +309,8 @@ class KDE_EXPORT MultiplayerScores MultiplayerScores &score); }; -KDE_EXPORT TQDataStream &operator <<(TQDataStream &stream, const MultiplayerScores &score); -KDE_EXPORT TQDataStream &operator >>(TQDataStream &stream, MultiplayerScores &score); +TDE_EXPORT TQDataStream &operator <<(TQDataStream &stream, const MultiplayerScores &score); +TDE_EXPORT TQDataStream &operator >>(TQDataStream &stream, MultiplayerScores &score); } // namespace diff --git a/libtdegames/highscore/kexthighscore_tab.cpp b/libtdegames/highscore/kexthighscore_tab.cpp index e48db436..b45a86b0 100644 --- a/libtdegames/highscore/kexthighscore_tab.cpp +++ b/libtdegames/highscore/kexthighscore_tab.cpp @@ -46,7 +46,7 @@ PlayersCombo::PlayersCombo(TQWidget *parent, const char *name) for (uint i = 0; i<p.nbEntries(); i++) insertItem(p.prettyName(i)); insertItem(TQString("<") + i18n("all") + '>'); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(activatedSlot(int))); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(activatedSlot(int))); } void PlayersCombo::activatedSlot(int i) @@ -75,9 +75,9 @@ AdditionalTab::AdditionalTab(TQWidget *parent, const char *name) TQLabel *label = new TQLabel(i18n("Select player:"), this); hbox->addWidget(label); _combo = new PlayersCombo(this); - connect(_combo, TQT_SIGNAL(playerSelected(uint)), - TQT_SLOT(playerSelected(uint))); - connect(_combo, TQT_SIGNAL(allSelected()), TQT_SLOT(allSelected())); + connect(_combo, TQ_SIGNAL(playerSelected(uint)), + TQ_SLOT(playerSelected(uint))); + connect(_combo, TQ_SIGNAL(allSelected()), TQ_SLOT(allSelected())); hbox->addWidget(_combo); hbox->addStretch(1); } diff --git a/libtdegames/highscore/kexthighscore_tab.h b/libtdegames/highscore/kexthighscore_tab.h index bb84f155..3ba1c720 100644 --- a/libtdegames/highscore/kexthighscore_tab.h +++ b/libtdegames/highscore/kexthighscore_tab.h @@ -33,7 +33,7 @@ namespace KExtHighscore //----------------------------------------------------------------------------- class PlayersCombo : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: PlayersCombo(TQWidget *parent = 0, const char *name = 0); @@ -52,7 +52,7 @@ class PlayersCombo : public TQComboBox //----------------------------------------------------------------------------- class AdditionalTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: AdditionalTab(TQWidget *parent, const char *name); @@ -75,7 +75,7 @@ class AdditionalTab : public TQWidget //----------------------------------------------------------------------------- class StatisticsTab : public AdditionalTab { - Q_OBJECT + TQ_OBJECT public: StatisticsTab(TQWidget *parent); @@ -101,7 +101,7 @@ class StatisticsTab : public AdditionalTab //----------------------------------------------------------------------------- class HistogramTab : public AdditionalTab { - Q_OBJECT + TQ_OBJECT public: HistogramTab(TQWidget *parent); diff --git a/libtdegames/highscore/khighscore.h b/libtdegames/highscore/khighscore.h index 4cf5778c..62451fc8 100644 --- a/libtdegames/highscore/khighscore.h +++ b/libtdegames/highscore/khighscore.h @@ -81,9 +81,9 @@ class KHighscorePrivate; * Easy, what? * @author Andreas Beckermann <b_mann@gmx.de> **/ -class KDE_EXPORT KHighscore : public TQObject +class TDE_EXPORT KHighscore : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @obsolete diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp index 518d0084..0f35c191 100644 --- a/libtdegames/highscore/kscoredialog.cpp +++ b/libtdegames/highscore/kscoredialog.cpp @@ -90,7 +90,7 @@ KScoreDialog::KScoreDialog(int fields, TQWidget *parent, const char *oname) d->key[Score] = "Score"; d->page = makeMainWidget(); - connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotGotName())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotGotName())); } KScoreDialog::~KScoreDialog() @@ -154,7 +154,7 @@ void KScoreDialog::setupDialog() } } - KSeparator *sep = new KSeparator(Qt::Horizontal, d->page); + KSeparator *sep = new KSeparator(TQt::Horizontal, d->page); d->layout->addMultiCellWidget(sep, 4, 4, 0, d->nrCols-1); d->labels.resize(d->nrCols * 10); @@ -239,8 +239,8 @@ void KScoreDialog::aboutToShow() stack->addWidget(d->edit); stack->raiseWidget(d->edit); d->edit->setFocus(); - connect(d->edit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotGotReturn())); + connect(d->edit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotGotReturn())); } else { @@ -365,7 +365,7 @@ void KScoreDialog::show() void KScoreDialog::slotGotReturn() { - TQTimer::singleShot(0, this, TQT_SLOT(slotGotName())); + TQTimer::singleShot(0, this, TQ_SLOT(slotGotName())); } void KScoreDialog::slotGotName() diff --git a/libtdegames/highscore/kscoredialog.h b/libtdegames/highscore/kscoredialog.h index 51cdb479..6789654c 100644 --- a/libtdegames/highscore/kscoredialog.h +++ b/libtdegames/highscore/kscoredialog.h @@ -37,8 +37,8 @@ class TQWidgetStack; /** * A simple high score dialog. */ -class KDE_EXPORT KScoreDialog : public KDialogBase { - Q_OBJECT +class TDE_EXPORT KScoreDialog : public KDialogBase { + TQ_OBJECT public: diff --git a/libtdegames/highscore/tdeconfigrawbackend.h b/libtdegames/highscore/tdeconfigrawbackend.h index 7e8f2790..fdaeb88a 100644 --- a/libtdegames/highscore/tdeconfigrawbackend.h +++ b/libtdegames/highscore/tdeconfigrawbackend.h @@ -47,7 +47,7 @@ private: class KRawConfig : public KSimpleConfig { - Q_OBJECT + TQ_OBJECT public: KRawConfig(int fd, bool readOnly) diff --git a/libtdegames/kcanvasrootpixmap.cpp b/libtdegames/kcanvasrootpixmap.cpp index 0976e7ef..fc75c408 100644 --- a/libtdegames/kcanvasrootpixmap.cpp +++ b/libtdegames/kcanvasrootpixmap.cpp @@ -26,8 +26,8 @@ KCanvasRootPixmap::KCanvasRootPixmap(TQCanvasView *view, const char *name) : KRootPixmap(view, name), _view(view) { setCustomPainting(true); - connect(this, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), - TQT_SLOT(backgroundUpdatedSlot(const TQPixmap &))); + connect(this, TQ_SIGNAL(backgroundUpdated(const TQPixmap &)), + TQ_SLOT(backgroundUpdatedSlot(const TQPixmap &))); } void KCanvasRootPixmap::backgroundUpdatedSlot(const TQPixmap &pixmap) diff --git a/libtdegames/kcanvasrootpixmap.h b/libtdegames/kcanvasrootpixmap.h index 566f50d2..cff176b3 100644 --- a/libtdegames/kcanvasrootpixmap.h +++ b/libtdegames/kcanvasrootpixmap.h @@ -37,9 +37,9 @@ class TQCanvasView; * <li>other views of the canvas will have the same background pixmap.</li> * </ul> */ -class KDE_EXPORT KCanvasRootPixmap : public KRootPixmap +class TDE_EXPORT KCanvasRootPixmap : public KRootPixmap { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp index be1c7fef..77b63205 100644 --- a/libtdegames/kcarddialog.cpp +++ b/libtdegames/kcarddialog.cpp @@ -274,7 +274,7 @@ void KCardDialog::setupDialog(bool showResizeBox) TQHBoxLayout* layout = new TQHBoxLayout(cardLayout); // Deck iconview - TQGroupBox* grp1 = new TQGroupBox(1,Qt::Horizontal, i18n("Choose Backside"), plainPage()); + TQGroupBox* grp1 = new TQGroupBox(1,TQt::Horizontal, i18n("Choose Backside"), plainPage()); layout->addWidget(grp1); d->deckIconView = new TDEIconView(grp1,"decks"); @@ -304,8 +304,8 @@ void KCardDialog::setupDialog(bool showResizeBox) d->randomDeck = new TQCheckBox(plainPage()); d->randomDeck->setChecked(false); - connect(d->randomDeck, TQT_SIGNAL(toggled(bool)), this, - TQT_SLOT(slotRandomDeckToggled(bool))); + connect(d->randomDeck, TQ_SIGNAL(toggled(bool)), this, + TQ_SLOT(slotRandomDeckToggled(bool))); d->randomDeck->setText(i18n("Random backside")); l->addWidget(d->randomDeck, 0, AlignTop|AlignHCenter); @@ -315,18 +315,18 @@ void KCardDialog::setupDialog(bool showResizeBox) l->addWidget(d->globalDeck, 0, AlignTop|AlignHCenter); TQPushButton* b = new TQPushButton(i18n("Make Backside Global"), plainPage()); - connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSetGlobalDeck())); + connect(b, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSetGlobalDeck())); l->addWidget(b, 0, AlignTop|AlignHCenter); - connect(d->deckIconView,TQT_SIGNAL(clicked(TQIconViewItem *)), - this,TQT_SLOT(slotDeckClicked(TQIconViewItem *))); + connect(d->deckIconView,TQ_SIGNAL(clicked(TQIconViewItem *)), + this,TQ_SLOT(slotDeckClicked(TQIconViewItem *))); } if (! (flags() & NoCards)) { // Cards iconview TQHBoxLayout* layout = new TQHBoxLayout(cardLayout); - TQGroupBox* grp2 = new TQGroupBox(1,Qt::Horizontal, i18n("Choose Frontside"), plainPage()); + TQGroupBox* grp2 = new TQGroupBox(1,TQt::Horizontal, i18n("Choose Frontside"), plainPage()); layout->addWidget(grp2); d->cardIconView =new TDEIconView(grp2,"cards"); @@ -354,8 +354,8 @@ void KCardDialog::setupDialog(bool showResizeBox) d->randomCardDir = new TQCheckBox(plainPage()); d->randomCardDir->setChecked(false); - connect(d->randomCardDir, TQT_SIGNAL(toggled(bool)), this, - TQT_SLOT(slotRandomCardDirToggled(bool))); + connect(d->randomCardDir, TQ_SIGNAL(toggled(bool)), this, + TQ_SLOT(slotRandomCardDirToggled(bool))); d->randomCardDir->setText(i18n("Random frontside")); l->addWidget(d->randomCardDir, 0, AlignTop|AlignHCenter); @@ -365,11 +365,11 @@ void KCardDialog::setupDialog(bool showResizeBox) l->addWidget(d->globalCardDir, 0, AlignTop|AlignHCenter); TQPushButton* b = new TQPushButton(i18n("Make Frontside Global"), plainPage()); - connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSetGlobalCardDir())); + connect(b, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSetGlobalCardDir())); l->addWidget(b, 0, AlignTop|AlignHCenter); - connect(d->cardIconView,TQT_SIGNAL(clicked(TQIconViewItem *)), - this,TQT_SLOT(slotCardClicked(TQIconViewItem *))); + connect(d->cardIconView,TQ_SIGNAL(clicked(TQIconViewItem *)), + this,TQ_SLOT(slotCardClicked(TQIconViewItem *))); } // Insert deck icons @@ -423,7 +423,7 @@ void KCardDialog::setupDialog(bool showResizeBox) // larger but i want the complete pixmap to be displayed. the dialog is not // resized if you make the pixmap smaller again. TQVBoxLayout* layout = new TQVBoxLayout(topLayout); - TQGroupBox* grp = new TQGroupBox(1,Qt::Horizontal, i18n("Resize Cards"), plainPage()); + TQGroupBox* grp = new TQGroupBox(1,TQt::Horizontal, i18n("Resize Cards"), plainPage()); layout->setResizeMode(TQLayout::Fixed); layout->addWidget(grp); TQWidget* box = new TQWidget(grp); @@ -431,13 +431,13 @@ void KCardDialog::setupDialog(bool showResizeBox) TQVBoxLayout* boxLayout = new TQVBoxLayout(hbox); hbox->addStretch(0); - d->scaleSlider = new TQSlider(1, SLIDER_MAX, 1, (-1000+SLIDER_MIN+SLIDER_MAX),Qt::Horizontal, box); + d->scaleSlider = new TQSlider(1, SLIDER_MAX, 1, (-1000+SLIDER_MIN+SLIDER_MAX),TQt::Horizontal, box); d->scaleSlider->setMinValue(SLIDER_MIN); - connect(d->scaleSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotCardResized(int))); + connect(d->scaleSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotCardResized(int))); boxLayout->addWidget(d->scaleSlider, 0, AlignLeft); TQPushButton* b = new TQPushButton(i18n("Default Size"), box); - connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotDefaultSize())); + connect(b, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotDefaultSize())); boxLayout->addWidget(b, 0, AlignLeft); TQLabel* l = new TQLabel(i18n("Preview:"), box); diff --git a/libtdegames/kcarddialog.h b/libtdegames/kcarddialog.h index b80e87cd..cdf75b78 100644 --- a/libtdegames/kcarddialog.h +++ b/libtdegames/kcarddialog.h @@ -87,9 +87,9 @@ class KCardDialogPrivate; * @author Martin Heni <martin@heni-online.de> * @version $Id$ */ -class KDE_EXPORT KCardDialog : public KDialogBase +class TDE_EXPORT KCardDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kchat.h b/libtdegames/kchat.h index 59e2e55a..b623f606 100644 --- a/libtdegames/kchat.h +++ b/libtdegames/kchat.h @@ -33,9 +33,9 @@ class KChatPrivate; * * @author Andreas Beckermann <b_mann@gmx.de> **/ -class KDE_EXPORT KChat : public KChatBase +class TDE_EXPORT KChat : public KChatBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp index 17f831a0..4ebd425b 100644 --- a/libtdegames/kchatbase.cpp +++ b/libtdegames/kchatbase.cpp @@ -206,12 +206,12 @@ void KChatBase::init(bool noComboBox) TQVBoxLayout* l = new TQVBoxLayout(this); d->mBox = new TQListBox(this); - connect(d->mBox, TQT_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint&)), - this, TQT_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint&))); + connect(d->mBox, TQ_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint&)), + this, TQ_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint&))); l->addWidget(d->mBox); d->mBox->setVScrollBarMode(TQScrollView::AlwaysOn); d->mBox->setHScrollBarMode(TQScrollView::AlwaysOff); - d->mBox->setFocusPolicy(TQ_NoFocus); + d->mBox->setFocusPolicy(TQWidget::NoFocus); // d->mBox->setSelectionMode(TQListBox::NoSelection); d->mBox->setSelectionMode(TQListBox::Single); @@ -223,7 +223,7 @@ void KChatBase::init(bool noComboBox) d->mEdit->setTrapReturnKey(true); d->mEdit->completionObject(); // add the completion object d->mEdit->setCompletionMode(TDEGlobalSettings::CompletionNone); - connect(d->mEdit, TQT_SIGNAL(returnPressed(const TQString&)), this, TQT_SLOT(slotReturnPressed(const TQString&))); + connect(d->mEdit, TQ_SIGNAL(returnPressed(const TQString&)), this, TQ_SLOT(slotReturnPressed(const TQString&))); h->addWidget(d->mEdit); if (!noComboBox) { @@ -399,7 +399,7 @@ void KChatBase::slotReturnPressed(const TQString& text) return; } d->mEdit->completionObject()->addItem(text); -// connect(d->mEdit, TQT_SIGNAL(returnPressed(const TQString&)), comp, TQT_SLOT(addItem(const TQString&))); +// connect(d->mEdit, TQ_SIGNAL(returnPressed(const TQString&)), comp, TQ_SLOT(addItem(const TQString&))); d->mEdit->clear(); returnPressed(text); } diff --git a/libtdegames/kchatbase.h b/libtdegames/kchatbase.h index 49d41558..bd06ccb9 100644 --- a/libtdegames/kchatbase.h +++ b/libtdegames/kchatbase.h @@ -181,9 +181,9 @@ class KChatBasePrivate; * * @author Andreas Beckermann <b_mann@gmx.de> **/ -class KDE_EXPORT KChatBase : public TQFrame +class TDE_EXPORT KChatBase : public TQFrame { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libtdegames/kchatdialog.cpp b/libtdegames/kchatdialog.cpp index eaa6c6fc..707e9987 100644 --- a/libtdegames/kchatdialog.cpp +++ b/libtdegames/kchatdialog.cpp @@ -84,10 +84,10 @@ void KChatDialog::init() // General fonts TQPushButton* nameFont = new TQPushButton(i18n("Name Font..."), d->mTextPage); - connect(nameFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetNameFont())); + connect(nameFont, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotGetNameFont())); layout->addWidget(nameFont, 0, 0); TQPushButton* textFont = new TQPushButton(i18n("Text Font..."), d->mTextPage); - connect(textFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetTextFont())); + connect(textFont, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotGetTextFont())); layout->addWidget(textFont, 0, 1); TQFrame* messagePreview = new TQFrame(d->mTextPage); @@ -106,10 +106,10 @@ void KChatDialog::init() TQLabel* systemMessages = new TQLabel(i18n("System Messages - Messages directly sent from the game"), d->mTextPage); layout->addMultiCellWidget(systemMessages, 3, 3, 0, 1); TQPushButton* systemNameFont = new TQPushButton(i18n("Name Font..."), d->mTextPage); - connect(systemNameFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetSystemNameFont())); + connect(systemNameFont, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotGetSystemNameFont())); layout->addWidget(systemNameFont, 4, 0); TQPushButton* systemTextFont = new TQPushButton(i18n("Text Font..."), d->mTextPage); - connect(systemTextFont, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotGetSystemTextFont())); + connect(systemTextFont, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotGetSystemTextFont())); layout->addWidget(systemTextFont, 4, 1); TQFrame* systemMessagePreview = new TQFrame(d->mTextPage); diff --git a/libtdegames/kchatdialog.h b/libtdegames/kchatdialog.h index 80b63c50..82cf0175 100644 --- a/libtdegames/kchatdialog.h +++ b/libtdegames/kchatdialog.h @@ -27,9 +27,9 @@ class KChatBase; class KChatDialogPrivate; -class KDE_EXPORT KChatDialog : public KDialogBase +class TDE_EXPORT KChatDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libtdegames/kgame/COMPAT b/libtdegames/kgame/COMPAT index b85ec9b6..cfe81537 100644 --- a/libtdegames/kgame/COMPAT +++ b/libtdegames/kgame/COMPAT @@ -10,8 +10,8 @@ KGameIO::signalPrepareMove(..., bool*): don't know why this was necessary but it didn't work anymore... 16.09.2001: KGamePropertyHandler uses bool* for the sent parameter now. This is - because QT3 obviously doesn't honor referneces in Q_SIGNALS/Q_SLOTS. - This might even be a QT bug. Bad situation - we use references + because TQt3 obviously doesn't honor references in signals/slots. + This might even be a Qt bug. Bad situation - we use references everywhere in KGame... hope nothing else is affecterd by this problem (signalPrepareMove was fixed already by me) 18.09.2001: bool* for Key/Mouseevents and IOAdded in kgameio.h too @@ -47,7 +47,7 @@ KPlayer::sendProperty() and related functions contain a "int msgid" parameter. This is the id() of the property handler. This parameter enables us to easily add any number of property handler to a game - just by connecting it to existing send Q_SLOTS and call + just by connecting it to existing send slots and call processMessage() in slotNetworkData() 03.11.2001 KPlayer::signalNetworkData now emits msgid-KGameMessage::IdUser just like KGame::signalNetworkData does diff --git a/libtdegames/kgame/DESIGN b/libtdegames/kgame/DESIGN index b1c48146..0ad9be8b 100644 --- a/libtdegames/kgame/DESIGN +++ b/libtdegames/kgame/DESIGN @@ -256,7 +256,7 @@ class. To overload the "<<" you would e.g. do something like this: QDataStream& operator<<(QDataStream& stream, MyData& data) { int type = data.type; - QString name = data.name; + TQString name = data.name; stream << type << name; return stream; } @@ -347,7 +347,7 @@ a slot like slotDebug() { KGameDebugDialog* dialog = new KGameDebugDialog(mGame, this); - connect(dialog, SIGNAL(finished()), dialog, SLOT(slotDelayedDestruct())); + connect(dialog, TQ_SIGNAL(finished()), dialog, TQ_SLOT(slotDelayedDestruct())); dialog->show(); } that's it. @@ -374,7 +374,7 @@ the memory of the names in a release version. For as long as you use standard types for your properties (int, long, bool, ...) you should always be able to see the value of the property. If you just see "unknown" then this type has not been implemented. You can connect to the signal -KGamePropertyHandler::signalRequestValue() and supply a QString with the value +KGamePropertyHandler::signalRequestValue() and supply a TQString with the value yourself. If you do so for a standard type please also submit a bug report! Currently the dialog does *not* update automatically! So you alway have to click diff --git a/libtdegames/kgame/Makefile.am b/libtdegames/kgame/Makefile.am index f49bc653..1c427178 100644 --- a/libtdegames/kgame/Makefile.am +++ b/libtdegames/kgame/Makefile.am @@ -25,5 +25,5 @@ METASOURCES = AUTO SUBDIRS = . dialogs messages: -# $(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/libtdegames.pot +# $(XGETTEXT) `find . -name \*.h -o -name \*.cpp` -o $(podir)/libtdegames.pot diff --git a/libtdegames/kgame/dialogs/Makefile.am b/libtdegames/kgame/dialogs/Makefile.am index f3c1adbe..f44a3d07 100644 --- a/libtdegames/kgame/dialogs/Makefile.am +++ b/libtdegames/kgame/dialogs/Makefile.am @@ -13,5 +13,5 @@ INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/kgame $(all_i METASOURCES = AUTO messages: -# $(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/libtdegames.pot +# $(XGETTEXT) `find . -name \*.h -o -name \*.cpp` -o $(podir)/libtdegames.pot diff --git a/libtdegames/kgame/dialogs/kgameconnectdialog.cpp b/libtdegames/kgame/dialogs/kgameconnectdialog.cpp index 2de27a0e..86d32ac2 100644 --- a/libtdegames/kgame/dialogs/kgameconnectdialog.cpp +++ b/libtdegames/kgame/dialogs/kgameconnectdialog.cpp @@ -63,7 +63,7 @@ KGameConnectWidget::KGameConnectWidget(TQWidget* parent) : TQWidget(parent) TQVBoxLayout* vb = new TQVBoxLayout(this, KDialog::spacingHint()); d->mButtonGroup = new TQVButtonGroup(this); vb->addWidget(d->mButtonGroup); - connect(d->mButtonGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotTypeChanged(int))); + connect(d->mButtonGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotTypeChanged(int))); (void)new TQRadioButton(i18n("Create a network game"), d->mButtonGroup); (void)new TQRadioButton(i18n("Join a network game"), d->mButtonGroup); @@ -74,14 +74,14 @@ KGameConnectWidget::KGameConnectWidget(TQWidget* parent) : TQWidget(parent) d->mServerName = new TQLineEdit(g); d->mClientNameLabel = new TQLabel(i18n("Network games:"), g); d->mClientName = new TQComboBox(g); - connect(d->mClientName,TQT_SIGNAL(activated(int)),TQT_SLOT(slotGameSelected(int))); + connect(d->mClientName,TQ_SIGNAL(activated(int)),TQ_SLOT(slotGameSelected(int))); (void)new TQLabel(i18n("Port to connect to:"), g); d->mPort = new KIntNumInput(g); (void)new TQLabel(i18n("Host to connect to:"), g); d->mHost = new TQLineEdit(g); TQPushButton *button=new TQPushButton(i18n("&Start Network"), this); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(signalNetworkSetup())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(signalNetworkSetup())); vb->addWidget(button); // Hide until type is set d->mClientName->hide(); @@ -112,7 +112,7 @@ void KGameConnectWidget::setType(const TQString& type) d->mType = type; delete d->mBrowser; d->mBrowser = new DNSSD::ServiceBrowser(type); - connect(d->mBrowser,TQT_SIGNAL(finished()),TQT_SLOT(slotGamesFound())); + connect(d->mBrowser,TQ_SIGNAL(finished()),TQ_SLOT(slotGamesFound())); d->mBrowser->startBrowse(); showDnssdControls(); } diff --git a/libtdegames/kgame/dialogs/kgameconnectdialog.h b/libtdegames/kgame/dialogs/kgameconnectdialog.h index c6c195bf..6c0fb329 100644 --- a/libtdegames/kgame/dialogs/kgameconnectdialog.h +++ b/libtdegames/kgame/dialogs/kgameconnectdialog.h @@ -28,7 +28,7 @@ class KGameConnectWidgetPrivate; class KGameConnectWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KGameConnectWidget(TQWidget* parent); @@ -116,7 +116,7 @@ private: **/ class KGameConnectDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KGameConnectDialog(TQWidget* parent = 0,int buttonmask=Ok|Cancel); diff --git a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp index 1b172cf2..7b82c909 100644 --- a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp +++ b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp @@ -156,7 +156,7 @@ void KGameDebugDialog::initGamePage() layout->addWidget(d->mGameProperties); TQPushButton* b = new TQPushButton(i18n("Update"), d->mGamePage); - connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUpdateGameData())); + connect(b, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotUpdateGameData())); topLayout->addWidget(b); // game data @@ -184,7 +184,7 @@ void KGameDebugDialog::initPlayerPage() TQLabel* listLabel = new TQLabel(i18n("Available Players"), d->mPlayerPage); listLayout->addWidget(listLabel); d->mPlayerList = new TDEListBox(d->mPlayerPage); - connect(d->mPlayerList, TQT_SIGNAL(executed(TQListBoxItem*)), this, TQT_SLOT(slotUpdatePlayerData(TQListBoxItem*))); + connect(d->mPlayerList, TQ_SIGNAL(executed(TQListBoxItem*)), this, TQ_SLOT(slotUpdatePlayerData(TQListBoxItem*))); listLayout->addWidget(d->mPlayerList); d->mPlayerList->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); @@ -200,7 +200,7 @@ void KGameDebugDialog::initPlayerPage() layout->addWidget(d->mPlayerProperties); TQPushButton* b = new TQPushButton(i18n("Update"), d->mPlayerPage); - connect(b, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotUpdatePlayerList())); + connect(b, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotUpdatePlayerList())); topLayout->addWidget(b); d->mPlayerAddress = new TQListViewItem(v, i18n("Player Pointer")); @@ -230,11 +230,11 @@ void KGameDebugDialog::initMessagePage() d->mMessageList->addColumn(i18n("ID - Text")); TQPushButton* hide = new TQPushButton(i18n("&>>"), d->mMessagePage); - connect(hide, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotHideId())); + connect(hide, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotHideId())); layout->addWidget(hide, 4, 4); TQPushButton* show = new TQPushButton(i18n("&<<"), d->mMessagePage); - connect(show, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotShowId())); + connect(show, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotShowId())); layout->addWidget(show, 6, 4); TQLabel* l = new TQLabel(i18n("Do not show IDs:"), d->mMessagePage); @@ -243,7 +243,7 @@ void KGameDebugDialog::initMessagePage() layout->addMultiCellWidget(d->mHideIdList, 1, 8, 5, 6); TQPushButton* clear = new KPushButton(KStdGuiItem::clear(), d->mMessagePage); - connect(clear, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearMessages())); + connect(clear, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearMessages())); layout->addMultiCellWidget(clear, 10, 10, 0, 6); //TODO: "show all but..." and "show nothing but..." } @@ -431,7 +431,7 @@ void KGameDebugDialog::setKGame(const KGame* g) d->mGame = g; if (g) { //TODO: connect to the KGame signals for joined/removed players!!! - connect(d->mGame, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotUnsetKGame())); + connect(d->mGame, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotUnsetKGame())); // connect(); TQPtrList<KPlayer> list = *d->mGame->playerList(); @@ -441,7 +441,7 @@ void KGameDebugDialog::setKGame(const KGame* g) slotUpdateGameData(); - connect(d->mGame, TQT_SIGNAL(signalMessageUpdate(int, TQ_UINT32, TQ_UINT32)), this, TQT_SLOT(slotMessageUpdate(int, TQ_UINT32, TQ_UINT32))); + connect(d->mGame, TQ_SIGNAL(signalMessageUpdate(int, TQ_UINT32, TQ_UINT32)), this, TQ_SLOT(slotMessageUpdate(int, TQ_UINT32, TQ_UINT32))); } } diff --git a/libtdegames/kgame/dialogs/kgamedebugdialog.h b/libtdegames/kgame/dialogs/kgamedebugdialog.h index 6dcea2c9..06a46202 100644 --- a/libtdegames/kgame/dialogs/kgamedebugdialog.h +++ b/libtdegames/kgame/dialogs/kgamedebugdialog.h @@ -31,9 +31,9 @@ class KGamePropertyBase; class KGameDebugDialogPrivate; -class KDE_EXPORT KGameDebugDialog : public KDialogBase +class TDE_EXPORT KGameDebugDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KGameDebugDialog(KGame* g, TQWidget* parent, bool modal = false); diff --git a/libtdegames/kgame/dialogs/kgamedialog.cpp b/libtdegames/kgame/dialogs/kgamedialog.cpp index a2440355..077d7f32 100644 --- a/libtdegames/kgame/dialogs/kgamedialog.cpp +++ b/libtdegames/kgame/dialogs/kgamedialog.cpp @@ -239,7 +239,7 @@ void KGameDialog::addConfigWidget(KGameDialogConfig* widget, TQWidget* parent) // kdDebug(11001) << "reparenting widget" << endl; widget->reparent(parent, TQPoint(0,0)); d->mConfigWidgets.append(widget); - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(slotRemoveConfigWidget(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(slotRemoveConfigWidget(TQObject*))); if (!d->mGame) { kdWarning(11001) << "No game has been set!" << endl; } else { @@ -306,9 +306,9 @@ void KGameDialog::setKGame(KGame* g) } if (d->mGame) { setAdmin(d->mGame->isAdmin()); - connect(d->mGame, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotUnsetKGame())); - connect(d->mGame, TQT_SIGNAL(signalAdminStatusChanged(bool)), - this, TQT_SLOT(setAdmin(bool))); + connect(d->mGame, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotUnsetKGame())); + connect(d->mGame, TQ_SIGNAL(signalAdminStatusChanged(bool)), + this, TQ_SLOT(setAdmin(bool))); } } diff --git a/libtdegames/kgame/dialogs/kgamedialog.h b/libtdegames/kgame/dialogs/kgamedialog.h index f25f0c96..834fb5a5 100644 --- a/libtdegames/kgame/dialogs/kgamedialog.h +++ b/libtdegames/kgame/dialogs/kgamedialog.h @@ -71,9 +71,9 @@ class KGameDialogPrivate; * @short Main configuration dialog for KGame * @author Andreas Beckermann <b_mann@gmx.de> **/ -class KDE_EXPORT KGameDialog : public KDialogBase +class TDE_EXPORT KGameDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp index a14abe73..646e8e41 100644 --- a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp +++ b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp @@ -130,16 +130,16 @@ KGameDialogNetworkConfig::KGameDialogNetworkConfig(TQWidget* parent) hb->addWidget(d->mNetworkLabel); d->mDisconnectButton=new TQPushButton(i18n("Disconnect"),this); - connect(d->mDisconnectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExitConnection())); + connect(d->mDisconnectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExitConnection())); hb->addWidget(d->mDisconnectButton); d->mInitConnection = new TQHGroupBox(i18n("Network Configuration"), this); topLayout->addWidget(d->mInitConnection); d->mConnect = new KGameConnectWidget(d->mInitConnection); - connect(d->mConnect, TQT_SIGNAL(signalNetworkSetup()), this, TQT_SLOT(slotInitConnection())); - connect(d->mConnect, TQT_SIGNAL(signalServerTypeChanged(int)), - this, TQT_SIGNAL(signalServerTypeChanged(int))); + connect(d->mConnect, TQ_SIGNAL(signalNetworkSetup()), this, TQ_SLOT(slotInitConnection())); + connect(d->mConnect, TQ_SIGNAL(signalServerTypeChanged(int)), + this, TQ_SIGNAL(signalServerTypeChanged(int))); // Needs to be AFTER the creation of the dialogs setConnected(false); @@ -180,8 +180,8 @@ void KGameDialogNetworkConfig::slotInitConnection() } // We need to learn about failed connections if (game()) { - connect(game(), TQT_SIGNAL(signalConnectionBroken()), - this, TQT_SLOT(slotConnectionBroken())); + connect(game(), TQ_SIGNAL(signalConnectionBroken()), + this, TQ_SLOT(slotConnectionBroken())); } } setConnected(connected, master); @@ -309,8 +309,8 @@ void KGameDialogGeneralConfig::setOwner(KPlayer* p) // maybe call hide() return; } - connect(owner(), TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase*, KPlayer*)), - this, TQT_SLOT(slotPropertyChanged(KGamePropertyBase*, KPlayer*))); + connect(owner(), TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase*, KPlayer*)), + this, TQ_SLOT(slotPropertyChanged(KGamePropertyBase*, KPlayer*))); setPlayerName(p->name()); //TODO: connect signalPropertyChanged and check for playername changes! } @@ -408,7 +408,7 @@ void KGameDialogMsgServerConfig::setKGame(KGame* g) { KGameDialogConfig::setKGame(g); //TODO display the ID of the admin if we aren't - // connect(g, TQT_SIGNAL(signalAdminChanged(int)), this, TQT_SLOT(slotChangeIsAdmin(int)));//TODO + // connect(g, TQ_SIGNAL(signalAdminChanged(int)), this, TQ_SLOT(slotChangeIsAdmin(int)));//TODO if (!game()) { // we cannot do anything without a KGame object! setAdmin(false); @@ -488,11 +488,11 @@ void KGameDialogMsgServerConfig::setAdmin(bool a) d->noAdmin = 0; } d->changeMaxClients = new TQPushButton(i18n("Change Maximal Number of Clients"), this); - connect(d->changeMaxClients, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChangeMaxClients())); + connect(d->changeMaxClients, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotChangeMaxClients())); d->changeAdmin = new TQPushButton(i18n("Change Admin"), this); - connect(d->changeAdmin, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChangeAdmin())); + connect(d->changeAdmin, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotChangeAdmin())); d->removeClient = new TQPushButton(i18n("Remove Client with All Players"), this); - connect(d->removeClient, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotRemoveClient())); + connect(d->removeClient, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotRemoveClient())); d->senderLayout->addWidget(d->changeMaxClients); d->senderLayout->addWidget(d->changeAdmin); d->senderLayout->addWidget(d->removeClient); @@ -627,10 +627,10 @@ void KGameDialogConnectionConfig::setKGame(KGame* g) slotClearPlayers(); if (game()) { // react to changes in KGame::playerList() - connect(game(), TQT_SIGNAL(signalPlayerJoinedGame(KPlayer*)), - this, TQT_SLOT(slotPlayerJoinedGame(KPlayer*))); - connect(game(), TQT_SIGNAL(signalPlayerLeftGame(KPlayer*)), - this, TQT_SLOT(slotPlayerLeftGame(KPlayer*))); + connect(game(), TQ_SIGNAL(signalPlayerJoinedGame(KPlayer*)), + this, TQ_SLOT(slotPlayerJoinedGame(KPlayer*))); + connect(game(), TQ_SIGNAL(signalPlayerLeftGame(KPlayer*)), + this, TQ_SLOT(slotPlayerLeftGame(KPlayer*))); KGame::KGamePlayerList l = *game()->playerList(); for (KPlayer* p = l.first(); p; p = l.next()) { @@ -650,12 +650,12 @@ void KGameDialogConnectionConfig::setAdmin(bool a) return; } if (admin()) { - disconnect(game(), TQT_SIGNAL(executed(TQListBoxItem*)), this, 0); + disconnect(game(), TQ_SIGNAL(executed(TQListBoxItem*)), this, 0); } KGameDialogConfig::setAdmin(a); if (admin()) { - connect(d->mPlayerBox, TQT_SIGNAL(executed(TQListBoxItem*)), this, - TQT_SLOT(slotKickPlayerOut(TQListBoxItem*))); + connect(d->mPlayerBox, TQ_SIGNAL(executed(TQListBoxItem*)), this, + TQ_SLOT(slotKickPlayerOut(TQListBoxItem*))); } } @@ -704,8 +704,8 @@ void KGameDialogConnectionConfig::slotPlayerJoinedGame(KPlayer* p) d->mItem2Player.insert(t, p); d->mPlayerBox->insertItem(t); - connect(p, TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase*, KPlayer*)), - this, TQT_SLOT(slotPropertyChanged(KGamePropertyBase*, KPlayer*))); + connect(p, TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase*, KPlayer*)), + this, TQ_SLOT(slotPropertyChanged(KGamePropertyBase*, KPlayer*))); } diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.h b/libtdegames/kgame/dialogs/kgamedialogconfig.h index 261500c4..28c611f8 100644 --- a/libtdegames/kgame/dialogs/kgamedialogconfig.h +++ b/libtdegames/kgame/dialogs/kgamedialogconfig.h @@ -48,9 +48,9 @@ class KGameDialogConfigPrivate; * @short Base class for configuration widgets * @author Andreas Beckermann <b_mann@gmx.de> **/ -class KDE_EXPORT KGameDialogConfig : public TQWidget +class TDE_EXPORT KGameDialogConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KGameDialogConfig(TQWidget* parent = 0); @@ -144,7 +144,7 @@ private: class KGameDialogGeneralConfigPrivate; class KGameDialogGeneralConfig : public KGameDialogConfig { - Q_OBJECT + TQ_OBJECT public: /** @@ -210,9 +210,9 @@ private: }; class KGameDialogNetworkConfigPrivate; -class KDE_EXPORT KGameDialogNetworkConfig : public KGameDialogConfig +class TDE_EXPORT KGameDialogNetworkConfig : public KGameDialogConfig { - Q_OBJECT + TQ_OBJECT public: KGameDialogNetworkConfig(TQWidget* parent = 0); @@ -279,7 +279,7 @@ private: class KGameDialogMsgServerConfigPrivate; class KGameDialogMsgServerConfig : public KGameDialogConfig { - Q_OBJECT + TQ_OBJECT public: KGameDialogMsgServerConfig(TQWidget* parent = 0); @@ -313,7 +313,7 @@ class KGameDialogChatConfigPrivate; **/ class KGameDialogChatConfig : public KGameDialogConfig { - Q_OBJECT + TQ_OBJECT public: KGameDialogChatConfig(int chatMsgId, TQWidget* parent = 0); @@ -335,7 +335,7 @@ private: class KGameDialogConnectionConfigPrivate; class KGameDialogConnectionConfig : public KGameDialogConfig { - Q_OBJECT + TQ_OBJECT public: KGameDialogConnectionConfig(TQWidget* parent = 0); diff --git a/libtdegames/kgame/dialogs/kgameerrordialog.cpp b/libtdegames/kgame/dialogs/kgameerrordialog.cpp index 468ca7c8..574d4545 100644 --- a/libtdegames/kgame/dialogs/kgameerrordialog.cpp +++ b/libtdegames/kgame/dialogs/kgameerrordialog.cpp @@ -52,15 +52,15 @@ void KGameErrorDialog::setKGame(const KGame* g) slotUnsetKGame(); d->mGame = g; - connect(d->mGame, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotUnsetKGame())); + connect(d->mGame, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotUnsetKGame())); // the error signals: - connect(d->mGame, TQT_SIGNAL(signalNetworkErrorMessage(int, TQString)), - this, TQT_SLOT(slotError(int, TQString))); - connect(d->mGame, TQT_SIGNAL(signalConnectionBroken()), - this, TQT_SLOT(slotServerConnectionLost())); - connect(d->mGame, TQT_SIGNAL(signalClientDisconnected(TQ_UINT32,bool)), - this, TQT_SLOT(slotClientConnectionLost(TQ_UINT32,bool))); + connect(d->mGame, TQ_SIGNAL(signalNetworkErrorMessage(int, TQString)), + this, TQ_SLOT(slotError(int, TQString))); + connect(d->mGame, TQ_SIGNAL(signalConnectionBroken()), + this, TQ_SLOT(slotServerConnectionLost())); + connect(d->mGame, TQ_SIGNAL(signalClientDisconnected(TQ_UINT32,bool)), + this, TQ_SLOT(slotClientConnectionLost(TQ_UINT32,bool))); } void KGameErrorDialog::slotUnsetKGame() diff --git a/libtdegames/kgame/dialogs/kgameerrordialog.h b/libtdegames/kgame/dialogs/kgameerrordialog.h index fee0b73e..c9b26863 100644 --- a/libtdegames/kgame/dialogs/kgameerrordialog.h +++ b/libtdegames/kgame/dialogs/kgameerrordialog.h @@ -38,7 +38,7 @@ class KGameErrorDialogPrivate; **/ class KGameErrorDialog : public TQObject { - Q_OBJECT + TQ_OBJECT public: KGameErrorDialog(TQWidget* parent); @@ -103,7 +103,7 @@ private: **/ class KGameErrorMessageDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KGameErrorMessageDialog(TQWidget* parent); diff --git a/libtdegames/kgame/kgame.cpp b/libtdegames/kgame/kgame.cpp index 70d0644c..a3967cc3 100644 --- a/libtdegames/kgame/kgame.cpp +++ b/libtdegames/kgame/kgame.cpp @@ -89,8 +89,8 @@ KGame::KGame(int cookie,TQObject* parent) : KGameNetwork(cookie,parent) d->mProperties = new KGamePropertyHandler(this); d->mProperties->registerHandler(KGameMessage::IdGameProperty, - this,TQT_SLOT(sendProperty(int, TQDataStream&, bool* )), - TQT_SLOT(emitSignal(KGamePropertyBase *))); + this,TQ_SLOT(sendProperty(int, TQDataStream&, bool* )), + TQ_SLOT(emitSignal(KGamePropertyBase *))); d->mMaxPlayer.registerData(KGamePropertyBase::IdMaxPlayer, this, i18n("MaxPlayers")); d->mMaxPlayer.setLocal(-1); // Infinite d->mMinPlayer.registerData(KGamePropertyBase::IdMinPlayer, this, i18n("MinPlayers")); @@ -101,20 +101,20 @@ KGame::KGame(int cookie,TQObject* parent) : KGameNetwork(cookie,parent) d->mRandom = new KRandomSequence; d->mRandom->setSeed(0); - connect(this, TQT_SIGNAL(signalClientConnected(TQ_UINT32)), - this, TQT_SLOT(slotClientConnected(TQ_UINT32))); - connect(this, TQT_SIGNAL(signalClientDisconnected(TQ_UINT32,bool)), - this, TQT_SLOT(slotClientDisconnected(TQ_UINT32,bool))); - connect(this, TQT_SIGNAL(signalConnectionBroken()), - this, TQT_SLOT(slotServerDisconnected())); + connect(this, TQ_SIGNAL(signalClientConnected(TQ_UINT32)), + this, TQ_SLOT(slotClientConnected(TQ_UINT32))); + connect(this, TQ_SIGNAL(signalClientDisconnected(TQ_UINT32,bool)), + this, TQ_SLOT(slotClientDisconnected(TQ_UINT32,bool))); + connect(this, TQ_SIGNAL(signalConnectionBroken()), + this, TQ_SLOT(slotServerDisconnected())); setGameSequence(new KGameSequence()); // BL: FIXME This signal does no longer exist. When we are merging // MH: super....and how do I find out about the lost conenction now? // KGame and KGameNetwork, this could be improved! -// connect(this,TQT_SIGNAL(signalConnectionLost(KGameClient *)), -// this,TQT_SLOT(slotConnectionLost(KGameClient *))); +// connect(this,TQ_SIGNAL(signalConnectionLost(KGameClient *)), +// this,TQ_SLOT(slotConnectionLost(KGameClient *))); } KGame::~KGame() @@ -780,7 +780,7 @@ KPlayer * KGame::playerInputFinished(KPlayer *player) player->setTurn(false); // in turn based games we have to switch off input now if (gameSequence()) { - TQTimer::singleShot(0,this,TQT_SLOT(prepareNext())); + TQTimer::singleShot(0,this,TQ_SLOT(prepareNext())); } } return player; diff --git a/libtdegames/kgame/kgame.h b/libtdegames/kgame/kgame.h index 8ef56591..f2d687cc 100644 --- a/libtdegames/kgame/kgame.h +++ b/libtdegames/kgame/kgame.h @@ -59,9 +59,9 @@ class KGamePrivate; * @author Martin Heni <martin@heni-online.de> * */ -class KDE_EXPORT KGame : public KGameNetwork +class TDE_EXPORT KGame : public KGameNetwork { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/kgamechat.cpp b/libtdegames/kgame/kgamechat.cpp index 80059e7b..650cf060 100644 --- a/libtdegames/kgame/kgamechat.cpp +++ b/libtdegames/kgame/kgamechat.cpp @@ -227,13 +227,13 @@ void KGameChat::setKGame(KGame* g) d->mGame = g; if (d->mGame) { - connect(d->mGame, TQT_SIGNAL(signalPlayerJoinedGame(KPlayer*)), - this, TQT_SLOT(slotAddPlayer(KPlayer*))); - connect(d->mGame, TQT_SIGNAL(signalPlayerLeftGame(KPlayer*)), - this, TQT_SLOT(slotRemovePlayer(KPlayer*))); - connect(d->mGame, TQT_SIGNAL(signalNetworkData(int, const TQByteArray&, TQ_UINT32, TQ_UINT32)), - this, TQT_SLOT(slotReceiveMessage(int, const TQByteArray&, TQ_UINT32, TQ_UINT32))); - connect(d->mGame, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotUnsetKGame())); + connect(d->mGame, TQ_SIGNAL(signalPlayerJoinedGame(KPlayer*)), + this, TQ_SLOT(slotAddPlayer(KPlayer*))); + connect(d->mGame, TQ_SIGNAL(signalPlayerLeftGame(KPlayer*)), + this, TQ_SLOT(slotRemovePlayer(KPlayer*))); + connect(d->mGame, TQ_SIGNAL(signalNetworkData(int, const TQByteArray&, TQ_UINT32, TQ_UINT32)), + this, TQ_SLOT(slotReceiveMessage(int, const TQByteArray&, TQ_UINT32, TQ_UINT32))); + connect(d->mGame, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotUnsetKGame())); TQPtrList<KPlayer> playerList = *d->mGame->playerList(); for (int unsigned i = 0; i < playerList.count(); i++) { @@ -281,10 +281,10 @@ void KGameChat::slotAddPlayer(KPlayer* p) int sendingId = nextId(); addSendingEntry(comboBoxItem(p->name()), sendingId); d->mSendId2PlayerId.insert(sendingId, p->id()); - connect(p, TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase*, KPlayer*)), - this, TQT_SLOT(slotPropertyChanged(KGamePropertyBase*, KPlayer*))); - connect(p, TQT_SIGNAL(signalNetworkData(int, const TQByteArray&, TQ_UINT32, KPlayer*)), - this, TQT_SLOT(slotReceivePrivateMessage(int, const TQByteArray&, TQ_UINT32, KPlayer*))); + connect(p, TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase*, KPlayer*)), + this, TQ_SLOT(slotPropertyChanged(KGamePropertyBase*, KPlayer*))); + connect(p, TQ_SIGNAL(signalNetworkData(int, const TQByteArray&, TQ_UINT32, KPlayer*)), + this, TQ_SLOT(slotReceivePrivateMessage(int, const TQByteArray&, TQ_UINT32, KPlayer*))); } void KGameChat::slotRemovePlayer(KPlayer* p) diff --git a/libtdegames/kgame/kgamechat.h b/libtdegames/kgame/kgamechat.h index 8ba51159..29239aff 100644 --- a/libtdegames/kgame/kgamechat.h +++ b/libtdegames/kgame/kgamechat.h @@ -40,9 +40,9 @@ class KGameChatPrivate; * * @author Andreas Beckermann <b_mann@gmx.de> **/ -class KDE_EXPORT KGameChat : public KChatBase +class TDE_EXPORT KGameChat : public KChatBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libtdegames/kgame/kgameio.cpp b/libtdegames/kgame/kgameio.cpp index 852e04f2..13a19a81 100644 --- a/libtdegames/kgame/kgameio.cpp +++ b/libtdegames/kgame/kgameio.cpp @@ -266,12 +266,12 @@ KGameProcessIO::KGameProcessIO(const TQString& name) //kdDebug(11001) << "================= KMEssage SetSErver ==================== " << endl; //d->mMessageClient->setServer(d->mMessageServer); kdDebug(11001) << "================= KMEssage: Connect ==================== " << endl; - //connect(d->mMessageClient, TQT_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32)), - // this, TQT_SLOT(clientMessage(const TQByteArray&, TQ_UINT32))); - //connect(d->mMessageClient, TQT_SIGNAL(forwardReceived(const TQByteArray&, TQ_UINT32, const TQValueList <TQ_UINT32> &)), - // this, TQT_SLOT(clientMessage(const TQByteArray&, TQ_UINT32, const TQValueList <TQ_UINT32> &))); - connect(d->mProcessIO, TQT_SIGNAL(received(const TQByteArray&)), - this, TQT_SLOT(receivedMessage(const TQByteArray&))); + //connect(d->mMessageClient, TQ_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32)), + // this, TQ_SLOT(clientMessage(const TQByteArray&, TQ_UINT32))); + //connect(d->mMessageClient, TQ_SIGNAL(forwardReceived(const TQByteArray&, TQ_UINT32, const TQValueList <TQ_UINT32> &)), + // this, TQ_SLOT(clientMessage(const TQByteArray&, TQ_UINT32, const TQValueList <TQ_UINT32> &))); + connect(d->mProcessIO, TQ_SIGNAL(received(const TQByteArray&)), + this, TQ_SLOT(receivedMessage(const TQByteArray&))); //kdDebug(11001) << "Our client is id="<<d->mMessageClient->id() << endl; } @@ -489,7 +489,7 @@ void KGameComputerIO::setAdvancePeriod(int ms) { stopAdvancePeriod(); d->mAdvanceTimer = new TQTimer(this); - connect(d->mAdvanceTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(advance())); + connect(d->mAdvanceTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(advance())); d->mAdvanceTimer->start(ms); } diff --git a/libtdegames/kgame/kgameio.h b/libtdegames/kgame/kgameio.h index 1478f632..7d776cd0 100644 --- a/libtdegames/kgame/kgameio.h +++ b/libtdegames/kgame/kgameio.h @@ -52,9 +52,9 @@ class TDEProcess; * * @author Martin Heni <martin@heni-online.de> */ -class KDE_EXPORT KGameIO : public TQObject +class TDE_EXPORT KGameIO : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -175,9 +175,9 @@ private: * from a widget and create moves for the player it belongs to. * @author Martin Heni <martin@heni-online.de> */ -class KDE_EXPORT KGameKeyIO : public KGameIO +class TDE_EXPORT KGameKeyIO : public KGameIO { - Q_OBJECT + TQ_OBJECT public: @@ -195,8 +195,8 @@ public: * \code * KGameKeyIO *input; * input=new KGameKeyIO(myWidget); - * connect(input,TQT_SIGNAL(signalKeyEvent(KGameIO *,TQDataStream &,TQKeyEvent *,bool *)), - * this,TQT_SLOT(slotKeyInput(KGameIO *,TQDataStream &,TQKeyEvent *,bool *))); + * connect(input,TQ_SIGNAL(signalKeyEvent(KGameIO *,TQDataStream &,TQKeyEvent *,bool *)), + * this,TQ_SLOT(slotKeyInput(KGameIO *,TQDataStream &,TQKeyEvent *,bool *))); * \endcode * * @param parent The parents widget whose keyboard events * should be grabbed @@ -247,9 +247,9 @@ protected: * from a widget and create moves for the player it belongs to. * @author Martin Heni <martin@heni-online.de> */ -class KDE_EXPORT KGameMouseIO : public KGameIO +class TDE_EXPORT KGameMouseIO : public KGameIO { - Q_OBJECT + TQ_OBJECT public: @@ -261,8 +261,8 @@ public: * \code * KGameMouseIO *input; * input=new KGameMouseIO(mView); - * connect(input,TQT_SIGNAL(signalMouseEvent(KGameIO *,TQDataStream &,TQMouseEvent *,bool *)), - * this,TQT_SLOT(slotMouseInput(KGameIO *,TQDataStream &,TQMouseEvent *,bool *))); + * connect(input,TQ_SIGNAL(signalMouseEvent(KGameIO *,TQDataStream &,TQMouseEvent *,bool *)), + * this,TQ_SLOT(slotMouseInput(KGameIO *,TQDataStream &,TQMouseEvent *,bool *))); * \endcode * * @param parent The widget whose events should be captured @@ -323,9 +323,9 @@ protected: * for the definition of the computer player. * @author Martin Heni <martin@heni-online.de> */ -class KDE_EXPORT KGameProcessIO : public KGameIO +class TDE_EXPORT KGameProcessIO : public KGameIO { - Q_OBJECT + TQ_OBJECT public: @@ -336,10 +336,10 @@ public: * \code * KGameProcessIO *input; * input=new KGameProcessIO(executable_file); - * connect(input,TQT_SIGNAL(signalPrepareTurn(TQDataStream &,bool,KGameIO *,bool *)), - * this,TQT_SLOT(slotPrepareTurn(TQDataStream &,bool,KGameIO *,bool *))); - * connect(input,TQT_SIGNAL(signalProcessQuery(TQDataStream &,KGameProcessIO *)), - * this,TQT_SLOT(slotProcessQuery(TQDataStream &,KGameProcessIO *))); + * connect(input,TQ_SIGNAL(signalPrepareTurn(TQDataStream &,bool,KGameIO *,bool *)), + * this,TQ_SLOT(slotPrepareTurn(TQDataStream &,bool,KGameIO *,bool *))); + * connect(input,TQ_SIGNAL(signalProcessQuery(TQDataStream &,KGameProcessIO *)), + * this,TQ_SLOT(slotProcessQuery(TQDataStream &,KGameProcessIO *))); * \endcode * * @param name the filename of the process to start @@ -478,9 +478,9 @@ private: * * @author <b_mann@gmx.de> */ -class KDE_EXPORT KGameComputerIO : public KGameIO +class TDE_EXPORT KGameComputerIO : public KGameIO { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/kgamemessage.h b/libtdegames/kgame/kgamemessage.h index 9e1930a0..4c7c08e4 100644 --- a/libtdegames/kgame/kgamemessage.h +++ b/libtdegames/kgame/kgamemessage.h @@ -26,7 +26,7 @@ #include <tqdatastream.h> #include <kdemacros.h> -class KDE_EXPORT KGameMessage +class TDE_EXPORT KGameMessage { public: /** diff --git a/libtdegames/kgame/kgamenetwork.cpp b/libtdegames/kgame/kgamenetwork.cpp index b51b5ae0..94badd88 100644 --- a/libtdegames/kgame/kgamenetwork.cpp +++ b/libtdegames/kgame/kgamenetwork.cpp @@ -120,25 +120,25 @@ void KGameNetwork::setMaster() } if (!d->mMessageClient) { d->mMessageClient = new KMessageClient (this); - connect (d->mMessageClient, TQT_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32)), - this, TQT_SLOT(receiveNetworkTransmission(const TQByteArray&, TQ_UINT32))); - connect (d->mMessageClient, TQT_SIGNAL(connectionBroken()), - this, TQT_SIGNAL(signalConnectionBroken())); - connect (d->mMessageClient, TQT_SIGNAL(aboutToDisconnect(TQ_UINT32)), - this, TQT_SLOT(aboutToLoseConnection(TQ_UINT32))); - connect (d->mMessageClient, TQT_SIGNAL(connectionBroken()), - this, TQT_SLOT(slotResetConnection())); - - connect (d->mMessageClient, TQT_SIGNAL(adminStatusChanged(bool)), - this, TQT_SLOT(slotAdminStatusChanged(bool))); - connect (d->mMessageClient, TQT_SIGNAL(eventClientConnected(TQ_UINT32)), - this, TQT_SIGNAL(signalClientConnected(TQ_UINT32))); - connect (d->mMessageClient, TQT_SIGNAL(eventClientDisconnected(TQ_UINT32, bool)), - this, TQT_SIGNAL(signalClientDisconnected(TQ_UINT32, bool))); + connect (d->mMessageClient, TQ_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32)), + this, TQ_SLOT(receiveNetworkTransmission(const TQByteArray&, TQ_UINT32))); + connect (d->mMessageClient, TQ_SIGNAL(connectionBroken()), + this, TQ_SIGNAL(signalConnectionBroken())); + connect (d->mMessageClient, TQ_SIGNAL(aboutToDisconnect(TQ_UINT32)), + this, TQ_SLOT(aboutToLoseConnection(TQ_UINT32))); + connect (d->mMessageClient, TQ_SIGNAL(connectionBroken()), + this, TQ_SLOT(slotResetConnection())); + + connect (d->mMessageClient, TQ_SIGNAL(adminStatusChanged(bool)), + this, TQ_SLOT(slotAdminStatusChanged(bool))); + connect (d->mMessageClient, TQ_SIGNAL(eventClientConnected(TQ_UINT32)), + this, TQ_SIGNAL(signalClientConnected(TQ_UINT32))); + connect (d->mMessageClient, TQ_SIGNAL(eventClientDisconnected(TQ_UINT32, bool)), + this, TQ_SIGNAL(signalClientDisconnected(TQ_UINT32, bool))); // broacast and direct messages are treated equally on receive. - connect (d->mMessageClient, TQT_SIGNAL(forwardReceived(const TQByteArray&, TQ_UINT32, const TQValueList<TQ_UINT32>&)), - d->mMessageClient, TQT_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32))); + connect (d->mMessageClient, TQ_SIGNAL(forwardReceived(const TQByteArray&, TQ_UINT32, const TQValueList<TQ_UINT32>&)), + d->mMessageClient, TQ_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32))); } else { // should be no problem but still has to be tested diff --git a/libtdegames/kgame/kgamenetwork.h b/libtdegames/kgame/kgamenetwork.h index 05e190c8..571d5963 100644 --- a/libtdegames/kgame/kgamenetwork.h +++ b/libtdegames/kgame/kgamenetwork.h @@ -43,9 +43,9 @@ class KGameNetworkPrivate; * @author Martin Heni <martin@heni-online.de> * @version $Id$ */ -class KDE_EXPORT KGameNetwork : public TQObject +class TDE_EXPORT KGameNetwork : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/kgameprocess.cpp b/libtdegames/kgame/kgameprocess.cpp index 8a8a2571..b0858e81 100644 --- a/libtdegames/kgame/kgameprocess.cpp +++ b/libtdegames/kgame/kgameprocess.cpp @@ -52,10 +52,10 @@ KGameProcess::KGameProcess() : TQObject(0,0) mMessageIO=new KMessageFilePipe(this,&rFile,&wFile); // mMessageClient=new KMessageClient(this); // mMessageClient->setServer(mMessageIO); -// connect (mMessageClient, TQT_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32)), -// this, TQT_SLOT(receivedMessage(const TQByteArray&, TQ_UINT32))); - connect (mMessageIO, TQT_SIGNAL(received(const TQByteArray&)), - this, TQT_SLOT(receivedMessage(const TQByteArray&))); +// connect (mMessageClient, TQ_SIGNAL(broadcastReceived(const TQByteArray&, TQ_UINT32)), +// this, TQ_SLOT(receivedMessage(const TQByteArray&, TQ_UINT32))); + connect (mMessageIO, TQ_SIGNAL(received(const TQByteArray&)), + this, TQ_SLOT(receivedMessage(const TQByteArray&))); fprintf(stderr,"KGameProcess::constructor %p %p\n",&rFile,&wFile); mRandom = new KRandomSequence; diff --git a/libtdegames/kgame/kgameprocess.h b/libtdegames/kgame/kgameprocess.h index 092acd0f..5faaf372 100644 --- a/libtdegames/kgame/kgameprocess.h +++ b/libtdegames/kgame/kgameprocess.h @@ -39,9 +39,9 @@ class KMessageFilePipe; * Using these two classes will give fully transparent communication * via TQDataStreams. */ -class KDE_EXPORT KGameProcess: public TQObject +class TDE_EXPORT KGameProcess: public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -61,12 +61,12 @@ class KDE_EXPORT KGameProcess: public TQObject * int main(int argc ,char * argv[]) * { * KGameProcess proc; - * connect(&proc,TQT_SIGNAL(signalCommand(TQDataStream &,int ,int ,int )), - * this,TQT_SLOT(slotCommand(TQDataStream & ,int ,int ,int ))); - * connect(&proc,TQT_SIGNAL(signalInit(TQDataStream &,int)), - * this,TQT_SLOT(slotInit(TQDataStream & ,int ))); - * connect(&proc,TQT_SIGNAL(signalTurn(TQDataStream &,bool )), - * this,TQT_SLOT(slotTurn(TQDataStream & ,bool ))); + * connect(&proc,TQ_SIGNAL(signalCommand(TQDataStream &,int ,int ,int )), + * this,TQ_SLOT(slotCommand(TQDataStream & ,int ,int ,int ))); + * connect(&proc,TQ_SIGNAL(signalInit(TQDataStream &,int)), + * this,TQ_SLOT(slotInit(TQDataStream & ,int ))); + * connect(&proc,TQ_SIGNAL(signalTurn(TQDataStream &,bool )), + * this,TQ_SLOT(slotTurn(TQDataStream & ,bool ))); * return proc.exec(argc,argv); * } * \endcode diff --git a/libtdegames/kgame/kgameproperty.h b/libtdegames/kgame/kgameproperty.h index 17de3fb2..15bc9956 100644 --- a/libtdegames/kgame/kgameproperty.h +++ b/libtdegames/kgame/kgameproperty.h @@ -39,7 +39,7 @@ using namespace std; * * @author Andreas Beckermann <b_mann@gmx.de> **/ -class KDE_EXPORT KGamePropertyBase +class TDE_EXPORT KGamePropertyBase { public: enum PropertyDataIds { // these belong to KPlayer/KGame! diff --git a/libtdegames/kgame/kgamepropertyhandler.cpp b/libtdegames/kgame/kgamepropertyhandler.cpp index 732c8bde..0cd02fbf 100644 --- a/libtdegames/kgame/kgamepropertyhandler.cpp +++ b/libtdegames/kgame/kgamepropertyhandler.cpp @@ -94,12 +94,12 @@ void KGamePropertyHandler::registerHandler(int id,const TQObject * receiver, con { setId(id); if (receiver && sendf) { - kdDebug(11001) << "Connecting TQT_SLOT " << sendf << endl; - connect(this, TQT_SIGNAL(signalSendMessage(int, TQDataStream &, bool*)), receiver, sendf); + kdDebug(11001) << "Connecting TQ_SLOT " << sendf << endl; + connect(this, TQ_SIGNAL(signalSendMessage(int, TQDataStream &, bool*)), receiver, sendf); } if (receiver && emitf) { - kdDebug(11001) << "Connecting TQT_SLOT " << emitf << endl; - connect(this, TQT_SIGNAL(signalPropertyChanged(KGamePropertyBase *)), receiver, emitf); + kdDebug(11001) << "Connecting TQ_SLOT " << emitf << endl; + connect(this, TQ_SIGNAL(signalPropertyChanged(KGamePropertyBase *)), receiver, emitf); } } diff --git a/libtdegames/kgame/kgamepropertyhandler.h b/libtdegames/kgame/kgamepropertyhandler.h index f337fe21..97f42b42 100644 --- a/libtdegames/kgame/kgamepropertyhandler.h +++ b/libtdegames/kgame/kgamepropertyhandler.h @@ -69,9 +69,9 @@ class KGamePropertyHandlerPrivate; // wow - what a name ;-) * multiplied. * **/ -class KDE_EXPORT KGamePropertyHandler : public TQObject +class TDE_EXPORT KGamePropertyHandler : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/kgamesequence.h b/libtdegames/kgame/kgamesequence.h index 0d14b32f..f4b58e21 100644 --- a/libtdegames/kgame/kgamesequence.h +++ b/libtdegames/kgame/kgamesequence.h @@ -41,7 +41,7 @@ class KGame; **/ class KGameSequence : public TQObject { - Q_OBJECT + TQ_OBJECT public: KGameSequence(); diff --git a/libtdegames/kgame/kmessageclient.cpp b/libtdegames/kgame/kmessageclient.cpp index 8c9278b6..01cc7175 100644 --- a/libtdegames/kgame/kmessageclient.cpp +++ b/libtdegames/kgame/kmessageclient.cpp @@ -86,10 +86,10 @@ void KMessageClient::setServer (KMessageIO *connection) d->connection = connection; if (connection ) { - connect (connection, TQT_SIGNAL (received(const TQByteArray &)), - this, TQT_SLOT (processIncomingMessage(const TQByteArray &))); - connect (connection, TQT_SIGNAL (connectionBroken()), - this, TQT_SLOT (removeBrokenConnection ())); + connect (connection, TQ_SIGNAL (received(const TQByteArray &)), + this, TQ_SLOT (processIncomingMessage(const TQByteArray &))); + connect (connection, TQ_SIGNAL (connectionBroken()), + this, TQ_SLOT (removeBrokenConnection ())); } } @@ -155,7 +155,7 @@ void KMessageClient::sendBroadcast (const TQByteArray &msg) TQDataStream stream (&buffer); stream << static_cast<TQ_UINT32> ( KMessageServer::REQ_BROADCAST ); - TQT_TQIODEVICE(&buffer)->writeBlock (msg); + buffer.writeBlock (msg); sendServerMessage (sendBuffer); } @@ -167,7 +167,7 @@ void KMessageClient::sendForward (const TQByteArray &msg, const TQValueList <TQ_ TQDataStream stream (&buffer); stream << static_cast<TQ_UINT32>( KMessageServer::REQ_FORWARD ) << clients; - TQT_TQIODEVICE(&buffer)->writeBlock (msg); + buffer.writeBlock (msg); sendServerMessage (sendBuffer); } @@ -322,7 +322,7 @@ void KMessageClient::removeBrokenConnection () { kdDebug (11001) << k_funcinfo << ": timer single shot for removeBrokenConnection"<<this << endl; // MH We cannot directly delete the socket. otherwise TQSocket crashes - TQTimer::singleShot( 0, this, TQT_SLOT(removeBrokenConnection2()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(removeBrokenConnection2()) ); return; } @@ -361,7 +361,7 @@ void KMessageClient::unlock () d->isLocked = false; for (unsigned int i = 0; i < d->delayedMessages.count(); i++) { - TQTimer::singleShot(0, this, TQT_SLOT(processFirstMessage())); + TQTimer::singleShot(0, this, TQ_SLOT(processFirstMessage())); } } diff --git a/libtdegames/kgame/kmessageclient.h b/libtdegames/kgame/kmessageclient.h index d66d4352..456f79cc 100644 --- a/libtdegames/kgame/kmessageclient.h +++ b/libtdegames/kgame/kmessageclient.h @@ -49,7 +49,7 @@ class KMessageClientPrivate; */ class KMessageClient : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -295,8 +295,8 @@ signals: \code KMessageClient *client = new KMessageClient (); - connect (client, TQT_SIGNAL (forwardReceived (const TQByteArray &, TQ_UINT32, const TQValueList <TQ_UINT32>&)), - client, TQT_SIGNAL (broadcastReceived (const TQByteArray &, TQ_UINT32))); + connect (client, TQ_SIGNAL (forwardReceived (const TQByteArray &, TQ_UINT32, const TQValueList <TQ_UINT32>&)), + client, TQ_SIGNAL (broadcastReceived (const TQByteArray &, TQ_UINT32))); \endcode Then connect the broadcast signal to your slot that analyzes the message. diff --git a/libtdegames/kgame/kmessageio.cpp b/libtdegames/kgame/kmessageio.cpp index 6067d9e5..413d1a66 100644 --- a/libtdegames/kgame/kmessageio.cpp +++ b/libtdegames/kgame/kmessageio.cpp @@ -157,9 +157,9 @@ void KMessageSocket::processNewData () void KMessageSocket::initSocket () { - connect (mSocket, TQT_SIGNAL (error(int)), TQT_SIGNAL (connectionBroken())); - connect (mSocket, TQT_SIGNAL (connectionClosed()), TQT_SIGNAL (connectionBroken())); - connect (mSocket, TQT_SIGNAL (readyRead()), TQT_SLOT (processNewData())); + connect (mSocket, TQ_SIGNAL (error(int)), TQ_SIGNAL (connectionBroken())); + connect (mSocket, TQ_SIGNAL (connectionClosed()), TQ_SIGNAL (connectionBroken())); + connect (mSocket, TQ_SIGNAL (readyRead()), TQ_SLOT (processNewData())); mAwaitingHeader = true; mNextBlockLength = 0; isRecursive = false; @@ -248,14 +248,14 @@ KMessageProcess::KMessageProcess(TQObject *parent, TQString file) : KMessageIO(p *mProcess << mProcessName << TQString("%1").arg(id); kdDebug(11001) << "@@@KMessageProcess::Init:Id= " << id << endl; kdDebug(11001) << "@@@KMessgeProcess::Init:Processname: " << mProcessName << endl; - connect(mProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this, TQT_SLOT(slotReceivedStdout(TDEProcess *, char * , int ))); - connect(mProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )), - this, TQT_SLOT(slotReceivedStderr(TDEProcess *, char * , int ))); - connect(mProcess, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); - connect(mProcess, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(slotWroteStdin(TDEProcess *))); + connect(mProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQ_SLOT(slotReceivedStdout(TDEProcess *, char * , int ))); + connect(mProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int )), + this, TQ_SLOT(slotReceivedStderr(TDEProcess *, char * , int ))); + connect(mProcess, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); + connect(mProcess, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(slotWroteStdin(TDEProcess *))); mProcess->start(TDEProcess::NotifyOnExit,TDEProcess::All); mSendBuffer=0; mReceiveCount=0; diff --git a/libtdegames/kgame/kmessageio.h b/libtdegames/kgame/kmessageio.h index 0a8d4172..e503da6d 100644 --- a/libtdegames/kgame/kmessageio.h +++ b/libtdegames/kgame/kmessageio.h @@ -55,7 +55,7 @@ class TDEProcess; class KMessageIO : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -169,7 +169,7 @@ protected: class KMessageSocket : public KMessageIO { - Q_OBJECT + TQ_OBJECT public: @@ -296,7 +296,7 @@ protected: class KMessageDirect : public KMessageIO { - Q_OBJECT + TQ_OBJECT public: @@ -350,7 +350,7 @@ protected: class KMessageProcess : public KMessageIO { - Q_OBJECT + TQ_OBJECT public: @@ -389,7 +389,7 @@ class KMessageProcess : public KMessageIO class KMessageFilePipe : public KMessageIO { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/kmessageserver.cpp b/libtdegames/kgame/kmessageserver.cpp index 0ea66dda..e8617f57 100644 --- a/libtdegames/kgame/kmessageserver.cpp +++ b/libtdegames/kgame/kmessageserver.cpp @@ -92,8 +92,8 @@ KMessageServer::KMessageServer (TQ_UINT16 cookie,TQObject* parent) d = new KMessageServerPrivate; d->mIsRecursive=false; d->mCookie=cookie; - connect (&(d->mTimer), TQT_SIGNAL (timeout()), - this, TQT_SLOT (processOneMessage())); + connect (&(d->mTimer), TQ_SIGNAL (timeout()), + this, TQ_SLOT (processOneMessage())); kdDebug(11001) << "CREATE(KMessageServer=" << this << ") cookie=" @@ -138,8 +138,8 @@ bool KMessageServer::initNetwork (TQ_UINT16 port) kdDebug (11001) << k_funcinfo << ": Now listening to port " << d->mServerSocket->port() << endl; - connect (d->mServerSocket, TQT_SIGNAL (newClientConnected (KMessageIO*)), - this, TQT_SLOT (addClient (KMessageIO*))); + connect (d->mServerSocket, TQ_SIGNAL (newClientConnected (KMessageIO*)), + this, TQ_SLOT (addClient (KMessageIO*))); return true; } @@ -183,10 +183,10 @@ void KMessageServer::addClient (KMessageIO* client) kdDebug (11001) << k_funcinfo << ": " << client->id() << endl; // connect its signals - connect (client, TQT_SIGNAL (connectionBroken()), - this, TQT_SLOT (removeBrokenClient())); - connect (client, TQT_SIGNAL (received (const TQByteArray &)), - this, TQT_SLOT (getReceivedMessage (const TQByteArray &))); + connect (client, TQ_SIGNAL (connectionBroken()), + this, TQ_SLOT (removeBrokenClient())); + connect (client, TQ_SIGNAL (received (const TQByteArray &)), + this, TQ_SLOT (getReceivedMessage (const TQByteArray &))); // Tell everyone about the new guest // Note: The new client doesn't get this message! @@ -415,10 +415,7 @@ void KMessageServer::processOneMessage () { case REQ_BROADCAST: out_stream << TQ_UINT32 (MSG_BROADCAST) << clientID; - // FIXME, compiler bug? - // this should be okay, since TQBuffer is subclass of TQIODevice! : - // out_buffer.writeBlock (in_buffer.readAll()); - TQT_TQIODEVICE(&out_buffer)->writeBlock (in_buffer.readAll()); + out_buffer.writeBlock (in_buffer.readAll()); broadcastMessage (out_msg); break; @@ -427,8 +424,7 @@ void KMessageServer::processOneMessage () TQValueList <TQ_UINT32> clients; in_stream >> clients; out_stream << TQ_UINT32 (MSG_FORWARD) << clientID << clients; - // see above! - TQT_TQIODEVICE(&out_buffer)->writeBlock (in_buffer.readAll()); + out_buffer.writeBlock (in_buffer.readAll()); sendMessage (clients, out_msg); } break; diff --git a/libtdegames/kgame/kmessageserver.h b/libtdegames/kgame/kmessageserver.h index 36e58659..93f0e4f2 100644 --- a/libtdegames/kgame/kmessageserver.h +++ b/libtdegames/kgame/kmessageserver.h @@ -174,7 +174,7 @@ class KMessageServerPrivate; */ class KMessageServer : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -476,7 +476,7 @@ private: */ class KMessageServerSocket : public TQServerSocket { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/kplayer.cpp b/libtdegames/kgame/kplayer.cpp index 5945f9cf..4e815b81 100644 --- a/libtdegames/kgame/kplayer.cpp +++ b/libtdegames/kgame/kplayer.cpp @@ -78,8 +78,8 @@ void KPlayer::init() d = new KPlayerPrivate; d->mProperties.registerHandler(KGameMessage::IdPlayerProperty, - this,TQT_SLOT(sendProperty(int, TQDataStream&, bool*)), - TQT_SLOT(emitSignal(KGamePropertyBase *))); + this,TQ_SLOT(sendProperty(int, TQDataStream&, bool*)), + TQ_SLOT(emitSignal(KGamePropertyBase *))); d->mVirtual=false; mActive=true; mGame=0; diff --git a/libtdegames/kgame/kplayer.h b/libtdegames/kgame/kplayer.h index 6e4ef3ae..c12cb92e 100644 --- a/libtdegames/kgame/kplayer.h +++ b/libtdegames/kgame/kplayer.h @@ -66,9 +66,9 @@ class KPlayerPrivate; * functions which are shared by all of your KGameIOs. * */ -class KDE_EXPORT KPlayer : public TQObject +class TDE_EXPORT KPlayer : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdegames/kgame/libtdegames.html b/libtdegames/kgame/libtdegames.html index 94656f36..417ce9b2 100644 --- a/libtdegames/kgame/libtdegames.html +++ b/libtdegames/kgame/libtdegames.html @@ -59,8 +59,8 @@ The exchange of moves and other information is done using the class <em>KMessageServer</em>. An object of this class is a server that waits for connections. Someone who wants to take part - in the game has to connect to this server - usually using an internet socket connection. He does - this by creating a <em>KMessageClient</em> object. This object connects to the message server.<P> + in the game has to connect to this server - usually using an internet socket connection. This is + done by creating a <em>KMessageClient</em> object. This object connects to the message server.<P> The transfer of data is realised by subclasses of the abstract class <em>KMessageIO</em>. One object of this class is created on the client side, one on the server side. Different types of networks can @@ -84,8 +84,8 @@ The KGame objects are by default all equal. So the usual approach will be that every KGame object will store the complete status of the game, and any change or move will be broadcasted to the other KGame objects, so that they all change the status in identical ways. Sometimes it may be necessary (or just - easier to implement) that one KGame object is a <em>game server</em> (i.e. he is repsonsible for everything, - he coordinates the complete game and stores the game status), whereas the other KGame objects are + easier to implement) that one KGame object is a <em>game server</em> (i.e. repsonsible for everything, + coordinating the complete game and stores the game status), whereas the other KGame objects are only dumb stubs that are used to contact the <em>game server</em>. You can implement both approaches using the message server structure. If you need to elect the KGame object that shall be the game server, you may e.g. use the one that has the KMessageClient that is the admin of the message @@ -119,8 +119,8 @@ <b>Scenario 2: network game, started by one player</b><P> - If one user is bored of playing alone, he can open his game for connections from the outside world. - He listens to a TCP/IP socket port (i.e. a number between 0 and 65535). Other players can create + If one user is bored of playing alone, they can open their game for connections from the outside world. + The game listens to a TCP/IP socket port (i.e. a number between 0 and 65535). Other players can create KGame objects of their own and connect to this port. They need to know the IP address of that computer and the port number. This situation will have this structure: @@ -184,4 +184,4 @@ <!--------------------------------------------------------------------------------> </body> -</html>
\ No newline at end of file +</html> diff --git a/libtdegames/kgame/messages.txt b/libtdegames/kgame/messages.txt index 3a163790..5a313f72 100644 --- a/libtdegames/kgame/messages.txt +++ b/libtdegames/kgame/messages.txt @@ -80,7 +80,7 @@ IdAddPlayer rtti IdRemovePlayer Q_INT16 playerid IdError Q_INT32 errorcode - QString errortext + TQString errortext IdGameStatus Q_INT32 status diff --git a/libtdegames/kgamelcd.cpp b/libtdegames/kgamelcd.cpp index 5c9c1d85..86314cc1 100644 --- a/libtdegames/kgamelcd.cpp +++ b/libtdegames/kgamelcd.cpp @@ -36,7 +36,7 @@ KGameLCD::KGameLCD(uint nbDigits, TQWidget *parent, const char *name) _hlColor = p.color(TQPalette::Active, TQColorGroup::HighlightedText); _timer = new TQTimer(this); - connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); setFrameStyle(Panel | Plain); setSegmentStyle(Flat); @@ -114,7 +114,7 @@ KGameLCDClock::KGameLCDClock(TQWidget *parent, const char *name) : KGameLCD(5, parent, name) { _timerClock = new TQTimer(this); - connect(_timerClock, TQT_SIGNAL(timeout()), TQT_SLOT(timeoutClock())); + connect(_timerClock, TQ_SIGNAL(timeout()), TQ_SLOT(timeoutClock())); } KGameLCDClock::~KGameLCDClock() diff --git a/libtdegames/kgamelcd.h b/libtdegames/kgamelcd.h index ba93b91a..2efdc969 100644 --- a/libtdegames/kgamelcd.h +++ b/libtdegames/kgamelcd.h @@ -39,9 +39,9 @@ class TQTimer; * * @since 3.2 */ -class KDE_EXPORT KGameLCD : public TQLCDNumber +class TDE_EXPORT KGameLCD : public TQLCDNumber { - Q_OBJECT + TQ_OBJECT public: KGameLCD(uint nbDigits, TQWidget *parent = 0, const char *name = 0); @@ -124,9 +124,9 @@ private: * * @since 3.2 */ -class KDE_EXPORT KGameLCDClock : public KGameLCD +class TDE_EXPORT KGameLCDClock : public KGameLCD { - Q_OBJECT + TQ_OBJECT public: KGameLCDClock(TQWidget *parent = 0, const char *name = 0); @@ -189,9 +189,9 @@ private: * * @since 3.2 */ -class KDE_EXPORT KGameLCDList : public TQWidget +class TDE_EXPORT KGameLCDList : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/libtdegames/kgamemisc.h b/libtdegames/kgamemisc.h index d610effd..f3c49b1d 100644 --- a/libtdegames/kgamemisc.h +++ b/libtdegames/kgamemisc.h @@ -30,7 +30,7 @@ class KGameMiscPrivate; * a class for. If you know a class for any of these member s please drop one of * the above copyright holders a mail (or just kde-games-devel@kde.org) **/ -class KDE_EXPORT KGameMisc +class TDE_EXPORT KGameMisc { public: KGameMisc(); diff --git a/libtdegames/kgameprogress.cpp b/libtdegames/kgameprogress.cpp index 7327a70f..f3b48c5a 100644 --- a/libtdegames/kgameprogress.cpp +++ b/libtdegames/kgameprogress.cpp @@ -32,12 +32,12 @@ KGameProgress::KGameProgress(TQWidget *parent, const char *name) : TQFrame(parent, name), TQRangeControl(0, 100, 1, 10, 0), - orient(Qt::Horizontal) + orient(TQt::Horizontal) { initialize(); } -KGameProgress::KGameProgress(Qt::Orientation orientation, TQWidget *parent, const char *name) +KGameProgress::KGameProgress(TQt::Orientation orientation, TQWidget *parent, const char *name) : TQFrame(parent, name), TQRangeControl(0, 100, 1, 10, 0), orient(orientation) @@ -46,7 +46,7 @@ KGameProgress::KGameProgress(Qt::Orientation orientation, TQWidget *parent, cons } KGameProgress::KGameProgress(int minValue, int maxValue, int value, - Qt::Orientation orientation, TQWidget *parent, const char *name) + TQt::Orientation orientation, TQWidget *parent, const char *name) : TQFrame(parent, name), TQRangeControl(minValue, maxValue, 1, 10, value), orient(orientation) @@ -72,7 +72,7 @@ void KGameProgress::initialize() bar_style = Solid; text_enabled = TRUE; setBackgroundMode( PaletteBackground ); - connect(kapp, TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(paletteChange())); + connect(kapp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(paletteChange())); paletteChange(); } @@ -118,7 +118,7 @@ void KGameProgress::setBarStyle(BarStyle style) } } -void KGameProgress::setOrientation(Qt::Orientation orientation) +void KGameProgress::setOrientation(TQt::Orientation orientation) { if (orient != orientation) { orient = orientation; @@ -155,7 +155,7 @@ TQSize KGameProgress::sizeHint() const { TQSize s( size() ); - if(orientation() == Qt::Vertical) { + if(orientation() == TQt::Vertical) { s.setWidth(24); } else { s.setHeight(24); @@ -171,7 +171,7 @@ TQSize KGameProgress::minimumSizeHint() const TQSizePolicy KGameProgress::sizePolicy() const { - if ( orientation()==Qt::Vertical ) + if ( orientation()==TQt::Vertical ) return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); else return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); @@ -271,7 +271,7 @@ void KGameProgress::drawContents(TQPainter *p) switch (bar_style) { case Solid: - if (orient ==Qt::Horizontal) { + if (orient ==TQt::Horizontal) { fr.setWidth(recalcValue(cr.width())); er.setLeft(fr.right() + 1); } else { @@ -289,7 +289,7 @@ void KGameProgress::drawContents(TQPainter *p) case Blocked: const int margin = 2; int max, num, dx, dy; - if (orient ==Qt::Horizontal) { + if (orient ==TQt::Horizontal) { fr.setHeight(cr.height() - 2 * margin); fr.setWidth((int)(0.67 * fr.height())); fr.moveTopLeft(TQPoint(cr.left() + margin, cr.top() + margin)); @@ -315,7 +315,7 @@ void KGameProgress::drawContents(TQPainter *p) } if (num != max) { - if (orient ==Qt::Horizontal) + if (orient ==TQt::Horizontal) er.setLeft(fr.right() + 1); else er.setBottom(fr.bottom() + 1); diff --git a/libtdegames/kgameprogress.h b/libtdegames/kgameprogress.h index 2f5e8e57..e5372ce6 100644 --- a/libtdegames/kgameprogress.h +++ b/libtdegames/kgameprogress.h @@ -47,9 +47,9 @@ * @author Martynas Kunigelis * @version $Id$ */ -class KDE_EXPORT KGameProgress : public TQFrame, public TQRangeControl +class TDE_EXPORT KGameProgress : public TQFrame, public TQRangeControl { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( BarStyle ) TQ_PROPERTY( int value READ value WRITE setValue) @@ -109,7 +109,7 @@ public: /** * Set the orientation of the progress bar. * - * Allowed values are @p Qt::Horizontal and @p Qt::Vertical. + * Allowed values are @p TQt::Horizontal and @p TQt::Vertical. */ void setOrientation(Orientation); diff --git a/libtdegames/kstdgameaction.cpp b/libtdegames/kstdgameaction.cpp index 55c41f86..a2e7e906 100644 --- a/libtdegames/kstdgameaction.cpp +++ b/libtdegames/kstdgameaction.cpp @@ -70,8 +70,8 @@ const KStdGameActionInfo g_rgActionInfo[] = { { KStdGameAction::Quit, TDEStdAccel::Quit, 0, "game_quit", I18N_NOOP("&Quit"), 0, "application-exit" }, // "move" menu { KStdGameAction::Repeat, TDEStdAccel::AccelNone, 0, "move_repeat", I18N_NOOP("Repeat"), 0, 0 }, - { KStdGameAction::Undo, TDEStdAccel::Undo, 0, "move_undo", I18N_NOOP("Und&o"), 0, "undo" }, - { KStdGameAction::Redo, TDEStdAccel::Redo, 0, "move_redo", I18N_NOOP("Re&do"), 0, "redo" }, + { KStdGameAction::Undo, TDEStdAccel::Undo, 0, "move_undo", I18N_NOOP("Und&o"), 0, "edit-undo" }, + { KStdGameAction::Redo, TDEStdAccel::Redo, 0, "move_redo", I18N_NOOP("Re&do"), 0, "edit-redo" }, { KStdGameAction::Roll, TDEStdAccel::AccelNone, TQt::CTRL+TQt::Key_R, "move_roll", I18N_NOOP("&Roll Dice"), 0, "roll" }, { KStdGameAction::EndTurn, TDEStdAccel::AccelNone, 0, "move_end_turn", I18N_NOOP("End Turn"), 0, "endturn" }, { KStdGameAction::Hint, TDEStdAccel::AccelNone, TQt::Key_H, "move_hint", I18N_NOOP("&Hint"), 0, "idea" }, diff --git a/libtdegames/kstdgameaction.h b/libtdegames/kstdgameaction.h index f0d809b2..16624f1a 100644 --- a/libtdegames/kstdgameaction.h +++ b/libtdegames/kstdgameaction.h @@ -45,7 +45,7 @@ class TDESelectAction; * @author Andreas Beckermann <b_mann@gmx.de> */ // #### KDE4: transform in namespace -class KDE_EXPORT KStdGameAction +class TDE_EXPORT KStdGameAction { public: /** |