Browse Source

Rename a number of classes to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 8 years ago
parent
commit
58a97ed3af
162 changed files with 1038 additions and 1038 deletions
  1. +13
    -13
      atlantik/client/atlantik.cpp
  2. +3
    -3
      atlantik/client/atlantik.h
  3. +2
    -2
      atlantik/client/eventlogwidget.cpp
  4. +3
    -3
      atlantik/client/eventlogwidget.h
  5. +1
    -1
      atlantik/client/selectgame_widget.cpp
  6. +1
    -1
      atlantik/client/selectgame_widget.h
  7. +1
    -1
      atlantik/client/selectserver_widget.cpp
  8. +1
    -1
      atlantik/client/selectserver_widget.h
  9. +3
    -3
      atlantik/libatlantikui/auction_widget.cpp
  10. +3
    -3
      atlantik/libatlantikui/auction_widget.h
  11. +1
    -1
      atlantik/libatlantikui/estatedetails.cpp
  12. +2
    -2
      atlantik/libatlantikui/estatedetails.h
  13. +2
    -2
      atlantik/libatlantikui/estateview.cpp
  14. +2
    -2
      atlantik/libatlantikui/kwrappedlistviewitem.cpp
  15. +1
    -1
      atlantik/libatlantikui/kwrappedlistviewitem.h
  16. +1
    -1
      atlantik/libatlantikui/portfolioview.cpp
  17. +11
    -11
      atlantik/libatlantikui/trade_widget.cpp
  18. +6
    -6
      atlantik/libatlantikui/trade_widget.h
  19. +16
    -16
      kasteroids/toplevel.cpp
  20. +4
    -4
      kasteroids/toplevel.h
  21. +8
    -8
      katomic/toplevel.cpp
  22. +3
    -3
      katomic/toplevel.h
  23. +24
    -24
      kbackgammon/engines/fibs/kbgfibs.cpp
  24. +7
    -7
      kbackgammon/engines/fibs/kbgfibs.h
  25. +23
    -23
      kbackgammon/engines/fibs/kbgfibschat.cpp
  26. +1
    -1
      kbackgammon/engines/fibs/kbgfibschat.h
  27. +27
    -27
      kbackgammon/engines/fibs/kplayerlist.cpp
  28. +2
    -2
      kbackgammon/engines/fibs/kplayerlist.h
  29. +1
    -1
      kbackgammon/engines/gnubg/kbggnubg.cpp
  30. +1
    -1
      kbackgammon/engines/gnubg/kbggnubg.h
  31. +2
    -2
      kbackgammon/engines/nextgen/kbgng.cpp
  32. +3
    -3
      kbackgammon/engines/nextgen/kbgng.h
  33. +5
    -5
      kbackgammon/engines/offline/kbgoffline.cpp
  34. +7
    -7
      kbackgammon/kbg.cpp
  35. +5
    -5
      kbackgammon/kbg.h
  36. +1
    -1
      kbackgammon/kbgboard.cpp
  37. +1
    -1
      kbackgammon/kbgboard.h
  38. +1
    -1
      kbackgammon/kbgtextview.cpp
  39. +8
    -8
      kbattleship/kbattleship/kbattleship.cpp
  40. +8
    -8
      kbattleship/kbattleship/kbattleship.h
  41. +13
    -13
      kblackbox/kbbgame.cpp
  42. +6
    -6
      kblackbox/kbbgame.h
  43. +6
    -6
      kbounce/kbounce.cpp
  44. +5
    -5
      kbounce/kbounce.h
  45. +18
    -18
      kenolaba/AbTop.cpp
  46. +7
    -7
      kenolaba/AbTop.h
  47. +1
    -1
      kenolaba/ChangeLog
  48. +1
    -1
      kenolaba/kenolaba.cpp
  49. +53
    -53
      kgoldrunner/src/kgoldrunner.cpp
  50. +19
    -19
      kgoldrunner/src/kgoldrunner.h
  51. +4
    -4
      kjumpingcube/kjumpingcube.cpp
  52. +4
    -4
      kjumpingcube/kjumpingcube.h
  53. +14
    -14
      klines/klines.cpp
  54. +9
    -9
      klines/klines.h
  55. +3
    -3
      kmahjongg/Editor.cpp
  56. +1
    -1
      kmahjongg/Editor.h
  57. +12
    -12
      kmahjongg/kmahjongg.cpp
  58. +5
    -5
      kmahjongg/kmahjongg.h
  59. +2
    -2
      kmines/CHANGELOG
  60. +3
    -3
      kmines/kzoommainwindow.cpp
  61. +4
    -4
      kmines/kzoommainwindow.h
  62. +11
    -11
      kmines/main.cpp
  63. +7
    -7
      kmines/main.h
  64. +1
    -1
      knetwalk/src/mainwindow.cpp
  65. +3
    -3
      knetwalk/src/mainwindow.h
  66. +1
    -1
      kolf/editor.cpp
  67. +2
    -2
      kolf/editor.h
  68. +25
    -25
      kolf/kolf.cpp
  69. +32
    -32
      kolf/kolf.h
  70. +1
    -1
      kolf/newgame.cpp
  71. +2
    -2
      kolf/newgame.h
  72. +1
    -1
      konquest/fleetdlg.cc
  73. +8
    -8
      konquest/mainwin.cc
  74. +3
    -3
      konquest/mainwin.h
  75. +1
    -1
      konquest/scoredlg.cc
  76. +2
    -2
      kpat/clock.cpp
  77. +1
    -1
      kpat/clock.h
  78. +2
    -2
      kpat/computation.cpp
  79. +1
    -1
      kpat/computation.h
  80. +7
    -7
      kpat/dealer.cpp
  81. +9
    -9
      kpat/dealer.h
  82. +2
    -2
      kpat/fortyeight.cpp
  83. +1
    -1
      kpat/fortyeight.h
  84. +4
    -4
      kpat/freecell.cpp
  85. +1
    -1
      kpat/freecell.h
  86. +2
    -2
      kpat/golf.cpp
  87. +1
    -1
      kpat/golf.h
  88. +2
    -2
      kpat/grandf.cpp
  89. +3
    -3
      kpat/grandf.h
  90. +2
    -2
      kpat/gypsy.cpp
  91. +3
    -3
      kpat/gypsy.h
  92. +2
    -2
      kpat/idiot.cpp
  93. +1
    -1
      kpat/idiot.h
  94. +2
    -2
      kpat/kings.cpp
  95. +2
    -2
      kpat/kings.h
  96. +3
    -3
      kpat/klondike.cpp
  97. +1
    -1
      kpat/klondike.h
  98. +2
    -2
      kpat/mod3.cpp
  99. +1
    -1
      kpat/mod3.h
  100. +2
    -2
      kpat/napoleon.cpp
  101. +1
    -1
      kpat/napoleon.h
  102. +11
    -11
      kpat/pwidget.cpp
  103. +13
    -13
      kpat/pwidget.h
  104. +2
    -2
      kpat/simon.cpp
  105. +1
    -1
      kpat/simon.h
  106. +4
    -4
      kpat/spider.cpp
  107. +1
    -1
      kpat/spider.h
  108. +2
    -2
      kpat/yukon.cpp
  109. +1
    -1
      kpat/yukon.h
  110. +13
    -13
      kpoker/top.cpp
  111. +8
    -8
      kpoker/top.h
  112. +2
    -2
      kreversi/ChangeLog
  113. +1
    -1
      kreversi/DESIGN
  114. +1
    -1
      kreversi/TODO
  115. +9
    -9
      kreversi/kreversi.cpp
  116. +8
    -8
      kreversi/kreversi.h
  117. +3
    -3
      kreversi/kzoommainwindow.cpp
  118. +5
    -5
      kreversi/kzoommainwindow.h
  119. +5
    -5
      ksame/KSameWidget.cpp
  120. +6
    -6
      ksame/KSameWidget.h
  121. +11
    -11
      kshisen/app.cpp
  122. +2
    -2
      kshisen/app.h
  123. +3
    -3
      ksirtet/CHANGELOG
  124. +17
    -17
      ksmiletris/gamewindow.cpp
  125. +1
    -1
      ksmiletris/gamewindow.h
  126. +6
    -6
      ksnake/game.cpp
  127. +3
    -3
      ksnake/game.h
  128. +1
    -1
      ksnake/rattler.cpp
  129. +2
    -2
      ksnake/rattler.h
  130. +4
    -4
      ksokoban/MainWindow.cpp
  131. +1
    -1
      ksokoban/MainWindow.h
  132. +4
    -4
      kspaceduel/mainview.cpp
  133. +5
    -5
      kspaceduel/mainview.h
  134. +14
    -14
      kspaceduel/topwidget.cpp
  135. +1
    -1
      kspaceduel/topwidget.h
  136. +13
    -13
      ktron/ktron.cpp
  137. +4
    -4
      ktron/ktron.h
  138. +1
    -1
      ktron/tron.cpp
  139. +3
    -3
      ktron/tron.h
  140. +41
    -41
      ktuberling/toplevel.cpp
  141. +2
    -2
      ktuberling/toplevel.h
  142. +3
    -3
      libksirtet/base/kzoommainwindow.cpp
  143. +4
    -4
      libksirtet/base/kzoommainwindow.h
  144. +2
    -2
      libksirtet/base/main.h
  145. +5
    -5
      libksirtet/common/main.cpp
  146. +4
    -4
      libksirtet/lib/keys.cpp
  147. +2
    -2
      libksirtet/lib/keys.h
  148. +1
    -1
      libksirtet/lib/mp_interface.h
  149. +1
    -1
      libksirtet/lib/mp_simple_interface.cpp
  150. +3
    -3
      libtdegames/highscore/kexthighscore_gui.cpp
  151. +2
    -2
      libtdegames/highscore/kexthighscore_gui.h
  152. +2
    -2
      libtdegames/highscore/kexthighscore_tab.cpp
  153. +2
    -2
      libtdegames/highscore/kexthighscore_tab.h
  154. +4
    -4
      libtdegames/kchatdialog.cpp
  155. +12
    -12
      libtdegames/kgame/dialogs/kgamedebugdialog.cpp
  156. +2
    -2
      libtdegames/kgame/dialogs/kgamedialogconfig.cpp
  157. +84
    -84
      libtdegames/kstdgameaction.cpp
  158. +55
    -55
      libtdegames/kstdgameaction.h
  159. +30
    -30
      lskat/lskat/lskat.cpp
  160. +15
    -15
      lskat/lskat/lskat.h
  161. +6
    -6
      twin4/twin4/twin4.cpp
  162. +1
    -1
      twin4/twin4/twin4.h

+ 13
- 13
atlantik/client/atlantik.cpp View File

@ -69,7 +69,7 @@ LogTextEdit::LogTextEdit( TQWidget *parent, const char *name ) : TQTextEdit( par
#ifdef KDE_3_2_FEATURES
m_clear = KStdAction::clear( TQT_TQOBJECT(this), TQT_SLOT( clear() ), 0 );
#else
m_clear = new KAction( i18n("Clear"), "clear", NULL, TQT_TQOBJECT(this), TQT_SLOT( clear() ), static_cast<KActionCollection *>(0), "clear" );
m_clear = new TDEAction( i18n("Clear"), "clear", NULL, TQT_TQOBJECT(this), TQT_SLOT( clear() ), static_cast<TDEActionCollection *>(0), "clear" );
#endif
m_selectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), 0 );
m_copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copy() ), 0 );
@ -95,7 +95,7 @@ TQPopupMenu *LogTextEdit::createPopupMenu( const TQPoint & )
}
Atlantik::Atlantik ()
: KMainWindow (),
: TDEMainWindow (),
m_runningGame( false )
{
// Read application configuration
@ -103,7 +103,7 @@ Atlantik::Atlantik ()
// Toolbar: Game
// KStdGameAction::gameNew(this, TQT_SLOT(slotNewGame()), actionCollection(), "game_new");
m_showEventLog = new KAction(i18n("Show Event &Log")/*, "atlantik_showeventlog"*/, CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(showEventLog()), actionCollection(), "showeventlog");
m_showEventLog = new TDEAction(i18n("Show Event &Log")/*, "atlantik_showeventlog"*/, CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(showEventLog()), actionCollection(), "showeventlog");
KStdGameAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection(), "game_quit");
// Toolbar: Settings
@ -132,24 +132,24 @@ Atlantik::Atlantik ()
// Menu,toolbar: Move
m_roll = KStdGameAction::roll(TQT_TQOBJECT(this), TQT_SIGNAL(rollDice()), actionCollection());
m_roll->setEnabled(false);
m_buyEstate = new KAction(i18n("&Buy"), "atlantik_buy_estate", CTRL+Key_B, TQT_TQOBJECT(this), TQT_SIGNAL(buyEstate()), actionCollection(), "buy_estate");
m_buyEstate = new TDEAction(i18n("&Buy"), "atlantik_buy_estate", CTRL+Key_B, TQT_TQOBJECT(this), TQT_SIGNAL(buyEstate()), actionCollection(), "buy_estate");
m_buyEstate->setEnabled(false);
m_auctionEstate = new KAction(i18n("&Auction"), "auction", CTRL+Key_A, TQT_TQOBJECT(this), TQT_SIGNAL(auctionEstate()), actionCollection(), "auction");
m_auctionEstate = new TDEAction(i18n("&Auction"), "auction", CTRL+Key_A, TQT_TQOBJECT(this), TQT_SIGNAL(auctionEstate()), actionCollection(), "auction");
m_auctionEstate->setEnabled(false);
m_endTurn = KStdGameAction::endTurn(TQT_TQOBJECT(this), TQT_SIGNAL(endTurn()), actionCollection());
m_endTurn->setEnabled(false);
m_jailCard = new KAction(i18n("Use Card to Leave Jail")/*, "atlantik_move_jail_card"*/, 0, TQT_TQOBJECT(this), TQT_SIGNAL(jailCard()), actionCollection(), "move_jailcard");
m_jailCard = new TDEAction(i18n("Use Card to Leave Jail")/*, "atlantik_move_jail_card"*/, 0, TQT_TQOBJECT(this), TQT_SIGNAL(jailCard()), actionCollection(), "move_jailcard");
m_jailCard->setEnabled(false);
m_jailPay = new KAction(i18n("&Pay to Leave Jail"), "jail_pay", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SIGNAL(jailPay()), actionCollection(), "move_jailpay");
m_jailPay = new TDEAction(i18n("&Pay to Leave Jail"), "jail_pay", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SIGNAL(jailPay()), actionCollection(), "move_jailpay");
m_jailPay->setEnabled(false);
m_jailRoll = new KAction(i18n("Roll to Leave &Jail")/*, "atlantik_move_jail_roll"*/, CTRL+Key_J, TQT_TQOBJECT(this), TQT_SIGNAL(jailRoll()), actionCollection(), "move_jailroll");
m_jailRoll = new TDEAction(i18n("Roll to Leave &Jail")/*, "atlantik_move_jail_roll"*/, CTRL+Key_J, TQT_TQOBJECT(this), TQT_SIGNAL(jailRoll()), actionCollection(), "move_jailroll");
m_jailRoll->setEnabled(false);
// Mix code and XML into GUI
KMainWindow::createGUI();
TDEMainWindow::createGUI();
applyMainWindowSettings( TDEGlobal::config(), "AtlantikMainWindow" );
KMainWindow::statusBar()->insertItem("Atlantik " ATLANTIK_VERSION_STRING, 0);
KMainWindow::statusBar()->insertItem(TQString(), 1);
TDEMainWindow::statusBar()->insertItem("Atlantik " ATLANTIK_VERSION_STRING, 0);
TDEMainWindow::statusBar()->insertItem(TQString(), 1);
connect(statusBar(), TQT_SIGNAL(released(int)), TQT_TQOBJECT(this), TQT_SLOT(statusBarClick(int)));
// Main widget, containing all others
@ -627,7 +627,7 @@ void Atlantik::slotMsgError(TQString msg)
void Atlantik::slotMsgStatus(const TQString &message, const TQString &icon)
{
KMainWindow::statusBar()->changeItem(message, 1);
TDEMainWindow::statusBar()->changeItem(message, 1);
m_eventLog->addEvent(message, icon);
}
@ -848,6 +848,6 @@ void Atlantik::closeEvent(TQCloseEvent *e)
m_atlantikNetwork->leaveGame();
saveMainWindowSettings(kapp->config(), "AtlantikMainWindow");
KMainWindow::closeEvent(e);
TDEMainWindow::closeEvent(e);
}
}

+ 3
- 3
atlantik/client/atlantik.h View File

@ -80,7 +80,7 @@ public:
TQPopupMenu *createPopupMenu( const TQPoint & pos );
private:
KAction *m_clear, *m_selectAll, *m_copy;
TDEAction *m_clear, *m_selectAll, *m_copy;
};
/**
@ -89,7 +89,7 @@ private:
*
* @author Rob Kaper <cap@capsi.com>
*/
class Atlantik : public KMainWindow
class Atlantik : public TDEMainWindow
{
Q_OBJECT
@ -245,7 +245,7 @@ private:
TQLineEdit *m_input;
TQTextEdit *m_serverMsgs;
KAction *m_roll, *m_buyEstate, *m_auctionEstate, *m_endTurn,
TDEAction *m_roll, *m_buyEstate, *m_auctionEstate, *m_endTurn,
*m_jailCard, *m_jailPay, *m_jailRoll, *m_configure,
*m_showEventLog;


+ 2
- 2
atlantik/client/eventlogwidget.cpp View File

@ -60,7 +60,7 @@ EventLogWidget::EventLogWidget(EventLog *eventLog, TQWidget *parent, const char
TQVBoxLayout *listCompBox = new TQVBoxLayout(this, KDialog::marginHint());
m_eventList = new KListView(this, "eventList");
m_eventList = new TDEListView(this, "eventList");
listCompBox->addWidget(m_eventList);
m_eventList->addColumn(i18n("Date/Time"));
@ -92,7 +92,7 @@ void EventLogWidget::addEvent(Event *event)
delete m_eventList->firstChild();
TQString description = KStringHandler::rsqueeze( event->description(), 200 );
KListViewItem *item = new KListViewItem(m_eventList, event->dateTime().toString("yyyy-MM-dd hh:mm:ss zzz"), description);
TDEListViewItem *item = new TDEListViewItem(m_eventList, event->dateTime().toString("yyyy-MM-dd hh:mm:ss zzz"), description);
if (event->icon().isEmpty())
item->setPixmap(1, TQPixmap(SmallIcon("atlantik")));
else


+ 3
- 3
atlantik/client/eventlogwidget.h View File

@ -24,8 +24,8 @@ class TQString;
class Event;
class KListView;
class KListViewItem;
class TDEListView;
class TDEListViewItem;
class KPushButton;
class EventLog : public TQObject
@ -68,7 +68,7 @@ private slots:
private:
EventLog *m_eventLog;
KListView *m_eventList;
TDEListView *m_eventList;
KPushButton *m_saveButton;
};


+ 1
- 1
atlantik/client/selectgame_widget.cpp View File

@ -44,7 +44,7 @@ SelectGame::SelectGame(AtlanticCore *atlanticCore, TQWidget *parent, const char
m_mainLayout->addWidget(groupBox);
// List of games
m_gameList = new KListView(groupBox, "m_gameList");
m_gameList = new TDEListView(groupBox, "m_gameList");
m_gameList->addColumn(i18n("Game"));
m_gameList->addColumn(i18n("Description"));
m_gameList->addColumn(i18n("Id"));


+ 1
- 1
atlantik/client/selectgame_widget.h View File

@ -59,7 +59,7 @@ private:
AtlanticCore *m_atlanticCore;
TQVBoxLayout *m_mainLayout;
KListView *m_gameList;
TDEListView *m_gameList;
KPushButton *m_connectButton;
};


+ 1
- 1
atlantik/client/selectserver_widget.cpp View File

@ -58,7 +58,7 @@ SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServe
m_mainLayout->addWidget(bgroup);
// List of servers
m_serverList = new KListView(bgroup, "m_serverList");
m_serverList = new TDEListView(bgroup, "m_serverList");
m_serverList->addColumn(i18n("Host"));
m_serverList->addColumn(i18n("Latency"));
m_serverList->addColumn(i18n("Version"));


+ 1
- 1
atlantik/client/selectserver_widget.h View File

@ -64,7 +64,7 @@ private:
void initMonopigator();
TQVBoxLayout *m_mainLayout;
KListView *m_serverList;
TDEListView *m_serverList;
KLineEdit *m_hostEdit, *m_portEdit;
KPushButton *m_addServerButton, *m_refreshButton, *m_customConnect, *m_connectButton;
Monopigator *m_monopigator;


+ 3
- 3
atlantik/libatlantikui/auction_widget.cpp View File

@ -50,12 +50,12 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid
m_playerGroupBox = new TQVGroupBox(estate ? i18n("Auction: %1").arg(estate->name()) : i18n("Auction"), this, "groupBox");
m_mainLayout->addWidget(m_playerGroupBox);
m_playerList = new KListView(m_playerGroupBox);
m_playerList = new TDEListView(m_playerGroupBox);
m_playerList->addColumn(i18n("Player"));
m_playerList->addColumn(i18n("Bid"));
m_playerList->setSorting(1, false);
KListViewItem *item;
TDEListViewItem *item;
Player *player, *pSelf = m_atlanticCore->playerSelf();
TQPtrList<Player> playerList = m_atlanticCore->players();
@ -63,7 +63,7 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid
{
if ( (player = *it) && player->game() == pSelf->game() )
{
item = new KListViewItem(m_playerList, player->name(), TQString("0"));
item = new TDEListViewItem(m_playerList, player->name(), TQString("0"));
item->setPixmap(0, TQPixmap(SmallIcon("personal")));
m_playerItems[player] = item;


+ 3
- 3
atlantik/libatlantikui/auction_widget.h View File

@ -27,7 +27,7 @@ class TQVGroupBox;
class TQSpinBox;
class TQLabel;
class KListViewItem;
class TDEListViewItem;
class AtlanticCore;
class Player;
@ -54,10 +54,10 @@ private:
TQVBoxLayout *m_mainLayout;
TQVGroupBox *m_playerGroupBox;
TQSpinBox *m_bidSpinBox;
TQMap<Player *, KListViewItem *> m_playerItems;
TQMap<Player *, TDEListViewItem *> m_playerItems;
TQLabel *m_statusLabel;
KListView *m_playerList;
TDEListView *m_playerList;
AtlanticCore *m_atlanticCore;
Auction *m_auction;


+ 1
- 1
atlantik/libatlantikui/estatedetails.cpp View File

@ -56,7 +56,7 @@ EstateDetails::EstateDetails(Estate *estate, TQString text, TQWidget *parent, co
m_mainLayout->addItem(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint()+50, TQSizePolicy::Fixed, TQSizePolicy::Minimum));
m_infoListView = new KListView(this, "infoListView");
m_infoListView = new TDEListView(this, "infoListView");
m_infoListView->addColumn(m_estate ? m_estate->name() : TQString("") );
m_infoListView->setSorting(-1);
m_mainLayout->addWidget(m_infoListView);


+ 2
- 2
atlantik/libatlantikui/estatedetails.h View File

@ -25,7 +25,7 @@ class TQHBoxLayout;
class TQVBoxLayout;
class TQVGroupBox;
class KListView;
class TDEListView;
class KPixmap;
class KPushButton;
@ -65,7 +65,7 @@ private:
Estate *m_estate;
TQPixmap *m_pixmap;
KPixmap *m_quartzBlocks;
KListView *m_infoListView;
TDEListView *m_infoListView;
KPushButton *m_closeButton;
bool b_recreate, m_recreateQuartz;
TQVBoxLayout *m_mainLayout;


+ 2
- 2
atlantik/libatlantikui/estateview.cpp View File

@ -434,7 +434,7 @@ void EstateView::mousePressEvent(TQMouseEvent *e)
{
if (e->button()==Qt::RightButton && m_estate->isOwned())
{
KPopupMenu *rmbMenu = new KPopupMenu(this);
TDEPopupMenu *rmbMenu = new TDEPopupMenu(this);
rmbMenu->insertTitle(m_estate->name());
if (m_estate->isOwnedBySelf())
@ -480,7 +480,7 @@ void EstateView::mousePressEvent(TQMouseEvent *e)
rmbMenu->insertItem(i18n("Request Trade with %1").arg(player->name()), 3);
}
KPopupMenu *pm = dynamic_cast<KPopupMenu *>(rmbMenu);
TDEPopupMenu *pm = dynamic_cast<TDEPopupMenu *>(rmbMenu);
if (pm) {
connect(pm, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuAction(int)));
}


+ 2
- 2
atlantik/libatlantikui/kwrappedlistviewitem.cpp View File

@ -32,13 +32,13 @@
#include "kwrappedlistviewitem.h"
KWrappedListViewItem::KWrappedListViewItem( TQListView *parent, TQString text, TQString t2 )
: TQObject(), KListViewItem( parent )
: TQObject(), TDEListViewItem( parent )
{
init( parent, text, t2 );
}
KWrappedListViewItem::KWrappedListViewItem( TQListView *parent, TQListViewItem *after, TQString text, TQString t2 )
: TQObject(), KListViewItem( parent, after )
: TQObject(), TDEListViewItem( parent, after )
{
init( parent, text, t2 );
}


+ 1
- 1
atlantik/libatlantikui/kwrappedlistviewitem.h View File

@ -32,7 +32,7 @@
class KWordWrap;
class KWrappedListViewItem : public TQObject, public KListViewItem
class KWrappedListViewItem : public TQObject, public TDEListViewItem
{
Q_OBJECT


+ 1
- 1
atlantik/libatlantikui/portfolioview.cpp View File

@ -254,7 +254,7 @@ void PortfolioView::mousePressEvent(TQMouseEvent *e)
if ( e->button()==Qt::RightButton && (m_player != playerSelf) )
{
KPopupMenu *rmbMenu = new KPopupMenu(this);
TDEPopupMenu *rmbMenu = new TDEPopupMenu(this);
rmbMenu->insertTitle(m_player->name());
if ( m_portfolioEstates.count() )


+ 11
- 11
atlantik/libatlantikui/trade_widget.cpp View File

@ -114,7 +114,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p
connect(m_updateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateComponent()));
m_componentList = new KListView(this, "componentList");
m_componentList = new TDEListView(this, "componentList");
listCompBox->addWidget(m_componentList);
m_componentList->addColumn(i18n("Player"));
@ -122,7 +122,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p
m_componentList->addColumn(i18n("Player"));
m_componentList->addColumn(i18n("Item"));
connect(m_componentList, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem *, const TQPoint&)), TQT_SLOT(contextMenu(KListView *, TQListViewItem *, const TQPoint&)));
connect(m_componentList, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem *, const TQPoint&)), TQT_SLOT(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)));
connect(m_componentList, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(setCombos(TQListViewItem *)));
TQHBoxLayout *actionBox = new TQHBoxLayout(this, 0, KDialog::spacingHint());
@ -147,7 +147,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p
// mPlayerList->header()->hide();
// mPlayerList->setRootIsDecorated(true);
// mPlayerList->setResizeMode(KListView::AllColumns);
// mPlayerList->setResizeMode(TDEListView::AllColumns);
connect(m_trade, TQT_SIGNAL(itemAdded(TradeItem *)), this, TQT_SLOT(tradeItemAdded(TradeItem *)));
connect(m_trade, TQT_SIGNAL(itemRemoved(TradeItem *)), this, TQT_SLOT(tradeItemRemoved(TradeItem *)));
@ -177,7 +177,7 @@ void TradeDisplay::closeEvent(TQCloseEvent *e)
void TradeDisplay::tradeItemAdded(TradeItem *tradeItem)
{
KListViewItem *item = new KListViewItem(m_componentList, (tradeItem->from() ? tradeItem->from()->name() : TQString("?")), i18n("gives is transitive ;)", "gives"), (tradeItem->to() ? tradeItem->to()->name() : TQString("?")), tradeItem->text());
TDEListViewItem *item = new TDEListViewItem(m_componentList, (tradeItem->from() ? tradeItem->from()->name() : TQString("?")), i18n("gives is transitive ;)", "gives"), (tradeItem->to() ? tradeItem->to()->name() : TQString("?")), tradeItem->text());
connect(tradeItem, TQT_SIGNAL(changed(TradeItem *)), this, TQT_SLOT(tradeItemChanged(TradeItem *)));
item->setPixmap(0, TQPixmap(SmallIcon("personal")));
@ -194,14 +194,14 @@ void TradeDisplay::tradeItemAdded(TradeItem *tradeItem)
void TradeDisplay::tradeItemRemoved(TradeItem *t)
{
KListViewItem *item = m_componentMap[t];
TDEListViewItem *item = m_componentMap[t];
delete item;
m_componentMap[t] = 0;
}
void TradeDisplay::tradeItemChanged(TradeItem *t)
{
KListViewItem *item = m_componentMap[t];
TDEListViewItem *item = m_componentMap[t];
if (item)
{
item->setText(0, t->from() ? t->from()->name() : TQString("?"));
@ -225,7 +225,7 @@ void TradeDisplay::playerChanged(Player *player)
m_playerTargetCombo->changeItem(player->name(), m_playerTargetRevMap[player]);
TradeItem *item = 0;
for (TQMap<KListViewItem *, TradeItem *>::Iterator it=m_componentRevMap.begin() ; it != m_componentRevMap.end() && (item = *it) ; ++it)
for (TQMap<TDEListViewItem *, TradeItem *>::Iterator it=m_componentRevMap.begin() ; it != m_componentRevMap.end() && (item = *it) ; ++it)
tradeItemChanged(item);
}
@ -293,7 +293,7 @@ void TradeDisplay::setEstateCombo(int index)
void TradeDisplay::setCombos(TQListViewItem *i)
{
TradeItem *item = m_componentRevMap[(KListViewItem *)(i)];
TradeItem *item = m_componentRevMap[(TDEListViewItem *)(i)];
if (TradeEstate *tradeEstate = dynamic_cast<TradeEstate*>(item))
{
setTypeCombo(0);
@ -348,11 +348,11 @@ void TradeDisplay::accept()
emit accept(m_trade);
}
void TradeDisplay::contextMenu(KListView *, TQListViewItem *i, const TQPoint& p)
void TradeDisplay::contextMenu(TDEListView *, TQListViewItem *i, const TQPoint& p)
{
m_contextTradeItem = m_componentRevMap[(KListViewItem *)(i)];
m_contextTradeItem = m_componentRevMap[(TDEListViewItem *)(i)];
KPopupMenu *rmbMenu = new KPopupMenu(this);
TDEPopupMenu *rmbMenu = new TDEPopupMenu(this);
// rmbMenu->insertTitle( ... );
rmbMenu->insertItem(i18n("Remove From Trade"), 0);


+ 6
- 6
atlantik/libatlantikui/trade_widget.h View File

@ -26,8 +26,8 @@ class TQLabel;
class TQListViewItem;
class TQSpinBox;
class KListView;
class KListViewItem;
class TDEListView;
class TDEListViewItem;
class KComboBox;
class KPushButton;
@ -65,7 +65,7 @@ private slots:
void reject();
void accept();
void contextMenu(KListView *l, TQListViewItem *i, const TQPoint& p);
void contextMenu(TDEListView *l, TQListViewItem *i, const TQPoint& p);
void contextMenuClicked(int item);
signals:
@ -80,7 +80,7 @@ private:
TQSpinBox *m_moneyBox;
KComboBox *m_editTypeCombo, *m_playerFromCombo, *m_playerTargetCombo, *m_estateCombo;
KListView *m_componentList;
TDEListView *m_componentList;
KPushButton *m_updateButton, *m_rejectButton, *m_acceptButton;
AtlanticCore *m_atlanticCore;
@ -88,8 +88,8 @@ private:
TradeItem *m_contextTradeItem;
// TODO: Wouldn't TQPair make more sense here?
TQMap<TradeItem *, KListViewItem *> m_componentMap;
TQMap<KListViewItem *, TradeItem *> m_componentRevMap;
TQMap<TradeItem *, TDEListViewItem *> m_componentMap;
TQMap<TDEListViewItem *, TradeItem *> m_componentRevMap;
TQMap<int, Estate *> m_estateMap;
TQMap<Estate *, int> m_estateRevMap;
TQMap<int, Player *> m_playerFromMap, m_playerTargetMap;


+ 16
- 16
kasteroids/toplevel.cpp View File

@ -246,11 +246,11 @@ KAstTopLevel::KAstTopLevel()
powerMeter->setFixedSize( 200, 12 );
hbd->addWidget( powerMeter );
initKAction();
initTDEAction();
setCentralWidget( mainWin );
setupGUI( KMainWindow::Save | Create );
setupGUI( TDEMainWindow::Save | Create );
setFocusPolicy( TQ_StrongFocus );
setFocus();
@ -277,7 +277,7 @@ KAstTopLevel::~KAstTopLevel()
#endif
}
void KAstTopLevel::initKAction()
void KAstTopLevel::initTDEAction()
{
// game
KStdGameAction::gameNew( TQT_TQOBJECT(this), TQT_SLOT( slotNewGame() ), actionCollection() );
@ -290,14 +290,14 @@ void KAstTopLevel::initKAction()
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotPref() ), actionCollection());
// keyboard-only actions
keycodes.insert(Thrust, new KAction(i18n("Thrust"), TQt::Key_Up, 0, 0, actionCollection(), "Thrust"));
keycodes.insert(RotateLeft, new KAction(i18n("Rotate Left"), TQt::Key_Left, 0, 0, actionCollection(), "RotateLeft"));
keycodes.insert(RotateRight, new KAction(i18n("Rotate Right"), TQt::Key_Right, 0, 0, actionCollection(), "RotateRight"));
keycodes.insert(Shoot, new KAction(i18n("Shoot"), TQt::Key_Space, 0, 0, actionCollection(), "Shoot"));
// keycodes.insert(Teleport, new KAction(i18n("Teleport"), TQt::Key_Z, 0, 0, actionCollection(), "Teleport"));
keycodes.insert(Brake, new KAction(i18n("Brake"), TQt::Key_X, 0, 0, actionCollection(), "Brake"));
keycodes.insert(Shield, new KAction(i18n("Shield"), TQt::Key_S, 0, 0, actionCollection(), "Shield"));
launchAction = new KAction(i18n("Launch"), TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotLaunch()), actionCollection(), "Launch");
keycodes.insert(Thrust, new TDEAction(i18n("Thrust"), TQt::Key_Up, 0, 0, actionCollection(), "Thrust"));
keycodes.insert(RotateLeft, new TDEAction(i18n("Rotate Left"), TQt::Key_Left, 0, 0, actionCollection(), "RotateLeft"));
keycodes.insert(RotateRight, new TDEAction(i18n("Rotate Right"), TQt::Key_Right, 0, 0, actionCollection(), "RotateRight"));
keycodes.insert(Shoot, new TDEAction(i18n("Shoot"), TQt::Key_Space, 0, 0, actionCollection(), "Shoot"));
// keycodes.insert(Teleport, new TDEAction(i18n("Teleport"), TQt::Key_Z, 0, 0, actionCollection(), "Teleport"));
keycodes.insert(Brake, new TDEAction(i18n("Brake"), TQt::Key_X, 0, 0, actionCollection(), "Brake"));
keycodes.insert(Shield, new TDEAction(i18n("Shield"), TQt::Key_S, 0, 0, actionCollection(), "Shield"));
launchAction = new TDEAction(i18n("Launch"), TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotLaunch()), actionCollection(), "Launch");
}
@ -354,7 +354,7 @@ bool KAstTopLevel::processKeyPress( TQKeyEvent *event )
{
KKey key(event);
Action a = Invalid;
TQMap<Action, KAction*>::Iterator it = keycodes.begin();
TQMap<Action, TDEAction*>::Iterator it = keycodes.begin();
for (; it != keycodes.end(); ++it)
{
if ( (*it)->shortcut().contains(key) )
@ -407,7 +407,7 @@ bool KAstTopLevel::processKeyRelease( TQKeyEvent *event )
{
KKey key(event);
Action a = Invalid;
TQMap<Action, KAction*>::Iterator it = keycodes.begin();
TQMap<Action, TDEAction*>::Iterator it = keycodes.begin();
for (; it != keycodes.end(); ++it)
{
if ( (*it)->shortcut().contains(key) )
@ -460,7 +460,7 @@ void KAstTopLevel::focusInEvent( TQFocusEvent *e )
#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
XAutoRepeatOff( tqt_xdisplay() );
#endif
KMainWindow::focusInEvent(e);
TDEMainWindow::focusInEvent(e);
}
void KAstTopLevel::focusOutEvent( TQFocusEvent *e )
@ -469,7 +469,7 @@ void KAstTopLevel::focusOutEvent( TQFocusEvent *e )
#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
XAutoRepeatOn( tqt_xdisplay() );
#endif
KMainWindow::focusOutEvent(e);
TDEMainWindow::focusOutEvent(e);
}
void KAstTopLevel::slotNewGame()
@ -663,7 +663,7 @@ void KAstTopLevel::slotPause()
//and we "play" when we close this messagebox
//so before this action was 'checked/uncheched'
//so I force to unchecked it when we close messagebox.
KToggleAction * act = (KToggleAction *)(sender());
TDEToggleAction * act = (TDEToggleAction *)(sender());
act->setChecked(false);
}


+ 4
- 4
kasteroids/toplevel.h View File

@ -20,7 +20,7 @@ class KALedMeter;
class TQLCDNumber;
class KDialogBase;
class KAstTopLevel : public KMainWindow
class KAstTopLevel : public TDEMainWindow
{
Q_OBJECT
@ -29,7 +29,7 @@ public:
virtual ~KAstTopLevel();
private:
void initKAction();
void initTDEAction();
void playSound( const char *snd );
void readSoundMapping();
void doStats();
@ -86,9 +86,9 @@ private:
enum Action { Invalid, Launch, Thrust, RotateLeft, RotateRight, Shoot,
Teleport, Brake, Shield };
TQMap<Action, KAction*> keycodes;
TQMap<Action, TDEAction*> keycodes;
KAction *launchAction;
TDEAction *launchAction;
};
#endif


+ 8
- 8
katomic/toplevel.cpp View File

@ -40,7 +40,7 @@ extern Options settings;
void AtomTopLevel::createMenu()
{
KAction *act = KStdGameAction::highscores(TQT_TQOBJECT(main), TQT_SLOT(showHighscores()), actionCollection());
TDEAction *act = KStdGameAction::highscores(TQT_TQOBJECT(main), TQT_SLOT(showHighscores()), actionCollection());
act->setText(i18n("Show &Highscores"));
KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
KStdGameAction::restart(TQT_TQOBJECT(main), TQT_SLOT(restartLevel()), actionCollection());
@ -54,13 +54,13 @@ void AtomTopLevel::createMenu()
connect (main, TQT_SIGNAL (enableRedo(bool)), TQT_SLOT(enableRedo(bool)));
connect (main, TQT_SIGNAL (enableUndo(bool)), TQT_SLOT(enableUndo(bool)));
new KAction(i18n("Atom Up"), Key_Up, TQT_TQOBJECT(main), TQT_SLOT(moveUp()), actionCollection(), "atom_up");
new KAction(i18n("Atom Down"), Key_Down, TQT_TQOBJECT(main), TQT_SLOT(moveDown()), actionCollection(), "atom_down");
new KAction(i18n("Atom Left"), Key_Left, TQT_TQOBJECT(main), TQT_SLOT(moveLeft()), actionCollection(), "atom_left");
new KAction(i18n("Atom Right"), Key_Right, TQT_TQOBJECT(main), TQT_SLOT(moveRight()), actionCollection(), "atom_right");
new TDEAction(i18n("Atom Up"), Key_Up, TQT_TQOBJECT(main), TQT_SLOT(moveUp()), actionCollection(), "atom_up");
new TDEAction(i18n("Atom Down"), Key_Down, TQT_TQOBJECT(main), TQT_SLOT(moveDown()), actionCollection(), "atom_down");
new TDEAction(i18n("Atom Left"), Key_Left, TQT_TQOBJECT(main), TQT_SLOT(moveLeft()), actionCollection(), "atom_left");
new TDEAction(i18n("Atom Right"), Key_Right, TQT_TQOBJECT(main), TQT_SLOT(moveRight()), actionCollection(), "atom_right");
new KAction(i18n("Next Atom"), Key_Tab, TQT_TQOBJECT(main), TQT_SLOT(nextAtom()), actionCollection(), "next_atom");
new KAction(i18n("Previous Atom"), SHIFT+Key_Tab, TQT_TQOBJECT(main), TQT_SLOT(previousAtom()), actionCollection(), "prev_atom");
new TDEAction(i18n("Next Atom"), Key_Tab, TQT_TQOBJECT(main), TQT_SLOT(nextAtom()), actionCollection(), "next_atom");
new TDEAction(i18n("Previous Atom"), SHIFT+Key_Tab, TQT_TQOBJECT(main), TQT_SLOT(previousAtom()), actionCollection(), "prev_atom");
}
void AtomTopLevel::configopts()
@ -93,7 +93,7 @@ AtomTopLevel::AtomTopLevel()
initConfig();
setCentralWidget(main);
setupGUI( KMainWindow::Save | Keys | Create );
setupGUI( TDEMainWindow::Save | Keys | Create );
}
AtomTopLevel::~AtomTopLevel()


+ 3
- 3
katomic/toplevel.h View File

@ -8,7 +8,7 @@
#define TOPLEVEL_H
class GameWidget;
class KAction;
class TDEAction;
class TDEConfig;
#include <kmainwindow.h>
@ -21,7 +21,7 @@ class TDEConfig;
* @author Andreas Wüst
*/
class AtomTopLevel : public KMainWindow
class AtomTopLevel : public TDEMainWindow
{
Q_OBJECT
@ -51,7 +51,7 @@ class AtomTopLevel : public KMainWindow
GameWidget *main;
KAction *redoAction, *undoAction;
TDEAction *redoAction, *undoAction;
protected slots:
void enableRedo(bool enable);


+ 24
- 24
kbackgammon/engines/fibs/kbgfibs.cpp View File

@ -2159,9 +2159,9 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen
/*
* Initialize the FIBS submenu - this is also put in the play menu
*/
conAction = new KAction(i18n("&Connect"), 0, this, TQT_SLOT( connectFIBS()), this);
newAction = new KAction(i18n("New Account"), 0, this, TQT_SLOT( newAccount()), this);
disAction = new KAction(i18n("&Disconnect"), 0, this, TQT_SLOT(disconnectFIBS()), this);
conAction = new TDEAction(i18n("&Connect"), 0, this, TQT_SLOT( connectFIBS()), this);
newAction = new TDEAction(i18n("New Account"), 0, this, TQT_SLOT( newAccount()), this);
disAction = new TDEAction(i18n("&Disconnect"), 0, this, TQT_SLOT(disconnectFIBS()), this);
conAction->setEnabled(true ); conAction->plug(menu);
disAction->setEnabled(false); disAction->plug(menu);
@ -2169,7 +2169,7 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen
menu->insertSeparator();
(invAction = new KAction(i18n("&Invite..."), 0, this, TQT_SLOT(inviteDialog()), this))->plug(menu);
(invAction = new TDEAction(i18n("&Invite..."), 0, this, TQT_SLOT(inviteDialog()), this))->plug(menu);
/*
* Create and fill the response menu. This is for all these: type this or
@ -2177,8 +2177,8 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen
*/
cmdMenuID = menu->insertItem(i18n("&Commands"), cmdMenu); {
(actAway = new KAction(i18n("Away"), 0, this, TQT_SLOT(away()), this))->plug(cmdMenu);
(actBack = new KAction(i18n("Back"), 0, this, TQT_SLOT(back()), this))->plug(cmdMenu);
(actAway = new TDEAction(i18n("Away"), 0, this, TQT_SLOT(away()), this))->plug(cmdMenu);
(actBack = new TDEAction(i18n("Back"), 0, this, TQT_SLOT(back()), this))->plug(cmdMenu);
actAway->setEnabled(true);
actBack->setEnabled(false);
@ -2194,14 +2194,14 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen
for (int i = 0; i < NumFIBSOpt; i++)
fibsOpt[i] = 0;
fibsOpt[OptReady] = new KToggleAction(i18n("Ready to Play"),
fibsOpt[OptReady] = new TDEToggleAction(i18n("Ready to Play"),
0, this, TQT_SLOT(toggle_ready()), this);
fibsOpt[OptRatings] = new KToggleAction(i18n("Show Rating Computations"),
fibsOpt[OptRatings] = new TDEToggleAction(i18n("Show Rating Computations"),
0, this, TQT_SLOT(toggle_ratings()), this);
fibsOpt[OptRatings]->setCheckedState(i18n("Hide Rating Computations"));
fibsOpt[OptGreedy] = new KToggleAction(i18n("Greedy Bearoffs"),
fibsOpt[OptGreedy] = new TDEToggleAction(i18n("Greedy Bearoffs"),
0, this, TQT_SLOT(toggle_greedy()), this);
fibsOpt[OptDouble] = new KToggleAction(i18n("Ask for Doubles"),
fibsOpt[OptDouble] = new TDEToggleAction(i18n("Ask for Doubles"),
0, this, TQT_SLOT(toggle_double()), this);
for (int i = 0; i < NumFIBSOpt; i++)
@ -2216,16 +2216,16 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen
*/
respMenuID = menu->insertItem(i18n("&Response"), respMenu); {
(actAccept = new KAction(i18n("Accept"), 0, this, TQT_SLOT(accept()), this))->plug(respMenu);
(actReject = new KAction(i18n("Reject"), 0, this, TQT_SLOT(reject()), this))->plug(respMenu);
(actAccept = new TDEAction(i18n("Accept"), 0, this, TQT_SLOT(accept()), this))->plug(respMenu);
(actReject = new TDEAction(i18n("Reject"), 0, this, TQT_SLOT(reject()), this))->plug(respMenu);
actAccept->setEnabled(false);
actReject->setEnabled(false);
respMenu->insertSeparator();
(actConti = new KAction(i18n("Join"), 0, this, TQT_SLOT(match_conti()), this))->plug(respMenu);
(actLeave = new KAction(i18n("Leave"), 0, this, TQT_SLOT(match_leave()), this))->plug(respMenu);
(actConti = new TDEAction(i18n("Join"), 0, this, TQT_SLOT(match_conti()), this))->plug(respMenu);
(actLeave = new TDEAction(i18n("Leave"), 0, this, TQT_SLOT(match_leave()), this))->plug(respMenu);
actConti->setEnabled(false);
actLeave->setEnabled(false);
@ -2238,14 +2238,14 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen
joinMenuID = menu->insertItem(i18n("&Join"), joinMenu); {
numJoin = -1;
actJoin[0] = new KAction("", 0, this, TQT_SLOT(join_0()), this);
actJoin[1] = new KAction("", 0, this, TQT_SLOT(join_1()), this);
actJoin[2] = new KAction("", 0, this, TQT_SLOT(join_2()), this);
actJoin[3] = new KAction("", 0, this, TQT_SLOT(join_3()), this);
actJoin[4] = new KAction("", 0, this, TQT_SLOT(join_4()), this);
actJoin[5] = new KAction("", 0, this, TQT_SLOT(join_5()), this);
actJoin[6] = new KAction("", 0, this, TQT_SLOT(join_6()), this);
actJoin[7] = new KAction("", 0, this, TQT_SLOT(join_7()), this);
actJoin[0] = new TDEAction("", 0, this, TQT_SLOT(join_0()), this);
actJoin[1] = new TDEAction("", 0, this, TQT_SLOT(join_1()), this);
actJoin[2] = new TDEAction("", 0, this, TQT_SLOT(join_2()), this);
actJoin[3] = new TDEAction("", 0, this, TQT_SLOT(join_3()), this);
actJoin[4] = new TDEAction("", 0, this, TQT_SLOT(join_4()), this);
actJoin[5] = new TDEAction("", 0, this, TQT_SLOT(join_5()), this);
actJoin[6] = new TDEAction("", 0, this, TQT_SLOT(join_6()), this);
actJoin[7] = new TDEAction("", 0, this, TQT_SLOT(join_7()), this);
}
menu->setItemEnabled(joinMenuID, false);
@ -2258,8 +2258,8 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen
*/
menu->insertSeparator();
(listAct = new KToggleAction(i18n("&Player List"), 0, this, TQT_SLOT(showList()), this))->plug(menu);
(chatAct = new KToggleAction(i18n("&Chat"), 0, this, TQT_SLOT(showChat()), this))->plug(menu);
(listAct = new TDEToggleAction(i18n("&Player List"), 0, this, TQT_SLOT(showList()), this))->plug(menu);
(chatAct = new TDEToggleAction(i18n("&Chat"), 0, this, TQT_SLOT(showChat()), this))->plug(menu);
connect(playerlist, TQT_SIGNAL(windowVisible(bool)), listAct, TQT_SLOT(setChecked(bool)));
connect(chatWindow, TQT_SIGNAL(windowVisible(bool)), chatAct, TQT_SLOT(setChecked(bool)));


+ 7
- 7
kbackgammon/engines/fibs/kbgfibs.h View File

@ -46,8 +46,8 @@ class TQSocket;
class TQPopupMenu;
class TQCheckBox;
class KAction;
class KToggleAction;
class TDEAction;
class TDEToggleAction;
/**
*
@ -228,11 +228,11 @@ private:
bool redoPossible;
int undoCounter;
KAction *conAction, *disAction, *newAction, *invAction;
TDEAction *conAction, *disAction, *newAction, *invAction;
KAction *actAccept, *actReject, *actConti, *actLeave, *actAway, *actBack;
TDEAction *actAccept, *actReject, *actConti, *actLeave, *actAway, *actBack;
KToggleAction *chatAct, *listAct;
TDEToggleAction *chatAct, *listAct;
// ###########################################################################
@ -253,7 +253,7 @@ private:
* is eight and this is hardcoded in a lot of places (not the least
* of which are the slots join_N().
*/
KAction *actJoin[8];
TDEAction *actJoin[8];
int numJoin;
protected slots:
@ -304,7 +304,7 @@ private:
*/
enum FIBSOpt {OptReady, OptGreedy, OptDouble,
OptAllowPip, OptAutoMove, OptCrawford, OptSilent, OptRatings, OptMoves, NumFIBSOpt};
KToggleAction *fibsOpt[NumFIBSOpt];
TDEToggleAction *fibsOpt[NumFIBSOpt];
public slots:


+ 23
- 23
kbackgammon/engines/fibs/kbgfibschat.cpp View File

@ -159,7 +159,7 @@ public:
/*
* Available actions
*/
KAction *mAct[MaxAction];
TDEAction *mAct[MaxAction];
/*
* Context menu and invitation menu
@ -193,7 +193,7 @@ KBgChat::KBgChat(TQWidget *parent, const char *name)
: KChat(parent, false)
{
d = new KBgChatPrivate();
KActionCollection* actions = new KActionCollection(this);
TDEActionCollection* actions = new TDEActionCollection(this);
d->mName[0] = TQString();
d->mChat = 0;
@ -230,34 +230,34 @@ KBgChat::KBgChat(TQWidget *parent, const char *name)
/*
* Define set of available actions
*/
d->mAct[KBgChatPrivate::Inquire] = new KAction(i18n("Info On"),
d->mAct[KBgChatPrivate::Inquire] = new TDEAction(i18n("Info On"),
TQIconSet(kapp->iconLoader()->loadIcon(
"help.xpm", KIcon::Small)),
0, TQT_TQOBJECT(this), TQT_SLOT(slotInquire()), actions);
d->mAct[KBgChatPrivate::Talk] = new KAction(i18n("Talk To"),
d->mAct[KBgChatPrivate::Talk] = new TDEAction(i18n("Talk To"),
TQIconSet(kapp->iconLoader()->loadIcon(
PROG_NAME "-chat.png", KIcon::Small)),
0, TQT_TQOBJECT(this), TQT_SLOT(slotTalk()), actions);
d->mAct[KBgChatPrivate::InviteD] = new KAction(i18n("Use Dialog"), 0, TQT_TQOBJECT(this),
d->mAct[KBgChatPrivate::InviteD] = new TDEAction(i18n("Use Dialog"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInviteD()), actions);
d->mAct[KBgChatPrivate::Invite1] = new KAction(i18n("1 Point Match"), 0, TQT_TQOBJECT(this),
d->mAct[KBgChatPrivate::Invite1] = new TDEAction(i18n("1 Point Match"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInvite1()), actions);
d->mAct[KBgChatPrivate::Invite2] = new KAction(i18n("2 Point Match"), 0, TQT_TQOBJECT(this),
d->mAct[KBgChatPrivate::Invite2] = new TDEAction(i18n("2 Point Match"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInvite2()), actions);
d->mAct[KBgChatPrivate::Invite3] = new KAction(i18n("3 Point Match"), 0, TQT_TQOBJECT(this),
d->mAct[KBgChatPrivate::Invite3] = new TDEAction(i18n("3 Point Match"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInvite3()), actions);
d->mAct[KBgChatPrivate::Invite4] = new KAction(i18n("4 Point Match"), 0, TQT_TQOBJECT(this),
d->mAct[KBgChatPrivate::Invite4] = new TDEAction(i18n("4 Point Match"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInvite4()), actions);
d->mAct[KBgChatPrivate::Invite5] = new KAction(i18n("5 Point Match"), 0, TQT_TQOBJECT(this),
d->mAct[KBgChatPrivate::Invite5] = new TDEAction(i18n("5 Point Match"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInvite5()), actions);
d->mAct[KBgChatPrivate::Invite6] = new KAction(i18n("6 Point Match"), 0, TQT_TQOBJECT(this),
d->mAct[KBgChatPrivate::Invite6] = new TDEAction(i18n("6 Point Match"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInvite6()), actions);
d->mAct[KBgChatPrivate::Invite7] = new KAction(i18n("7 Point Match"), 0, TQT_TQOBJECT(this),
d->mAct[KBgChatPrivate::Invite7] = new TDEAction(i18n("7 Point Match"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInvite7()), actions);
d->mAct[KBgChatPrivate::InviteU] = new KAction(i18n("Unlimited"), 0, TQT_TQOBJECT(this),
d->mAct[KBgChatPrivate::InviteU] = new TDEAction(i18n("Unlimited"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInviteU()), actions);
d->mAct[KBgChatPrivate::InviteR] = new KAction(i18n("Resume"), 0, TQT_TQOBJECT(this),
d->mAct[KBgChatPrivate::InviteR] = new TDEAction(i18n("Resume"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInviteR()), actions);
d->mAct[KBgChatPrivate::InviteD]->plug(d->mInvt);
@ -277,13 +277,13 @@ KBgChat::KBgChat(TQWidget *parent, const char *name)
d->mAct[KBgChatPrivate::InviteU]->plug(d->mInvt);
d->mAct[KBgChatPrivate::InviteR]->plug(d->mInvt);
d->mAct[KBgChatPrivate::Gag] = new KAction(i18n("Gag"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGag()), actions);
d->mAct[KBgChatPrivate::Ungag] = new KAction(i18n("Ungag"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUngag()), actions);
d->mAct[KBgChatPrivate::Cleargag] = new KAction(i18n("Clear Gag List"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleargag()), actions);
d->mAct[KBgChatPrivate::Gag] = new TDEAction(i18n("Gag"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGag()), actions);
d->mAct[KBgChatPrivate::Ungag] = new TDEAction(i18n("Ungag"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUngag()), actions);
d->mAct[KBgChatPrivate::Cleargag] = new TDEAction(i18n("Clear Gag List"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleargag()), actions);
d->mAct[KBgChatPrivate::Copy] = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions);
d->mAct[KBgChatPrivate::Clear] = new KAction(i18n("Clear"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotClear()), actions);
d->mAct[KBgChatPrivate::Clear] = new TDEAction(i18n("Clear"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotClear()), actions);
d->mAct[KBgChatPrivate::Close] = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(hide()), actions);
d->mAct[KBgChatPrivate::Silent] = new KToggleAction(i18n("Silent"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSilent()), actions);
d->mAct[KBgChatPrivate::Silent] = new TDEToggleAction(i18n("Silent"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSilent()), actions);
}
@ -316,7 +316,7 @@ void KBgChat::readConfig()
config->readBoolEntry("vis", false) ? show() : hide();
((KToggleAction *)d->mAct[KBgChatPrivate::Silent])->setChecked(config->readBoolEntry("sil", false));
((TDEToggleAction *)d->mAct[KBgChatPrivate::Silent])->setChecked(config->readBoolEntry("sil", false));
d->mGag = config->readListEntry("gag");
}
@ -334,7 +334,7 @@ void KBgChat::saveConfig()
config->writeEntry("wdt", width());
config->writeEntry("vis", isVisible());
config->writeEntry("sil", ((KToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked());
config->writeEntry("sil", ((TDEToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked());
config->writeEntry("gag", d->mGag);
}
@ -557,7 +557,7 @@ void KBgChat::handleData(const TQString &msg)
break;
case CLIP_SHOUTS:
if ((!((KToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked()) && (!d->mGag.contains(user))) {
if ((!((TDEToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked()) && (!d->mGag.contains(user))) {
cMsg = i18n("<u>%1 shouts:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), ""));
cMsg = "<font color=\"black\">" + cMsg + "</font>";
} else
@ -784,7 +784,7 @@ void KBgChat::slotInquire()
void KBgChat::slotSilent()
{
TQString msg;
if (((KToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked())
if (((TDEToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked())
msg = "<font color=\"blue\">" + i18n("You will not hear what people shout.") + "</font>";
else
msg = "<font color=\"blue\">" + i18n("You will hear what people shout.") + "</font>";


+ 1
- 1
kbackgammon/engines/fibs/kbgfibschat.h View File

@ -37,7 +37,7 @@ class TQListBoxItem;
class TQPopupMenu;
class KTabCtl;
class KAction;
class TDEAction;
class KBgChatPrivate;


+ 27
- 27
kbackgammon/engines/fibs/kplayerlist.cpp View File

@ -72,14 +72,14 @@ public:
* Extension of the TQListViewItem class that has a custom key function
* that can deal with the different items of the player list.
*/
class KFibsPlayerListLVI : public KListViewItem {
class KFibsPlayerListLVI : public TDEListViewItem {
public:
/*
* Constructor
*/
KFibsPlayerListLVI(KFibsPlayerList *parent) : KListViewItem(parent) { _plist = parent; }
KFibsPlayerListLVI(KFibsPlayerList *parent) : TDEListViewItem(parent) { _plist = parent; }
/*
* Destructor
@ -145,7 +145,7 @@ public:
/*
* Various actions for the context menu
*/
KAction *mAct[ActionEnd];
TDEAction *mAct[ActionEnd];
/*
* All relevant information on the columns
@ -201,10 +201,10 @@ public:
* Construct the playerlist and do some initial setup
*/
KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name)
: KListView(parent, name)
: TDEListView(parent, name)
{
d = new KFibsPlayerListPrivate();
KActionCollection* actions = new KActionCollection(this);
TDEActionCollection* actions = new TDEActionCollection(this);
/*
* Allocate the column information
@ -286,44 +286,44 @@ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name)
/*
* Create the whole set of actions
*/
d->mAct[KFibsPlayerListPrivate::Info] = new KAction(i18n("Info"),
d->mAct[KFibsPlayerListPrivate::Info] = new TDEAction(i18n("Info"),
TQIconSet(kapp->iconLoader()->loadIcon
("help.xpm", KIcon::Small)),
0, TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actions);
d->mAct[KFibsPlayerListPrivate::Talk] = new KAction(i18n("Talk"),
d->mAct[KFibsPlayerListPrivate::Talk] = new TDEAction(i18n("Talk"),
TQIconSet(kapp->iconLoader()->loadIcon
(PROG_NAME "-chat.png", KIcon::Small)),
0, TQT_TQOBJECT(this), TQT_SLOT(slotTalk()), actions);
d->mAct[KFibsPlayerListPrivate::Look] = new KAction(i18n("Look"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLook()), actions);
d->mAct[KFibsPlayerListPrivate::Watch] = new KAction(i18n("Watch"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWatch()), actions);
d->mAct[KFibsPlayerListPrivate::Unwatch] = new KAction(i18n("Unwatch"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnwatch()),actions);
d->mAct[KFibsPlayerListPrivate::BlindAct] = new KAction(i18n("Blind"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlind()), actions);
d->mAct[KFibsPlayerListPrivate::Update] = new KAction(i18n("Update"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdate()), actions);
d->mAct[KFibsPlayerListPrivate::Look] = new TDEAction(i18n("Look"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLook()), actions);
d->mAct[KFibsPlayerListPrivate::Watch] = new TDEAction(i18n("Watch"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWatch()), actions);
d->mAct[KFibsPlayerListPrivate::Unwatch] = new TDEAction(i18n("Unwatch"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnwatch()),actions);
d->mAct[KFibsPlayerListPrivate::BlindAct] = new TDEAction(i18n("Blind"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlind()), actions);
d->mAct[KFibsPlayerListPrivate::Update] = new TDEAction(i18n("Update"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdate()), actions);
d->mAct[KFibsPlayerListPrivate::Reload] = KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(slotReload()), actions);
d->mAct[KFibsPlayerListPrivate::Mail] = KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actions);
d->mAct[KFibsPlayerListPrivate::Close] = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(hide()), actions);
d->mAct[KFibsPlayerListPrivate::InviteD] = new KAction(i18n("Use Dialog"), 0, TQT_TQOBJECT(this),
d->mAct[KFibsPlayerListPrivate::InviteD] = new TDEAction(i18n("Use Dialog"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInviteD()), actions);
d->mAct[KFibsPlayerListPrivate::Invite1] = new KAction(i18n("1 Point Match"), 0, TQT_TQOBJECT(this),
d->mAct[KFibsPlayerListPrivate::Invite1] = new TDEAction(i18n("1 Point Match"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInvite1()), actions);
d->mAct[KFibsPlayerListPrivate::Invite2] = new KAction(i18n("2 Point Match"), 0, TQT_TQOBJECT(this),
d->mAct[KFibsPlayerListPrivate::Invite2] = new TDEAction(i18n("2 Point Match"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInvite2()), actions);
d->mAct[KFibsPlayerListPrivate::Invite3] = new KAction(i18n("3 Point Match"), 0, TQT_TQOBJECT(this),
d->mAct[KFibsPlayerListPrivate::Invite3] = new TDEAction(i18n("3 Point Match"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInvite3()), actions);
d->mAct[KFibsPlayerListPrivate::Invite4] = new KAction(i18n("4 Point Match"), 0, TQT_TQOBJECT(this),
d->mAct[KFibsPlayerListPrivate::Invite4] = new TDEAction(i18n("4 Point Match"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotIn