From 58a97ed3af5e4df6c4a58d043b0c267bd97056a9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:12:46 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- atlantik/client/atlantik.cpp | 26 +++++++++++++------------- atlantik/client/atlantik.h | 6 +++--- atlantik/client/eventlogwidget.cpp | 4 ++-- atlantik/client/eventlogwidget.h | 6 +++--- atlantik/client/selectgame_widget.cpp | 2 +- atlantik/client/selectgame_widget.h | 2 +- atlantik/client/selectserver_widget.cpp | 2 +- atlantik/client/selectserver_widget.h | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) (limited to 'atlantik/client') diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp index 64650ba7..9557b80b 100644 --- a/atlantik/client/atlantik.cpp +++ b/atlantik/client/atlantik.cpp @@ -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(0), "clear" ); + m_clear = new TDEAction( i18n("Clear"), "clear", NULL, TQT_TQOBJECT(this), TQT_SLOT( clear() ), static_cast(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); } } diff --git a/atlantik/client/atlantik.h b/atlantik/client/atlantik.h index 76e716b8..7370204c 100644 --- a/atlantik/client/atlantik.h +++ b/atlantik/client/atlantik.h @@ -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 */ -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; diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp index c6c83896..064aa71e 100644 --- a/atlantik/client/eventlogwidget.cpp +++ b/atlantik/client/eventlogwidget.cpp @@ -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 diff --git a/atlantik/client/eventlogwidget.h b/atlantik/client/eventlogwidget.h index de652d35..18972377 100644 --- a/atlantik/client/eventlogwidget.h +++ b/atlantik/client/eventlogwidget.h @@ -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; }; diff --git a/atlantik/client/selectgame_widget.cpp b/atlantik/client/selectgame_widget.cpp index 573f2841..0eb22877 100644 --- a/atlantik/client/selectgame_widget.cpp +++ b/atlantik/client/selectgame_widget.cpp @@ -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")); diff --git a/atlantik/client/selectgame_widget.h b/atlantik/client/selectgame_widget.h index ce28909b..0f8427a0 100644 --- a/atlantik/client/selectgame_widget.h +++ b/atlantik/client/selectgame_widget.h @@ -59,7 +59,7 @@ private: AtlanticCore *m_atlanticCore; TQVBoxLayout *m_mainLayout; - KListView *m_gameList; + TDEListView *m_gameList; KPushButton *m_connectButton; }; diff --git a/atlantik/client/selectserver_widget.cpp b/atlantik/client/selectserver_widget.cpp index 7adc506b..7c2fe488 100644 --- a/atlantik/client/selectserver_widget.cpp +++ b/atlantik/client/selectserver_widget.cpp @@ -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")); diff --git a/atlantik/client/selectserver_widget.h b/atlantik/client/selectserver_widget.h index 0aceccd8..ef8965fa 100644 --- a/atlantik/client/selectserver_widget.h +++ b/atlantik/client/selectserver_widget.h @@ -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; -- cgit v1.2.1