diff options
Diffstat (limited to 'tdewallet')
-rw-r--r-- | tdewallet/allyourbase.cpp | 8 | ||||
-rw-r--r-- | tdewallet/allyourbase.h | 8 | ||||
-rw-r--r-- | tdewallet/konfigurator/konfigurator.cpp | 2 | ||||
-rw-r--r-- | tdewallet/kwmapeditor.cpp | 4 | ||||
-rw-r--r-- | tdewallet/kwmapeditor.h | 8 | ||||
-rw-r--r-- | tdewallet/tdewalleteditor.cpp | 18 | ||||
-rw-r--r-- | tdewallet/tdewalleteditor.h | 12 | ||||
-rw-r--r-- | tdewallet/tdewalletmanager.cpp | 20 | ||||
-rw-r--r-- | tdewallet/tdewalletmanager.h | 6 | ||||
-rw-r--r-- | tdewallet/tdewalletpopup.cpp | 16 | ||||
-rw-r--r-- | tdewallet/tdewalletpopup.h | 2 |
11 files changed, 52 insertions, 52 deletions
diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp index 221c9b4..1939f5a 100644 --- a/tdewallet/allyourbase.cpp +++ b/tdewallet/allyourbase.cpp @@ -39,7 +39,7 @@ * KWalletFolderItem - ListView items to represent tdewallet folders */ KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, const TQString &name, int entries) -: KListViewItem(parent),_wallet(w),_name(name),_entries(entries) { +: TDEListViewItem(parent),_wallet(w),_name(name),_entries(entries) { setText(0, TQString("%1 (%2)").arg(_name).arg(_entries)); setRenameEnabled(0, false); setDragEnabled(true); @@ -122,7 +122,7 @@ KWalletFolderItem::~KWalletFolderItem() { * passwords, maps, ... */ KWalletContainerItem::KWalletContainerItem(TQListViewItem* parent, const TQString &name, KWallet::Wallet::EntryType type) -: KListViewItem(parent, name), _type(type) { +: TDEListViewItem(parent, name), _type(type) { setRenameEnabled(0, false); setDragEnabled(true); } @@ -155,7 +155,7 @@ TQListViewItem *KWalletContainerItem::getItem(const TQString& key) { * KWalletEntryItem - ListView items to represent tdewallet entries */ KWalletEntryItem::KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename) -: KListViewItem(parent, ename), _wallet(w), _oldName(ename) { +: TDEListViewItem(parent, ename), _wallet(w), _oldName(ename) { setRenameEnabled(0, true); setDragEnabled(true); } @@ -349,7 +349,7 @@ class KWalletFolderDrag : public TQStoredDrag { * KWalletEntryList - A listview to store wallet entries */ KWalletEntryList::KWalletEntryList(TQWidget *parent, const char *name) -: KListView(parent, name) { +: TDEListView(parent, name) { addColumn(i18n("Folders")); setRootIsDecorated(true); setDefaultRenameAction(Reject); diff --git a/tdewallet/allyourbase.h b/tdewallet/allyourbase.h index fe9bd05..34c37d3 100644 --- a/tdewallet/allyourbase.h +++ b/tdewallet/allyourbase.h @@ -37,7 +37,7 @@ enum KWalletListItemClasses { KWalletUnknownClass = 2000 }; -class KWalletEntryItem : public KListViewItem { +class KWalletEntryItem : public TDEListViewItem { public: KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename); virtual ~KWalletEntryItem(); @@ -55,7 +55,7 @@ class KWalletEntryItem : public KListViewItem { TQString _oldName; }; -class KWalletContainerItem : public KListViewItem { +class KWalletContainerItem : public TDEListViewItem { public: KWalletContainerItem(TQListViewItem* parent, const TQString& name, KWallet::Wallet::EntryType type); @@ -71,7 +71,7 @@ class KWalletContainerItem : public KListViewItem { KWallet::Wallet::EntryType _type; }; -class KWalletFolderItem : public KListViewItem { +class KWalletFolderItem : public TDEListViewItem { public: KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, const TQString& name, int entries); @@ -95,7 +95,7 @@ class KWalletFolderItem : public KListViewItem { int _entries; }; -class KWalletEntryList : public KListView { +class KWalletEntryList : public TDEListView { Q_OBJECT public: diff --git a/tdewallet/konfigurator/konfigurator.cpp b/tdewallet/konfigurator/konfigurator.cpp index 04639fa..406a58e 100644 --- a/tdewallet/konfigurator/konfigurator.cpp +++ b/tdewallet/konfigurator/konfigurator.cpp @@ -303,7 +303,7 @@ TQString KWalletConfig::quickHelp() const { void KWalletConfig::contextMenuRequested(TQListViewItem *item, const TQPoint& pos, int col) { Q_UNUSED(col) if (item && item->parent()) { - KPopupMenu *m = new KPopupMenu(this); + TDEPopupMenu *m = new TDEPopupMenu(this); m->insertTitle(item->parent()->text(0)); m->insertItem(i18n("&Delete"), this, TQT_SLOT(deleteEntry()), Key_Delete); m->popup(pos); diff --git a/tdewallet/kwmapeditor.cpp b/tdewallet/kwmapeditor.cpp index 2a9e332..3d85950 100644 --- a/tdewallet/kwmapeditor.cpp +++ b/tdewallet/kwmapeditor.cpp @@ -33,7 +33,7 @@ KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent, const char *name) : TQTable(0, 3, parent, name), _map(map) { - _ac = new KActionCollection(this); + _ac = new TDEActionCollection(this); _copyAct = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), _ac); connect(this, TQT_SIGNAL(valueChanged(int,int)), this, TQT_SIGNAL(dirty())); connect(this, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), @@ -117,7 +117,7 @@ void KWMapEditor::emitDirty() { void KWMapEditor::contextMenu(int row, int col, const TQPoint& pos) { _contextRow = row; _contextCol = col; - KPopupMenu *m = new KPopupMenu(this); + TDEPopupMenu *m = new TDEPopupMenu(this); m->insertItem(i18n("&New Entry"), this, TQT_SLOT(addEntry())); _copyAct->plug(m); m->popup(pos); diff --git a/tdewallet/kwmapeditor.h b/tdewallet/kwmapeditor.h index 0fade7b..cad9c6a 100644 --- a/tdewallet/kwmapeditor.h +++ b/tdewallet/kwmapeditor.h @@ -24,8 +24,8 @@ #include <tqstring.h> #include <tqtable.h> -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class KWMapEditor : public TQTable { Q_OBJECT @@ -55,8 +55,8 @@ class KWMapEditor : public TQTable { private: TQMap<TQString,TQString>& _map; int _contextRow, _contextCol; - KActionCollection *_ac; - KAction *_copyAct; + TDEActionCollection *_ac; + TDEAction *_copyAct; }; #endif diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp index ee07ccf..05b6e83 100644 --- a/tdewallet/tdewalleteditor.cpp +++ b/tdewallet/tdewalleteditor.cpp @@ -63,7 +63,7 @@ #include <stdlib.h> KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *parent, const char *name) -: KMainWindow(parent, name), _walletName(wallet), _nonLocal(isPath) { +: TDEMainWindow(parent, name), _walletName(wallet), _nonLocal(isPath) { _newWallet = false; _ww = new WalletWidget(this, "Wallet Widget"); _copyPassAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copyPassword()), actionCollection()); @@ -72,7 +72,7 @@ KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *pare box->setSpacing( KDialog::spacingHint() ); box->setMargin( KDialog::marginHint() ); _entryList = new KWalletEntryList(_ww->_entryListFrame, "Wallet Entry List"); - box->addWidget(new KListViewSearchLineWidget(_entryList, _ww->_entryListFrame)); + box->addWidget(new TDEListViewSearchLineWidget(_entryList, _ww->_entryListFrame)); box->addWidget(_entryList); _ww->_entryStack->setEnabled(true); @@ -158,13 +158,13 @@ void KWalletEditor::layout() { } void KWalletEditor::createActions() { - _newFolderAction = new KAction(i18n("&New Folder..."), "folder_new", + _newFolderAction = new TDEAction(i18n("&New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT(createFolder()), actionCollection(), "create_folder"); connect(this, TQT_SIGNAL(enableFolderActions(bool)), _newFolderAction, TQT_SLOT(setEnabled(bool))); - _deleteFolderAction = new KAction(i18n("&Delete Folder"), 0, 0, + _deleteFolderAction = new TDEAction(i18n("&Delete Folder"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(deleteFolder()), actionCollection(), "delete_folder"); connect(this, TQT_SIGNAL(enableContextFolderActions(bool)), @@ -172,25 +172,25 @@ void KWalletEditor::createActions() { connect(this, TQT_SIGNAL(enableFolderActions(bool)), _deleteFolderAction, TQT_SLOT(setEnabled(bool))); - _passwordAction = new KAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this), + _passwordAction = new TDEAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(changePassword()), actionCollection(), "change_password"); connect(this, TQT_SIGNAL(enableWalletActions(bool)), _passwordAction, TQT_SLOT(setEnabled(bool))); - _mergeAction = new KAction(i18n("&Merge Wallet..."), 0, 0, TQT_TQOBJECT(this), + _mergeAction = new TDEAction(i18n("&Merge Wallet..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(importWallet()), actionCollection(), "merge"); connect(this, TQT_SIGNAL(enableWalletActions(bool)), _mergeAction, TQT_SLOT(setEnabled(bool))); - _importAction = new KAction(i18n("&Import XML..."), 0, 0, TQT_TQOBJECT(this), + _importAction = new TDEAction(i18n("&Import XML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(importXML()), actionCollection(), "import"); connect(this, TQT_SIGNAL(enableWalletActions(bool)), _importAction, TQT_SLOT(setEnabled(bool))); - _exportAction = new KAction(i18n("&Export..."), 0, 0, TQT_TQOBJECT(this), + _exportAction = new TDEAction(i18n("&Export..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportXML()), actionCollection(), "export"); connect(this, TQT_SIGNAL(enableWalletActions(bool)), @@ -577,7 +577,7 @@ void KWalletEditor::listContextMenuRequested(TQListViewItem *item, const TQPoint menuClass = static_cast<KWalletListItemClasses>(item->rtti()); } - KPopupMenu *m = new KPopupMenu(this); + TDEPopupMenu *m = new TDEPopupMenu(this); if (item) { TQString title = item->text(0); // I think 200 pixels is wide enough for a title diff --git a/tdewallet/tdewalleteditor.h b/tdewallet/tdewalleteditor.h index fa7ea25..6016c95 100644 --- a/tdewallet/tdewalleteditor.h +++ b/tdewallet/tdewalleteditor.h @@ -26,7 +26,7 @@ #include <kmainwindow.h> #include <tqstringlist.h> -class KAction; +class TDEAction; class TQIconViewItem; class TQListViewItem; class TQCheckBox; @@ -34,7 +34,7 @@ class KWalletFolderIconView; class KWalletEntryList; class KWMapEditor; -class KWalletEditor : public KMainWindow { +class KWalletEditor : public TDEMainWindow { Q_OBJECT @@ -84,7 +84,7 @@ class KWalletEditor : public KMainWindow { void enableWalletActions(bool enable); void enableFolderActions(bool enable); void enableContextFolderActions(bool enable); - void editorClosed(KMainWindow*); + void editorClosed(TDEMainWindow*); public: TQString _walletName; @@ -96,9 +96,9 @@ class KWalletEditor : public KMainWindow { WalletWidget *_ww; KWalletEntryList *_entryList; bool _walletIsOpen; - KAction *_newFolderAction, *_deleteFolderAction; - KAction *_passwordAction, *_exportAction, *_saveAsAction, *_mergeAction, *_importAction; - KAction *_copyPassAction; + TDEAction *_newFolderAction, *_deleteFolderAction; + TDEAction *_passwordAction, *_exportAction, *_saveAsAction, *_mergeAction, *_importAction; + TDEAction *_copyPassAction; TQLabel*_details; TQString _currentFolder; TQMap<TQString,TQString> _currentMap; // save memory by storing diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp index 9b1a7df..25978f5 100644 --- a/tdewallet/tdewalletmanager.cpp +++ b/tdewallet/tdewalletmanager.cpp @@ -47,7 +47,7 @@ #include <tqtooltip.h> KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f) -: KMainWindow(parent, name, f), DCOPObject("KWalletManager") { +: TDEMainWindow(parent, name, f), DCOPObject("KWalletManager") { TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet"); _tdewalletdLaunch = false; TQAccel *accel = new TQAccel(this, "tdewalletmanager"); @@ -112,16 +112,16 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f) // wallet closes before we are done opening. We will then stay // open. Must check that a wallet is still open here. - new KAction(i18n("&New Wallet..."), "tdewalletmanager", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&New Wallet..."), "tdewalletmanager", 0, TQT_TQOBJECT(this), TQT_SLOT(createWallet()), actionCollection(), "wallet_create"); - KAction *act = new KAction(i18n("Configure &Wallet..."), "configure", + TDEAction *act = new TDEAction(i18n("Configure &Wallet..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(setupWallet()), actionCollection(), "wallet_settings"); if (_tray) { act->plug(_tray->contextMenu()); } - act = new KAction(i18n("Close &All Wallets"), 0, 0, TQT_TQOBJECT(this), + act = new TDEAction(i18n("Close &All Wallets"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(closeAllWallets()), actionCollection(), "close_all_wallets"); if (_tray) { @@ -256,8 +256,8 @@ void KWalletManager::changeWalletPassword(const TQString& walletName) { void KWalletManager::openWalletFile(const TQString& path) { KWalletEditor *we = new KWalletEditor(path, true, this, "Wallet Editor"); if (we->isOpen()) { - connect(we, TQT_SIGNAL(editorClosed(KMainWindow*)), - this, TQT_SLOT(editorClosed(KMainWindow*))); + connect(we, TQT_SIGNAL(editorClosed(TDEMainWindow*)), + this, TQT_SLOT(editorClosed(TDEMainWindow*))); we->show(); } else { KMessageBox::sorry(this, i18n("Error opening wallet %1.").arg(path)); @@ -286,7 +286,7 @@ void KWalletManager::openWallet(const TQString& walletName) { void KWalletManager::openWallet(const TQString& walletName, bool newWallet) { // Don't allow a wallet to open in two windows - for (KMainWindow *w = _windows.first(); w; w = _windows.next()) { + for (TDEMainWindow *w = _windows.first(); w; w = _windows.next()) { KWalletEditor *e = static_cast<KWalletEditor*>(w); if (e->isOpen() && e->_walletName == walletName) { w->raise(); @@ -297,8 +297,8 @@ void KWalletManager::openWallet(const TQString& walletName, bool newWallet) { KWalletEditor *we = new KWalletEditor(walletName, false, this, "Wallet Editor"); we->setNewWallet(newWallet); if (we->isOpen()) { - connect(we, TQT_SIGNAL(editorClosed(KMainWindow*)), - this, TQT_SLOT(editorClosed(KMainWindow*))); + connect(we, TQT_SIGNAL(editorClosed(TDEMainWindow*)), + this, TQT_SLOT(editorClosed(TDEMainWindow*))); we->show(); _windows.append(we); } else if (!newWallet) { @@ -337,7 +337,7 @@ void KWalletManager::possiblyQuit() { } -void KWalletManager::editorClosed(KMainWindow* e) { +void KWalletManager::editorClosed(TDEMainWindow* e) { _windows.remove(e); } diff --git a/tdewallet/tdewalletmanager.h b/tdewallet/tdewalletmanager.h index 23103d5..0a12f99 100644 --- a/tdewallet/tdewalletmanager.h +++ b/tdewallet/tdewalletmanager.h @@ -30,7 +30,7 @@ class TQIconViewItem; class DCOPRef; -class KWalletManager : public KMainWindow, public DCOPObject { +class KWalletManager : public TDEMainWindow, public DCOPObject { Q_OBJECT // K_DCOP @@ -66,7 +66,7 @@ class KWalletManager : public KMainWindow, public DCOPObject { private slots: void shuttingDown(); void possiblyQuit(); - void editorClosed(KMainWindow* e); + void editorClosed(TDEMainWindow* e); void possiblyRescan(const TQCString& app); void setupWallet(); void openWallet(); @@ -78,7 +78,7 @@ class KWalletManager : public KMainWindow, public DCOPObject { bool _shuttingDown; KWalletIconView *_iconView; DCOPRef *_dcopRef; - TQPtrList<KMainWindow> _windows; + TQPtrList<TDEMainWindow> _windows; bool _tdewalletdLaunch; }; diff --git a/tdewallet/tdewalletpopup.cpp b/tdewallet/tdewalletpopup.cpp index 05f142d..4a2037a 100644 --- a/tdewallet/tdewalletpopup.cpp +++ b/tdewallet/tdewalletpopup.cpp @@ -29,26 +29,26 @@ #include <kstdguiitem.h> KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *parent, const char *name) -: KPopupMenu(parent, name), _walletName(wallet) { +: TDEPopupMenu(parent, name), _walletName(wallet) { insertTitle(wallet); - KActionCollection *ac = new KActionCollection(this, "tdewallet context actions"); - KAction *act; + TDEActionCollection *ac = new TDEActionCollection(this, "tdewallet context actions"); + TDEAction *act; - act = new KAction(i18n("&New Wallet..."), 0, 0, TQT_TQOBJECT(this), + act = new TDEAction(i18n("&New Wallet..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(createWallet()), ac, "wallet_create"); act->plug(this); - act = new KAction(i18n("&Open..."), 0, Key_Return, TQT_TQOBJECT(this), + act = new TDEAction(i18n("&Open..."), 0, Key_Return, TQT_TQOBJECT(this), TQT_SLOT(openWallet()), ac, "wallet_open"); act->plug(this); - act = new KAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this), + act = new TDEAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(changeWalletPassword()), ac, "wallet_password"); act->plug(this); TQStringList ul = KWallet::Wallet::users(wallet); if (!ul.isEmpty()) { - KPopupMenu *pm = new KPopupMenu(this, "Disconnect Apps"); + TDEPopupMenu *pm = new TDEPopupMenu(this, "Disconnect Apps"); int id = 7000; for (TQStringList::Iterator it = ul.begin(); it != ul.end(); ++it) { _appMap[id] = *it; @@ -67,7 +67,7 @@ KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *parent, const char act->setEnabled(KWallet::Wallet::isOpen(wallet)); act->plug(this); - act = new KAction(i18n("&Delete"), 0, Key_Delete, TQT_TQOBJECT(this), + act = new TDEAction(i18n("&Delete"), 0, Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteWallet()), ac, "wallet_delete"); act->plug(this); } diff --git a/tdewallet/tdewalletpopup.h b/tdewallet/tdewalletpopup.h index 8ef78b0..c0b5616 100644 --- a/tdewallet/tdewalletpopup.h +++ b/tdewallet/tdewalletpopup.h @@ -24,7 +24,7 @@ #include <tqmap.h> #include <tqstring.h> -class KWalletPopup : public KPopupMenu { +class KWalletPopup : public TDEPopupMenu { Q_OBJECT |