diff --git a/ChangeLog b/ChangeLog index a7723aa..1af53d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3084,7 +3084,7 @@ * Added plugin dialog to show plugin information * Added warning message when quitting transaction dialog editor via selection of a different transaction - * Don't show the sort column shaded in KListViews + * Don't show the sort column shaded in TDEListViews 2007-12-10 Tony Bloomfield * Make GNC import error message translator-friendly @@ -3188,7 +3188,7 @@ 2007-10-25 Thomas Baumgart * Added forecast patch provided by Alvaro Soliverez - * Modified layout and changed QListView* into KListView* objects in forecast + * Modified layout and changed QListView* into TDEListView* objects in forecast * Don't include disabled widgets in mandatory field checks * Fixed a layout problem in enter and edit schedule dialogs when resizing * Fixed a sizing problem with KMyMoneyCombo widgets @@ -3418,7 +3418,7 @@ * Allow creation of multi currency categories * Allow changing the base currency * Removed default parameter of MyMoneyPrice::rate() - * Base currency activities (new, edit, delete, etc.) on KActions + * Base currency activities (new, edit, delete, etc.) on TDEActions * Show networth graph on home page in base currency * Fixed a problem with ledger not displaying all transactions when loading a new account @@ -3538,7 +3538,7 @@ 2007-05-16 Thomas Baumgart * Use prettyURL() where appropriate - * Renamed KMergeTransactionDlgDecl into KSelectTransactionDlgDecl + * Renamed KMergeTransactionDlgDecl into TDESelectTransactionDlgDecl 2007-05-14 Thomas Baumgart * Better detection of write errors in GPGFile component @@ -4703,7 +4703,7 @@ * Renamed kMyMoneyCurrencySelector to KMyMoneyCurrencySelector * Renamed kMyMoneySecuritySelector to KMyMoneySecuritySelector * Added both of the above to Qt designer widgets - * Reworked payees view to use new KAction logic + * Reworked payees view to use new TDEAction logic 2006-01-21 Darren Gould * Initial budgeting view and report mockup @@ -4728,7 +4728,7 @@ 2006-01-14 Ace Jones * Added account setup for OFX direct connect - * Revived OFX direct connect (it's been broken since the KAction changes) + * Revived OFX direct connect (it's been broken since the TDEAction changes) * OFX direct connect is now officially supproted! * Even added some docs @@ -4968,7 +4968,7 @@ 2005-11-08 Thomas Baumgart * Moved some action slots to KMyMoney2App: - * Revised KAction handling + * Revised TDEAction handling * Fixed date calculation in isOverdue testcase, enhanced testcase * Restructured action handling * Renamed some members in the new account wizard @@ -8039,7 +8039,7 @@ view. * The date for the current cell to be painted is passed to the drawCellContents method. - * Changed the list view widget in KScheduleView to a KListView so I can use + * Changed the list view widget in KScheduleView to a TDEListView so I can use the executed signal. * Implemented an executed slot on a schedule list item that shows the next payment date in the calendar. @@ -8936,7 +8936,7 @@ 2002-01-16 Michael Edwardes * Removed some old 'recurring transactions' code. - * Removed the unneeded KMainView class and converted KMyMoneyView + * Removed the unneeded TDEMainView class and converted KMyMoneyView to use the KBanksView and KTransactionView classes directly. * Moved all the dialogs into the dialogs subdir. @@ -9027,11 +9027,11 @@ * fixed memory leaks in the reconcile and endingbalance dialog boxes 2001-12-14 Thomas Baumgart - * fixed another memory leak bug having to do with the Transaction KPopupMenu + * fixed another memory leak bug having to do with the Transaction TDEPopupMenu * revised Felix' fixes to avoid creating countless objects 2001-12-14 Felix Rodriguez - * fixed another memory leak bug having to do with the Account KPopupMenu + * fixed another memory leak bug having to do with the Account TDEPopupMenu 2001-12-13 Thomas Baumgart * fixed debug output of QIF import (result message of date conversion) diff --git a/ChangeLog.original b/ChangeLog.original index d017315..b336590 100644 --- a/ChangeLog.original +++ b/ChangeLog.original @@ -59,7 +59,7 @@ use the apprpriate KDE 2 dialog. (KMenu -> Preferences -> Personalisation -> Country & Language.) Added a dialog to let the user choose the columns to be displayed, and to choose the fonts/colours. Updated the list view code to read from the user variables. A couple of bugs exist. - The settings are now saved in the application config file. (KMainWnd::read/saveOptions). + The settings are now saved in the application config file. (TDEMainWnd::read/saveOptions). Added a find dialog and added menu and toolbar items. The find dialog now opens a new results window to display in, and now support regular expressions in the description & number fields. @@ -81,14 +81,14 @@ ALL THE HAND EDITED FILES (KDEVELOP DOESN'T ON MINE BUT I CAN'T GUARANTEE IT FOR OTHER MACHINES). -- I DON'T REALLY UNDERSTAND AUTOCONF ETC!!! Added a caption to let the user know where they are at any time. Thanks to ... - Moved the list views over to KListView and am now using better ordering of the items. + Moved the list views over to TDEListView and am now using better ordering of the items. Changed the API in the engine to be more robust and to disengage itself from external number ordering. Added an index field to MyMoneyTransaction and removed MyMoneyTransactionE from KReconcileDlg. KReconcileDlg is now implemented using designer, and the code has been modified to reflect this and the code has been simplified. Added == operators to the 'engine' classes. Removed QdbtTabular completely from the source code. All lists now use the - KListView class. + TDEListView class. Moved over to KDevelop 1.3 and am now using the new templates and admin directory. Made all tdevelop dialogs into designer dialogs and they now look better and the tabs behave as expected. Removed the dock applet from the source, I will release it once kmymoney2 becomes stable again. (most of @@ -174,7 +174,7 @@ useful and sometimes errenous, but I have decided to integrate them purely for c Copy constructors and assignment operators added to all the mymoney classes. Quite a few changes to the mymoney classes actually, (added consts, &'s, removed a few methods etc). Switched to KDE2 Beta3 and QT2.2.0 beta0 (qt-copy-1.92). - Changed the main window from KTMainWindow to KMainWindow and changed some affected code. + Changed the main window from KTMainWindow to TDEMainWindow and changed some affected code. Added income/expense support to categories and changed dialog and list view code to reflect these changes. Added a KNewCategoryDlg to edit the categories from KCategoriesDlg. Added code to load standard categories when a new file is created. The data is loaded from @@ -234,9 +234,9 @@ yet). Started making the interface look like it will do in version 1. (Most of it prints a message saying that it isn't working yet !). Removed calendar-0.12 from the source tree. You now need to install this prior to compiling. - Added a new tabbed widget to control the different aspects of KMyMoney2. The Main widget ((KMainView) + Added a new tabbed widget to control the different aspects of KMyMoney2. The Main widget ((TDEMainView) is now one of the tabs (Accounts). - Cleaned up KMainWnd (the class inherited from KTMainWindow) and it is now lean and clean. + Cleaned up TDEMainWnd (the class inherited from KTMainWindow) and it is now lean and clean. NOTHING WORKS AT THE MOMENT. @@ -305,7 +305,7 @@ yet). 090500 First steps in making MyMoney* ready for a shared library. This - version WON'T compile due to undefined methods and KMainWnd + version WON'T compile due to undefined methods and TDEMainWnd not using the new methods. 060500 diff --git a/developer-doc/phb/src-examples.docbook b/developer-doc/phb/src-examples.docbook index 6a999c9..d81c7ee 100644 --- a/developer-doc/phb/src-examples.docbook +++ b/developer-doc/phb/src-examples.docbook @@ -76,9 +76,9 @@ private: /** Color background */ KColorButton *m_kcolorbuttonBack; /** Select font header */ - KFontChooser *m_kfontchooserHeader; + TDEFontChooser *m_kfontchooserHeader; /** Font cell setting */ - KFontChooser *m_kfontchooserCell; + TDEFontChooser *m_kfontchooserCell; /** No rows to show in register */ KLineEdit *m_klineeditRowCount; @@ -387,14 +387,14 @@ void KSettingsDlg::setPageList() QVBox *qvboxInsideTab1 = new QVBox( this, "tab1" ); qvboxInsideTab1->setSpacing( 6 ); qvboxInsideTab1->setMargin( 11 ); - m_kfontchooserHeader = new KFontChooser(qvboxInsideTab1); + m_kfontchooserHeader = new TDEFontChooser(qvboxInsideTab1); qtabwidget->insertTab(qvboxInsideTab1, i18n("Header Font")); // Create another tab adding a font chooser widget QVBox *qvboxInsideTab2 = new QVBox( this, "tab2" ); qvboxInsideTab2->setSpacing( 6 ); qvboxInsideTab2->setMargin( 11 ); - m_kfontchooserCell = new KFontChooser(qvboxInsideTab2); + m_kfontchooserCell = new TDEFontChooser(qvboxInsideTab2); qtabwidget->addTab(qvboxInsideTab2, i18n("Cell Font")); } diff --git a/kmymoney2/dialogs/kcurrencyeditdlg.h b/kmymoney2/dialogs/kcurrencyeditdlg.h index 4cc2a11..b3a29c2 100644 --- a/kmymoney2/dialogs/kcurrencyeditdlg.h +++ b/kmymoney2/dialogs/kcurrencyeditdlg.h @@ -31,7 +31,7 @@ // ---------------------------------------------------------------------------- // KDE Includes -class KPopupMenu; +class TDEPopupMenu; // ---------------------------------------------------------------------------- // Project Includes diff --git a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui index 2ab7f00..c4fab59 100644 --- a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui +++ b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui @@ -38,7 +38,7 @@ unnamed - + m_currencyList @@ -174,7 +174,7 @@ X - + Currency diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp index 3af2912..d9c09cc 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp +++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp @@ -217,7 +217,7 @@ void KEquityPriceUpdateDlg::addPricePair(const MyMoneySecurityPair& pair, bool d } if(keep) { - KListViewItem* item = new KListViewItem(lvEquityList, + TDEListViewItem* item = new TDEListViewItem(lvEquityList, symbol, i18n("%1 units in %2").arg(pair.first,pair.second)); if(pr.isValid()) { @@ -251,7 +251,7 @@ void KEquityPriceUpdateDlg::addInvestment(const MyMoneySecurity& inv) } // if it is in use, it_a is not equal to list.end() if(it_a != list.end()) { - KListViewItem* item = new KListViewItem(lvEquityList, symbol, inv.name()); + TDEListViewItem* item = new TDEListViewItem(lvEquityList, symbol, inv.name()); MyMoneySecurity currency = file->currency(inv.tradingCurrency()); MyMoneyPrice pr = file->price(id.utf8(), inv.tradingCurrency()); if(pr.isValid()) { diff --git a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui index a381e0d..d3dbf99 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui +++ b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui @@ -20,7 +20,7 @@ unnamed - + lvEquityList diff --git a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui index 81d17c1..1109da9 100644 --- a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui +++ b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui @@ -488,7 +488,7 @@ 6 - + Payee diff --git a/kmymoney2/dialogs/kmergetransactionsdlg.cpp b/kmymoney2/dialogs/kmergetransactionsdlg.cpp index aeb4f69..6b750f1 100644 --- a/kmymoney2/dialogs/kmergetransactionsdlg.cpp +++ b/kmymoney2/dialogs/kmergetransactionsdlg.cpp @@ -32,7 +32,7 @@ #include "kmergetransactionsdlg.h" KMergeTransactionsDlg::KMergeTransactionsDlg(const MyMoneyAccount& account, TQWidget* parent, const char* name) : - KSelectTransactionsDlg(account, parent, name) + TDESelectTransactionsDlg(account, parent, name) { // setup descriptive texts diff --git a/kmymoney2/dialogs/kmergetransactionsdlg.h b/kmymoney2/dialogs/kmergetransactionsdlg.h index 68bfee0..f42997c 100644 --- a/kmymoney2/dialogs/kmergetransactionsdlg.h +++ b/kmymoney2/dialogs/kmergetransactionsdlg.h @@ -36,7 +36,7 @@ class TQResizeEvent; #include "../dialogs/kselecttransactionsdlg.h" -class KMergeTransactionsDlg: public KSelectTransactionsDlg +class KMergeTransactionsDlg: public TDESelectTransactionsDlg { Q_OBJECT diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp b/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp index 49852a7..0041a68 100644 --- a/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp +++ b/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp @@ -67,7 +67,7 @@ KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(TQWidget *parent, const char *name ) TQMap::const_iterator it_m; for(it_m = accountMap.begin(); it_m != accountMap.end(); ++it_m) { - new KListViewItem(m_accountView, KMyMoneyUtils::accountTypeToString(it_m.key()), TQString("%1").arg(*it_m), TQString("%1").arg(accountMapClosed[it_m.key()])); + new TDEListViewItem(m_accountView, KMyMoneyUtils::accountTypeToString(it_m.key()), TQString("%1").arg(*it_m), TQString("%1").arg(accountMapClosed[it_m.key()])); } diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui index 4a625f7..5f85579 100644 --- a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui +++ b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui @@ -49,7 +49,7 @@ x - + Type diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp index bd37775..64387a8 100644 --- a/kmymoney2/dialogs/kmymoneysplittable.cpp +++ b/kmymoney2/dialogs/kmymoneysplittable.cpp @@ -93,7 +93,7 @@ kMyMoneySplitTable::kMyMoneySplitTable(TQWidget *parent, const char *name ) : setHScrollBarMode(TQScrollView::AlwaysOff); // setup the context menu - m_contextMenu = new KPopupMenu(this); + m_contextMenu = new TDEPopupMenu(this); KIconLoader *il = TDEGlobal::iconLoader(); m_contextMenu->insertTitle(il->loadIcon("transaction", KIcon::MainToolbar), i18n("Split Options")); m_contextMenu->insertItem(il->loadIcon("edit", KIcon::Small), i18n("Edit..."), this, TQT_SLOT(slotStartEdit())); @@ -272,8 +272,8 @@ bool kMyMoneySplitTable::eventFilter(TQObject *o, TQEvent *e) default: rc = true; - KShortcut copySplit(i18n("Duplicate split", "CTRL+c")); - KShortcut newSplit(TQKeySequence(TQt::CTRL | TQt::Key_Insert)); + TDEShortcut copySplit(i18n("Duplicate split", "CTRL+c")); + TDEShortcut newSplit(TQKeySequence(TQt::CTRL | TQt::Key_Insert)); if(copySplit.contains(KKey(k))) { slotDuplicateSplit(); diff --git a/kmymoney2/dialogs/kmymoneysplittable.h b/kmymoney2/dialogs/kmymoneysplittable.h index 43b75fb..cc61b14 100644 --- a/kmymoney2/dialogs/kmymoneysplittable.h +++ b/kmymoney2/dialogs/kmymoneysplittable.h @@ -34,7 +34,7 @@ // ---------------------------------------------------------------------------- // KDE Includes -class KPopupMenu; +class TDEPopupMenu; class KPushButton; // ---------------------------------------------------------------------------- @@ -221,7 +221,7 @@ private: /** * This member keeps a pointer to the context menu */ - KPopupMenu* m_contextMenu; + TDEPopupMenu* m_contextMenu; /// keeps the id of the delete entry in the context menu int m_contextMenuDelete; diff --git a/kmymoney2/dialogs/kplugindlg.ui b/kmymoney2/dialogs/kplugindlg.ui index 2cf4373..f41ffb1 100644 --- a/kmymoney2/dialogs/kplugindlg.ui +++ b/kmymoney2/dialogs/kplugindlg.ui @@ -22,7 +22,7 @@ unnamed - + PlugIn diff --git a/kmymoney2/dialogs/krecentfileitem.cpp b/kmymoney2/dialogs/krecentfileitem.cpp index ff06c6a..495d81f 100644 --- a/kmymoney2/dialogs/krecentfileitem.cpp +++ b/kmymoney2/dialogs/krecentfileitem.cpp @@ -37,7 +37,7 @@ #include "krecentfileitem.h" -KRecentFileItem::KRecentFileItem(const TQString& url, TQIconView* parent, const TQString& text, const TQPixmap& icon) +TDERecentFileItem::TDERecentFileItem(const TQString& url, TQIconView* parent, const TQString& text, const TQPixmap& icon) : TQIconViewItem(parent, text, icon), m_url(url), m_parent(parent) @@ -47,11 +47,11 @@ KRecentFileItem::KRecentFileItem(const TQString& url, TQIconView* parent, const setDragEnabled(false); } -KRecentFileItem::~KRecentFileItem() +TDERecentFileItem::~TDERecentFileItem() { } -bool KRecentFileItem::move( int x, int y ) +bool TDERecentFileItem::move( int x, int y ) { TQRect r = rect(); TQToolTip::remove(m_parent, rect()); diff --git a/kmymoney2/dialogs/krecentfileitem.h b/kmymoney2/dialogs/krecentfileitem.h index 89a080a..bc89c48 100644 --- a/kmymoney2/dialogs/krecentfileitem.h +++ b/kmymoney2/dialogs/krecentfileitem.h @@ -40,10 +40,10 @@ * @author Michael Edwardes */ -class KRecentFileItem : public TQIconViewItem { +class TDERecentFileItem : public TQIconViewItem { public: - KRecentFileItem(const TQString& url, TQIconView* parent, const TQString& text, const TQPixmap& icon); - ~KRecentFileItem(); + TDERecentFileItem(const TQString& url, TQIconView* parent, const TQString& text, const TQPixmap& icon); + ~TDERecentFileItem(); TQString fileURL(void) const { return m_url; } bool move( int x, int y ); diff --git a/kmymoney2/dialogs/kreconciledlgdecl.ui b/kmymoney2/dialogs/kreconciledlgdecl.ui index d5893e8..dce5658 100644 --- a/kmymoney2/dialogs/kreconciledlgdecl.ui +++ b/kmymoney2/dialogs/kreconciledlgdecl.ui @@ -141,7 +141,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto Withdrawals - + debitListView @@ -198,7 +198,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto Deposits - + creditListView diff --git a/kmymoney2/dialogs/ksecuritylisteditor.cpp b/kmymoney2/dialogs/ksecuritylisteditor.cpp index e0642a0..afbf4e3 100644 --- a/kmymoney2/dialogs/ksecuritylisteditor.cpp +++ b/kmymoney2/dialogs/ksecuritylisteditor.cpp @@ -115,7 +115,7 @@ void KSecurityListEditor::slotLoadList(void) list += MyMoneyFile::instance()->currencyList(); } for(it = list.begin(); it != list.end(); ++it) { - KListViewItem* newItem = new KListViewItem(m_listView, TQString((*it).id())); + TDEListViewItem* newItem = new TDEListViewItem(m_listView, TQString((*it).id())); fillItem(newItem, *it); } diff --git a/kmymoney2/dialogs/ksecuritylisteditordecl.ui b/kmymoney2/dialogs/ksecuritylisteditordecl.ui index d9033da..e88177e 100644 --- a/kmymoney2/dialogs/ksecuritylisteditordecl.ui +++ b/kmymoney2/dialogs/ksecuritylisteditordecl.ui @@ -30,7 +30,7 @@ unnamed - + ID diff --git a/kmymoney2/dialogs/kselectdatabasedlg.cpp b/kmymoney2/dialogs/kselectdatabasedlg.cpp index 50e66d4..607abbc 100644 --- a/kmymoney2/dialogs/kselectdatabasedlg.cpp +++ b/kmymoney2/dialogs/kselectdatabasedlg.cpp @@ -45,8 +45,8 @@ #include "kselectdatabasedlg.h" -KSelectDatabaseDlg::KSelectDatabaseDlg(TQWidget *parent, const char *name) - : KSelectDatabaseDlgDecl(parent, name) { +TDESelectDatabaseDlg::TDESelectDatabaseDlg(TQWidget *parent, const char *name) + : TDESelectDatabaseDlgDecl(parent, name) { listDrivers->clear(); // list drivers supported by KMM TQMap map = m_map.driverMap(); @@ -95,8 +95,8 @@ KSelectDatabaseDlg::KSelectDatabaseDlg(TQWidget *parent, const char *name) } } -KSelectDatabaseDlg::KSelectDatabaseDlg(KURL openURL, TQWidget *parent, const char *name) - : KSelectDatabaseDlgDecl(parent, name) { +TDESelectDatabaseDlg::TDESelectDatabaseDlg(KURL openURL, TQWidget *parent, const char *name) + : TDESelectDatabaseDlgDecl(parent, name) { // here we are re-opening a database from a URL // probably taken from the last-used or recent file list listDrivers->clear(); @@ -142,16 +142,16 @@ KSelectDatabaseDlg::KSelectDatabaseDlg(KURL openURL, TQWidget *parent, const cha } -KSelectDatabaseDlg::~KSelectDatabaseDlg() { +TDESelectDatabaseDlg::~TDESelectDatabaseDlg() { if (m_requiredFields != 0) delete m_requiredFields; } -void KSelectDatabaseDlg::setMode (int openMode) { +void TDESelectDatabaseDlg::setMode (int openMode) { m_mode = openMode; checkPreLoad->setEnabled (openMode == IO_ReadWrite); } -const KURL KSelectDatabaseDlg::selectedURL() { +const KURL TDESelectDatabaseDlg::selectedURL() { KURL url; url.setProtocol("sql"); url.setUser(textUserName->text()); @@ -166,7 +166,7 @@ const KURL KSelectDatabaseDlg::selectedURL() { return (url); } -void KSelectDatabaseDlg::slotDriverSelected (TQListBoxItem *driver) { +void TDESelectDatabaseDlg::slotDriverSelected (TQListBoxItem *driver) { databaseTypeE dbType = m_map.driverToType(driver->text().section(' ', 0, 0)); if (!m_map.isTested(dbType)) { int rc = KMessageBox::warningContinueCancel (0, @@ -203,7 +203,7 @@ void KSelectDatabaseDlg::slotDriverSelected (TQListBoxItem *driver) { } } -void KSelectDatabaseDlg::slotGenerateSQL () { +void TDESelectDatabaseDlg::slotGenerateSQL () { TQString fileName = TQFileDialog::getSaveFileName( "", i18n("All files (*.*)"), @@ -219,11 +219,11 @@ void KSelectDatabaseDlg::slotGenerateSQL () { out.close(); } -void KSelectDatabaseDlg::slotHelp(void) { +void TDESelectDatabaseDlg::slotHelp(void) { kapp->invokeHelp("details.database.selectdatabase"); } -void KSelectDatabaseDlg::setError() { +void TDESelectDatabaseDlg::setError() { buttonOK->setEnabled(false); buttonSQL->setEnabled(false); m_requiredFields = 0; diff --git a/kmymoney2/dialogs/kselectdatabasedlg.h b/kmymoney2/dialogs/kselectdatabasedlg.h index a0d446f..4fe2809 100644 --- a/kmymoney2/dialogs/kselectdatabasedlg.h +++ b/kmymoney2/dialogs/kselectdatabasedlg.h @@ -34,14 +34,14 @@ #include "../mymoney/storage/mymoneystoragesql.h" #include "kmymoney/kguiutils.h" -class KSelectDatabaseDlg : public KSelectDatabaseDlgDecl +class TDESelectDatabaseDlg : public TDESelectDatabaseDlgDecl { Q_OBJECT public: - KSelectDatabaseDlg(TQWidget *parent = 0, const char *name = 0); - KSelectDatabaseDlg(KURL openURL, TQWidget *parent = 0, const char *name = 0); - ~KSelectDatabaseDlg(); + TDESelectDatabaseDlg(TQWidget *parent = 0, const char *name = 0); + TDESelectDatabaseDlg(KURL openURL, TQWidget *parent = 0, const char *name = 0); + ~TDESelectDatabaseDlg(); /** Set the mode of this dialog * @param - openMode (IO_ReadWrite = open database; IO_WriteOnly = saveas database) **/ diff --git a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui index 2215b9a..5e756a7 100644 --- a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui +++ b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui @@ -1,8 +1,8 @@ -KSelectDatabaseDlgDecl +TDESelectDatabaseDlgDecl - KSelectDatabaseDlgDecl + TDESelectDatabaseDlgDecl @@ -236,13 +236,13 @@ As always, please make sure you have adequate backups of your data.</font> buttonOK released() - KSelectDatabaseDlgDecl + TDESelectDatabaseDlgDecl accept() buttonCancel released() - KSelectDatabaseDlgDecl + TDESelectDatabaseDlgDecl reject() diff --git a/kmymoney2/dialogs/kselecttransactionsdlg.cpp b/kmymoney2/dialogs/kselecttransactionsdlg.cpp index 04e377e..51968f1 100644 --- a/kmymoney2/dialogs/kselecttransactionsdlg.cpp +++ b/kmymoney2/dialogs/kselecttransactionsdlg.cpp @@ -36,8 +36,8 @@ #include "kmergetransactionsdlg.h" -KSelectTransactionsDlg::KSelectTransactionsDlg(const MyMoneyAccount& _account, TQWidget* parent, const char* name) : - KSelectTransactionsDlgDecl(parent, name), +TDESelectTransactionsDlg::TDESelectTransactionsDlg(const MyMoneyAccount& _account, TQWidget* parent, const char* name) : + TDESelectTransactionsDlgDecl(parent, name), m_account(_account) { // setup descriptive texts @@ -82,12 +82,12 @@ KSelectTransactionsDlg::KSelectTransactionsDlg(const MyMoneyAccount& _account, T connect(m_helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp())); } -void KSelectTransactionsDlg::slotEnableOk(const KMyMoneyRegister::SelectedTransactions& list) +void TDESelectTransactionsDlg::slotEnableOk(const KMyMoneyRegister::SelectedTransactions& list) { buttonOk->setEnabled(list.count() != 0); } -void KSelectTransactionsDlg::addTransaction(const MyMoneyTransaction& t) +void TDESelectTransactionsDlg::addTransaction(const MyMoneyTransaction& t) { TQValueList::const_iterator it_s; for(it_s = t.splits().begin(); it_s != t.splits().end(); ++it_s) { @@ -100,37 +100,37 @@ void KSelectTransactionsDlg::addTransaction(const MyMoneyTransaction& t) } } -int KSelectTransactionsDlg::exec(void) +int TDESelectTransactionsDlg::exec(void) { m_register->updateRegister(true); m_register->updateContents(); m_register->setFocus(); - return KSelectTransactionsDlgDecl::exec(); + return TDESelectTransactionsDlgDecl::exec(); } -void KSelectTransactionsDlg::slotHelp(void) +void TDESelectTransactionsDlg::slotHelp(void) { // kapp->invokeHelp("details.ledgers.match"); } -void KSelectTransactionsDlg::show(void) +void TDESelectTransactionsDlg::show(void) { - KSelectTransactionsDlgDecl::show(); + TDESelectTransactionsDlgDecl::show(); m_register->resize(KMyMoneyRegister::DetailColumn); } -void KSelectTransactionsDlg::resizeEvent(TQResizeEvent* ev) +void TDESelectTransactionsDlg::resizeEvent(TQResizeEvent* ev) { // don't forget the resizer - KSelectTransactionsDlgDecl::resizeEvent(ev); + TDESelectTransactionsDlgDecl::resizeEvent(ev); // resize the register m_register->resize(KMyMoneyRegister::DetailColumn); } -MyMoneyTransaction KSelectTransactionsDlg::transaction(void) const +MyMoneyTransaction TDESelectTransactionsDlg::transaction(void) const { MyMoneyTransaction t; @@ -144,7 +144,7 @@ MyMoneyTransaction KSelectTransactionsDlg::transaction(void) const return t; } -bool KSelectTransactionsDlg::eventFilter(TQObject* o, TQEvent* e) +bool TDESelectTransactionsDlg::eventFilter(TQObject* o, TQEvent* e) { bool rc = false; TQKeyEvent* k; diff --git a/kmymoney2/dialogs/kselecttransactionsdlg.h b/kmymoney2/dialogs/kselecttransactionsdlg.h index 657df34..4eeaea2 100644 --- a/kmymoney2/dialogs/kselecttransactionsdlg.h +++ b/kmymoney2/dialogs/kselecttransactionsdlg.h @@ -36,12 +36,12 @@ class TQResizeEvent; #include "../dialogs/kselecttransactionsdlgdecl.h" -class KSelectTransactionsDlg: public KSelectTransactionsDlgDecl +class TDESelectTransactionsDlg: public TDESelectTransactionsDlgDecl { Q_OBJECT public: - KSelectTransactionsDlg(const MyMoneyAccount& account, TQWidget* parent = 0, const char* name = 0); + TDESelectTransactionsDlg(const MyMoneyAccount& account, TQWidget* parent = 0, const char* name = 0); /** * Adds the transaction @a t to the dialog diff --git a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui index f4fb116..24bc6f0 100644 --- a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui +++ b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui @@ -1,8 +1,8 @@ -KSelectTransactionsDlgDecl +TDESelectTransactionsDlgDecl - KSelectTransactionsDlgDecl + TDESelectTransactionsDlgDecl @@ -160,13 +160,13 @@ buttonOk clicked() - KSelectTransactionsDlgDecl + TDESelectTransactionsDlgDecl accept() buttonCancel clicked() - KSelectTransactionsDlgDecl + TDESelectTransactionsDlgDecl reject() diff --git a/kmymoney2/dialogs/kstartdlg.cpp b/kmymoney2/dialogs/kstartdlg.cpp index f6f1460..9aefa00 100644 --- a/kmymoney2/dialogs/kstartdlg.cpp +++ b/kmymoney2/dialogs/kstartdlg.cpp @@ -142,7 +142,7 @@ void KStartDlg::readConfig() if( !value.isNull() && fileExists(value) ) { TQString file_name = value.mid(value.findRev('/')+1); - (void)new KRecentFileItem( value, view_recent, file_name, il->loadIcon("kmy", KIcon::Desktop, KIcon::SizeLarge)); + (void)new TDERecentFileItem( value, view_recent, file_name, il->loadIcon("kmy", KIcon::Desktop, KIcon::SizeLarge)); } i++; } while( !value.isNull() ); @@ -176,7 +176,7 @@ void KStartDlg::writeConfig() /** slot to recent view */ void KStartDlg::slotRecentClicked(TQIconViewItem *item) { - KRecentFileItem *kitem = (KRecentFileItem*)item; + TDERecentFileItem *kitem = (TDERecentFileItem*)item; if(!kitem) return; isopenfile = true; @@ -220,7 +220,7 @@ void KStartDlg::slotTemplateSelectionChanged(TQIconViewItem* item) void KStartDlg::slotRecentSelectionChanged(TQIconViewItem* item) { - KRecentFileItem *kitem = (KRecentFileItem*)item; + TDERecentFileItem *kitem = (TDERecentFileItem*)item; if(!kitem) return; // Clear the other selection diff --git a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui index a6e48f9..874aa85 100644 --- a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui @@ -38,12 +38,12 @@ unnamed - + kcfg_listCellFont - + kcfg_listHeaderFont diff --git a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui index c442639..948e487 100644 --- a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui @@ -370,7 +370,7 @@ WordBreak|AlignTop - + m_viewList diff --git a/kmymoney2/dialogs/settings/ksettingshomedecl.ui b/kmymoney2/dialogs/settings/ksettingshomedecl.ui index f6342f3..33eb837 100644 --- a/kmymoney2/dialogs/settings/ksettingshomedecl.ui +++ b/kmymoney2/dialogs/settings/ksettingshomedecl.ui @@ -132,7 +132,7 @@ Use the buttons and checkboxes to customize the layout of the home page. - + m_homePageList diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui index ad68131..def8727 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui @@ -25,7 +25,7 @@ unnamed - + Name diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp index a6f83dc..0af5b41 100644 --- a/kmymoney2/dialogs/transactioneditor.cpp +++ b/kmymoney2/dialogs/transactioneditor.cpp @@ -1286,7 +1286,7 @@ void StdTransactionEditor::autoFill(const TQString& payeeId) t = list.last().first; } else { #endif - KSelectTransactionsDlg dlg(m_account, m_regForm); + TDESelectTransactionsDlg dlg(m_account, m_regForm); dlg.setCaption(i18n("Select autofill transaction")); TQMap::const_iterator it_u; diff --git a/kmymoney2/dialogs/transactioneditor.h b/kmymoney2/dialogs/transactioneditor.h index 581cdfc..39ebcc4 100644 --- a/kmymoney2/dialogs/transactioneditor.h +++ b/kmymoney2/dialogs/transactioneditor.h @@ -193,7 +193,7 @@ signals: /** * This signal is sent out whenever enough data is present to enter the * transaction into the ledger. This signal can be used to control the - * KAction which implements entering the transaction. + * TDEAction which implements entering the transaction. * * @sa isComplete() * diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp index 13ef387..6d9f718 100644 --- a/kmymoney2/kmymoney2.cpp +++ b/kmymoney2/kmymoney2.cpp @@ -176,7 +176,7 @@ public: }; KMyMoney2App::KMyMoney2App(TQWidget * /*parent*/ , const char* name) : - KMainWindow(0, name), + TDEMainWindow(0, name), DCOPObject("kmymoney2app"), d(new Private), myMoneyView(0), @@ -299,7 +299,7 @@ void KMyMoney2App::initDynamicMenus(void) void KMyMoney2App::initActions(void) { - KAction* p; + TDEAction* p; // ************* // The File menu @@ -313,177 +313,177 @@ void KMyMoney2App::initActions(void) KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrintView()), actionCollection()); - new KAction(i18n("Open database..."), "",0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenDatabase()),actionCollection(),"open_database"); - new KAction(i18n("Save as database..."), "",0,TQT_TQOBJECT(this), TQT_SLOT(slotSaveAsDatabase()),actionCollection(),"saveas_database"); - new KAction(i18n("Backup..."), "backup",0,TQT_TQOBJECT(this), TQT_SLOT(slotFileBackup()),actionCollection(),"file_backup"); - new KAction(i18n("QIF..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQifImport()), actionCollection(), "file_import_qif"); - new KAction(i18n("Gnucash..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGncImport()), actionCollection(), "file_import_gnc"); - new KAction(i18n("Statement file..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStatementImport()), actionCollection(), "file_import_statement"); + new TDEAction(i18n("Open database..."), "",0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenDatabase()),actionCollection(),"open_database"); + new TDEAction(i18n("Save as database..."), "",0,TQT_TQOBJECT(this), TQT_SLOT(slotSaveAsDatabase()),actionCollection(),"saveas_database"); + new TDEAction(i18n("Backup..."), "backup",0,TQT_TQOBJECT(this), TQT_SLOT(slotFileBackup()),actionCollection(),"file_backup"); + new TDEAction(i18n("QIF..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQifImport()), actionCollection(), "file_import_qif"); + new TDEAction(i18n("Gnucash..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGncImport()), actionCollection(), "file_import_gnc"); + new TDEAction(i18n("Statement file..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStatementImport()), actionCollection(), "file_import_statement"); - new KAction(i18n("Account Template..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotLoadAccountTemplates()), actionCollection(), "file_import_template"); - new KAction(i18n("Account Template..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAccountTemplates()), actionCollection(), "file_export_template"); - new KAction(i18n("QIF..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQifExport()), actionCollection(), "file_export_qif"); - new KAction(i18n("Personal Data..."), "personal_data", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileViewPersonal()), actionCollection(), "view_personal_data"); + new TDEAction(i18n("Account Template..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotLoadAccountTemplates()), actionCollection(), "file_import_template"); + new TDEAction(i18n("Account Template..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAccountTemplates()), actionCollection(), "file_export_template"); + new TDEAction(i18n("QIF..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQifExport()), actionCollection(), "file_export_qif"); + new TDEAction(i18n("Personal Data..."), "personal_data", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileViewPersonal()), actionCollection(), "view_personal_data"); #if KMM_DEBUG - new KAction(i18n("Dump Memory"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileFileInfo()), actionCollection(), "file_dump"); + new TDEAction(i18n("Dump Memory"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileFileInfo()), actionCollection(), "file_dump"); #endif - new KAction(i18n("File-Information..."), "info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileInfoDialog()), actionCollection(), "view_file_info"); + new TDEAction(i18n("File-Information..."), "info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileInfoDialog()), actionCollection(), "view_file_info"); // ************* // The Edit menu // ************* - new KAction(i18n("Find transaction..."), "transaction_find", KShortcut("Ctrl+F"), TQT_TQOBJECT(this), TQT_SLOT(slotFindTransaction()), actionCollection(), "edit_find_transaction"); + new TDEAction(i18n("Find transaction..."), "transaction_find", TDEShortcut("Ctrl+F"), TQT_TQOBJECT(this), TQT_SLOT(slotFindTransaction()), actionCollection(), "edit_find_transaction"); // ************* // The View menu // ************* - new KToggleAction(i18n("Show Transaction Detail"), KShortcut("Ctrl+T"), actionCollection(), "view_show_transaction_detail"); - new KToggleAction(i18n("Hide reconciled transactions"), "hide_reconciled", KShortcut("Ctrl+R"), TQT_TQOBJECT(this), TQT_SLOT(slotHideReconciledTransactions()), actionCollection(), "view_hide_reconciled_transactions"); - new KToggleAction(i18n("Hide unused categories"), "hide_categories", KShortcut("Ctrl+U"), TQT_TQOBJECT(this), TQT_SLOT(slotHideUnusedCategories()), actionCollection(), "view_hide_unused_categories"); - new KToggleAction(i18n("Show all accounts"), "", KShortcut("Ctrl+Shift+A"), TQT_TQOBJECT(this), TQT_SLOT(slotShowAllAccounts()), actionCollection(), "view_show_all_accounts"); + new TDEToggleAction(i18n("Show Transaction Detail"), TDEShortcut("Ctrl+T"), actionCollection(), "view_show_transaction_detail"); + new TDEToggleAction(i18n("Hide reconciled transactions"), "hide_reconciled", TDEShortcut("Ctrl+R"), TQT_TQOBJECT(this), TQT_SLOT(slotHideReconciledTransactions()), actionCollection(), "view_hide_reconciled_transactions"); + new TDEToggleAction(i18n("Hide unused categories"), "hide_categories", TDEShortcut("Ctrl+U"), TQT_TQOBJECT(this), TQT_SLOT(slotHideUnusedCategories()), actionCollection(), "view_hide_unused_categories"); + new TDEToggleAction(i18n("Show all accounts"), "", TDEShortcut("Ctrl+Shift+A"), TQT_TQOBJECT(this), TQT_SLOT(slotShowAllAccounts()), actionCollection(), "view_show_all_accounts"); // ********************* // The institutions menu // ********************* - new KAction(i18n("New institution..."), "institution_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInstitutionNew()), actionCollection(), "institution_new"); - new KAction(i18n("Edit institution..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInstitutionEdit()), actionCollection(), "institution_edit"); - new KAction(i18n("Delete institution..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInstitutionDelete()), actionCollection(), "institution_delete"); + new TDEAction(i18n("New institution..."), "institution_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInstitutionNew()), actionCollection(), "institution_new"); + new TDEAction(i18n("Edit institution..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInstitutionEdit()), actionCollection(), "institution_edit"); + new TDEAction(i18n("Delete institution..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInstitutionDelete()), actionCollection(), "institution_delete"); // ***************** // The accounts menu // ***************** - new KAction(i18n("New account..."), "account_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountNew()), actionCollection(), "account_new"); + new TDEAction(i18n("New account..."), "account_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountNew()), actionCollection(), "account_new"); // note : action "category_new" is included in this menu but defined below - new KAction(i18n("Open ledger"), "ledger", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountOpen()), actionCollection(), "account_open"); - new KAction(i18n("Reconcile..."), "reconcile", KShortcut("Ctrl+Shift+R"), TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcileStart()), actionCollection(), "account_reconcile"); - new KAction(i18n("Finish reconciliation", "Finish"), "player_end", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcileFinish()), actionCollection(), "account_reconcile_finish"); - new KAction(i18n("Postpone reconciliation", "Postpone"), "player_pause", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcilePostpone()), actionCollection(), "account_reconcile_postpone"); - new KAction(i18n("Edit account..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountEdit()), actionCollection(), "account_edit"); - new KAction(i18n("Delete account..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountDelete()), actionCollection(), "account_delete"); - new KAction(i18n("Close account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountClose()), actionCollection(), "account_close"); - new KAction(i18n("Reopen account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReopen()), actionCollection(), "account_reopen"); - new KAction(i18n("Transaction report"), "view_info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountTransactionReport()), actionCollection(), "account_transaction_report"); + new TDEAction(i18n("Open ledger"), "ledger", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountOpen()), actionCollection(), "account_open"); + new TDEAction(i18n("Reconcile..."), "reconcile", TDEShortcut("Ctrl+Shift+R"), TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcileStart()), actionCollection(), "account_reconcile"); + new TDEAction(i18n("Finish reconciliation", "Finish"), "player_end", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcileFinish()), actionCollection(), "account_reconcile_finish"); + new TDEAction(i18n("Postpone reconciliation", "Postpone"), "player_pause", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcilePostpone()), actionCollection(), "account_reconcile_postpone"); + new TDEAction(i18n("Edit account..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountEdit()), actionCollection(), "account_edit"); + new TDEAction(i18n("Delete account..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountDelete()), actionCollection(), "account_delete"); + new TDEAction(i18n("Close account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountClose()), actionCollection(), "account_close"); + new TDEAction(i18n("Reopen account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReopen()), actionCollection(), "account_reopen"); + new TDEAction(i18n("Transaction report"), "view_info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountTransactionReport()), actionCollection(), "account_transaction_report"); #ifdef HAVE_KDCHART - new KAction(i18n("Show balance chart..."), "kchart_chrt", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountChart()), actionCollection(), "account_chart"); + new TDEAction(i18n("Show balance chart..."), "kchart_chrt", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountChart()), actionCollection(), "account_chart"); #endif - new KAction(i18n("Map to online account"), "news_subscribe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountMapOnline()), actionCollection(), "account_online_map"); - new KAction(i18n("Unmap account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUnmapOnline()), actionCollection(), "account_online_unmap"); - KActionMenu* menu = new KActionMenu(i18n("Update"), TQIconSet(TDEGlobal::iconLoader()->loadIcon("reload", KIcon::Small, + new TDEAction(i18n("Map to online account"), "news_subscribe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountMapOnline()), actionCollection(), "account_online_map"); + new TDEAction(i18n("Unmap account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUnmapOnline()), actionCollection(), "account_online_unmap"); + TDEActionMenu* menu = new TDEActionMenu(i18n("Update"), TQIconSet(TDEGlobal::iconLoader()->loadIcon("reload", KIcon::Small, KIcon::SizeSmall)), actionCollection(), "account_online_update_menu"); // activating the menu button is the same as selecting the current account connect( menu, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT(slotAccountUpdateOnline())); - menu->insert(new KAction(i18n("Update account..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUpdateOnline()), actionCollection(), "account_online_update")); - menu->insert(new KAction(i18n("Update all accounts..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUpdateOnlineAll()), actionCollection(), "account_online_update_all")); + menu->insert(new TDEAction(i18n("Update account..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUpdateOnline()), actionCollection(), "account_online_update")); + menu->insert(new TDEAction(i18n("Update all accounts..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUpdateOnlineAll()), actionCollection(), "account_online_update_all")); // ******************* // The categories menu // ******************* - new KAction(i18n("New category..."), "account_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCategoryNew()), actionCollection(), "category_new"); - new KAction(i18n("Edit category..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountEdit()), actionCollection(), "category_edit"); - new KAction(i18n("Delete category..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountDelete()), actionCollection(), "category_delete"); + new TDEAction(i18n("New category..."), "account_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCategoryNew()), actionCollection(), "category_new"); + new TDEAction(i18n("Edit category..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountEdit()), actionCollection(), "category_edit"); + new TDEAction(i18n("Delete category..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountDelete()), actionCollection(), "category_delete"); // ************** // The tools menu // ************** - new KAction(i18n("QIF Profile Editor..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQifProfileEditor()), actionCollection(), "tools_qif_editor"); - new KAction(i18n("Securities..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSecurityEditor()), actionCollection(), "tools_security_editor"); - new KAction(i18n("Currencies..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCurrencyDialog()), actionCollection(), "tools_currency_editor"); - new KAction(i18n("Prices..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPriceDialog()), actionCollection(), "tools_price_editor"); - new KAction(i18n("Update Stock and Currency Prices..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEquityPriceUpdate()), actionCollection(), "tools_update_prices"); - new KAction(i18n("Consistency Check"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileConsitencyCheck()), actionCollection(), "tools_consistency_check"); - new KAction(i18n("Performance-Test"), "fork", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPerformanceTest()), actionCollection(), "tools_performancetest"); - new KAction(i18n("KCalc..."), "kcalc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToolsStartKCalc()), actionCollection(), "tools_kcalc"); + new TDEAction(i18n("QIF Profile Editor..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQifProfileEditor()), actionCollection(), "tools_qif_editor"); + new TDEAction(i18n("Securities..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSecurityEditor()), actionCollection(), "tools_security_editor"); + new TDEAction(i18n("Currencies..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCurrencyDialog()), actionCollection(), "tools_currency_editor"); + new TDEAction(i18n("Prices..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPriceDialog()), actionCollection(), "tools_price_editor"); + new TDEAction(i18n("Update Stock and Currency Prices..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEquityPriceUpdate()), actionCollection(), "tools_update_prices"); + new TDEAction(i18n("Consistency Check"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileConsitencyCheck()), actionCollection(), "tools_consistency_check"); + new TDEAction(i18n("Performance-Test"), "fork", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPerformanceTest()), actionCollection(), "tools_performancetest"); + new TDEAction(i18n("KCalc..."), "kcalc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToolsStartKCalc()), actionCollection(), "tools_kcalc"); // ***************** // The settings menu // ***************** KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotSettings() ), actionCollection()); - new KAction(i18n("Enable all messages"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEnableMessages()), actionCollection(), "settings_enable_messages"); - new KAction(i18n("TDE language settings..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotKDELanguageSettings()), actionCollection(), "settings_language"); + new TDEAction(i18n("Enable all messages"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEnableMessages()), actionCollection(), "settings_enable_messages"); + new TDEAction(i18n("TDE language settings..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotKDELanguageSettings()), actionCollection(), "settings_language"); // ************* // The help menu // ************* - new KAction(i18n("&Show tip of the day"), "idea", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTipOfTheDay()), actionCollection(), "help_show_tip"); + new TDEAction(i18n("&Show tip of the day"), "idea", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTipOfTheDay()), actionCollection(), "help_show_tip"); // *************************** // Actions w/o main menu entry // *************************** - new KAction(i18n("New transaction button", "New"), "filenew", TQKeySequence(TQt::CTRL | TQt::Key_Insert), TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsNew()), actionCollection(), "transaction_new"); + new TDEAction(i18n("New transaction button", "New"), "filenew", TQKeySequence(TQt::CTRL | TQt::Key_Insert), TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsNew()), actionCollection(), "transaction_new"); // we use Return as the same shortcut for Edit and Enter. Therefore, we don't allow // to change them (The standard KDE dialog complains anyway if you want to assign // the same shortcut to two actions) - p = new KAction(i18n("Edit transaction button", "Edit"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsEdit()), actionCollection(), "transaction_edit"); + p = new TDEAction(i18n("Edit transaction button", "Edit"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsEdit()), actionCollection(), "transaction_edit"); p->setShortcutConfigurable(false); - p = new KAction(i18n("Enter transaction", "Enter"), "button_ok", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsEnter()), actionCollection(), "transaction_enter"); + p = new TDEAction(i18n("Enter transaction", "Enter"), "button_ok", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsEnter()), actionCollection(), "transaction_enter"); p->setShortcutConfigurable(false); - new KAction(i18n("Edit split button", "Edit splits"), "split_transaction", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsEditSplits()), actionCollection(), "transaction_editsplits"); - new KAction(i18n("Cancel transaction edit", "Cancel"), "button_cancel", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsCancel()), actionCollection(), "transaction_cancel"); - new KAction(i18n("Delete transaction", "Delete"), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsDelete()), actionCollection(), "transaction_delete"); - new KAction(i18n("Duplicate transaction", "Duplicate"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionDuplicate()), actionCollection(), "transaction_duplicate"); - - new KAction(i18n("Button text for match transaction", "Match"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionMatch()), actionCollection(), "transaction_match"); - new KAction(i18n("Accept 'imported' and 'matched' transaction", "Accept"), "apply", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsAccept()), actionCollection(), "transaction_accept"); - - new KAction(i18n("Toggle reconciliation flag", "Toggle"), 0, KShortcut("Ctrl+Space"), TQT_TQOBJECT(this), TQT_SLOT(slotToggleReconciliationFlag()), actionCollection(), "transaction_mark_toggle"); - new KAction(i18n("Mark transaction cleared", "Cleared"), 0, KShortcut("Ctrl+Alt+Space"), TQT_TQOBJECT(this), TQT_SLOT(slotMarkTransactionCleared()), actionCollection(), "transaction_mark_cleared"); - new KAction(i18n("Mark transaction reconciled", "Reconciled"), "", KShortcut("Ctrl+Shift+Space"), TQT_TQOBJECT(this), TQT_SLOT(slotMarkTransactionReconciled()), actionCollection(), "transaction_mark_reconciled"); - new KAction(i18n("Mark transaction not reconciled", "Not reconciled"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMarkTransactionNotReconciled()), actionCollection(), "transaction_mark_notreconciled"); - new KAction(i18n("Select all transactions", "Select all"), 0, KShortcut("Ctrl+A"), TQT_TQOBJECT(this), TQT_SIGNAL(selectAllTransactions()), actionCollection(), "transaction_select_all"); - - new KAction(i18n("Goto account"), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionGotoAccount()), actionCollection(), "transaction_goto_account"); - new KAction(i18n("Goto payee"), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionGotoPayee()), actionCollection(), "transaction_goto_payee"); - new KAction(i18n("Create scheduled transaction..."), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionCreateSchedule()), actionCollection(), "transaction_create_schedule"); - new KAction(i18n("Assign next number"), "", KShortcut("Ctrl+Shift+N"), TQT_TQOBJECT(this), TQT_SLOT(slotTransactionAssignNumber()), actionCollection(), "transaction_assign_number"); - new KAction(i18n("Combine transactions", "Combine"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionCombine()), actionCollection(), "transaction_combine"); - - new KAction(i18n("New investment"), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvestmentNew()), actionCollection(), "investment_new"); - new KAction(i18n("Edit investment..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvestmentEdit()), actionCollection(), "investment_edit"); - new KAction(i18n("Delete investment..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvestmentDelete()), actionCollection(), "investment_delete"); - new KAction(i18n("Online price update..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOnlinePriceUpdate()), actionCollection(), "investment_online_price_update"); - new KAction(i18n("Manual price update..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotManualPriceUpdate()), actionCollection(), "investment_manual_price_update"); - - new KAction(i18n("New scheduled transaction..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleNew()), actionCollection(), "schedule_new"); - new KAction(i18n("Edit scheduled transaction..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleEdit()), actionCollection(), "schedule_edit"); - new KAction(i18n("Delete scheduled transaction..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleDelete()), actionCollection(), "schedule_delete"); - new KAction(i18n("Duplicate scheduled transaction"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleDuplicate()), actionCollection(), "schedule_duplicate"); - new KAction(i18n("Enter next transaction..."), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleEnter()), actionCollection(), "schedule_enter"); - new KAction(i18n("Skip next transaction..."), "player_fwd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleSkip()), actionCollection(), "schedule_skip"); - - new KAction(i18n("New payee"), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPayeeNew()), actionCollection(), "payee_new"); - new KAction(i18n("Rename payee"), "edit", 0, TQT_TQOBJECT(this), TQT_SIGNAL(payeeRename()), actionCollection(), "payee_rename"); - new KAction(i18n("Delete payee"), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPayeeDelete()), actionCollection(), "payee_delete"); - - new KAction(i18n("New budget"), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetNew()), actionCollection(), "budget_new"); - new KAction(i18n("Rename budget"), "edit", 0, TQT_TQOBJECT(this), TQT_SIGNAL(budgetRename()), actionCollection(), "budget_rename"); - new KAction(i18n("Delete budget"), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetDelete()), actionCollection(), "budget_delete"); - new KAction(i18n("Copy budget"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetCopy()), actionCollection(), "budget_copy"); - new KAction(i18n("Change budget year"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetChangeYear()), actionCollection(), "budget_change_year"); - new KAction(i18n("Budget based on forecast", "Forecast"), "forcast", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetForecast()), actionCollection(), "budget_forecast"); + new TDEAction(i18n("Edit split button", "Edit splits"), "split_transaction", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsEditSplits()), actionCollection(), "transaction_editsplits"); + new TDEAction(i18n("Cancel transaction edit", "Cancel"), "button_cancel", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsCancel()), actionCollection(), "transaction_cancel"); + new TDEAction(i18n("Delete transaction", "Delete"), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsDelete()), actionCollection(), "transaction_delete"); + new TDEAction(i18n("Duplicate transaction", "Duplicate"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionDuplicate()), actionCollection(), "transaction_duplicate"); + + new TDEAction(i18n("Button text for match transaction", "Match"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionMatch()), actionCollection(), "transaction_match"); + new TDEAction(i18n("Accept 'imported' and 'matched' transaction", "Accept"), "apply", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsAccept()), actionCollection(), "transaction_accept"); + + new TDEAction(i18n("Toggle reconciliation flag", "Toggle"), 0, TDEShortcut("Ctrl+Space"), TQT_TQOBJECT(this), TQT_SLOT(slotToggleReconciliationFlag()), actionCollection(), "transaction_mark_toggle"); + new TDEAction(i18n("Mark transaction cleared", "Cleared"), 0, TDEShortcut("Ctrl+Alt+Space"), TQT_TQOBJECT(this), TQT_SLOT(slotMarkTransactionCleared()), actionCollection(), "transaction_mark_cleared"); + new TDEAction(i18n("Mark transaction reconciled", "Reconciled"), "", TDEShortcut("Ctrl+Shift+Space"), TQT_TQOBJECT(this), TQT_SLOT(slotMarkTransactionReconciled()), actionCollection(), "transaction_mark_reconciled"); + new TDEAction(i18n("Mark transaction not reconciled", "Not reconciled"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMarkTransactionNotReconciled()), actionCollection(), "transaction_mark_notreconciled"); + new TDEAction(i18n("Select all transactions", "Select all"), 0, TDEShortcut("Ctrl+A"), TQT_TQOBJECT(this), TQT_SIGNAL(selectAllTransactions()), actionCollection(), "transaction_select_all"); + + new TDEAction(i18n("Goto account"), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionGotoAccount()), actionCollection(), "transaction_goto_account"); + new TDEAction(i18n("Goto payee"), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionGotoPayee()), actionCollection(), "transaction_goto_payee"); + new TDEAction(i18n("Create scheduled transaction..."), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionCreateSchedule()), actionCollection(), "transaction_create_schedule"); + new TDEAction(i18n("Assign next number"), "", TDEShortcut("Ctrl+Shift+N"), TQT_TQOBJECT(this), TQT_SLOT(slotTransactionAssignNumber()), actionCollection(), "transaction_assign_number"); + new TDEAction(i18n("Combine transactions", "Combine"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionCombine()), actionCollection(), "transaction_combine"); + + new TDEAction(i18n("New investment"), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvestmentNew()), actionCollection(), "investment_new"); + new TDEAction(i18n("Edit investment..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvestmentEdit()), actionCollection(), "investment_edit"); + new TDEAction(i18n("Delete investment..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvestmentDelete()), actionCollection(), "investment_delete"); + new TDEAction(i18n("Online price update..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOnlinePriceUpdate()), actionCollection(), "investment_online_price_update"); + new TDEAction(i18n("Manual price update..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotManualPriceUpdate()), actionCollection(), "investment_manual_price_update"); + + new TDEAction(i18n("New scheduled transaction..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleNew()), actionCollection(), "schedule_new"); + new TDEAction(i18n("Edit scheduled transaction..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleEdit()), actionCollection(), "schedule_edit"); + new TDEAction(i18n("Delete scheduled transaction..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleDelete()), actionCollection(), "schedule_delete"); + new TDEAction(i18n("Duplicate scheduled transaction"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleDuplicate()), actionCollection(), "schedule_duplicate"); + new TDEAction(i18n("Enter next transaction..."), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleEnter()), actionCollection(), "schedule_enter"); + new TDEAction(i18n("Skip next transaction..."), "player_fwd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleSkip()), actionCollection(), "schedule_skip"); + + new TDEAction(i18n("New payee"), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPayeeNew()), actionCollection(), "payee_new"); + new TDEAction(i18n("Rename payee"), "edit", 0, TQT_TQOBJECT(this), TQT_SIGNAL(payeeRename()), actionCollection(), "payee_rename"); + new TDEAction(i18n("Delete payee"), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPayeeDelete()), actionCollection(), "payee_delete"); + + new TDEAction(i18n("New budget"), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetNew()), actionCollection(), "budget_new"); + new TDEAction(i18n("Rename budget"), "edit", 0, TQT_TQOBJECT(this), TQT_SIGNAL(budgetRename()), actionCollection(), "budget_rename"); + new TDEAction(i18n("Delete budget"), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetDelete()), actionCollection(), "budget_delete"); + new TDEAction(i18n("Copy budget"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetCopy()), actionCollection(), "budget_copy"); + new TDEAction(i18n("Change budget year"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetChangeYear()), actionCollection(), "budget_change_year"); + new TDEAction(i18n("Budget based on forecast", "Forecast"), "forcast", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetForecast()), actionCollection(), "budget_forecast"); // ************************ // Currency actions // ************************ - new KAction(i18n("New currency"), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCurrencyNew()), actionCollection(), "currency_new"); - new KAction(i18n("Rename currency"), "edit", 0, TQT_TQOBJECT(this), TQT_SIGNAL(currencyRename()), actionCollection(), "currency_rename"); - new KAction(i18n("Delete currency"), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCurrencyDelete()), actionCollection(), "currency_delete"); - new KAction(i18n("Select as base currency"), "kmymoney2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCurrencySetBase()), actionCollection(), "currency_setbase"); + new TDEAction(i18n("New currency"), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCurrencyNew()), actionCollection(), "currency_new"); + new TDEAction(i18n("Rename currency"), "edit", 0, TQT_TQOBJECT(this), TQT_SIGNAL(currencyRename()), actionCollection(), "currency_rename"); + new TDEAction(i18n("Delete currency"), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCurrencyDelete()), actionCollection(), "currency_delete"); + new TDEAction(i18n("Select as base currency"), "kmymoney2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCurrencySetBase()), actionCollection(), "currency_setbase"); #ifdef KMM_DEBUG - new KAction("Test new feature", "", KShortcut("Ctrl+G"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFeature()), actionCollection(), "new_user_wizard"); - new KToggleAction("Debug Traces", "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTraces()), actionCollection(), "debug_traces"); - new KToggleAction("Debug Timers", "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTimers()), actionCollection(), "debug_timers"); + new TDEAction("Test new feature", "", TDEShortcut("Ctrl+G"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFeature()), actionCollection(), "new_user_wizard"); + new TDEToggleAction("Debug Traces", "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTraces()), actionCollection(), "debug_traces"); + new TDEToggleAction("Debug Timers", "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTimers()), actionCollection(), "debug_timers"); #endif // ************************ // Currently unused actions // ************************ #if 0 - new KToolBarPopupAction(i18n("View back"), "back", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowPreviousView()), actionCollection(), "go_back"); - new KToolBarPopupAction(i18n("View forward"), "forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowNextView()), actionCollection(), "go_forward"); + new TDEToolBarPopupAction(i18n("View back"), "back", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowPreviousView()), actionCollection(), "go_back"); + new TDEToolBarPopupAction(i18n("View forward"), "forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowNextView()), actionCollection(), "go_forward"); action("go_back")->setEnabled(false); action("go_forward")->setEnabled(false); @@ -502,19 +502,19 @@ void KMyMoney2App::initActions(void) void KMyMoney2App::dumpActions(void) const { - KActionPtrList list = actionCollection()->actions(); - KActionPtrList::const_iterator it; + TDEActionPtrList list = actionCollection()->actions(); + TDEActionPtrList::const_iterator it; for(it = list.begin(); it != list.end(); ++it) { std::cout << (*it)->name() << ": " << (*it)->text() << std::endl; } } -KAction* KMyMoney2App::action(const TQString& actionName) const +TDEAction* KMyMoney2App::action(const TQString& actionName) const { - static KShortcut shortcut(""); - static KAction dummyAction(TQString("Dummy"), TQString(), shortcut, TQT_TQOBJECT_CONST(this), 0, static_cast(0), ""); + static TDEShortcut shortcut(""); + static TDEAction dummyAction(TQString("Dummy"), TQString(), shortcut, TQT_TQOBJECT_CONST(this), 0, static_cast(0), ""); - KAction* p = actionCollection()->action(actionName.latin1()); + TDEAction* p = actionCollection()->action(actionName.latin1()); if(p) return p; @@ -522,17 +522,17 @@ KAction* KMyMoney2App::action(const TQString& actionName) const return &dummyAction; } -KToggleAction* KMyMoney2App::toggleAction(const TQString& actionName) const +TDEToggleAction* KMyMoney2App::toggleAction(const TQString& actionName) const { - static KShortcut shortcut(""); - static KToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, TQT_TQOBJECT_CONST(this), 0, static_cast(0), ""); + static TDEShortcut shortcut(""); + static TDEToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, TQT_TQOBJECT_CONST(this), 0, static_cast(0), ""); - KAction* q = actionCollection()->action(actionName.latin1()); + TDEAction* q = actionCollection()->action(actionName.latin1()); if(q) { - KToggleAction* p = dynamic_cast(q); + TDEToggleAction* p = dynamic_cast(q); if(!p) { - tqWarning("Action '%s' is not of type KToggleAction", actionName.latin1()); + tqWarning("Action '%s' is not of type TDEToggleAction", actionName.latin1()); p = &dummyAction; } return p; @@ -571,7 +571,7 @@ void KMyMoney2App::saveOptions(void) // config->writeEntry("Show Statusbar", toggleAction("options_show_statusbar")->isChecked()); // toolBar("mainToolBar")->saveSettings(config, "mainToolBar"); - dynamic_cast(action("file_open_recent"))->saveEntries(config,"Recent Files"); + dynamic_cast(action("file_open_recent"))->saveEntries(config,"Recent Files"); } @@ -583,7 +583,7 @@ void KMyMoney2App::readOptions(void) toggleAction("view_hide_unused_categories")->setChecked(KMyMoneyGlobalSettings::hideUnusedCategory()); // initialize the recent file list - KRecentFilesAction *p = dynamic_cast(action("file_open_recent")); + TDERecentFilesAction *p = dynamic_cast(action("file_open_recent")); if(p) p->loadEntries(config,"Recent Files"); @@ -603,7 +603,7 @@ void KMyMoney2App::readOptions(void) void KMyMoney2App::resizeEvent(TQResizeEvent* ev) { - KMainWindow::resizeEvent(ev); + TDEMainWindow::resizeEvent(ev); updateCaption(true); } @@ -827,7 +827,7 @@ void KMyMoney2App::slotFileNew(void) slotFileSave(); // now keep the filename in the recent files used list - KRecentFilesAction *p = dynamic_cast(action("file_open_recent")); + TDERecentFilesAction *p = dynamic_cast(action("file_open_recent")); if(p) p->addURL( m_fileName ); writeLastUsedFile(m_fileName.url()); @@ -887,7 +887,7 @@ void KMyMoney2App::slotFileOpen(void) void KMyMoney2App::slotOpenDatabase(void) { KMSTATUS(i18n("Open a file.")); - KSelectDatabaseDlg dialog; + TDESelectDatabaseDlg dialog; dialog.setMode(IO_ReadWrite); if(dialog.exec() == TQDialog::Accepted) { @@ -958,7 +958,7 @@ void KMyMoney2App::slotFileOpenRecent(const KURL& url) KURL dburl = url; // check if a password is needed. it may be if the URL came from the last/recent file list if ((dburl.queryItem("secure") == "yes") && dburl.pass().isEmpty()) { - KSelectDatabaseDlg dialog(dburl); + TDESelectDatabaseDlg dialog(dburl); dialog.setMode(IO_ReadWrite); if(dialog.exec() == TQDialog::Accepted) dburl = dialog.selectedURL(); @@ -968,7 +968,7 @@ void KMyMoney2App::slotFileOpenRecent(const KURL& url) if(myMoneyView->readFile(dburl)) { if((myMoneyView->isNativeFile())) { m_fileName = dburl; - KRecentFilesAction *p = dynamic_cast(action("file_open_recent")); + TDERecentFilesAction *p = dynamic_cast(action("file_open_recent")); if(p) p->addURL(dburl.prettyURL(0, KURL::StripFileProtocol)); writeLastUsedFile(dburl.prettyURL(0, KURL::StripFileProtocol)); @@ -1148,7 +1148,7 @@ bool KMyMoney2App::slotFileSaveAs(void) } if(okToWriteFile(newName)) { - KRecentFilesAction *p = dynamic_cast(action("file_open_recent")); + TDERecentFilesAction *p = dynamic_cast(action("file_open_recent")); if(p) p->addURL( newName ); @@ -1198,7 +1198,7 @@ bool KMyMoney2App::slotSaveAsDatabase(void) if (myMoneyView->isDatabase()) dynamic_cast (MyMoneyFile::instance()->storage())->fillStorage(); KMSTATUS(i18n("Saving file to database...")); - KSelectDatabaseDlg dialog; + TDESelectDatabaseDlg dialog; dialog.setMode(IO_WriteOnly); KURL oldUrl = m_fileName.isEmpty() ? lastOpenedURL() : m_fileName; KURL url = oldUrl; @@ -1217,7 +1217,7 @@ bool KMyMoney2App::slotSaveAsDatabase(void) } } if (rc) { - KRecentFilesAction *p = dynamic_cast(action("file_open_recent")); + TDERecentFilesAction *p = dynamic_cast(action("file_open_recent")); if(p) p->addURL(url.prettyURL(0, KURL::StripFileProtocol)); writeLastUsedFile(url.prettyURL(0, KURL::StripFileProtocol)); @@ -1288,7 +1288,7 @@ void KMyMoney2App::slotFileQuit(void) // don't modify the status message here as this will prevent quit from working!! // See the beginning of queryClose() and isReady() why. Thomas Baumgart 2005-10-17 - KMainWindow* w = 0; + TDEMainWindow* w = 0; if(memberList) { @@ -6094,7 +6094,7 @@ void KMyMoney2App::slotAccountMapOnline(void) for(it_p = m_onlinePlugins.begin(); it_p != m_onlinePlugins.end(); ++it_p) { TQStringList protocolList; (*it_p)->protocols(protocolList); - new KListViewItem(dlg.m_listView, it_p.key(), "Loaded", protocolList.join(", ")); + new TDEListViewItem(dlg.m_listView, it_p.key(), "Loaded", protocolList.join(", ")); } if(dlg.exec() == TQDialog::Accepted) { if(dlg.m_listView->selectedItem()) { diff --git a/kmymoney2/kmymoney2.h b/kmymoney2/kmymoney2.h index c714ea0..56f1725 100644 --- a/kmymoney2/kmymoney2.h +++ b/kmymoney2/kmymoney2.h @@ -93,7 +93,7 @@ namespace KMyMoneyPlugin { class ImporterPlugin; } * * @short Main application class. */ -class KMyMoney2App : public KMainWindow, public DCOPObject +class KMyMoney2App : public TDEMainWindow, public DCOPObject { Q_OBJECT // @@ -505,7 +505,7 @@ public: const TQValueList instanceList(void) const; /** - * Dump a list of the names of all defined KActions to stdout. + * Dump a list of the names of all defined TDEActions to stdout. */ void dumpActions(void) const; @@ -580,7 +580,7 @@ protected: */ void readOptions(void); - /** initializes the KActions of the application */ + /** initializes the TDEActions of the application */ void initActions(void); /** initializes the dynamic menus (account selectors) */ @@ -1001,7 +1001,7 @@ public slots: void slotCategoryNew(MyMoneyAccount& account, const MyMoneyAccount& parent = MyMoneyAccount()); /** - * This method updates all KAction items to the current state. + * This method updates all TDEAction items to the current state. */ void slotUpdateActions(void); @@ -1162,24 +1162,24 @@ signals: public: /** - * This method retrieves a pointer to a KAction object from actionCollection(). + * This method retrieves a pointer to a TDEAction object from actionCollection(). * If the action with the name @p actionName is not found, a pointer to - * a static non-configured KAction object is returned and a warning is + * a static non-configured TDEAction object is returned and a warning is * printed to stderr. * * @param actionName name of the action to be retrieved - * @return pointer to KAction object (or derivative) + * @return pointer to TDEAction object (or derivative) */ - KAction* action(const TQString& actionName) const; + TDEAction* action(const TQString& actionName) const; /** * This method is implemented for convenience. It returns a dynamic_cast-ed * pointer to an action found in actionCollection(). * If the action with the name @p actionName is not found or the object - * is not of type KToggleAction, a pointer to a static non-configured - * KToggleAction object is returned and a warning is printed to stderr. + * is not of type TDEToggleAction, a pointer to a static non-configured + * TDEToggleAction object is returned and a warning is printed to stderr. */ - KToggleAction* toggleAction(const TQString& actionName) const; + TDEToggleAction* toggleAction(const TQString& actionName) const; private: @@ -1252,8 +1252,8 @@ private: bool m_bCheckSchedules; - KToolBarPopupAction* m_previousViewButton; - KToolBarPopupAction* m_nextViewButton; + TDEToolBarPopupAction* m_previousViewButton; + TDEToolBarPopupAction* m_nextViewButton; TQObject* m_pluginInterface; diff --git a/kmymoney2/main.cpp b/kmymoney2/main.cpp index d31c7d5..55ef740 100644 --- a/kmymoney2/main.cpp +++ b/kmymoney2/main.cpp @@ -59,7 +59,7 @@ static KCmdLineOptions options[] = #if KMM_DEBUG // The following options are only available when compiled in debug mode { "trace", I18N_NOOP("turn on program traces"), 0}, - { "dump-actions", I18N_NOOP("dump the names of all defined KAction objects to stdout and quit"), 0}, + { "dump-actions", I18N_NOOP("dump the names of all defined TDEAction objects to stdout and quit"), 0}, #endif // INSERT YOUR COMMANDLINE OPTIONS HERE diff --git a/kmymoney2/plugins/importinterface.h b/kmymoney2/plugins/importinterface.h index 8249ed0..b3d1657 100644 --- a/kmymoney2/plugins/importinterface.h +++ b/kmymoney2/plugins/importinterface.h @@ -33,7 +33,7 @@ #include #include -class KPopupMenu; +class TDEPopupMenu; // ---------------------------------------------------------------------------- // Project Includes diff --git a/kmymoney2/plugins/kmymoneyplugin.cpp b/kmymoney2/plugins/kmymoneyplugin.cpp index db57abd..202b996 100644 --- a/kmymoney2/plugins/kmymoneyplugin.cpp +++ b/kmymoney2/plugins/kmymoneyplugin.cpp @@ -40,12 +40,12 @@ KMyMoneyPlugin::Plugin::~Plugin() { } -KAction* KMyMoneyPlugin::Plugin::action(const TQString& actionName) const +TDEAction* KMyMoneyPlugin::Plugin::action(const TQString& actionName) const { - static KShortcut shortcut(""); - static KAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast(this), 0, static_cast(0), ""); + static TDEShortcut shortcut(""); + static TDEAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast(this), 0, static_cast(0), ""); - KAction* p = actionCollection()->action(actionName.latin1()); + TDEAction* p = actionCollection()->action(actionName.latin1()); if(p) return p; @@ -53,17 +53,17 @@ KAction* KMyMoneyPlugin::Plugin::action(const TQString& actionName) const return &dummyAction; } -KToggleAction* KMyMoneyPlugin::Plugin::toggleAction(const TQString& actionName) const +TDEToggleAction* KMyMoneyPlugin::Plugin::toggleAction(const TQString& actionName) const { - static KShortcut shortcut(""); - static KToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast(this), 0, static_cast(0), ""); + static TDEShortcut shortcut(""); + static TDEToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast(this), 0, static_cast(0), ""); - KAction* q = actionCollection()->action(actionName.latin1()); + TDEAction* q = actionCollection()->action(actionName.latin1()); if(q) { - KToggleAction* p = dynamic_cast(q); + TDEToggleAction* p = dynamic_cast(q); if(!p) { - tqWarning("Action '%s' is not of type KToggleAction", actionName.latin1()); + tqWarning("Action '%s' is not of type TDEToggleAction", actionName.latin1()); p = &dummyAction; } return p; diff --git a/kmymoney2/plugins/kmymoneyplugin.h b/kmymoney2/plugins/kmymoneyplugin.h index d0ca4b6..dda096b 100644 --- a/kmymoney2/plugins/kmymoneyplugin.h +++ b/kmymoney2/plugins/kmymoneyplugin.h @@ -33,8 +33,8 @@ #include class TDEAboutData; class TDEInstance; -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; // ---------------------------------------------------------------------------- // Project Includes @@ -66,10 +66,10 @@ namespace KMyMoneyPlugin { protected: /** See KMyMoney2App::action() for a description */ - KAction* action(const TQString& name) const; + TDEAction* action(const TQString& name) const; /** See KMyMoney2App::toggleAction() for a description */ - KToggleAction* toggleAction(const TQString& name) const; + TDEToggleAction* toggleAction(const TQString& name) const; // define interface classes here. The interface classes provide a mechanism // for the plugin to interact with KMyMoney diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui index 100cbd1..917401c 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui @@ -77,7 +77,7 @@ unnamed - + Financial Institution diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp index a61ad77..1dd5ff0 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp @@ -76,14 +76,14 @@ KOnlineBankingSetupWizard::KOnlineBankingSetupWizard(TQWidget *parent, const cha dlg->setMinimumDuration(0); kapp->processEvents(); - tabLayout->insertWidget(0, new KListViewSearchLineWidget(m_listFi, tab, 0)); + tabLayout->insertWidget(0, new TDEListViewSearchLineWidget(m_listFi, tab, 0)); OfxPartner::setDirectory(locateLocal("appdata", "")); TQStringList banks = OfxPartner::BankNames(); TQStringList::const_iterator it_bank = banks.begin(); while (it_bank != banks.end()) { - new KListViewItem( m_listFi, (*it_bank)); + new TDEListViewItem( m_listFi, (*it_bank)); ++it_bank; } m_fInit = true; diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp index d5d9a85..0b9c9a0 100644 --- a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp +++ b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp @@ -61,7 +61,7 @@ OfxImporterPlugin::~OfxImporterPlugin() void OfxImporterPlugin::createActions(void) { - new KAction(i18n("OFX..."), "", 0, this, TQT_SLOT(slotImportFile()), actionCollection(), "file_import_ofx"); + new TDEAction(i18n("OFX..."), "", 0, this, TQT_SLOT(slotImportFile()), actionCollection(), "file_import_ofx"); } void OfxImporterPlugin::slotImportFile(void) diff --git a/kmymoney2/plugins/viewinterface.h b/kmymoney2/plugins/viewinterface.h index 8f94311..2a0fa6d 100644 --- a/kmymoney2/plugins/viewinterface.h +++ b/kmymoney2/plugins/viewinterface.h @@ -33,7 +33,7 @@ class TQFrame; // ---------------------------------------------------------------------------- // KDE Includes -class KPopupMenu; +class TDEPopupMenu; // ---------------------------------------------------------------------------- // Project Includes 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 diff --git a/kmymoney2/widgets/kaccounttemplateselector.cpp b/kmymoney2/widgets/kaccounttemplateselector.cpp index badcdff..d7afd37 100644 --- a/kmymoney2/widgets/kaccounttemplateselector.cpp +++ b/kmymoney2/widgets/kaccounttemplateselector.cpp @@ -38,7 +38,7 @@ #include "kaccounttemplateselector.h" -class KTemplateListItem : public KListViewItem +class KTemplateListItem : public TDEListViewItem { public: KTemplateListItem(TQListViewItem* parent, const TQString& text); @@ -48,7 +48,7 @@ class KTemplateListItem : public KListViewItem }; KTemplateListItem::KTemplateListItem(TQListViewItem* parent, const TQString& text) : - KListViewItem(parent, text), + TDEListViewItem(parent, text), m_isAvailable(false) { } @@ -132,7 +132,7 @@ void KAccountTemplateSelector::Private::loadHierarchy(void) TQRegExp exp("(.*):(.*)"); for(it_m = m_templateHierarchy.begin(); it_m != m_templateHierarchy.end(); ++it_m) { if(exp.search(it_m.key()) == -1) { - (*it_m) = new KListViewItem(m_parent->m_accountList, it_m.key()); + (*it_m) = new TDEListViewItem(m_parent->m_accountList, it_m.key()); } else { (*it_m) = hierarchyItem(exp.cap(1), exp.cap(2)); } @@ -233,7 +233,7 @@ void KAccountTemplateSelector::slotLoadCountry(void) { #ifndef KMM_DESIGNER - KListViewItem* parent = new KListViewItem(m_groupList, d->it_m.key()); + TDEListViewItem* parent = new TDEListViewItem(m_groupList, d->it_m.key()); parent->setSelectable(false); TQStringList::iterator it; for(it = d->dirlist.begin(); it != d->dirlist.end(); ++it) { @@ -244,7 +244,7 @@ void KAccountTemplateSelector::slotLoadCountry(void) for(it_f = files.begin(); it_f != files.end(); ++it_f) { MyMoneyTemplate templ(TQString("%1/%2").arg(dir.canonicalPath()).arg(*it_f)); d->m_templates[TQString("%1").arg(d->id)] = templ; - new KListViewItem(parent, templ.title(), templ.shortDescription(), TQString("%1").arg(d->id)); + new TDEListViewItem(parent, templ.title(), templ.shortDescription(), TQString("%1").arg(d->id)); ++d->id; } } diff --git a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp index c4c683e..80e5c58 100644 --- a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp +++ b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp @@ -36,7 +36,7 @@ KAccountTemplateSelectorDecl::KAccountTemplateSelectorDecl( TQWidget* parent, co setName( "KAccountTemplateSelectorDecl" ); KAccountTemplateSelectorDeclLayout = new TQVBoxLayout( this, 0, 6, "KAccountTemplateSelectorDeclLayout"); - m_groupList = new KListView( this, "m_groupList" ); + m_groupList = new TDEListView( this, "m_groupList" ); m_groupList->addColumn( kmm_i18n( "Account Types" ) ); m_groupList->addColumn( kmm_i18n( "Description" ) ); m_groupList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_groupList->sizePolicy().hasHeightForWidth() ) ); @@ -71,7 +71,7 @@ KAccountTemplateSelectorDecl::KAccountTemplateSelectorDecl( TQWidget* parent, co groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); groupBox2Layout->setAlignment( TQt::AlignTop ); - m_accountList = new KListView( groupBox2, "m_accountList" ); + m_accountList = new TDEListView( groupBox2, "m_accountList" ); m_accountList->addColumn( kmm_i18n( "Name" ) ); m_accountList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 3, m_accountList->sizePolicy().hasHeightForWidth() ) ); m_accountList->setMinimumSize( TQSize( 0, 150 ) ); diff --git a/kmymoney2/widgets/kaccounttemplateselectordecl.ui b/kmymoney2/widgets/kaccounttemplateselectordecl.ui index cc5b9da..c722c0e 100644 --- a/kmymoney2/widgets/kaccounttemplateselectordecl.ui +++ b/kmymoney2/widgets/kaccounttemplateselectordecl.ui @@ -19,7 +19,7 @@ 0 - + Account Types @@ -136,7 +136,7 @@ unnamed - + Name diff --git a/kmymoney2/widgets/klistviewsearchline.cpp b/kmymoney2/widgets/klistviewsearchline.cpp index b2d554c..0af29d7 100644 --- a/kmymoney2/widgets/klistviewsearchline.cpp +++ b/kmymoney2/widgets/klistviewsearchline.cpp @@ -33,17 +33,17 @@ #define KLISTVIEWSEARCHLINE_ALLVISIBLECOLUMNS_ID 2004 -class KListViewSearchLine::KListViewSearchLinePrivate +class TDEListViewSearchLine::TDEListViewSearchLinePrivate { public: - KListViewSearchLinePrivate() : + TDEListViewSearchLinePrivate() : listView(0), caseSensitive(false), activeSearch(false), keepParentsVisible(true), queuedSearches(0) {} - KListView *listView; + TDEListView *listView; bool caseSensitive; bool activeSearch; bool keepParentsVisible; @@ -56,10 +56,10 @@ public: // public methods //////////////////////////////////////////////////////////////////////////////// -KListViewSearchLine::KListViewSearchLine(TQWidget *parent, KListView *listView, const char *name) : +TDEListViewSearchLine::TDEListViewSearchLine(TQWidget *parent, TDEListView *listView, const char *name) : KLineEdit(parent, name) { - d = new KListViewSearchLinePrivate; + d = new TDEListViewSearchLinePrivate; d->listView = listView; @@ -79,10 +79,10 @@ KListViewSearchLine::KListViewSearchLine(TQWidget *parent, KListView *listView, setEnabled(false); } -KListViewSearchLine::KListViewSearchLine(TQWidget *parent, const char *name) : +TDEListViewSearchLine::TDEListViewSearchLine(TQWidget *parent, const char *name) : KLineEdit(parent, name) { - d = new KListViewSearchLinePrivate; + d = new TDEListViewSearchLinePrivate; d->listView = 0; @@ -92,27 +92,27 @@ KListViewSearchLine::KListViewSearchLine(TQWidget *parent, const char *name) : setEnabled(false); } -KListViewSearchLine::~KListViewSearchLine() +TDEListViewSearchLine::~TDEListViewSearchLine() { delete d; } -bool KListViewSearchLine::caseSensitive() const +bool TDEListViewSearchLine::caseSensitive() const { return d->caseSensitive; } -TQValueList KListViewSearchLine::searchColumns() const +TQValueList TDEListViewSearchLine::searchColumns() const { return d->searchColumns; } -bool KListViewSearchLine::keepParentsVisible() const +bool TDEListViewSearchLine::keepParentsVisible() const { return d->keepParentsVisible; } -KListView *KListViewSearchLine::listView() const +TDEListView *TDEListViewSearchLine::listView() const { return d->listView; } @@ -121,7 +121,7 @@ KListView *KListViewSearchLine::listView() const // public slots //////////////////////////////////////////////////////////////////////////////// -void KListViewSearchLine::updateSearch(const TQString &s) +void TDEListViewSearchLine::updateSearch(const TQString &s) { if(!d->listView) return; @@ -135,9 +135,9 @@ void KListViewSearchLine::updateSearch(const TQString &s) switch(d->listView->selectionMode()) { - case KListView::NoSelection: + case TDEListView::NoSelection: break; - case KListView::Single: + case TDEListView::Single: currentItem = d->listView->selectedItem(); break; default: @@ -162,22 +162,22 @@ void KListViewSearchLine::updateSearch(const TQString &s) d->listView->ensureItemVisible(currentItem); } -void KListViewSearchLine::setCaseSensitive(bool cs) +void TDEListViewSearchLine::setCaseSensitive(bool cs) { d->caseSensitive = cs; } -void KListViewSearchLine::setKeepParentsVisible(bool v) +void TDEListViewSearchLine::setKeepParentsVisible(bool v) { d->keepParentsVisible = v; } -void KListViewSearchLine::setSearchColumns(const TQValueList &columns) +void TDEListViewSearchLine::setSearchColumns(const TQValueList &columns) { d->searchColumns = columns; } -void KListViewSearchLine::setListView(KListView *lv) +void TDEListViewSearchLine::setListView(TDEListView *lv) { if(d->listView) { disconnect(d->listView, TQT_SIGNAL(destroyed()), @@ -208,7 +208,7 @@ void KListViewSearchLine::setListView(KListView *lv) // protected members //////////////////////////////////////////////////////////////////////////////// -bool KListViewSearchLine::itemMatches(const TQListViewItem *item, const TQString &s) const +bool TDEListViewSearchLine::itemMatches(const TQListViewItem *item, const TQString &s) const { if(s.isEmpty()) return true; @@ -237,7 +237,7 @@ bool KListViewSearchLine::itemMatches(const TQListViewItem *item, const TQString return false; } -TQPopupMenu *KListViewSearchLine::createPopupMenu() +TQPopupMenu *TDEListViewSearchLine::createPopupMenu() { TQPopupMenu *popup = KLineEdit::createPopupMenu(); @@ -287,14 +287,14 @@ TQPopupMenu *KListViewSearchLine::createPopupMenu() // protected slots //////////////////////////////////////////////////////////////////////////////// -void KListViewSearchLine::queueSearch(const TQString &search) +void TDEListViewSearchLine::queueSearch(const TQString &search) { d->queuedSearches++; d->search = search; TQTimer::singleShot(200, this, TQT_SLOT(activateSearch())); } -void KListViewSearchLine::activateSearch() +void TDEListViewSearchLine::activateSearch() { --(d->queuedSearches); @@ -306,18 +306,18 @@ void KListViewSearchLine::activateSearch() // private slots //////////////////////////////////////////////////////////////////////////////// -void KListViewSearchLine::itemAdded(TQListViewItem *item) const +void TDEListViewSearchLine::itemAdded(TQListViewItem *item) const { item->setVisible(itemMatches(item, text())); } -void KListViewSearchLine::listViewDeleted() +void TDEListViewSearchLine::listViewDeleted() { d->listView = 0; setEnabled(false); } -void KListViewSearchLine::searchColumnsMenuActivated(int id) +void TDEListViewSearchLine::searchColumnsMenuActivated(int id) { if(id == KLISTVIEWSEARCHLINE_ALLVISIBLECOLUMNS_ID) { if(d->searchColumns.isEmpty()) @@ -346,7 +346,7 @@ void KListViewSearchLine::searchColumnsMenuActivated(int id) // private methods //////////////////////////////////////////////////////////////////////////////// -void KListViewSearchLine::checkItemParentsNotVisible() +void TDEListViewSearchLine::checkItemParentsNotVisible() { TQListViewItemIterator it(d->listView); for(; it.current(); ++it) @@ -370,7 +370,7 @@ void KListViewSearchLine::checkItemParentsNotVisible() * \return \c true if an item which should be visible is found, \c false if all items found should be hidden. If this function * returns true and \p highestHiddenParent was not 0, highestHiddenParent will have been shown. */ -bool KListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListViewItem *highestHiddenParent) +bool TDEListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListViewItem *highestHiddenParent) { bool visible = false; TQListViewItem * first = item; @@ -409,24 +409,24 @@ bool KListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListVi } //////////////////////////////////////////////////////////////////////////////// -// KListViewSearchLineWidget +// TDEListViewSearchLineWidget //////////////////////////////////////////////////////////////////////////////// -class KListViewSearchLineWidget::KListViewSearchLineWidgetPrivate +class TDEListViewSearchLineWidget::TDEListViewSearchLineWidgetPrivate { public: - KListViewSearchLineWidgetPrivate() : listView(0), searchLine(0), clearButton(0) {} - KListView *listView; - KListViewSearchLine *searchLine; + TDEListViewSearchLineWidgetPrivate() : listView(0), searchLine(0), clearButton(0) {} + TDEListView *listView; + TDEListViewSearchLine *searchLine; TQToolButton *clearButton; }; -KListViewSearchLineWidget::KListViewSearchLineWidget(KListView *listView, +TDEListViewSearchLineWidget::TDEListViewSearchLineWidget(TDEListView *listView, TQWidget *parent, const char *name) : TQHBox(parent, name) { - d = new KListViewSearchLineWidgetPrivate; + d = new TDEListViewSearchLineWidgetPrivate; d->listView = listView; setSpacing(5); @@ -434,19 +434,19 @@ KListViewSearchLineWidget::KListViewSearchLineWidget(KListView *listView, TQTimer::singleShot(0, this, TQT_SLOT(createWidgets())); } -KListViewSearchLineWidget::~KListViewSearchLineWidget() +TDEListViewSearchLineWidget::~TDEListViewSearchLineWidget() { delete d; } -KListViewSearchLine *KListViewSearchLineWidget::createSearchLine(KListView *listView) +TDEListViewSearchLine *TDEListViewSearchLineWidget::createSearchLine(TDEListView *listView) { if(!d->searchLine) - d->searchLine = new KListViewSearchLine(this, listView); + d->searchLine = new TDEListViewSearchLine(this, listView); return d->searchLine; } -void KListViewSearchLineWidget::createWidgets() +void TDEListViewSearchLineWidget::createWidgets() { positionInToolBar(); @@ -469,14 +469,14 @@ void KListViewSearchLineWidget::createWidgets() connect(d->clearButton, TQT_SIGNAL(clicked()), d->searchLine, TQT_SLOT(clear())); } -KListViewSearchLine *KListViewSearchLineWidget::searchLine() const +TDEListViewSearchLine *TDEListViewSearchLineWidget::searchLine() const { return d->searchLine; } -void KListViewSearchLineWidget::positionInToolBar() +void TDEListViewSearchLineWidget::positionInToolBar() { - KToolBar *toolBar = dynamic_cast(parent()); + TDEToolBar *toolBar = dynamic_cast(parent()); if(toolBar) { @@ -492,7 +492,7 @@ void KListViewSearchLineWidget::positionInToolBar() toolBar->setItemAutoSized(id); if(!d->clearButton) { TQString icon = TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"; - d->clearButton = new KToolBarButton(icon, 2005, toolBar); + d->clearButton = new TDEToolBarButton(icon, 2005, toolBar); } toolBar->insertWidget(2005, d->clearButton->width(), d->clearButton, index); break; diff --git a/kmymoney2/widgets/klistviewsearchline.h b/kmymoney2/widgets/klistviewsearchline.h index 28aeaef..2ffad3c 100644 --- a/kmymoney2/widgets/klistviewsearchline.h +++ b/kmymoney2/widgets/klistviewsearchline.h @@ -24,7 +24,7 @@ #include #include -class KListView; +class TDEListView; class TQListViewItem; class TQToolButton; @@ -33,12 +33,12 @@ class TQToolButton; * listview based on a simple text search. * * No changes to the application other than instantiating this class with an - * appropriate KListView should be needed. + * appropriate TDEListView should be needed. * * @since 3.3 */ -class KMYMONEY_EXPORT KListViewSearchLine : public KLineEdit +class KMYMONEY_EXPORT TDEListViewSearchLine : public KLineEdit { Q_OBJECT @@ -46,24 +46,24 @@ class KMYMONEY_EXPORT KListViewSearchLine : public KLineEdit public: /** - * Constructs a KListViewSearchLine with \a listView being the KListView to + * Constructs a TDEListViewSearchLine with \a listView being the TDEListView to * be filtered. * * If \a listView is null then the widget will be disabled until a listview * is set with setListView(). */ - KListViewSearchLine(TQWidget *parent = 0, KListView *listView = 0, const char *name = 0); + TDEListViewSearchLine(TQWidget *parent = 0, TDEListView *listView = 0, const char *name = 0); /** - * Constructs a KListViewSearchLine without any KListView to filter. The - * KListView object has to be set later with setListView(). + * Constructs a TDEListViewSearchLine without any TDEListView to filter. The + * TDEListView object has to be set later with setListView(). */ - KListViewSearchLine(TQWidget *parent, const char *name); + TDEListViewSearchLine(TQWidget *parent, const char *name); /** - * Destroys the KListViewSearchLine. + * Destroys the TDEListViewSearchLine. */ - virtual ~KListViewSearchLine(); + virtual ~TDEListViewSearchLine(); /** * Returns true if the search is case sensitive. This defaults to false. @@ -93,7 +93,7 @@ public: * * @see setListView() */ - KListView *listView() const; + TDEListView *listView() const; public slots: /** @@ -131,12 +131,12 @@ public slots: void setSearchColumns(const TQValueList &columns); /** - * Sets the KListView that is filtered by this search line. If \a lv is null + * Sets the TDEListView that is filtered by this search line. If \a lv is null * then the widget will be disabled. * * @see listView() */ - void setListView(KListView *lv); + void setListView(TDEListView *lv); protected: @@ -201,44 +201,44 @@ private slots: void searchColumnsMenuActivated(int); private: - class KListViewSearchLinePrivate; - KListViewSearchLinePrivate *d; + class TDEListViewSearchLinePrivate; + TDEListViewSearchLinePrivate *d; }; /** - * Creates a widget featuring a KListViewSearchLine, a label with the text + * Creates a widget featuring a TDEListViewSearchLine, a label with the text * "Search" and a button to clear the search. * * @since 3.4 */ -class KMYMONEY_EXPORT KListViewSearchLineWidget : public TQHBox +class KMYMONEY_EXPORT TDEListViewSearchLineWidget : public TQHBox { Q_OBJECT public: /** - * Creates a KListViewSearchLineWidget for \a listView with \a parent as the + * Creates a TDEListViewSearchLineWidget for \a listView with \a parent as the * parent with and \a name. */ - KListViewSearchLineWidget(KListView *listView = 0, TQWidget *parent = 0, + TDEListViewSearchLineWidget(TDEListView *listView = 0, TQWidget *parent = 0, const char *name = 0); /** - * Destroys the KListViewSearchLineWidget + * Destroys the TDEListViewSearchLineWidget */ - ~KListViewSearchLineWidget(); + ~TDEListViewSearchLineWidget(); /** * Creates the search line. This can be useful to reimplement in cases where - * a KListViewSearchLine subclass is used. + * a TDEListViewSearchLine subclass is used. */ - virtual KListViewSearchLine *createSearchLine(KListView *listView); + virtual TDEListViewSearchLine *createSearchLine(TDEListView *listView); /** * Returns a pointer to the search line. */ - KListViewSearchLine *searchLine() const; + TDEListViewSearchLine *searchLine() const; protected slots: /** @@ -253,8 +253,8 @@ private slots: void positionInToolBar(); private: - class KListViewSearchLineWidgetPrivate; - KListViewSearchLineWidgetPrivate *d; + class TDEListViewSearchLineWidgetPrivate; + TDEListViewSearchLineWidgetPrivate *d; }; #endif diff --git a/kmymoney2/widgets/kmymoneyaccountselector.cpp b/kmymoney2/widgets/kmymoneyaccountselector.cpp index 33bba13..17f8756 100644 --- a/kmymoney2/widgets/kmymoneyaccountselector.cpp +++ b/kmymoney2/widgets/kmymoneyaccountselector.cpp @@ -340,7 +340,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector) typeMask |= KMyMoneyUtils::equity; selector->clear(); - KListView* lv = selector->listView(); + TDEListView* lv = selector->listView(); m_count = 0; TQString key; TQListViewItem* after = 0; @@ -476,7 +476,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector, const TQString& baseName ++count; } - KListView* lv = selector->listView(); + TDEListView* lv = selector->listView(); if(lv->firstChild()) { lv->setCurrentItem(lv->firstChild()); lv->clearSelection(); diff --git a/kmymoney2/widgets/kmymoneyaccounttree.cpp b/kmymoney2/widgets/kmymoneyaccounttree.cpp index c3a9895..1f7c2ae 100644 --- a/kmymoney2/widgets/kmymoneyaccounttree.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttree.cpp @@ -62,7 +62,7 @@ KMyMoneyAccountTree::KMyMoneyAccountTree(TQWidget* parent, const char *name) : showValue(); } -KMyMoneyAccountTreeItem::KMyMoneyAccountTreeItem(KListView *parent, const MyMoneyAccount& account, const MyMoneySecurity& security , const TQString& name) : +KMyMoneyAccountTreeItem::KMyMoneyAccountTreeItem(TDEListView *parent, const MyMoneyAccount& account, const MyMoneySecurity& security , const TQString& name) : KMyMoneyAccountTreeBaseItem(parent,account,security,name), m_reconcileFlag(false) { @@ -76,7 +76,7 @@ KMyMoneyAccountTreeItem::KMyMoneyAccountTreeItem(KMyMoneyAccountTreeBaseItem *pa updateAccount(); } -KMyMoneyAccountTreeItem::KMyMoneyAccountTreeItem(KListView *parent, const MyMoneyInstitution& institution) : +KMyMoneyAccountTreeItem::KMyMoneyAccountTreeItem(TDEListView *parent, const MyMoneyInstitution& institution) : KMyMoneyAccountTreeBaseItem(parent,institution), m_reconcileFlag(false) { diff --git a/kmymoney2/widgets/kmymoneyaccounttree.h b/kmymoney2/widgets/kmymoneyaccounttree.h index c879fef..9b808b3 100644 --- a/kmymoney2/widgets/kmymoneyaccounttree.h +++ b/kmymoney2/widgets/kmymoneyaccounttree.h @@ -43,27 +43,27 @@ public: * Constructor to be used to construct an institution 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 institution const reference to MyMoneyInstitution for which - * the KListView entry is constructed + * the TDEListView entry is constructed */ - KMyMoneyAccountTreeItem(KListView *parent, const MyMoneyInstitution& institution); + KMyMoneyAccountTreeItem(TDEListView *parent, const MyMoneyInstitution& institution); /** * Constructor to be used to construct a standard account entry object (e.g. Asset, * Liability, etc.). * - * @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 account const reference to MyMoneyAccount for which - * the KListView entry is constructed + * the TDEListView entry is constructed * @param security const reference to the security used to show the value. Usually * one should pass MyMoneyFile::baseCurrency() here. * @param name name of the account to be used instead of the one stored with @p account * If empty, the one stored with @p account will be used. Default: empty */ - KMyMoneyAccountTreeItem(KListView *parent, const MyMoneyAccount& account, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); + KMyMoneyAccountTreeItem(TDEListView *parent, const MyMoneyAccount& account, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); /** * Constructor to be used to construct an account entry @@ -72,7 +72,7 @@ public: * @param parent pointer to the parent KAccountListView object this entry should be * added to. * @param account const reference to MyMoneyAccount for which - * the KListView entry is constructed + * the TDEListView entry is constructed * @param price price to be used to calculate value (defaults to 1) * This is used for accounts denominated in foreign currencies or stocks * @param security const reference to the security used to show the value. Usually diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp index fa8b5ed..f943d57 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp @@ -47,7 +47,7 @@ #include KMyMoneyAccountTreeBase::KMyMoneyAccountTreeBase(TQWidget* parent, const char* name) : - KListView(parent, name), + TDEListView(parent, name), m_accountConnections(false), m_institutionConnections(false), m_queuedSort(0) @@ -82,7 +82,7 @@ KMyMoneyAccountTreeBase::KMyMoneyAccountTreeBase(TQWidget* parent, const char* n connect(this, TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*,TQListViewItem*)), this, TQT_SLOT(slotObjectDropped(TQDropEvent*,TQListViewItem*,TQListViewItem*))); connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectObject(TQListViewItem*))); - connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem* , const TQPoint&)), this, TQT_SLOT(slotOpenContextMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem* , const TQPoint&)), this, TQT_SLOT(slotOpenContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), this, TQT_SLOT(slotOpenObject(TQListViewItem*))); // drag and drop timer connections @@ -105,7 +105,7 @@ void KMyMoneyAccountTreeBase::restoreLayout(const TQString& group) // we use equal distribution of all fields as an initial setting // TODO this only makes the first column invisible if settings exist setColumnWidth(0, 0); m_configGroup = group; - KListView::restoreLayout(TDEGlobal::config(), m_configGroup); + TDEListView::restoreLayout(TDEGlobal::config(), m_configGroup); } void KMyMoneyAccountTreeBase::showType(void) @@ -151,7 +151,7 @@ void KMyMoneyAccountTreeBase::setSectionHeader(const TQString& txt) KMyMoneyAccountTreeBaseItem* KMyMoneyAccountTreeBase::selectedItem(void) const { - return dynamic_cast(KListView::selectedItem()); + return dynamic_cast(TDEListView::selectedItem()); } const KMyMoneyAccountTreeBaseItem* KMyMoneyAccountTreeBase::findItem(const TQString& id) const @@ -332,7 +332,7 @@ void KMyMoneyAccountTreeBase::slotSelectObject(TQListViewItem* i) } } -void KMyMoneyAccountTreeBase::slotOpenContextMenu(KListView* lv, TQListViewItem* i, const TQPoint&) +void KMyMoneyAccountTreeBase::slotOpenContextMenu(TDEListView* lv, TQListViewItem* i, const TQPoint&) { Q_UNUSED(lv); @@ -533,8 +533,8 @@ const MyMoneyObject& KMyMoneyAccountTreeBaseItem::itemObject(void) const return m_account; } -KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KListView *parent, const MyMoneyInstitution& institution) : - KListViewItem(parent), +KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(TDEListView *parent, const MyMoneyInstitution& institution) : + TDEListViewItem(parent), m_totalValue(MyMoneyMoney(0)), m_negative(false), m_institution(institution), @@ -543,8 +543,8 @@ KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KListView *parent, cons setName(); } -KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KListView *parent, const MyMoneyAccount& account, const MyMoneySecurity& security, const TQString& name) : - KListViewItem(parent), +KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(TDEListView *parent, const MyMoneyAccount& account, const MyMoneySecurity& security, const TQString& name) : + TDEListViewItem(parent), m_security(security), m_totalValue(MyMoneyMoney(0)), m_account(account), @@ -561,7 +561,7 @@ KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KListView *parent, cons } KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KMyMoneyAccountTreeBaseItem *parent, const MyMoneyAccount& account, const TQValueList& price, const MyMoneySecurity& security) : - KListViewItem(parent), + TDEListViewItem(parent), m_price(price), m_security(security), m_totalValue(MyMoneyMoney(0)), @@ -673,7 +673,7 @@ void KMyMoneyAccountTreeBaseItem::setOpen(bool open) { if (open == isOpen()) return; - KListViewItem::setOpen(open); + TDEListViewItem::setOpen(open); fillColumns(); if(listView()) @@ -731,7 +731,7 @@ int KMyMoneyAccountTreeBaseItem::compare(TQListViewItem* i, int col, bool ascend } } // do standard sorting here - return KListViewItem::compare(i, col, ascending); + return TDEListViewItem::compare(i, col, ascending); } void KMyMoneyAccountTreeBaseItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align) @@ -800,7 +800,7 @@ void KMyMoneyAccountTreeBase::slotActivateSort(void) { --m_queuedSort; if(!m_queuedSort) - KListView::sort(); + TDEListView::sort(); } void KMyMoneyAccountTreeBaseItem::setNegative(bool isNegative) @@ -817,7 +817,7 @@ void KMyMoneyAccountTreeBaseItem::setText( int column, const TQString &text, con m_columnsColor[column] = TQColorGroup::Text; } - KListViewItem::setText(column, text); + TDEListViewItem::setText(column, text); } diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.h b/kmymoney2/widgets/kmymoneyaccounttreebase.h index 5932f85..528c845 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebase.h +++ b/kmymoney2/widgets/kmymoneyaccounttreebase.h @@ -40,7 +40,7 @@ class TQDragObject; class KMyMoneyAccountTreeBaseItem; -class KMyMoneyAccountTreeBase : public KListView +class KMyMoneyAccountTreeBase : public TDEListView { friend class KMyMoneyAccountTreeBaseItem; @@ -154,11 +154,11 @@ protected slots: * and checks if the item pointed to by @p i is either an account or institution * and sends out the necessary signal openContextMenu. * - * @param lv pointer to KListView + * @param lv pointer to TDEListView * @param i pointer to TQListViewItem * @param p position information */ - void slotOpenContextMenu(KListView* lv, TQListViewItem* i, const TQPoint& p); + void slotOpenContextMenu(TDEListView* lv, TQListViewItem* i, const TQPoint& p); /** * This slot is connected to the accout list view's executed signal @@ -174,7 +174,7 @@ protected slots: /** Open the folder pointed to by m_dropItem */ void slotOpenFolder(void); - /** override KListView implementation */ + /** override TDEListView implementation */ void cleanItemHighlighter(void); void slotActivateSort(void); @@ -255,7 +255,7 @@ signals: void reparent(const MyMoneyAccount& acc, const MyMoneyInstitution& institution); }; -class KMyMoneyAccountTreeBaseItem : public KListViewItem +class KMyMoneyAccountTreeBaseItem : public TDEListViewItem { public: typedef enum { @@ -267,27 +267,27 @@ public: * Constructor to be used to construct an institution 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 institution const reference to MyMoneyInstitution for which - * the KListView entry is constructed + * the TDEListView entry is constructed */ - KMyMoneyAccountTreeBaseItem(KListView *parent, const MyMoneyInstitution& institution); + KMyMoneyAccountTreeBaseItem(TDEListView *parent, const MyMoneyInstitution& institution); /** * Constructor to be used to construct a standard account entry object (e.g. Asset, * Liability, etc.). * - * @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 account const reference to MyMoneyAccount for which - * the KListView entry is constructed + * the TDEListView entry is constructed * @param security const reference to the security used to show the value. Usually * one should pass MyMoneyFile::baseCurrency() here. * @param name name of the account to be used instead of the one stored with @p account * If empty, the one stored with @p account will be used. Default: empty */ - KMyMoneyAccountTreeBaseItem(KListView *parent, const MyMoneyAccount& account, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); + KMyMoneyAccountTreeBaseItem(TDEListView *parent, const MyMoneyAccount& account, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); /** * Constructor to be used to construct an account entry @@ -296,7 +296,7 @@ public: * @param parent pointer to the parent KAccountListView object this entry should be * added to. * @param account const reference to MyMoneyAccount for which - * the KListView entry is constructed + * the TDEListView entry is constructed * @param price price to be used to calculate value (defaults to 1) * This is used for accounts denominated in foreign currencies or stocks * @param security const reference to the security used to show the value. Usually @@ -356,7 +356,7 @@ public: * o is FALSE, the children of this item are initially hidden. * The user can show them by clicking the + icon to the left of the item. * - * Overrides KListViewItem::setOpen() and exchanges the value field + * Overrides TDEListViewItem::setOpen() and exchanges the value field * with either the value of this account and its subaccounts if @p o * is false or the value of this account if @p o is true. * @@ -374,7 +374,7 @@ public: /** * Convenience method to return casted pointer */ - KMyMoneyAccountTreeBase* listView(void) const { return dynamic_cast(KListViewItem::listView()); }; + KMyMoneyAccountTreeBase* listView(void) const { return dynamic_cast(TDEListViewItem::listView()); }; /** * Return the type of entry diff --git a/kmymoney2/widgets/kmymoneyaccounttreebudget.cpp b/kmymoney2/widgets/kmymoneyaccounttreebudget.cpp index 2038116..eb56496 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebudget.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreebudget.cpp @@ -37,7 +37,7 @@ void KMyMoneyAccountTreeBudget::slotSelectObject(const TQListViewItem* i) } } -KMyMoneyAccountTreeBudgetItem::KMyMoneyAccountTreeBudgetItem(KListView *parent, const MyMoneyAccount& account, const MyMoneyBudget &budget, const MyMoneySecurity& security, const TQString& name) : +KMyMoneyAccountTreeBudgetItem::KMyMoneyAccountTreeBudgetItem(TDEListView *parent, const MyMoneyAccount& account, const MyMoneyBudget &budget, const MyMoneySecurity& security, const TQString& name) : KMyMoneyAccountTreeBaseItem(parent, account, security, name), m_budget(budget) { diff --git a/kmymoney2/widgets/kmymoneyaccounttreebudget.h b/kmymoney2/widgets/kmymoneyaccounttreebudget.h index 1b5139a..6f3c244 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebudget.h +++ b/kmymoney2/widgets/kmymoneyaccounttreebudget.h @@ -60,7 +60,7 @@ public: * @param parent pointer to the parent KAccountListView object this entry should be * added to. * @param account const reference to MyMoneyAccount for which - * the KListView entry is constructed + * the TDEListView entry is constructed * @param budget const reference to the budget to * which the account belongs * @param price price to be used to calculate value (defaults to 1) @@ -77,7 +77,7 @@ public: * @param parent pointer to the parent KAccountListView object this entry should be * added to. * @param account const reference to MyMoneyAccount for which - * the KListView entry is constructed + * the TDEListView entry is constructed * @param budget const reference to the budget to * which the account belongs * @param security const reference to the security used to show the value. Usually @@ -85,7 +85,7 @@ public: * @param name name of the account to be used instead of the one stored with @p account * If empty, the one stored with @p account will be used. Default: empty */ - KMyMoneyAccountTreeBudgetItem(KListView *parent, const MyMoneyAccount& account, const MyMoneyBudget &budget, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); + KMyMoneyAccountTreeBudgetItem(TDEListView *parent, const MyMoneyAccount& account, const MyMoneyBudget &budget, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); ~KMyMoneyAccountTreeBudgetItem(); diff --git a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp index d0903d2..ec198d6 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp @@ -156,7 +156,7 @@ void KMyMoneyAccountTreeForecast::slotSelectObject(const TQListViewItem* i) } } -KMyMoneyAccountTreeForecastItem::KMyMoneyAccountTreeForecastItem(KListView *parent, const MyMoneyAccount& account, const MyMoneyForecast &forecast, const MyMoneySecurity& security, const TQString& name) : +KMyMoneyAccountTreeForecastItem::KMyMoneyAccountTreeForecastItem(TDEListView *parent, const MyMoneyAccount& account, const MyMoneyForecast &forecast, const MyMoneySecurity& security, const TQString& name) : KMyMoneyAccountTreeBaseItem(parent, account, security, name), m_forecast(forecast) { diff --git a/kmymoney2/widgets/kmymoneyaccounttreeforecast.h b/kmymoney2/widgets/kmymoneyaccounttreeforecast.h index 8bde078..6965ab4 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.h +++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.h @@ -69,7 +69,7 @@ public: * @param parent pointer to the parent KAccountListView object this entry should be * added to. * @param account const reference to MyMoneyAccount for which - * the KListView entry is constructed + * the TDEListView entry is constructed * @param forecast const reference to the forecast to * which the account belongs * @param price price to be used to calculate value (defaults to 1) @@ -86,7 +86,7 @@ public: * @param parent pointer to the parent KAccountListView object this entry should be * added to. * @param account const reference to MyMoneyAccount for which - * the KListView entry is constructed + * the TDEListView entry is constructed * @param forecast const reference to the forecast to * which the account belongs * @param security const reference to the security used to show the value. Usually @@ -94,7 +94,7 @@ public: * @param name name of the account to be used instead of the one stored with @p account * If empty, the one stored with @p account will be used. Default: empty */ - KMyMoneyAccountTreeForecastItem(KListView *parent, const MyMoneyAccount& account, const MyMoneyForecast &forecast, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); + KMyMoneyAccountTreeForecastItem(TDEListView *parent, const MyMoneyAccount& account, const MyMoneyForecast &forecast, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); ~KMyMoneyAccountTreeForecastItem(); diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp index 35d4599..2deeaf2 100644 --- a/kmymoney2/widgets/kmymoneycalendar.cpp +++ b/kmymoney2/widgets/kmymoneycalendar.cpp @@ -119,7 +119,7 @@ void kMyMoneyCalendar::init( const TQDate &dt ) d->selectWeek = new TQToolButton( this ); // KIconLoader *kiconloader = TDEGlobal::iconLoader(); - KPopupMenu* kpopupmenuNew = new KPopupMenu(this); + TDEPopupMenu* kpopupmenuNew = new TDEPopupMenu(this); kpopupmenuNew->insertItem(i18n("Week"), this, TQT_SLOT(slotSetStyleWeekly())); kpopupmenuNew->insertItem(i18n("Month"), this, TQT_SLOT(slotSetStyleMonthly())); /* kpopupmenuNew->insertItem(i18n("3 Months"), this, TQT_SLOT(slotSetStyleQuarterly())); */ @@ -338,7 +338,7 @@ kMyMoneyCalendar::selectWeekClicked() { #if TDE_VERSION >= 310 && TDE_VERSION <= 314 int week; - KPopupFrame* popup = new KPopupFrame(this); + TDEPopupFrame* popup = new TDEPopupFrame(this); KDateInternalWeekSelector* picker = new KDateInternalWeekSelector(/*fontsize, */popup); // ----- picker->resize(picker->sizeHint()); @@ -377,7 +377,7 @@ kMyMoneyCalendar::selectMonthClicked() { #if TDE_VERSION >= 310 && TDE_VERSION <= 314 int month; - KPopupFrame* popup = new KPopupFrame(this); + TDEPopupFrame* popup = new TDEPopupFrame(this); KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(/*fontsize, */popup); // ----- picker->resize(picker->sizeHint()); @@ -409,7 +409,7 @@ kMyMoneyCalendar::selectYearClicked() { #if TDE_VERSION >= 310 && TDE_VERSION <= 314 int year; - KPopupFrame* popup = new KPopupFrame(this); + TDEPopupFrame* popup = new TDEPopupFrame(this); KDateInternalYearSelector* picker = new KDateInternalYearSelector(fontsize, popup); // ----- picker->resize(picker->sizeHint()); diff --git a/kmymoney2/widgets/kmymoneychecklistitem.cpp b/kmymoney2/widgets/kmymoneychecklistitem.cpp index 49b96fa..b292567 100644 --- a/kmymoney2/widgets/kmymoneychecklistitem.cpp +++ b/kmymoney2/widgets/kmymoneychecklistitem.cpp @@ -105,7 +105,7 @@ const TQColor KMyMoneyCheckListItem::backgroundColor() bool KMyMoneyCheckListItem::isAlternate(void) { -// logic taken from KListViewItem::isAlternate() +// logic taken from TDEListViewItem::isAlternate() KMyMoneyCheckListItem* ciAbove; KMyMoneyListViewItem* liAbove; ciAbove = dynamic_cast (itemAbove()); diff --git a/kmymoney2/widgets/kmymoneychecklistitem.h b/kmymoney2/widgets/kmymoneychecklistitem.h index bb91b6a..1c5474d 100644 --- a/kmymoney2/widgets/kmymoneychecklistitem.h +++ b/kmymoney2/widgets/kmymoneychecklistitem.h @@ -64,7 +64,7 @@ public: const TQColor backgroundColor(); /** - * see KListViewItem::isAlternate() + * see TDEListViewItem::isAlternate() */ bool isAlternate(void); @@ -85,7 +85,7 @@ protected: private: TQString m_key; TQString m_id; - // copied from KListViewItem() + // copied from TDEListViewItem() unsigned int m_isOdd : 1; unsigned int m_isKnown : 1; unsigned int m_unused : 30; diff --git a/kmymoney2/widgets/kmymoneycompletion.cpp b/kmymoney2/widgets/kmymoneycompletion.cpp index 41fa082..0a7e99d 100644 --- a/kmymoney2/widgets/kmymoneycompletion.cpp +++ b/kmymoney2/widgets/kmymoneycompletion.cpp @@ -52,7 +52,7 @@ kMyMoneyCompletion::kMyMoneyCompletion(TQWidget *parent, const char *name ) : connectSignals(m_selector, m_selector->listView()); } -void kMyMoneyCompletion::connectSignals(TQWidget* widget, KListView* lv) +void kMyMoneyCompletion::connectSignals(TQWidget* widget, TDEListView* lv) { m_widget = widget; m_lv = lv; diff --git a/kmymoney2/widgets/kmymoneycompletion.h b/kmymoney2/widgets/kmymoneycompletion.h index 36ff70b..63a290e 100644 --- a/kmymoney2/widgets/kmymoneycompletion.h +++ b/kmymoney2/widgets/kmymoneycompletion.h @@ -34,7 +34,7 @@ class TQListViewItem; // ---------------------------------------------------------------------------- // KDE Includes -class KListView; +class TDEListView; // ---------------------------------------------------------------------------- // Project Includes @@ -101,7 +101,7 @@ protected: */ void adjustSize(void); - void connectSignals(TQWidget *widget, KListView* lv); + void connectSignals(TQWidget *widget, TDEListView* lv); void show(bool presetSelected); @@ -112,7 +112,7 @@ protected: TQWidget* m_parent; TQWidget* m_widget; TQString m_id; - KListView* m_lv; + TDEListView* m_lv; KMyMoneySelector* m_selector; TQRegExp m_lastCompletion; diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp index bf64859..b2aecf2 100644 --- a/kmymoney2/widgets/kmymoneydateinput.cpp +++ b/kmymoney2/widgets/kmymoneydateinput.cpp @@ -241,7 +241,7 @@ void kMyMoneyDateInput::resizeEvent(TQResizeEvent* ev) */ void kMyMoneyDateInput::keyPressEvent(TQKeyEvent * k) { - KShortcut today(i18n("Enter todays date into date input widget", "T")); + TDEShortcut today(i18n("Enter todays date into date input widget", "T")); switch(k->key()) { case Key_Equal: diff --git a/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp b/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp index 9164d1a..deb3561 100644 --- a/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp +++ b/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp @@ -34,7 +34,7 @@ #include KMyMoneyForecastListViewItem::KMyMoneyForecastListViewItem (TQListView* parent, TQListViewItem* after, bool isNegative) : - KListViewItem(parent, after), + TDEListViewItem(parent, after), m_negative(isNegative) { } @@ -54,7 +54,7 @@ void KMyMoneyForecastListViewItem::paintCell(TQPainter *p, const TQColorGroup &c } _cg.setColor(TQColorGroup::Text, textColour); - KListViewItem::paintCell(p, _cg, column, width, alignment); + TDEListViewItem::paintCell(p, _cg, column, width, alignment); } void KMyMoneyForecastListViewItem::setNegative(bool isNegative) @@ -71,5 +71,5 @@ void KMyMoneyForecastListViewItem::setText( int column, const TQString &text, co m_columnsColor[column] = TQColorGroup::Text; } - KListViewItem::setText(column, text); + TDEListViewItem::setText(column, text); } diff --git a/kmymoney2/widgets/kmymoneyforecastlistviewitem.h b/kmymoney2/widgets/kmymoneyforecastlistviewitem.h index fe5fd0a..eb0eed1 100644 --- a/kmymoney2/widgets/kmymoneyforecastlistviewitem.h +++ b/kmymoney2/widgets/kmymoneyforecastlistviewitem.h @@ -32,12 +32,12 @@ // Project Includes /** - * This class implements a derived version of a KListViewItem that + * This class implements a derived version of a TDEListViewItem that * allows printing negative numbers in red * * @author Alvaro Soliverez */ -class KMyMoneyForecastListViewItem : public KListViewItem +class KMyMoneyForecastListViewItem : public TDEListViewItem { public: diff --git a/kmymoney2/widgets/kmymoneylistviewitem.cpp b/kmymoney2/widgets/kmymoneylistviewitem.cpp index 09ff2f9..9e71ba8 100644 --- a/kmymoney2/widgets/kmymoneylistviewitem.cpp +++ b/kmymoney2/widgets/kmymoneylistviewitem.cpp @@ -36,7 +36,7 @@ #include "../kmymoneyglobalsettings.h" KMyMoneyListViewItem::KMyMoneyListViewItem(TQListView* parent, const TQString& txt, const TQString& key, const TQString& id) : - KListViewItem(parent, txt), + TDEListViewItem(parent, txt), m_key(key), m_id(id), m_isOdd(0), @@ -47,7 +47,7 @@ KMyMoneyListViewItem::KMyMoneyListViewItem(TQListView* parent, const TQString& t } KMyMoneyListViewItem::KMyMoneyListViewItem(TQListViewItem* parent, const TQString& txt, const TQString& key, const TQString& id) : - KListViewItem(parent, txt), + TDEListViewItem(parent, txt), m_key(key), m_id(id), m_isOdd(0), @@ -76,7 +76,7 @@ void KMyMoneyListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int c TQColorGroup _cg = cg; _cg.setColor(TQColorGroup::Base, backgroundColor()); - // make sure to bypass KListViewItem::paintCell() as + // make sure to bypass TDEListViewItem::paintCell() as // we don't like it's logic - that's why we do this // here ;-) (ipwizard) TQListViewItem::paintCell(p, _cg, column, width, alignment); @@ -89,7 +89,7 @@ const TQColor KMyMoneyListViewItem::backgroundColor() bool KMyMoneyListViewItem::isAlternate(void) { -// logic taken from KListViewItem::isAlternate() +// logic taken from TDEListViewItem::isAlternate() KMyMoneyCheckListItem* ciAbove; KMyMoneyListViewItem* liAbove; ciAbove = dynamic_cast (itemAbove()); diff --git a/kmymoney2/widgets/kmymoneylistviewitem.h b/kmymoney2/widgets/kmymoneylistviewitem.h index 5322ea6..984a4bc 100644 --- a/kmymoney2/widgets/kmymoneylistviewitem.h +++ b/kmymoney2/widgets/kmymoneylistviewitem.h @@ -39,7 +39,7 @@ class KMyMoneyCheckListItem; * * @author Thomas Baumgart */ -class KMyMoneyListViewItem : public TQObject, public KListViewItem +class KMyMoneyListViewItem : public TQObject, public TDEListViewItem { friend class KMyMoneyCheckListItem; @@ -79,7 +79,7 @@ public: private: TQString m_key; TQString m_id; - // copied from KListViewItem() + // copied from TDEListViewItem() unsigned int m_isOdd : 1; unsigned int m_isKnown : 1; unsigned int m_unused : 30; diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui b/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui index 88f95f7..80fe7bd 100644 --- a/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui +++ b/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui @@ -25,7 +25,7 @@ unnamed - + Name diff --git a/kmymoney2/widgets/kmymoneypriceview.cpp b/kmymoney2/widgets/kmymoneypriceview.cpp index e1dd25e..8af269f 100644 --- a/kmymoney2/widgets/kmymoneypriceview.cpp +++ b/kmymoney2/widgets/kmymoneypriceview.cpp @@ -61,7 +61,7 @@ #define PRICE_COL 3 #define SOURCE_COL 4 -KMyMoneyPriceItem::KMyMoneyPriceItem(KListView *view, const MyMoneyPrice& pr) : +KMyMoneyPriceItem::KMyMoneyPriceItem(TDEListView *view, const MyMoneyPrice& pr) : KMyMoneyListViewItem(view, TQString(), TQString(), TQString()), m_pr(pr) { @@ -119,7 +119,7 @@ int KMyMoneyPriceItem::compare(TQListViewItem* i, int col, bool ascending) const } KMyMoneyPriceView::KMyMoneyPriceView(TQWidget *parent, const char *name ) : - KListView(parent,name), + TDEListView(parent,name), m_contextMenu(0), m_showAll(false) { @@ -139,7 +139,7 @@ KMyMoneyPriceView::KMyMoneyPriceView(TQWidget *parent, const char *name ) : KIconLoader *kiconloader = TDEGlobal::iconLoader(); - m_contextMenu = new KPopupMenu(this); + m_contextMenu = new TDEPopupMenu(this); m_contextMenu->insertTitle(i18n("Price Options")); m_contextMenu->insertItem(kiconloader->loadIcon("filenew", KIcon::Small), i18n("New..."), @@ -220,7 +220,7 @@ void KMyMoneyPriceView::resizeEvent(TQResizeEvent* e) setColumnWidth(4, w); resizeContents(visibleWidth(), contentsHeight()); - KListView::resizeEvent(e); + TDEListView::resizeEvent(e); } void KMyMoneyPriceView::slotListClicked(TQListViewItem* item, const TQPoint&, int) diff --git a/kmymoney2/widgets/kmymoneypriceview.h b/kmymoney2/widgets/kmymoneypriceview.h index 979a003..4415b88 100644 --- a/kmymoney2/widgets/kmymoneypriceview.h +++ b/kmymoney2/widgets/kmymoneypriceview.h @@ -44,7 +44,7 @@ class KMyMoneyPriceItem : public KMyMoneyListViewItem { public: - KMyMoneyPriceItem(KListView *, const MyMoneyPrice& pr); + KMyMoneyPriceItem(TDEListView *, const MyMoneyPrice& pr); ~KMyMoneyPriceItem() {} int compare(TQListViewItem *p, int col, bool ascending) const; @@ -56,7 +56,7 @@ private: }; -class KMyMoneyPriceView : public KListView +class KMyMoneyPriceView : public TDEListView { Q_OBJECT @@ -81,7 +81,7 @@ signals: void onlinePriceUpdate(void); private: - KPopupMenu* m_contextMenu; + TDEPopupMenu* m_contextMenu; bool m_showAll; }; diff --git a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp index 9f6d131..8e8cf32 100644 --- a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp +++ b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp @@ -41,7 +41,7 @@ kMyMoneyScheduledCalendar::kMyMoneyScheduledCalendar(TQWidget *parent, const cha { TQPushButton *pb1 = new TQPushButton(i18n("Select Schedules"), this); - kpopupmenu = new KPopupMenu(this); + kpopupmenu = new TDEPopupMenu(this); kpopupmenu->setCheckable(true); kpopupmenu->insertItem(i18n("Bills"), 0); kpopupmenu->insertItem(i18n("Deposits"), 1); diff --git a/kmymoney2/widgets/kmymoneyscheduledcalendar.h b/kmymoney2/widgets/kmymoneyscheduledcalendar.h index d018518..682603c 100644 --- a/kmymoney2/widgets/kmymoneyscheduledcalendar.h +++ b/kmymoney2/widgets/kmymoneyscheduledcalendar.h @@ -35,7 +35,7 @@ #include "../widgets/kmymoneycalendar.h" #include "../widgets/kmymoneyscheduleddatetbl.h" -class KPopupMenu; +class TDEPopupMenu; class kMyMoneyDateTbl; /** @@ -81,7 +81,7 @@ protected slots: void slotSetViewTransfers(); private: - KPopupMenu* kpopupmenu; + TDEPopupMenu* kpopupmenu; kMyMoneyScheduledDateTbl *m_scheduledDateTable; }; diff --git a/kmymoney2/widgets/kmymoneyselector.cpp b/kmymoney2/widgets/kmymoneyselector.cpp index 4f8af45..44fc546 100644 --- a/kmymoney2/widgets/kmymoneyselector.cpp +++ b/kmymoney2/widgets/kmymoneyselector.cpp @@ -41,7 +41,7 @@ KMyMoneySelector::KMyMoneySelector(TQWidget *parent, const char *name, TQWidget: { m_selMode = TQListView::Single; - m_listView = new KListView(this); + m_listView = new TDEListView(this); // don't show horizontal scroll bar m_listView->setHScrollBarMode(TQScrollView::AlwaysOff); diff --git a/kmymoney2/widgets/kmymoneyselector.h b/kmymoney2/widgets/kmymoneyselector.h index 0a4ac8b..f50e404 100644 --- a/kmymoney2/widgets/kmymoneyselector.h +++ b/kmymoney2/widgets/kmymoneyselector.h @@ -28,7 +28,7 @@ class TQHBoxLayout; // ---------------------------------------------------------------------------- // KDE Includes -class KListView; +class TDEListView; // ---------------------------------------------------------------------------- // Project Includes @@ -137,9 +137,9 @@ public: void setSelected(const TQString& id, const bool state = false); /** - * Return a pointer to the KListView object + * Return a pointer to the TDEListView object */ - KListView* listView(void) const { return m_listView; }; + TDEListView* listView(void) const { return m_listView; }; /** * This method selects/deselects all items that @@ -201,7 +201,7 @@ public: /** * This method creates a new selectable object depending on the - * selection mode. This is either a KListViewItem for single + * selection mode. This is either a TDEListViewItem for single * selection mode or a KMyMoneyCheckListItem for multi selection mode * * @note The new item will be the first one in the selection @@ -217,7 +217,7 @@ public: /** * This method creates a new selectable object depending on the - * selection mode. This is either a KListViewItem for single + * selection mode. This is either a TDEListViewItem for single * selection mode or a KMyMoneyCheckListItem for multi selection mode. * In contrast to the above method, the parent is always the view. * @@ -362,7 +362,7 @@ protected slots: void slotShowSelected(void); /** - * This slot is connected to the KListView executed signal + * This slot is connected to the TDEListView executed signal */ void slotItemSelected(TQListViewItem *it_v); @@ -375,7 +375,7 @@ protected slots: void slotListRightMouse(TQListViewItem* it_v, const TQPoint& p, int /* col */); protected: - KListView* m_listView; + TDEListView* m_listView; TQStringList m_itemList; TQString m_baseName; TQListView::SelectionMode m_selMode; diff --git a/kmymoney2/widgets/registersearchline.h b/kmymoney2/widgets/registersearchline.h index 6c3a681..07568c7 100644 --- a/kmymoney2/widgets/registersearchline.h +++ b/kmymoney2/widgets/registersearchline.h @@ -39,7 +39,7 @@ namespace KMyMoneyRegister { /** * This class makes it easy to add a search line for filtering the items * in a register based on simple text. Inspired by the idea of the tdelibs - * class KListViewSearchLine. + * class TDEListViewSearchLine. * * @author Thomas Baumgart */ @@ -103,7 +103,7 @@ private: /** * Creates a widget containing a RegisterSearchLine, a label with the text - * "Search" and a button to clear the search. Modelled after KListViewSearchLineWidget. + * "Search" and a button to clear the search. Modelled after TDEListViewSearchLineWidget. * * @author Thomas Baumgart */ diff --git a/kmymoney2/widgets/sortoptionlistitem.h b/kmymoney2/widgets/sortoptionlistitem.h index 9276b16..39fc608 100644 --- a/kmymoney2/widgets/sortoptionlistitem.h +++ b/kmymoney2/widgets/sortoptionlistitem.h @@ -346,7 +346,7 @@ static const char * sortDescendingXpm[] = { " e.f.g.h.i.j.k.l. ", " m.n. "}; -class SortOptionListItem : public KListViewItem +class SortOptionListItem : public TDEListViewItem { public: SortOptionListItem(TQListView* parent, TQListViewItem* after, const TQString& txt, int direction); @@ -363,7 +363,7 @@ private: }; SortOptionListItem::SortOptionListItem(TQListView* parent, TQListViewItem* after, const TQString& txt, int direction) : - KListViewItem(parent, after, txt) + TDEListViewItem(parent, after, txt) { m_direction = (direction >= 0) ? 1 : -1; setPixmap(); @@ -372,9 +372,9 @@ SortOptionListItem::SortOptionListItem(TQListView* parent, TQListViewItem* after void SortOptionListItem::setPixmap(void) { if(m_direction > 0) - KListViewItem::setPixmap(0, TQPixmap(&sortAscendingXpm[0])); + TDEListViewItem::setPixmap(0, TQPixmap(&sortAscendingXpm[0])); else - KListViewItem::setPixmap(0, TQPixmap(&sortDescendingXpm[0])); + TDEListViewItem::setPixmap(0, TQPixmap(&sortDescendingXpm[0])); } void SortOptionListItem::toggleDirection(void) diff --git a/kmymoney2/widgets/transactionsortoption.ui b/kmymoney2/widgets/transactionsortoption.ui index 393e0bc..2a677ba 100644 --- a/kmymoney2/widgets/transactionsortoption.ui +++ b/kmymoney2/widgets/transactionsortoption.ui @@ -28,7 +28,7 @@ unnamed - + Sort options @@ -123,7 +123,7 @@ unnamed - + Sort order @@ -283,7 +283,7 @@ init() - addEntry( KListView * p, TQListViewItem * after, int idx ) + addEntry( TDEListView * p, TQListViewItem * after, int idx ) settings( void ) const diff --git a/kmymoney2/widgets/transactionsortoption.ui.h b/kmymoney2/widgets/transactionsortoption.ui.h index cf87646..2a1f2e2 100644 --- a/kmymoney2/widgets/transactionsortoption.ui.h +++ b/kmymoney2/widgets/transactionsortoption.ui.h @@ -106,7 +106,7 @@ void TransactionSortOption::setSettings(const TQString& settings) } } -TQListViewItem* TransactionSortOption::addEntry( KListView * p, TQListViewItem* after, int idx ) +TQListViewItem* TransactionSortOption::addEntry( TDEListView * p, TQListViewItem* after, int idx ) { TQString txt = KMyMoneyRegister::sortOrderToText(static_cast(abs(idx))); if(txt.isEmpty()) diff --git a/kmymoney2/wizards/newaccountwizard/kaccountsummarypagedecl.ui b/kmymoney2/wizards/newaccountwizard/kaccountsummarypagedecl.ui index 2059042..ea94b54 100644 --- a/kmymoney2/wizards/newaccountwizard/kaccountsummarypagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kaccountsummarypagedecl.ui @@ -27,7 +27,7 @@ This page summarizes the data you have entered. Press <b>Finish</b> to create the account, schedules, etc. or use <b>Back</b> to modify your entries. - + Item diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp index c7eb6b5..2c8bc9f 100644 --- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp +++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp @@ -1596,29 +1596,29 @@ void AccountSummaryPage::enterPage(void) TQListViewItem* group = new KMyMoneyCheckListItem(m_dataList, i18n("Account information"), TQString(), TQString(), TQCheckListItem::RadioButtonController); group->setOpen(true); TQListViewItem* p; - p = new KListViewItem(group, i18n("Name"), acc.name()); + p = new TDEListViewItem(group, i18n("Name"), acc.name()); if(!acc.isLoan()) - p = new KListViewItem(group, p, i18n("Subaccount of"), + p = new TDEListViewItem(group, p, i18n("Subaccount of"), m_wizard->parentAccount().name()); if(acc.accountType() == MyMoneyAccount::AssetLoan) - p = new KListViewItem(group, p, i18n("Type"), i18n("Loan")); + p = new TDEListViewItem(group, p, i18n("Type"), i18n("Loan")); else - p = new KListViewItem(group, p, i18n("Type"), m_wizard->m_accountTypePage->m_typeSelection->currentText()); - p = new KListViewItem(group, p, i18n("Currency"), m_wizard->currency().name()); - p = new KListViewItem(group, p, i18n("Opening date"), TDEGlobal::locale()->formatDate(acc.openingDate())); + p = new TDEListViewItem(group, p, i18n("Type"), m_wizard->m_accountTypePage->m_typeSelection->currentText()); + p = new TDEListViewItem(group, p, i18n("Currency"), m_wizard->currency().name()); + p = new TDEListViewItem(group, p, i18n("Opening date"), TDEGlobal::locale()->formatDate(acc.openingDate())); if(m_wizard->currency().id() != MyMoneyFile::instance()->baseCurrency().id()) { - p = new KListViewItem(group, p, i18n("Conversion rate"), m_wizard->conversionRate().rate(TQString()).formatMoney("", KMyMoneyGlobalSettings::pricePrecision())); + p = new TDEListViewItem(group, p, i18n("Conversion rate"), m_wizard->conversionRate().rate(TQString()).formatMoney("", KMyMoneyGlobalSettings::pricePrecision())); } if(!acc.isLoan() || !m_wizard->openingBalance().isZero()) - p = new KListViewItem(group, p, i18n("Opening balance"), m_wizard->openingBalance().formatMoney(acc, sec)); + p = new TDEListViewItem(group, p, i18n("Opening balance"), m_wizard->openingBalance().formatMoney(acc, sec)); if(!m_wizard->m_institutionPage->institution().id().isEmpty()) { - p = new KListViewItem(group, p, i18n("Institution"), m_wizard->m_institutionPage->institution().name()); + p = new TDEListViewItem(group, p, i18n("Institution"), m_wizard->m_institutionPage->institution().name()); if(!acc.number().isEmpty()) { - p = new KListViewItem(group, p, i18n("Number"), acc.number()); + p = new TDEListViewItem(group, p, i18n("Number"), acc.number()); } if(!acc.value("IBAN").isEmpty()) { - p = new KListViewItem(group, p, i18n("IBAN"), acc.value("IBAN")); + p = new TDEListViewItem(group, p, i18n("IBAN"), acc.value("IBAN")); } } @@ -1626,12 +1626,12 @@ void AccountSummaryPage::enterPage(void) if(m_wizard->m_brokeragepage->m_createBrokerageButton->isChecked()) { group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Brokerage Account"), TQString(), TQString(), TQCheckListItem::RadioButtonController); group->setOpen(true); - p = new KListViewItem(group, p, i18n("Name"), TQString("%1 (Brokerage)").arg(acc.name())); - p = new KListViewItem(group, p, i18n("Currency"), m_wizard->m_brokeragepage->m_brokerageCurrency->security().name()); + p = new TDEListViewItem(group, p, i18n("Name"), TQString("%1 (Brokerage)").arg(acc.name())); + p = new TDEListViewItem(group, p, i18n("Currency"), m_wizard->m_brokeragepage->m_brokerageCurrency->security().name()); if(m_wizard->m_brokeragepage->m_accountNumber->isEnabled() && !m_wizard->m_brokeragepage->m_accountNumber->text().isEmpty()) - p = new KListViewItem(group, p, i18n("Number"), m_wizard->m_brokeragepage->m_accountNumber->text()); + p = new TDEListViewItem(group, p, i18n("Number"), m_wizard->m_brokeragepage->m_accountNumber->text()); if(m_wizard->m_brokeragepage->m_iban->isEnabled() && !m_wizard->m_brokeragepage->m_iban->text().isEmpty()) - p = new KListViewItem(group, p, i18n("IBAN"), m_wizard->m_brokeragepage->m_iban->text()); + p = new TDEListViewItem(group, p, i18n("IBAN"), m_wizard->m_brokeragepage->m_iban->text()); } } @@ -1640,29 +1640,29 @@ void AccountSummaryPage::enterPage(void) group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Loan information"), TQString(), TQString(), TQCheckListItem::RadioButtonController); group->setOpen(true); if(m_wizard->moneyBorrowed()) { - p = new KListViewItem(group, p, i18n("Amount borrowed"), m_wizard->m_loanDetailsPage->m_loanAmount->value().formatMoney(m_wizard->currency().tradingSymbol(), m_wizard->precision())); + p = new TDEListViewItem(group, p, i18n("Amount borrowed"), m_wizard->m_loanDetailsPage->m_loanAmount->value().formatMoney(m_wizard->currency().tradingSymbol(), m_wizard->precision())); } else { - p = new KListViewItem(group, p, i18n("Amount lent"), m_wizard->m_loanDetailsPage->m_loanAmount->value().formatMoney(m_wizard->currency().tradingSymbol(), m_wizard->precision())); + p = new TDEListViewItem(group, p, i18n("Amount lent"), m_wizard->m_loanDetailsPage->m_loanAmount->value().formatMoney(m_wizard->currency().tradingSymbol(), m_wizard->precision())); } - p = new KListViewItem(group, p, i18n("Interest rate"), TQString("%1 %").arg(m_wizard->m_loanDetailsPage->m_interestRate->value().formatMoney("", -1))); - p = new KListViewItem(group, p, i18n("Interest rate is"), m_wizard->m_generalLoanInfoPage->m_interestType->currentText()); - p = new KListViewItem(group, p, i18n("Principal and interest"), m_wizard->m_loanDetailsPage->m_paymentAmount->value().formatMoney(acc, sec)); - p = new KListViewItem(group, p, i18n("Additional fees"), m_wizard->m_loanPaymentPage->additionalFees().formatMoney(acc, sec)); - p = new KListViewItem(group, p, i18n("Payment frequency"), m_wizard->m_generalLoanInfoPage->m_paymentFrequency->currentText()); - p = new KListViewItem(group, p, i18n("Payment account"), m_wizard->m_loanSchedulePage->m_paymentAccount->currentText()); + p = new TDEListViewItem(group, p, i18n("Interest rate"), TQString("%1 %").arg(m_wizard->m_loanDetailsPage->m_interestRate->value().formatMoney("", -1))); + p = new TDEListViewItem(group, p, i18n("Interest rate is"), m_wizard->m_generalLoanInfoPage->m_interestType->currentText()); + p = new TDEListViewItem(group, p, i18n("Principal and interest"), m_wizard->m_loanDetailsPage->m_paymentAmount->value().formatMoney(acc, sec)); + p = new TDEListViewItem(group, p, i18n("Additional fees"), m_wizard->m_loanPaymentPage->additionalFees().formatMoney(acc, sec)); + p = new TDEListViewItem(group, p, i18n("Payment frequency"), m_wizard->m_generalLoanInfoPage->m_paymentFrequency->currentText()); + p = new TDEListViewItem(group, p, i18n("Payment account"), m_wizard->m_loanSchedulePage->m_paymentAccount->currentText()); if(!m_wizard->m_loanPayoutPage->m_noPayoutTransaction->isChecked() && m_wizard->openingBalance().isZero()) { group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Payout information"), TQString(), TQString(), TQCheckListItem::RadioButtonController); group->setOpen(true); if(m_wizard->m_loanPayoutPage->m_refinanceLoan->isChecked()) { - p = new KListViewItem(group, p, i18n("Refinance"), m_wizard->m_loanPayoutPage->m_loanAccount->currentText()); + p = new TDEListViewItem(group, p, i18n("Refinance"), m_wizard->m_loanPayoutPage->m_loanAccount->currentText()); } else { if(m_wizard->moneyBorrowed()) - p = new KListViewItem(group, p, i18n("Transfer amount to"), m_wizard->m_loanPayoutPage->m_assetAccount->currentText()); + p = new TDEListViewItem(group, p, i18n("Transfer amount to"), m_wizard->m_loanPayoutPage->m_assetAccount->currentText()); else - p = new KListViewItem(group, p, i18n("Transfer amount from"), m_wizard->m_loanPayoutPage->m_assetAccount->currentText()); + p = new TDEListViewItem(group, p, i18n("Transfer amount from"), m_wizard->m_loanPayoutPage->m_assetAccount->currentText()); } - p = new KListViewItem(group, p, i18n("Payment date"), TDEGlobal::locale()->formatDate(m_wizard->m_loanPayoutPage->m_payoutDate->date())); + p = new TDEListViewItem(group, p, i18n("Payment date"), TDEGlobal::locale()->formatDate(m_wizard->m_loanPayoutPage->m_payoutDate->date())); } } @@ -1670,20 +1670,20 @@ void AccountSummaryPage::enterPage(void) if(!(sch == MyMoneySchedule())) { group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Schedule information"), TQString(), TQString(), TQCheckListItem::RadioButtonController); group->setOpen(true); - p = new KListViewItem(group, i18n("Name"), sch.name()); + p = new TDEListViewItem(group, i18n("Name"), sch.name()); if(acc.accountType() == MyMoneyAccount::CreditCard) { MyMoneyAccount paymentAccount = MyMoneyFile::instance()->account(m_wizard->m_schedulePage->m_paymentAccount->selectedItem()); - p = new KListViewItem(group, p, i18n("Occurence"), i18n("Monthly")); - p = new KListViewItem(group, p, i18n("Paid from"), paymentAccount.name()); - p = new KListViewItem(group, p, i18n("Pay to"), m_wizard->m_schedulePage->m_payee->currentText()); - p = new KListViewItem(group, p, i18n("Amount"), m_wizard->m_schedulePage->m_amount->value().formatMoney(acc, sec)); - p = new KListViewItem(group, p, i18n("First payment due"), TDEGlobal::locale()->formatDate(sch.nextDueDate())); - p = new KListViewItem(group, p, i18n("Payment method"), m_wizard->m_schedulePage->m_method->currentText()); + p = new TDEListViewItem(group, p, i18n("Occurence"), i18n("Monthly")); + p = new TDEListViewItem(group, p, i18n("Paid from"), paymentAccount.name()); + p = new TDEListViewItem(group, p, i18n("Pay to"), m_wizard->m_schedulePage->m_payee->currentText()); + p = new TDEListViewItem(group, p, i18n("Amount"), m_wizard->m_schedulePage->m_amount->value().formatMoney(acc, sec)); + p = new TDEListViewItem(group, p, i18n("First payment due"), TDEGlobal::locale()->formatDate(sch.nextDueDate())); + p = new TDEListViewItem(group, p, i18n("Payment method"), m_wizard->m_schedulePage->m_method->currentText()); } if(acc.isLoan()) { - p = new KListViewItem(group, p, i18n("Occurence"), m_wizard->m_generalLoanInfoPage->m_paymentFrequency->currentText()); - p = new KListViewItem(group, p, i18n("Amount"), (m_wizard->m_loanPaymentPage->basePayment() + m_wizard->m_loanPaymentPage->additionalFees()).formatMoney(acc, sec)); - p = new KListViewItem(group, p, i18n("First payment due"), TDEGlobal::locale()->formatDate(m_wizard->m_loanSchedulePage->firstPaymentDueDate())); + p = new TDEListViewItem(group, p, i18n("Occurence"), m_wizard->m_generalLoanInfoPage->m_paymentFrequency->currentText()); + p = new TDEListViewItem(group, p, i18n("Amount"), (m_wizard->m_loanPaymentPage->basePayment() + m_wizard->m_loanPaymentPage->additionalFees()).formatMoney(acc, sec)); + p = new TDEListViewItem(group, p, i18n("First payment due"), TDEGlobal::locale()->formatDate(m_wizard->m_loanSchedulePage->firstPaymentDueDate())); } } } diff --git a/kmymoney2/wizards/wizardpages/currency.cpp b/kmymoney2/wizards/wizardpages/currency.cpp index cf645ab..2f540fb 100644 --- a/kmymoney2/wizards/wizardpages/currency.cpp +++ b/kmymoney2/wizards/wizardpages/currency.cpp @@ -38,7 +38,7 @@ Currency::Currency(TQWidget* parent, const char* name) : TQListViewItem* Currency::insertCurrency(const MyMoneySecurity& sec) { - return new KListViewItem(m_currencyList, sec.name(), TQString(sec.id()), sec.tradingSymbol()); + return new TDEListViewItem(m_currencyList, sec.name(), TQString(sec.id()), sec.tradingSymbol()); } void Currency::selectCurrency(const MyMoneySecurity& sec) diff --git a/kmymoney2/wizards/wizardpages/currency.h b/kmymoney2/wizards/wizardpages/currency.h index 8ebae23..680a49b 100644 --- a/kmymoney2/wizards/wizardpages/currency.h +++ b/kmymoney2/wizards/wizardpages/currency.h @@ -23,7 +23,7 @@ #include -class KListViewItem; +class TDEListViewItem; // ---------------------------------------------------------------------------- // Project Includes diff --git a/kmymoney2/wizards/wizardpages/currencydecl.ui b/kmymoney2/wizards/wizardpages/currencydecl.ui index d4893d5..d219efd 100644 --- a/kmymoney2/wizards/wizardpages/currencydecl.ui +++ b/kmymoney2/wizards/wizardpages/currencydecl.ui @@ -24,7 +24,7 @@ <p>KMyMoney supports multiple currencies, nevertheless one of them will be used as your base currency. The base currency is used as default for new accounts and reports. Please select the base currency from the following list. - + Name diff --git a/po/ca.po b/po/ca.po index fd4cc99..0b80ce8 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4928,7 +4928,7 @@ msgid "turn on program traces" msgstr "" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" #: main.cpp:66 diff --git a/po/cs.po b/po/cs.po index 1ab3dc1..4885cbc 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5036,7 +5036,7 @@ msgid "turn on program traces" msgstr "" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" #: main.cpp:66 diff --git a/po/da.po b/po/da.po index 2c8c183..025f074 100644 --- a/po/da.po +++ b/po/da.po @@ -4922,7 +4922,7 @@ msgid "turn on program traces" msgstr "" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" #: main.cpp:66 diff --git a/po/de.po b/po/de.po index 1f7249e..f1dde12 100644 --- a/po/de.po +++ b/po/de.po @@ -5153,8 +5153,8 @@ msgid "turn on program traces" msgstr "Schalte Programm-Traces ein" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" -msgstr "die Namen aller definierten KAction-Objeke auf stdout ausgeben und beenden" +msgid "dump the names of all defined TDEAction objects to stdout and quit" +msgstr "die Namen aller definierten TDEAction-Objeke auf stdout ausgeben und beenden" #: main.cpp:66 msgid "file to open" diff --git a/po/en_GB.po b/po/en_GB.po index 7e3c4d7..94aeb57 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -5008,8 +5008,8 @@ msgid "turn on program traces" msgstr "turn on program traces" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" -msgstr "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" +msgstr "dump the names of all defined TDEAction objects to stdout and quit" #: main.cpp:66 msgid "file to open" diff --git a/po/es.po b/po/es.po index 7415bbe..ed34bd6 100644 --- a/po/es.po +++ b/po/es.po @@ -5130,9 +5130,9 @@ msgid "turn on program traces" msgstr "habilitar trazas del programa" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" -"volcar los nombres de todos los objetos KAction definidos a la salida " +"volcar los nombres de todos los objetos TDEAction definidos a la salida " "estándar y salir" #: main.cpp:66 diff --git a/po/es_AR.po b/po/es_AR.po index 863aa99..823febd 100644 --- a/po/es_AR.po +++ b/po/es_AR.po @@ -5143,9 +5143,9 @@ msgid "turn on program traces" msgstr "habilitar trazas del programa" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" -"volcar los nombres de todos los objetos KAction definidos a stdout y salir" +"volcar los nombres de todos los objetos TDEAction definidos a stdout y salir" #: main.cpp:66 msgid "file to open" diff --git a/po/fi.po b/po/fi.po index 3440bf2..1e60aba 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5049,9 +5049,9 @@ msgid "turn on program traces" msgstr "Ota käyttöön virheenjäljitystoiminnot" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" -"talleta kaikki määritellyt KAction-objektit standardiulostuloon ja lopeta " +"talleta kaikki määritellyt TDEAction-objektit standardiulostuloon ja lopeta " "ohjelma" #: main.cpp:66 diff --git a/po/fr.po b/po/fr.po index 45ead37..4f6486e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5214,9 +5214,9 @@ msgid "turn on program traces" msgstr "activation des traces du programme" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" -"copier les noms de tous les objets définis KAction sur stdout et quitter" +"copier les noms de tous les objets définis TDEAction sur stdout et quitter" #: main.cpp:66 msgid "file to open" diff --git a/po/gl.po b/po/gl.po index 13461b6..f64273d 100644 --- a/po/gl.po +++ b/po/gl.po @@ -5109,9 +5109,9 @@ msgid "turn on program traces" msgstr "habilitar as trazas do programa" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" -"envorcar os nomes de todos os obxectos de KAction definidos en stdout e saír" +"envorcar os nomes de todos os obxectos de TDEAction definidos en stdout e saír" #: main.cpp:66 msgid "file to open" diff --git a/po/it.po b/po/it.po index 99f7e81..35eddc6 100644 --- a/po/it.po +++ b/po/it.po @@ -5014,7 +5014,7 @@ msgid "turn on program traces" msgstr "abilita traccia del programma" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" #: main.cpp:66 diff --git a/po/kmymoney2.pot b/po/kmymoney2.pot index e82bada..faf98cb 100644 --- a/po/kmymoney2.pot +++ b/po/kmymoney2.pot @@ -4606,7 +4606,7 @@ msgid "turn on program traces" msgstr "" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" #: main.cpp:66 diff --git a/po/lt.po b/po/lt.po index f79de14..22e1121 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4851,7 +4851,7 @@ msgid "turn on program traces" msgstr "" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" #: main.cpp:66 diff --git a/po/nl.po b/po/nl.po index a6eb92b..c4818ef 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5132,8 +5132,8 @@ msgid "turn on program traces" msgstr "Zet programma trance aan" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" -msgstr "Dump alle namen die zijn gedefiniëerd in KAction naar stdout en stop" +msgid "dump the names of all defined TDEAction objects to stdout and quit" +msgstr "Dump alle namen die zijn gedefiniëerd in TDEAction naar stdout en stop" #: main.cpp:66 msgid "file to open" diff --git a/po/pl.po b/po/pl.po index 24528b6..db68dfd 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5185,7 +5185,7 @@ msgid "turn on program traces" msgstr "włącz komunikaty diagnostyczne" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" #: main.cpp:66 diff --git a/po/pt.po b/po/pt.po index 2822ac1..f641283 100644 --- a/po/pt.po +++ b/po/pt.po @@ -5123,9 +5123,9 @@ msgid "turn on program traces" msgstr "ligar rastreio do programa" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" -"direcionar os nomes de todos os objetos KAction definidos para a saída " +"direcionar os nomes de todos os objetos TDEAction definidos para a saída " "padrão e sair" #: main.cpp:66 diff --git a/po/pt_BR.po b/po/pt_BR.po index 7bcac72..b368238 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5139,9 +5139,9 @@ msgid "turn on program traces" msgstr "ligar rastreio do programa" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" -"direcionar os nomes de todos os objetos KAction definidos para a saída " +"direcionar os nomes de todos os objetos TDEAction definidos para a saída " "padrão e sair" #: main.cpp:66 diff --git a/po/ro.po b/po/ro.po index 4d8f6be..ea02264 100644 --- a/po/ro.po +++ b/po/ro.po @@ -5165,9 +5165,9 @@ msgid "turn on program traces" msgstr "activează mesajele de programare a aplicaţiei" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" -"trimite numele tuturor obiectelor KAction la ieşirea standard şi termină " +"trimite numele tuturor obiectelor TDEAction la ieşirea standard şi termină " "execuţia" #: main.cpp:66 diff --git a/po/ru.po b/po/ru.po index bf44e59..7d1276d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5057,9 +5057,9 @@ msgid "turn on program traces" msgstr "включить отладку программы" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" -"вывести имена всех объектов KAction на стандартный поток вывода и завершить " +"вывести имена всех объектов TDEAction на стандартный поток вывода и завершить " "работу" #: main.cpp:66 diff --git a/po/sk.po b/po/sk.po index d2cfc7c..08e81c0 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5092,7 +5092,7 @@ msgid "turn on program traces" msgstr "zapnuté program" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" #: main.cpp:66 diff --git a/po/sv.po b/po/sv.po index 5fd3a1d..e298c24 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4792,7 +4792,7 @@ msgid "turn on program traces" msgstr "" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" #: main.cpp:66 diff --git a/po/tr.po b/po/tr.po index 62afa9f..e35fc2e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4741,7 +4741,7 @@ msgid "turn on program traces" msgstr "program izlerini aç" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" +msgid "dump the names of all defined TDEAction objects to stdout and quit" msgstr "" #: main.cpp:66 diff --git a/po/zh_CN.po b/po/zh_CN.po index 86b29cb..3cad8e4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4969,8 +4969,8 @@ msgid "turn on program traces" msgstr "打开程序跟踪" #: main.cpp:62 -msgid "dump the names of all defined KAction objects to stdout and quit" -msgstr "将所有已定义的KActions对象的名称输出到标准输出，然后退出。" +msgid "dump the names of all defined TDEAction objects to stdout and quit" +msgstr "将所有已定义的TDEActions对象的名称输出到标准输出，然后退出。" #: main.cpp:66 msgid "file to open"