diff options
Diffstat (limited to 'atlantik/libatlantikui')
-rw-r--r-- | atlantik/libatlantikui/auction_widget.cpp | 6 | ||||
-rw-r--r-- | atlantik/libatlantikui/auction_widget.h | 6 | ||||
-rw-r--r-- | atlantik/libatlantikui/estatedetails.cpp | 2 | ||||
-rw-r--r-- | atlantik/libatlantikui/estatedetails.h | 4 | ||||
-rw-r--r-- | atlantik/libatlantikui/estateview.cpp | 4 | ||||
-rw-r--r-- | atlantik/libatlantikui/kwrappedlistviewitem.cpp | 4 | ||||
-rw-r--r-- | atlantik/libatlantikui/kwrappedlistviewitem.h | 2 | ||||
-rw-r--r-- | atlantik/libatlantikui/portfolioview.cpp | 2 | ||||
-rw-r--r-- | atlantik/libatlantikui/trade_widget.cpp | 22 | ||||
-rw-r--r-- | atlantik/libatlantikui/trade_widget.h | 12 |
10 files changed, 32 insertions, 32 deletions
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; |