From a6000c6f2f1a03b34f15d1948f63f0c894f09451 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:01:10 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kmymoney2/views/kaccountsview.cpp | 2 +- kmymoney2/views/kaccountsview.h | 4 ++-- kmymoney2/views/kbudgetview.cpp | 10 +++++----- kmymoney2/views/kbudgetview.h | 10 +++++----- kmymoney2/views/kbudgetviewdecl.ui | 2 +- kmymoney2/views/kcategoriesview.cpp | 2 +- kmymoney2/views/kcategoriesview.h | 4 ++-- kmymoney2/views/kforecastviewdecl.ui | 2 +- kmymoney2/views/kgloballedgerview.cpp | 8 ++++---- kmymoney2/views/kgloballedgerview.h | 8 ++++---- kmymoney2/views/khomeview.cpp | 10 +++++----- kmymoney2/views/kinvestmentlistitem.cpp | 6 +++--- kmymoney2/views/kinvestmentlistitem.h | 6 +++--- kmymoney2/views/kinvestmentview.cpp | 6 +++--- kmymoney2/views/kinvestmentview.h | 2 +- kmymoney2/views/kinvestmentviewdecl.ui | 2 +- kmymoney2/views/kmymoneyview.h | 2 +- kmymoney2/views/kpayeesview.cpp | 20 ++++++++++---------- kmymoney2/views/kpayeesview.h | 18 +++++++++--------- kmymoney2/views/kpayeesviewdecl.ui | 4 ++-- kmymoney2/views/kreportsview.cpp | 14 +++++++------- kmymoney2/views/kreportsview.h | 18 +++++++++--------- kmymoney2/views/kscheduledlistitem.cpp | 8 ++++---- kmymoney2/views/kscheduledlistitem.h | 4 ++-- kmymoney2/views/kscheduledview.cpp | 10 +++++----- kmymoney2/views/kscheduledview.h | 10 +++++----- kmymoney2/views/kscheduledviewdecl.ui | 2 +- 27 files changed, 97 insertions(+), 97 deletions(-) (limited to 'kmymoney2/views') diff --git a/kmymoney2/views/kaccountsview.cpp b/kmymoney2/views/kaccountsview.cpp index cff2805..f13505b 100644 --- a/kmymoney2/views/kaccountsview.cpp +++ b/kmymoney2/views/kaccountsview.cpp @@ -75,7 +75,7 @@ KAccountsView::KAccountsView(TQWidget *parent, const char *name) : { // create the searchline widget // and insert it into the existing layout - m_searchWidget = new KListViewSearchLineWidget(m_accountTree, m_accountTree->parentWidget()); + m_searchWidget = new TDEListViewSearchLineWidget(m_accountTree, m_accountTree->parentWidget()); TQVBoxLayout* layout = dynamic_cast(m_accountTree->parentWidget()->layout()); if(layout) { layout->insertWidget(0, m_searchWidget); diff --git a/kmymoney2/views/kaccountsview.h b/kmymoney2/views/kaccountsview.h index a3d6385..96c547a 100644 --- a/kmymoney2/views/kaccountsview.h +++ b/kmymoney2/views/kaccountsview.h @@ -31,7 +31,7 @@ #include #include #include -class KListViewSearchLineWidget; +class TDEListViewSearchLineWidget; #include "../views/kaccountsviewdecl.h" @@ -200,7 +200,7 @@ private: /** * Search widget for the list */ - KListViewSearchLineWidget* m_searchWidget; + TDEListViewSearchLineWidget* m_searchWidget; /// set if a view needs to be reloaded during show() bool m_needReload[MaxViewTabs]; diff --git a/kmymoney2/views/kbudgetview.cpp b/kmymoney2/views/kbudgetview.cpp index 8656970..2a09ac9 100644 --- a/kmymoney2/views/kbudgetview.cpp +++ b/kmymoney2/views/kbudgetview.cpp @@ -61,8 +61,8 @@ #include "../kmymoney2.h" // *** KBudgetListItem Implementation *** -KBudgetListItem::KBudgetListItem(KListView *parent, const MyMoneyBudget& budget) : - KListViewItem(parent), +KBudgetListItem::KBudgetListItem(TDEListView *parent, const MyMoneyBudget& budget) : + TDEListViewItem(parent), m_budget(budget) { setText(0, budget.name()); @@ -139,8 +139,8 @@ KBudgetView::KBudgetView(TQWidget *parent, const char *name ) : m_resetButton->setGuiItem(resetButtenItem); TQToolTip::add(m_resetButton, resetButtenItem.toolTip()); - connect(m_budgetList, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem* , const TQPoint&)), - this, TQT_SLOT(slotOpenContextMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(m_budgetList, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem* , const TQPoint&)), + this, TQT_SLOT(slotOpenContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); connect(m_budgetList, TQT_SIGNAL(itemRenamed(TQListViewItem*,int,const TQString&)), this, TQT_SLOT(slotRenameBudget(TQListViewItem*,int,const TQString&))); connect(m_budgetList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectBudget())); @@ -562,7 +562,7 @@ KMyMoneyAccountTreeBudgetItem* KBudgetView::selectedAccount(void) const return item; } -void KBudgetView::slotOpenContextMenu(KListView* lv, TQListViewItem* i, const TQPoint& p) +void KBudgetView::slotOpenContextMenu(TDEListView* lv, TQListViewItem* i, const TQPoint& p) { Q_UNUSED(lv); Q_UNUSED(p); diff --git a/kmymoney2/views/kbudgetview.h b/kmymoney2/views/kbudgetview.h index 659736e..afe6112 100644 --- a/kmymoney2/views/kbudgetview.h +++ b/kmymoney2/views/kbudgetview.h @@ -44,18 +44,18 @@ class KMyMoneyAccountTreeBudgetItem; * * This class represents an item in the budgets list view. */ -class KBudgetListItem : public KListViewItem +class KBudgetListItem : public TDEListViewItem { public: /** * Constructor to be used to construct a budget entry object. * - * @param parent pointer to the KListView object this entry should be + * @param parent pointer to the TDEListView object this entry should be * added to. * @param budget const reference to MyMoneyBudget for which - * the KListView entry is constructed + * the TDEListView entry is constructed */ - KBudgetListItem(KListView *parent, const MyMoneyBudget& budget); + KBudgetListItem(TDEListView *parent, const MyMoneyBudget& budget); ~KBudgetListItem(); /** @@ -182,7 +182,7 @@ private slots: * @param i the item on which the cursor resides * @param p position of the pointing device */ - void slotOpenContextMenu(KListView* lv, TQListViewItem* i, const TQPoint& p); + void slotOpenContextMenu(TDEListView* lv, TQListViewItem* i, const TQPoint& p); signals: /** diff --git a/kmymoney2/views/kbudgetviewdecl.ui b/kmymoney2/views/kbudgetviewdecl.ui index f4c30e0..f417b7f 100644 --- a/kmymoney2/views/kbudgetviewdecl.ui +++ b/kmymoney2/views/kbudgetviewdecl.ui @@ -122,7 +122,7 @@ - + Name diff --git a/kmymoney2/views/kcategoriesview.cpp b/kmymoney2/views/kcategoriesview.cpp index 6be002a..e6cdf71 100644 --- a/kmymoney2/views/kcategoriesview.cpp +++ b/kmymoney2/views/kcategoriesview.cpp @@ -54,7 +54,7 @@ KCategoriesView::KCategoriesView(TQWidget *parent, const char *name ) : { // create the searchline widget // and insert it into the existing layout - m_searchWidget = new KListViewSearchLineWidget(m_accountTree, m_accountTree->parentWidget()); + m_searchWidget = new TDEListViewSearchLineWidget(m_accountTree, m_accountTree->parentWidget()); TQVBoxLayout* layout = dynamic_cast(m_accountTree->parentWidget()->layout()); if(layout) { layout->insertWidget(0, m_searchWidget); diff --git a/kmymoney2/views/kcategoriesview.h b/kmymoney2/views/kcategoriesview.h index fce4dd0..8b1b085 100644 --- a/kmymoney2/views/kcategoriesview.h +++ b/kmymoney2/views/kcategoriesview.h @@ -36,7 +36,7 @@ #include #include #include -class KListViewSearchLineWidget; +class TDEListViewSearchLineWidget; #include "kcategoriesviewdecl.h" @@ -139,7 +139,7 @@ private: /** * Search widget for the list */ - KListViewSearchLineWidget* m_searchWidget; + TDEListViewSearchLineWidget* m_searchWidget; /// set if a view needs to be reloaded during show() bool m_needReload; diff --git a/kmymoney2/views/kforecastviewdecl.ui b/kmymoney2/views/kforecastviewdecl.ui index 0562f15..310a687 100644 --- a/kmymoney2/views/kforecastviewdecl.ui +++ b/kmymoney2/views/kforecastviewdecl.ui @@ -540,7 +540,7 @@ 0 - + m_advancedList diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp index 4eaa389..94d6b3e 100644 --- a/kmymoney2/views/kgloballedgerview.cpp +++ b/kmymoney2/views/kgloballedgerview.cpp @@ -159,9 +159,9 @@ TDEGlobalLedgerView::TDEGlobalLedgerView(TQWidget *parent, const char *name ) m_toolbarFrame = new TQFrame(this); TQVBoxLayout* toolbarLayout = new TQVBoxLayout(m_toolbarFrame, 0, 0); - m_toolbar = new KToolBar(m_toolbarFrame, 0, true); + m_toolbar = new TDEToolBar(m_toolbarFrame, 0, true); toolbarLayout->addWidget(m_toolbar); - m_toolbar->setIconText(KToolBar::IconTextRight); + m_toolbar->setIconText(TDEToolBar::IconTextRight); m_accountComboBox = new KMyMoneyAccountCombo(m_toolbar, "AccountCombo"); m_toolbar->insertWidget(1, 100, m_accountComboBox); @@ -216,8 +216,8 @@ TDEGlobalLedgerView::TDEGlobalLedgerView(TQWidget *parent, const char *name ) m_buttonFrame = new TQFrame(this); TQVBoxLayout* buttonLayout = new TQVBoxLayout(m_buttonFrame, 0, 0); layout()->addWidget(m_buttonFrame); - m_buttonbar = new KToolBar(m_buttonFrame, 0, true); - m_buttonbar->setIconText(KToolBar::IconTextRight); + m_buttonbar = new TDEToolBar(m_buttonFrame, 0, true); + m_buttonbar->setIconText(TDEToolBar::IconTextRight); buttonLayout->addWidget(m_buttonbar); kmymoney2->action("transaction_new")->plug(m_buttonbar); diff --git a/kmymoney2/views/kgloballedgerview.h b/kmymoney2/views/kgloballedgerview.h index d6f83e0..d375b85 100644 --- a/kmymoney2/views/kgloballedgerview.h +++ b/kmymoney2/views/kgloballedgerview.h @@ -53,8 +53,8 @@ class TQFrame; class TQLabel; class KMyMoneyAccountCombo; -class KToolBar; -class KToolBarButton; +class TDEToolBar; +class TDEToolBarButton; class MyMoneyReport; class TransactionEditor; @@ -338,8 +338,8 @@ private: // widgets KMyMoneyAccountCombo* m_accountComboBox; KMyMoneyRegister::Register* m_register; - KToolBar* m_toolbar; - KToolBar* m_buttonbar; + TDEToolBar* m_toolbar; + TDEToolBar* m_buttonbar; /** * This member holds the currently selected account diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp index 316ca75..7b160d3 100644 --- a/kmymoney2/views/khomeview.cpp +++ b/kmymoney2/views/khomeview.cpp @@ -1130,19 +1130,19 @@ void KHomeView::slotOpenURL(const KURL &url, const KParts::URLArgs& /* args */) } else if(view == VIEW_SCHEDULE) { if(mode == "enter") { emit scheduleSelected(id); - KMainWindow* mw = dynamic_cast(tqApp->mainWidget()); + TDEMainWindow* mw = dynamic_cast(tqApp->mainWidget()); TQ_CHECK_PTR(mw); TQTimer::singleShot(0, mw->actionCollection()->action("schedule_enter"), TQT_SLOT(activate())); } else if(mode == "edit") { emit scheduleSelected(id); - KMainWindow* mw = dynamic_cast(tqApp->mainWidget()); + TDEMainWindow* mw = dynamic_cast(tqApp->mainWidget()); TQ_CHECK_PTR(mw); TQTimer::singleShot(0, mw->actionCollection()->action("schedule_edit"), TQT_SLOT(activate())); } else if(mode == "skip") { emit scheduleSelected(id); - KMainWindow* mw = dynamic_cast(tqApp->mainWidget()); + TDEMainWindow* mw = dynamic_cast(tqApp->mainWidget()); TQ_CHECK_PTR(mw); TQTimer::singleShot(0, mw->actionCollection()->action("schedule_skip"), TQT_SLOT(activate())); @@ -1159,7 +1159,7 @@ void KHomeView::slotOpenURL(const KURL &url, const KParts::URLArgs& /* args */) emit reportSelected(id); } else if(view == VIEW_WELCOME) { - KMainWindow* mw = dynamic_cast(tqApp->mainWidget()); + TDEMainWindow* mw = dynamic_cast(tqApp->mainWidget()); TQ_CHECK_PTR(mw); if ( mode == "whatsnew" ) { @@ -1171,7 +1171,7 @@ void KHomeView::slotOpenURL(const KURL &url, const KParts::URLArgs& /* args */) m_part->openURL(m_filename); } else if(view == "action") { - KMainWindow* mw = dynamic_cast(tqApp->mainWidget()); + TDEMainWindow* mw = dynamic_cast(tqApp->mainWidget()); TQ_CHECK_PTR(mw); TQTimer::singleShot(0, mw->actionCollection()->action( id ), TQT_SLOT(activate())); diff --git a/kmymoney2/views/kinvestmentlistitem.cpp b/kmymoney2/views/kinvestmentlistitem.cpp index a2a7723..979de40 100644 --- a/kmymoney2/views/kinvestmentlistitem.cpp +++ b/kmymoney2/views/kinvestmentlistitem.cpp @@ -40,8 +40,8 @@ #include #include -KInvestmentListItem::KInvestmentListItem(KListView* parent, const MyMoneyAccount& account) - : KListViewItem(parent) +KInvestmentListItem::KInvestmentListItem(TDEListView* parent, const MyMoneyAccount& account) + : TDEListViewItem(parent) { bColumn5Negative = false; bColumn6Negative = false; @@ -244,7 +244,7 @@ int KInvestmentListItem::compare(TQListViewItem* i, int col, bool ascending) con } // do standard sorting here - return KListViewItem::compare(i, col, ascending); + return TDEListViewItem::compare(i, col, ascending); } void KInvestmentListItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align) diff --git a/kmymoney2/views/kinvestmentlistitem.h b/kmymoney2/views/kinvestmentlistitem.h index 2cd69fb..b438fe0 100644 --- a/kmymoney2/views/kinvestmentlistitem.h +++ b/kmymoney2/views/kinvestmentlistitem.h @@ -56,10 +56,10 @@ * @author Kevin Tambascio * @author Thomas Baumgart */ -class KInvestmentListItem : public KListViewItem +class KInvestmentListItem : public TDEListViewItem { public: - KInvestmentListItem(KListView* parent, const MyMoneyAccount& security); + KInvestmentListItem(TDEListView* parent, const MyMoneyAccount& security); ~KInvestmentListItem(); TQString securityId() const { return m_account.currencyId(); }; @@ -86,7 +86,7 @@ private: #endif private: - KListView* m_listView; + TDEListView* m_listView; MyMoneyAccount m_account; MyMoneySecurity m_tradingCurrency; bool bColumn5Negative, bColumn6Negative, bColumn7Negative, bColumn8Negative, bColumn9Negative; diff --git a/kmymoney2/views/kinvestmentview.cpp b/kmymoney2/views/kinvestmentview.cpp index 74f9524..9edf43a 100644 --- a/kmymoney2/views/kinvestmentview.cpp +++ b/kmymoney2/views/kinvestmentview.cpp @@ -87,8 +87,8 @@ KInvestmentView::KInvestmentView(TQWidget *parent, const char *name) : m_table->setShowSortIndicator(true); m_table->restoreLayout(TDEGlobal::config(), "Investment Settings"); - connect(m_table, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem* , const TQPoint&)), - this, TQT_SLOT(slotListContextMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(m_table, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem* , const TQPoint&)), + this, TQT_SLOT(slotListContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); connect(m_table, TQT_SIGNAL(selectionChanged(TQListViewItem *)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem *))); connect(m_accountComboBox, TQT_SIGNAL(accountSelected(const TQString&)), @@ -121,7 +121,7 @@ void KInvestmentView::slotSelectionChanged(TQListViewItem *item) } } -void KInvestmentView::slotListContextMenu(KListView* /* lv */, TQListViewItem* /*item*/, const TQPoint& /*point*/) +void KInvestmentView::slotListContextMenu(TDEListView* /* lv */, TQListViewItem* /*item*/, const TQPoint& /*point*/) { kmymoney2->slotSelectInvestment(); KInvestmentListItem *pItem = dynamic_cast(m_table->selectedItem()); diff --git a/kmymoney2/views/kinvestmentview.h b/kmymoney2/views/kinvestmentview.h index 6685f39..daf3186 100644 --- a/kmymoney2/views/kinvestmentview.h +++ b/kmymoney2/views/kinvestmentview.h @@ -111,7 +111,7 @@ protected slots: * This slot receives the signal from the listview @c lv control that the context menu * was requested for @c item at @c point. */ - void slotListContextMenu(KListView* lv, TQListViewItem* item, const TQPoint& point); + void slotListContextMenu(TDEListView* lv, TQListViewItem* item, const TQPoint& point); void slotSelectionChanged(TQListViewItem *item); diff --git a/kmymoney2/views/kinvestmentviewdecl.ui b/kmymoney2/views/kinvestmentviewdecl.ui index f681c7a..50f5c7e 100644 --- a/kmymoney2/views/kinvestmentviewdecl.ui +++ b/kmymoney2/views/kinvestmentviewdecl.ui @@ -62,7 +62,7 @@ - + m_table diff --git a/kmymoney2/views/kmymoneyview.h b/kmymoney2/views/kmymoneyview.h index 320abeb..62b7f49 100644 --- a/kmymoney2/views/kmymoneyview.h +++ b/kmymoney2/views/kmymoneyview.h @@ -444,7 +444,7 @@ public slots: * Brings up a dialog to change the list(s) settings and saves them into the * class KMyMoneySettings (a singleton). * - * @see KListSettingsDlg + * @see TDEListSettingsDlg * Refreshs all views. Used e.g. after settings have been changed or * data has been loaded from external sources (QIF import). **/ diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp index e600c45..64e94f9 100644 --- a/kmymoney2/views/kpayeesview.cpp +++ b/kmymoney2/views/kpayeesview.cpp @@ -260,8 +260,8 @@ void KTransactionPtrVector::setPayeeId(const TQString& id) // *** KPayeeListItem Implementation *** -KPayeeListItem::KPayeeListItem(KListView *parent, const MyMoneyPayee& payee) : - KListViewItem(parent), +KPayeeListItem::KPayeeListItem(TDEListView *parent, const MyMoneyPayee& payee) : + TDEListViewItem(parent), m_payee(payee) { setText(0, payee.name()); @@ -287,8 +287,8 @@ void KPayeeListItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column TQListViewItem::paintCell(p, cg2, column, width, align); } -KTransactionListItem::KTransactionListItem(KListView* view, KTransactionListItem* parent, const TQString& accountId, const TQString& transactionId) : - KListViewItem(view, parent) +KTransactionListItem::KTransactionListItem(TDEListView* view, KTransactionListItem* parent, const TQString& accountId, const TQString& transactionId) : + TDEListViewItem(view, parent) { m_accountId = accountId; m_transactionId = transactionId; @@ -324,7 +324,7 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) : { // create the searchline widget // and insert it into the existing layout - m_searchWidget = new KListViewSearchLineWidget(m_payeesList, this); + m_searchWidget = new TDEListViewSearchLineWidget(m_payeesList, this); m_searchWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); KPayeesViewDeclLayout->insertWidget(0, m_searchWidget); @@ -393,7 +393,7 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) : connect(m_updateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpdatePayee())); connect(m_helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp())); - connect(m_payeesList, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotOpenContextMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(m_payeesList, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotOpenContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); // connect(m_payeesList, TQT_SIGNAL(rightButtonClicked(TQListViewItem* , const TQPoint&, int)), // this, TQT_SLOT(slotOpenContextMenu(TQListViewItem*))); @@ -417,7 +417,7 @@ KPayeesView::~KPayeesView() void KPayeesView::slotQueueUpdate(void) { m_updatesQueued++; - // The KListViewSearchLineWidget has an internal timer for update purposes + // The TDEListViewSearchLineWidget has an internal timer for update purposes // of 200 ms, so we should be safe with 250 ms here TQTimer::singleShot(250, this, TQT_SLOT(slotActivateUpdate())); } @@ -900,8 +900,8 @@ void KPayeesView::readConfig(void) void KPayeesView::show(void) { // since we could not construct the connection in our own ctor, - // we set it up now. The widgets of the KListViewSearchLineWidget must exist by now. - // If you want to learn about the details, see the source of KListViewSearchLineWidget's + // we set it up now. The widgets of the TDEListViewSearchLineWidget must exist by now. + // If you want to learn about the details, see the source of TDEListViewSearchLineWidget's // constructor if(m_needConnection) { connect(m_searchWidget->searchLine(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotQueueUpdate(void))); @@ -1088,7 +1088,7 @@ void KPayeesView::slotSelectPayeeAndTransaction(const TQString& payeeId, const T } } -void KPayeesView::slotOpenContextMenu(KListView* lv, TQListViewItem* i, const TQPoint& p) +void KPayeesView::slotOpenContextMenu(TDEListView* lv, TQListViewItem* i, const TQPoint& p) { Q_UNUSED(p); if(lv == m_payeesList) { diff --git a/kmymoney2/views/kpayeesview.h b/kmymoney2/views/kpayeesview.h index e640bf1..611b29a 100644 --- a/kmymoney2/views/kpayeesview.h +++ b/kmymoney2/views/kpayeesview.h @@ -45,7 +45,7 @@ class TQSplitter; #include "kmymoneytransaction.h" #include -class KListViewSearchLineWidget; +class TDEListViewSearchLineWidget; /** * @author Michael Edwardes, Thomas Baumgart @@ -141,18 +141,18 @@ private: /** * This class represents an item in the payees list view. */ -class KPayeeListItem : public KListViewItem +class KPayeeListItem : public TDEListViewItem { public: /** * Constructor to be used to construct a payee entry object. * - * @param parent pointer to the KListView object this entry should be + * @param parent pointer to the TDEListView object this entry should be * added to. * @param payee const reference to MyMoneyPayee for which - * the KListView entry is constructed + * the TDEListView entry is constructed */ - KPayeeListItem(KListView *parent, const MyMoneyPayee& payee); + KPayeeListItem(TDEListView *parent, const MyMoneyPayee& payee); ~KPayeeListItem(); /** @@ -172,10 +172,10 @@ private: * This class represents an item in the transaction list view. It is used * by the KPayeesView to select between transactions. */ -class KTransactionListItem : public KListViewItem +class KTransactionListItem : public TDEListViewItem { public: - KTransactionListItem(KListView* view, KTransactionListItem* parent, const TQString& accountId, const TQString& transaction); + KTransactionListItem(TDEListView* view, KTransactionListItem* parent, const TQString& accountId, const TQString& transaction); ~KTransactionListItem(); const TQString& transactionId(void) const { return m_transactionId; }; @@ -266,7 +266,7 @@ private slots: * @param item the item on which the cursor resides * @param p position of the pointer device */ - void slotOpenContextMenu(KListView* lv, TQListViewItem* item, const TQPoint& p); + void slotOpenContextMenu(TDEListView* lv, TQListViewItem* item, const TQPoint& p); void slotQueueUpdate(void); @@ -309,7 +309,7 @@ private: /** * Search widget for the list */ - KListViewSearchLineWidget* m_searchWidget; + TDEListViewSearchLineWidget* m_searchWidget; bool m_needConnection; /** diff --git a/kmymoney2/views/kpayeesviewdecl.ui b/kmymoney2/views/kpayeesviewdecl.ui index 8d3a7b8..3e95508 100644 --- a/kmymoney2/views/kpayeesviewdecl.ui +++ b/kmymoney2/views/kpayeesviewdecl.ui @@ -27,7 +27,7 @@ unnamed - + m_payeesList @@ -106,7 +106,7 @@ 6 - + No. diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp index 95eb991..6733e73 100755 --- a/kmymoney2/views/kreportsview.cpp +++ b/kmymoney2/views/kreportsview.cpp @@ -322,7 +322,7 @@ KReportsView::KReportsView(TQWidget *parent, const char *name ) : m_listTab = (new TQWidget( m_reportTabWidget, "indextab" )); m_listTabLayout = ( new TQVBoxLayout( m_listTab, 11, 6, "indextabLayout") ); - m_reportListView = new KListView( m_listTab, "m_reportListView" ); + m_reportListView = new TDEListView( m_listTab, "m_reportListView" ); m_listTabLayout->addWidget( m_reportListView ); m_reportTabWidget->insertTab( m_listTab, i18n("Reports") ); @@ -339,8 +339,8 @@ KReportsView::KReportsView(TQWidget *parent, const char *name ) : this, TQT_SLOT(slotOpenReport(TQListViewItem*))); connect(m_reportListView, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotOpenReport(TQListViewItem*))); - connect( m_reportListView, TQT_SIGNAL(contextMenu(KListView*,TQListViewItem*,const TQPoint &)), - this, TQT_SLOT(slotListContextMenu(KListView*,TQListViewItem*,const TQPoint &))); + connect( m_reportListView, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint &)), + this, TQT_SLOT(slotListContextMenu(TDEListView*,TQListViewItem*,const TQPoint &))); connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadView())); } @@ -381,11 +381,11 @@ TQString KReportsView::KReportGroupListItem::key ( int column, bool ascending ) if (column == 0) return TQString::number(m_nr).rightJustify(3,'0'); else - return KListViewItem::key(column,ascending); + return TDEListViewItem::key(column,ascending); } -KReportsView::KReportGroupListItem::KReportGroupListItem(KListView* parent, const int nr, TQString name) : - KListViewItem(parent), +KReportsView::KReportGroupListItem::KReportGroupListItem(TDEListView* parent, const int nr, TQString name) : + TDEListViewItem(parent), m_name(name) { setNr(nr); @@ -875,7 +875,7 @@ void KReportsView::addReportTab(const MyMoneyReport& report) } -void KReportsView::slotListContextMenu(KListView* lv,TQListViewItem* item,const TQPoint & p) +void KReportsView::slotListContextMenu(TDEListView* lv,TQListViewItem* item,const TQPoint & p) { if ( lv == m_reportListView && item ) { diff --git a/kmymoney2/views/kreportsview.h b/kmymoney2/views/kreportsview.h index 7f199d1..fb72e5c 100755 --- a/kmymoney2/views/kreportsview.h +++ b/kmymoney2/views/kreportsview.h @@ -127,20 +127,20 @@ public: * @author Ace Jones */ - class KReportListItem: public KListViewItem + class KReportListItem: public TDEListViewItem { private: TQString m_id; MyMoneyReport m_report; public: - KReportListItem( KListView* parent, const MyMoneyReport& report ): - KListViewItem( parent, report.name(), report.comment() ), + KReportListItem( TDEListView* parent, const MyMoneyReport& report ): + TDEListViewItem( parent, report.name(), report.comment() ), m_id( report.id() ), m_report( report ) {} - KReportListItem( KListViewItem* parent, const MyMoneyReport& report ): - KListViewItem( parent, report.name(), report.comment() ), + KReportListItem( TDEListViewItem* parent, const MyMoneyReport& report ): + TDEListViewItem( parent, report.name(), report.comment() ), m_id( report.id() ), m_report( report ) {} @@ -148,14 +148,14 @@ public: const MyMoneyReport& report(void) const { return m_report; } }; - class KReportGroupListItem: public KListViewItem + class KReportGroupListItem: public TDEListViewItem { private: int m_nr; TQString m_name; public: - KReportGroupListItem( KListView* parent,const int nr,const TQString name); + KReportGroupListItem( TDEListView* parent,const int nr,const TQString name); virtual TQString key ( int column, bool ascending ) const; void setNr(const int nr); }; @@ -186,7 +186,7 @@ private: /// \internal d-pointer instance. Private* const d; KTabWidget* m_reportTabWidget; - KListView* m_reportListView; + TDEListView* m_reportListView; TQWidget* m_listTab; TQVBoxLayout* m_listTabLayout; bool m_needReload; @@ -242,7 +242,7 @@ public slots: void slotClose(TQWidget*); void slotCloseAll(void); void slotDelete(void); - void slotListContextMenu(KListView*,TQListViewItem*,const TQPoint &); + void slotListContextMenu(TDEListView*,TQListViewItem*,const TQPoint &); void slotOpenFromList(void); void slotConfigureFromList(void); void slotNewFromList(void); diff --git a/kmymoney2/views/kscheduledlistitem.cpp b/kmymoney2/views/kscheduledlistitem.cpp index 8829a7a..c1bf126 100644 --- a/kmymoney2/views/kscheduledlistitem.cpp +++ b/kmymoney2/views/kscheduledlistitem.cpp @@ -42,8 +42,8 @@ #include "../kmymoneyglobalsettings.h" #include "../kmymoneyutils.h" -KScheduledListItem::KScheduledListItem(KListView *parent, const TQString& name, const TQPixmap& pixmap, const TQString& sortKey) : - KListViewItem(parent, name), +KScheduledListItem::KScheduledListItem(TDEListView *parent, const TQString& name, const TQPixmap& pixmap, const TQString& sortKey) : + TDEListViewItem(parent, name), m_sortKey(sortKey) { setPixmap(0, pixmap); @@ -52,7 +52,7 @@ KScheduledListItem::KScheduledListItem(KListView *parent, const TQString& name, } KScheduledListItem::KScheduledListItem(KScheduledListItem *parent, const MyMoneySchedule& schedule/*, bool even*/) - : KListViewItem(parent) + : TDEListViewItem(parent) { m_schedule = schedule; m_sortKey = schedule.name(); @@ -220,7 +220,7 @@ int KScheduledListItem::compare(TQListViewItem* i, int col, bool ascending) cons break; default: - rc = KListViewItem::compare(i, col, ascending); + rc = TDEListViewItem::compare(i, col, ascending); break; } // adjust to [-1..1] diff --git a/kmymoney2/views/kscheduledlistitem.h b/kmymoney2/views/kscheduledlistitem.h index 61ef12d..a2293d5 100644 --- a/kmymoney2/views/kscheduledlistitem.h +++ b/kmymoney2/views/kscheduledlistitem.h @@ -43,7 +43,7 @@ * * @author Michael Edwardes */ -class KScheduledListItem : public KListViewItem +class KScheduledListItem : public TDEListViewItem { public: /** @@ -63,7 +63,7 @@ public: * * @see MyMoneySchedule */ - KScheduledListItem(KListView *parent, const TQString& description, const TQPixmap& pixmap = TQPixmap(), const TQString& sortKey = TQString()); + KScheduledListItem(TDEListView *parent, const TQString& description, const TQPixmap& pixmap = TQPixmap(), const TQString& sortKey = TQString()); /** * This constructor is used to create a child of one of the children diff --git a/kmymoney2/views/kscheduledview.cpp b/kmymoney2/views/kscheduledview.cpp index 768a9c4..be5123a 100644 --- a/kmymoney2/views/kscheduledview.cpp +++ b/kmymoney2/views/kscheduledview.cpp @@ -64,7 +64,7 @@ KScheduledView::KScheduledView(TQWidget *parent, const char *name ) : { // create the searchline widget // and insert it into the existing layout - m_searchWidget = new KListViewSearchLineWidget(m_qlistviewScheduled, m_listTab); + m_searchWidget = new TDEListViewSearchLineWidget(m_qlistviewScheduled, m_listTab); m_listTabLayout->insertWidget(0, m_searchWidget); m_qlistviewScheduled->addColumn(i18n("Type/Name")); @@ -86,7 +86,7 @@ KScheduledView::KScheduledView(TQWidget *parent, const char *name ) : connect(m_qbuttonNew, TQT_SIGNAL(clicked()), kmymoney2->action("schedule_new"), TQT_SLOT(activate())); // attach popup to 'Filter...' button - m_kaccPopup = new KPopupMenu(this); + m_kaccPopup = new TDEPopupMenu(this); m_kaccPopup->setCheckable(true); m_accountsCombo->setPopup(m_kaccPopup); connect(m_kaccPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAccountActivated(int))); @@ -98,8 +98,8 @@ KScheduledView::KScheduledView(TQWidget *parent, const char *name ) : m_tabWidget->setTabIconSet(m_listTab, TQIconSet(il->loadIcon("contents", KIcon::Small, KIcon::SizeSmall))); m_tabWidget->setTabIconSet(m_calendarTab, TQIconSet(il->loadIcon("calendartab", KIcon::User, KIcon::SizeSmall))); - connect(m_qlistviewScheduled, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotListViewContextMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(m_qlistviewScheduled, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotListViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); connect(m_qlistviewScheduled, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSetSelectedItem(TQListViewItem*))); @@ -336,7 +336,7 @@ void KScheduledView::writeConfig(void) m_qlistviewScheduled->saveLayout(TDEGlobal::config(), "Schedule View Settings"); } -void KScheduledView::slotListViewContextMenu(KListView* /* view */, TQListViewItem *item, const TQPoint& /* pos */) +void KScheduledView::slotListViewContextMenu(TDEListView* /* view */, TQListViewItem *item, const TQPoint& /* pos */) { KScheduledListItem *scheduleItem = dynamic_cast(item); if (scheduleItem) diff --git a/kmymoney2/views/kscheduledview.h b/kmymoney2/views/kscheduledview.h index 378358a..bf4d407 100644 --- a/kmymoney2/views/kscheduledview.h +++ b/kmymoney2/views/kscheduledview.h @@ -31,7 +31,7 @@ // ---------------------------------------------------------------------------- // KDE Includes -class KListViewSearchLineWidget; +class TDEListViewSearchLineWidget; // ---------------------------------------------------------------------------- // Project Includes @@ -41,7 +41,7 @@ class KListViewSearchLineWidget; #include #include "../widgets/kmymoneyscheduledcalendar.h" -class KPopupMenu; +class TDEPopupMenu; /** * Contains all the scheduled transactions be they bills, deposits or transfers. @@ -95,7 +95,7 @@ protected slots: * @param pos The position to popup * @return none **/ - void slotListViewContextMenu(KListView* view, TQListViewItem* item, const TQPoint& pos); + void slotListViewContextMenu(TDEListView* view, TQListViewItem* item, const TQPoint& pos); void slotListItemExecuted(TQListViewItem*, const TQPoint&, int); @@ -133,7 +133,7 @@ private: */ // void loadAccounts(void); - KPopupMenu *m_kaccPopup; + TDEPopupMenu *m_kaccPopup; TQStringList m_filterAccounts; bool m_openBills; bool m_openDeposits; @@ -144,7 +144,7 @@ private: /** * Search widget for the list */ - KListViewSearchLineWidget* m_searchWidget; + TDEListViewSearchLineWidget* m_searchWidget; }; #endif diff --git a/kmymoney2/views/kscheduledviewdecl.ui b/kmymoney2/views/kscheduledviewdecl.ui index 925dc19..d2227a0 100644 --- a/kmymoney2/views/kscheduledviewdecl.ui +++ b/kmymoney2/views/kscheduledviewdecl.ui @@ -94,7 +94,7 @@ 0 - + m_qlistviewScheduled -- cgit v1.2.1