summaryrefslogtreecommitdiffstats
path: root/atlantik
diff options
context:
space:
mode:
Diffstat (limited to 'atlantik')
-rw-r--r--atlantik/client/atlantik.cpp26
-rw-r--r--atlantik/client/atlantik.h6
-rw-r--r--atlantik/client/eventlogwidget.cpp4
-rw-r--r--atlantik/client/eventlogwidget.h6
-rw-r--r--atlantik/client/selectgame_widget.cpp2
-rw-r--r--atlantik/client/selectgame_widget.h2
-rw-r--r--atlantik/client/selectserver_widget.cpp2
-rw-r--r--atlantik/client/selectserver_widget.h2
-rw-r--r--atlantik/libatlantikui/auction_widget.cpp6
-rw-r--r--atlantik/libatlantikui/auction_widget.h6
-rw-r--r--atlantik/libatlantikui/estatedetails.cpp2
-rw-r--r--atlantik/libatlantikui/estatedetails.h4
-rw-r--r--atlantik/libatlantikui/estateview.cpp4
-rw-r--r--atlantik/libatlantikui/kwrappedlistviewitem.cpp4
-rw-r--r--atlantik/libatlantikui/kwrappedlistviewitem.h2
-rw-r--r--atlantik/libatlantikui/portfolioview.cpp2
-rw-r--r--atlantik/libatlantikui/trade_widget.cpp22
-rw-r--r--atlantik/libatlantikui/trade_widget.h12
18 files changed, 57 insertions, 57 deletions
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<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);
}
}
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 <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;
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;
diff --git a/atlantik/libatlantikui/auction_widget.cpp b/atlantik/libatlantikui/auction_widget.cpp
index 94873d13..a7ffcc04 100644
--- a/atlantik/libatlantikui/auction_widget.cpp
+++ b/atlantik/libatlantikui/auction_widget.cpp
@@ -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;
diff --git a/atlantik/libatlantikui/auction_widget.h b/atlantik/libatlantikui/auction_widget.h
index 717c1a32..6bf93220 100644
--- a/atlantik/libatlantikui/auction_widget.h
+++ b/atlantik/libatlantikui/auction_widget.h
@@ -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;
diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp
index e4e52ea1..75837b99 100644
--- a/atlantik/libatlantikui/estatedetails.cpp
+++ b/atlantik/libatlantikui/estatedetails.cpp
@@ -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);
diff --git a/atlantik/libatlantikui/estatedetails.h b/atlantik/libatlantikui/estatedetails.h
index 4c9402a0..f44d3132 100644
--- a/atlantik/libatlantikui/estatedetails.h
+++ b/atlantik/libatlantikui/estatedetails.h
@@ -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;
diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp
index a9f4b83d..5cb865e5 100644
--- a/atlantik/libatlantikui/estateview.cpp
+++ b/atlantik/libatlantikui/estateview.cpp
@@ -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)));
}
diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.cpp b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
index eb0a0d9e..ffcf6728 100644
--- a/atlantik/libatlantikui/kwrappedlistviewitem.cpp
+++ b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
@@ -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 );
}
diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.h b/atlantik/libatlantikui/kwrappedlistviewitem.h
index 81d73985..09e91a29 100644
--- a/atlantik/libatlantikui/kwrappedlistviewitem.h
+++ b/atlantik/libatlantikui/kwrappedlistviewitem.h
@@ -32,7 +32,7 @@
class KWordWrap;
-class KWrappedListViewItem : public TQObject, public KListViewItem
+class KWrappedListViewItem : public TQObject, public TDEListViewItem
{
Q_OBJECT
diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp
index c2a7b1a4..ce8474d1 100644
--- a/atlantik/libatlantikui/portfolioview.cpp
+++ b/atlantik/libatlantikui/portfolioview.cpp
@@ -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() )
diff --git a/atlantik/libatlantikui/trade_widget.cpp b/atlantik/libatlantikui/trade_widget.cpp
index be8b2749..f581af6a 100644
--- a/atlantik/libatlantikui/trade_widget.cpp
+++ b/atlantik/libatlantikui/trade_widget.cpp
@@ -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);
diff --git a/atlantik/libatlantikui/trade_widget.h b/atlantik/libatlantikui/trade_widget.h
index ebdd6a50..6a74f857 100644
--- a/atlantik/libatlantikui/trade_widget.h
+++ b/atlantik/libatlantikui/trade_widget.h
@@ -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;