summaryrefslogtreecommitdiffstats
path: root/tdewallet
diff options
context:
space:
mode:
Diffstat (limited to 'tdewallet')
-rw-r--r--tdewallet/allyourbase.cpp2
-rw-r--r--tdewallet/konfigurator/konfigurator.cpp32
-rw-r--r--tdewallet/kwmapeditor.cpp16
-rw-r--r--tdewallet/tdewalleteditor.cpp108
-rw-r--r--tdewallet/tdewalletmanager.cpp48
-rw-r--r--tdewallet/tdewalletpopup.cpp12
6 files changed, 109 insertions, 109 deletions
diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp
index bc132b0..4b7563f 100644
--- a/tdewallet/allyourbase.cpp
+++ b/tdewallet/allyourbase.cpp
@@ -621,7 +621,7 @@ class TDEWalletIconDrag : public TQIconDrag {
TDEWalletIconView::TDEWalletIconView(TQWidget *parent, const char *name)
: TDEIconView(parent, name) {
TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
- connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), TQT_SLOT(slotDropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)));
+ connect(this, TQ_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), TQ_SLOT(slotDropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)));
}
TDEWalletIconView::~TDEWalletIconView() {
diff --git a/tdewallet/konfigurator/konfigurator.cpp b/tdewallet/konfigurator/konfigurator.cpp
index 9dcb4c7..592101f 100644
--- a/tdewallet/konfigurator/konfigurator.cpp
+++ b/tdewallet/konfigurator/konfigurator.cpp
@@ -57,21 +57,21 @@ TDEWalletConfig::TDEWalletConfig(TQWidget *parent, const char *name, const TQStr
TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint());
vbox->add(_wcw = new WalletConfigWidget(this));
- connect(_wcw->_enabled, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(_wcw->_launchManager, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(_wcw->_autocloseManager, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(_wcw->_autoclose, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(_wcw->_closeIdle, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(_wcw->_openPrompt, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(_wcw->_screensaverLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(_wcw->_localWalletSelected, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
- connect(_wcw->_idleTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
- connect(_wcw->_launch, TQT_SIGNAL(clicked()), this, TQT_SLOT(launchManager()));
- connect(_wcw->_newWallet, TQT_SIGNAL(clicked()), this, TQT_SLOT(newNetworkWallet()));
- connect(_wcw->_newLocalWallet, TQT_SIGNAL(clicked()), this, TQT_SLOT(newLocalWallet()));
- connect(_wcw->_localWallet, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
- connect(_wcw->_defaultWallet, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
- connect(_wcw->_accessList, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)));
+ connect(_wcw->_enabled, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(_wcw->_launchManager, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(_wcw->_autocloseManager, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(_wcw->_autoclose, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(_wcw->_closeIdle, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(_wcw->_openPrompt, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(_wcw->_screensaverLock, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(_wcw->_localWalletSelected, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+ connect(_wcw->_idleTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+ connect(_wcw->_launch, TQ_SIGNAL(clicked()), this, TQ_SLOT(launchManager()));
+ connect(_wcw->_newWallet, TQ_SIGNAL(clicked()), this, TQ_SLOT(newNetworkWallet()));
+ connect(_wcw->_newLocalWallet, TQ_SIGNAL(clicked()), this, TQ_SLOT(newLocalWallet()));
+ connect(_wcw->_localWallet, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
+ connect(_wcw->_defaultWallet, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
+ connect(_wcw->_accessList, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)));
_wcw->_accessList->setAllColumnsShowFocus(true);
updateWalletLists();
@@ -316,7 +316,7 @@ void TDEWalletConfig::contextMenuRequested(TQListViewItem *item, const TQPoint&
if (item && item->parent()) {
TDEPopupMenu *m = new TDEPopupMenu(this);
m->insertTitle(item->parent()->text(0));
- m->insertItem(i18n("&Delete"), this, TQT_SLOT(deleteEntry()), Key_Delete);
+ m->insertItem(i18n("&Delete"), this, TQ_SLOT(deleteEntry()), Key_Delete);
m->popup(pos);
}
}
diff --git a/tdewallet/kwmapeditor.cpp b/tdewallet/kwmapeditor.cpp
index 87e2f88..3e5c5b5 100644
--- a/tdewallet/kwmapeditor.cpp
+++ b/tdewallet/kwmapeditor.cpp
@@ -34,10 +34,10 @@
KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent, const char *name)
: TQTable(0, 3, parent, name), _map(map) {
_ac = new TDEActionCollection(this);
- _copyAct = KStdAction::copy(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&)),
- this, TQT_SLOT(contextMenu(int,int,const TQPoint&)));
+ _copyAct = KStdAction::copy(this, TQ_SLOT(copy()), _ac);
+ connect(this, TQ_SIGNAL(valueChanged(int,int)), this, TQ_SIGNAL(dirty()));
+ connect(this, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)),
+ this, TQ_SLOT(contextMenu(int,int,const TQPoint&)));
setSelectionMode(TQTable::NoSelection);
horizontalHeader()->setLabel(0, TQString());
horizontalHeader()->setLabel(1, i18n("Key"));
@@ -57,7 +57,7 @@ void KWMapEditor::reload() {
insertRows(row, _map.count() - row);
for (int x = row; x < numRows(); ++x) {
TQPushButton *b = new TQPushButton("X", this);
- connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(erase()));
+ connect(b, TQ_SIGNAL(clicked()), this, TQ_SLOT(erase()));
setCellWidget(x, 0, b);
}
}
@@ -101,7 +101,7 @@ void KWMapEditor::addEntry() {
int x = numRows();
insertRows(x, 1);
TQPushButton *b = new TQPushButton("X", this);
- connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(erase()));
+ connect(b, TQ_SIGNAL(clicked()), this, TQ_SLOT(erase()));
setCellWidget(x, 0, b);
ensureCellVisible(x, 1);
setCurrentCell(x, 1);
@@ -118,7 +118,7 @@ void KWMapEditor::contextMenu(int row, int col, const TQPoint& pos) {
_contextRow = row;
_contextCol = col;
TDEPopupMenu *m = new TDEPopupMenu(this);
- m->insertItem(i18n("&New Entry"), this, TQT_SLOT(addEntry()));
+ m->insertItem(i18n("&New Entry"), this, TQ_SLOT(addEntry()));
_copyAct->plug(m);
m->popup(pos);
}
@@ -135,7 +135,7 @@ class InlineEditor : public TQTextEdit {
: TQTextEdit(), _p(p), row(row), col(col) {
setWFlags(WStyle_NoBorder | WDestructiveClose);
KWin::setType(winId(), NET::Override);
- connect(p, TQT_SIGNAL(destroyed()), TQT_SLOT(close()));
+ connect(p, TQ_SIGNAL(destroyed()), TQ_SLOT(close()));
}
virtual ~InlineEditor() { if (!_p) return; _p->setText(row, col, text()); _p->emitDirty(); }
diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp
index 81321f7..2b68fbd 100644
--- a/tdewallet/tdewalleteditor.cpp
+++ b/tdewallet/tdewalleteditor.cpp
@@ -66,7 +66,7 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget *
: TDEMainWindow(parent, name), _walletName(wallet), _nonLocal(isPath) {
_newWallet = false;
_ww = new WalletWidget(this, "Wallet Widget");
- _copyPassAction = KStdAction::copy(this, TQT_SLOT(copyPassword()), actionCollection());
+ _copyPassAction = KStdAction::copy(this, TQ_SLOT(copyPassword()), actionCollection());
TQVBoxLayout *box = new TQVBoxLayout(_ww->_entryListFrame);
box->setSpacing( KDialog::spacingHint() );
@@ -79,7 +79,7 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget *
box = new TQVBoxLayout(_ww->_entryStack->widget(2));
_mapEditorShowHide = new TQCheckBox(i18n("&Show values"), _ww->_entryStack->widget(2));
- connect(_mapEditorShowHide, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showHideMapEditorValue(bool)));
+ connect(_mapEditorShowHide, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showHideMapEditorValue(bool)));
_mapEditor = new KWMapEditor(_currentMap, _ww->_entryStack->widget(2));
box->addWidget(_mapEditorShowHide);
box->addWidget(_mapEditor);
@@ -88,40 +88,40 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget *
resize(600, 400);
- connect(_entryList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
- this, TQT_SLOT(entrySelectionChanged(TQListViewItem*)));
+ connect(_entryList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+ this, TQ_SLOT(entrySelectionChanged(TQListViewItem*)));
connect(_entryList,
- TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),
+ TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),
this,
- TQT_SLOT(listContextMenuRequested(TQListViewItem*,const TQPoint&,int)));
+ TQ_SLOT(listContextMenuRequested(TQListViewItem*,const TQPoint&,int)));
connect(_entryList,
- TQT_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)),
+ TQ_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)),
this,
- TQT_SLOT(listItemRenamed(TQListViewItem*, int, const TQString&)));
+ TQ_SLOT(listItemRenamed(TQListViewItem*, int, const TQString&)));
- connect(_ww->_passwordValue, TQT_SIGNAL(textChanged()),
- this, TQT_SLOT(entryEditted()));
- connect(_mapEditor, TQT_SIGNAL(dirty()),
- this, TQT_SLOT(entryEditted()));
+ connect(_ww->_passwordValue, TQ_SIGNAL(textChanged()),
+ this, TQ_SLOT(entryEditted()));
+ connect(_mapEditor, TQ_SIGNAL(dirty()),
+ this, TQ_SLOT(entryEditted()));
- connect(_ww->_undoChanges, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(restoreEntry()));
- connect(_ww->_saveChanges, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(saveEntry()));
+ connect(_ww->_undoChanges, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(restoreEntry()));
+ connect(_ww->_saveChanges, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(saveEntry()));
- connect(_ww->_showContents, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(showPasswordContents()));
- connect(_ww->_hideContents, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(hidePasswordContents()));
+ connect(_ww->_showContents, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(showPasswordContents()));
+ connect(_ww->_hideContents, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(hidePasswordContents()));
_walletIsOpen = false;
_w = TDEWallet::Wallet::openWallet(wallet, winId(), isPath ? TDEWallet::Wallet::Path : TDEWallet::Wallet::Asynchronous);
if (_w) {
- connect(_w, TQT_SIGNAL(walletOpened(bool)), this, TQT_SLOT(walletOpened(bool)));
- connect(_w, TQT_SIGNAL(walletClosed()), this, TQT_SLOT(walletClosed()));
- connect(_w, TQT_SIGNAL(folderUpdated(const TQString&)), this, TQT_SLOT(updateEntries(const TQString&)));
- connect(_w, TQT_SIGNAL(folderListUpdated()), this, TQT_SLOT(updateFolderList()));
+ connect(_w, TQ_SIGNAL(walletOpened(bool)), this, TQ_SLOT(walletOpened(bool)));
+ connect(_w, TQ_SIGNAL(walletClosed()), this, TQ_SLOT(walletClosed()));
+ connect(_w, TQ_SIGNAL(folderUpdated(const TQString&)), this, TQ_SLOT(updateEntries(const TQString&)));
+ connect(_w, TQ_SIGNAL(folderListUpdated()), this, TQ_SLOT(updateFolderList()));
updateFolderList();
} else {
kdDebug(2300) << "Wallet open failed!" << endl;
@@ -133,7 +133,7 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget *
setCaption(wallet);
- TQTimer::singleShot(0, this, TQT_SLOT(layout()));
+ TQTimer::singleShot(0, this, TQ_SLOT(layout()));
}
TDEWalletEditor::~TDEWalletEditor() {
@@ -159,49 +159,49 @@ void TDEWalletEditor::layout() {
void TDEWalletEditor::createActions() {
_newFolderAction = new TDEAction(i18n("&New Folder..."), "folder-new",
- 0, this, TQT_SLOT(createFolder()), actionCollection(),
+ 0, this, TQ_SLOT(createFolder()), actionCollection(),
"create_folder");
- connect(this, TQT_SIGNAL(enableFolderActions(bool)),
- _newFolderAction, TQT_SLOT(setEnabled(bool)));
+ connect(this, TQ_SIGNAL(enableFolderActions(bool)),
+ _newFolderAction, TQ_SLOT(setEnabled(bool)));
_deleteFolderAction = new TDEAction(i18n("&Delete Folder"), 0, 0,
- this, TQT_SLOT(deleteFolder()), actionCollection(),
+ this, TQ_SLOT(deleteFolder()), actionCollection(),
"delete_folder");
- connect(this, TQT_SIGNAL(enableContextFolderActions(bool)),
- _deleteFolderAction, TQT_SLOT(setEnabled(bool)));
- connect(this, TQT_SIGNAL(enableFolderActions(bool)),
- _deleteFolderAction, TQT_SLOT(setEnabled(bool)));
+ connect(this, TQ_SIGNAL(enableContextFolderActions(bool)),
+ _deleteFolderAction, TQ_SLOT(setEnabled(bool)));
+ connect(this, TQ_SIGNAL(enableFolderActions(bool)),
+ _deleteFolderAction, TQ_SLOT(setEnabled(bool)));
_passwordAction = new TDEAction(i18n("Change &Password..."), 0, 0, this,
- TQT_SLOT(changePassword()), actionCollection(),
+ TQ_SLOT(changePassword()), actionCollection(),
"change_password");
- connect(this, TQT_SIGNAL(enableWalletActions(bool)),
- _passwordAction, TQT_SLOT(setEnabled(bool)));
+ connect(this, TQ_SIGNAL(enableWalletActions(bool)),
+ _passwordAction, TQ_SLOT(setEnabled(bool)));
_mergeAction = new TDEAction(i18n("&Merge Wallet..."), 0, 0, this,
- TQT_SLOT(importWallet()), actionCollection(),
+ TQ_SLOT(importWallet()), actionCollection(),
"merge");
- connect(this, TQT_SIGNAL(enableWalletActions(bool)),
- _mergeAction, TQT_SLOT(setEnabled(bool)));
+ connect(this, TQ_SIGNAL(enableWalletActions(bool)),
+ _mergeAction, TQ_SLOT(setEnabled(bool)));
_importAction = new TDEAction(i18n("&Import XML..."), 0, 0, this,
- TQT_SLOT(importXML()), actionCollection(),
+ TQ_SLOT(importXML()), actionCollection(),
"import");
- connect(this, TQT_SIGNAL(enableWalletActions(bool)),
- _importAction, TQT_SLOT(setEnabled(bool)));
+ connect(this, TQ_SIGNAL(enableWalletActions(bool)),
+ _importAction, TQ_SLOT(setEnabled(bool)));
_exportAction = new TDEAction(i18n("&Export..."), 0, 0, this,
- TQT_SLOT(exportXML()), actionCollection(),
+ TQ_SLOT(exportXML()), actionCollection(),
"export");
- connect(this, TQT_SIGNAL(enableWalletActions(bool)),
- _exportAction, TQT_SLOT(setEnabled(bool)));
+ connect(this, TQ_SIGNAL(enableWalletActions(bool)),
+ _exportAction, TQ_SLOT(setEnabled(bool)));
- _saveAsAction = KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
- connect(this, TQT_SIGNAL(enableWalletActions(bool)),
- _saveAsAction, TQT_SLOT(setEnabled(bool)));
+ _saveAsAction = KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection());
+ connect(this, TQ_SIGNAL(enableWalletActions(bool)),
+ _saveAsAction, TQ_SLOT(setEnabled(bool)));
- KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
- KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
+ KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
+ KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()),
actionCollection());
emit enableWalletActions(false);
emit enableFolderActions(false);
@@ -585,9 +585,9 @@ void TDEWalletEditor::listContextMenuRequested(TQListViewItem *item, const TQPoi
m->insertTitle(title);
switch (menuClass) {
case TDEWalletEntryItemClass:
- m->insertItem(i18n("&New..." ), this, TQT_SLOT(newEntry()), Key_Insert);
- m->insertItem(i18n( "&Rename" ), this, TQT_SLOT(renameEntry()), Key_F2);
- m->insertItem(i18n( "&Delete" ), this, TQT_SLOT(deleteEntry()), Key_Delete);
+ m->insertItem(i18n("&New..." ), this, TQ_SLOT(newEntry()), Key_Insert);
+ m->insertItem(i18n( "&Rename" ), this, TQ_SLOT(renameEntry()), Key_F2);
+ m->insertItem(i18n( "&Delete" ), this, TQ_SLOT(deleteEntry()), Key_Delete);
if (ci && ci->type() == TDEWallet::Wallet::Password) {
m->insertSeparator();
_copyPassAction->plug(m);
@@ -595,7 +595,7 @@ void TDEWalletEditor::listContextMenuRequested(TQListViewItem *item, const TQPoi
break;
case TDEWalletContainerItemClass:
- m->insertItem(i18n( "&New..." ), this, TQT_SLOT(newEntry()), Key_Insert);
+ m->insertItem(i18n( "&New..." ), this, TQ_SLOT(newEntry()), Key_Insert);
break;
case TDEWalletFolderItemClass:
diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp
index 8bc0b20..37608c2 100644
--- a/tdewallet/tdewalletmanager.cpp
+++ b/tdewallet/tdewalletmanager.cpp
@@ -61,7 +61,7 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f)
_tray = new KSystemTray(this, "tdewalletmanager tray");
_tray->setPixmap(loadSystemTrayIcon("wallet_closed"));
TQToolTip::add(_tray, i18n("TDE Wallet: No wallets open."));
- connect(_tray, TQT_SIGNAL(quitSelected()), TQT_SLOT(shuttingDown()));
+ connect(_tray, TQ_SIGNAL(quitSelected()), TQ_SLOT(shuttingDown()));
TQStringList wl = TDEWallet::Wallet::walletList();
bool isOpen = false;
for (TQStringList::Iterator it = wl.begin(); it != wl.end(); ++it) {
@@ -76,7 +76,7 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f)
if (!isOpen && kapp->isRestored()) {
delete _tray;
_tray = 0L;
- TQTimer::singleShot( 0, kapp, TQT_SLOT( quit()));
+ TQTimer::singleShot( 0, kapp, TQ_SLOT( quit()));
return;
}
} else {
@@ -84,8 +84,8 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f)
}
_iconView = new TDEWalletIconView(this, "tdewalletmanager icon view");
- connect(_iconView, TQT_SIGNAL(executed(TQIconViewItem*)), this, TQT_SLOT(openWallet(TQIconViewItem*)));
- connect(_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQT_SLOT(contextMenu(TQIconViewItem*, const TQPoint&)));
+ connect(_iconView, TQ_SIGNAL(executed(TQIconViewItem*)), this, TQ_SLOT(openWallet(TQIconViewItem*)));
+ connect(_iconView, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQ_SLOT(contextMenu(TQIconViewItem*, const TQPoint&)));
updateWalletDisplay();
setCentralWidget(_iconView);
@@ -94,13 +94,13 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f)
_dcopRef = new DCOPRef("kded", "tdewalletd");
_dcopRef->dcopClient()->setNotifications(true);
connect(_dcopRef->dcopClient(),
- TQT_SIGNAL(applicationRemoved(const TQCString&)),
+ TQ_SIGNAL(applicationRemoved(const TQCString&)),
this,
- TQT_SLOT(possiblyRescan(const TQCString&)));
+ TQ_SLOT(possiblyRescan(const TQCString&)));
connect(_dcopRef->dcopClient(),
- TQT_SIGNAL(applicationRegistered(const TQCString&)),
+ TQ_SIGNAL(applicationRegistered(const TQCString&)),
this,
- TQT_SLOT(possiblyRescan(const TQCString&)));
+ TQ_SLOT(possiblyRescan(const TQCString&)));
connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "allWalletsClosed()", "allWalletsClosed()", false);
connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "walletClosed(TQString)", "updateWalletDisplay()", false);
@@ -113,27 +113,27 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f)
// open. Must check that a wallet is still open here.
new TDEAction(i18n("&New Wallet..."), "tdewalletmanager", 0, this,
- TQT_SLOT(createWallet()), actionCollection(),
+ TQ_SLOT(createWallet()), actionCollection(),
"wallet_create");
TDEAction *act = new TDEAction(i18n("Configure &Wallet..."), "configure",
- 0, this, TQT_SLOT(setupWallet()), actionCollection(),
+ 0, this, TQ_SLOT(setupWallet()), actionCollection(),
"wallet_settings");
if (_tray) {
act->plug(_tray->contextMenu());
}
act = new TDEAction(i18n("Close &All Wallets"), 0, 0, this,
- TQT_SLOT(closeAllWallets()), actionCollection(),
+ TQ_SLOT(closeAllWallets()), actionCollection(),
"close_all_wallets");
if (_tray) {
act->plug(_tray->contextMenu());
}
- KStdAction::quit(this, TQT_SLOT(shuttingDown()), actionCollection());
- KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
+ KStdAction::quit(this, TQ_SLOT(shuttingDown()), actionCollection());
+ KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()),
actionCollection());
createGUI("tdewalletmanager.rc");
- accel->connectItem(accel->insertItem(Key_Return), this, TQT_SLOT(openWallet()));
- accel->connectItem(accel->insertItem(Key_Delete), this, TQT_SLOT(deleteWallet()));
+ accel->connectItem(accel->insertItem(Key_Return), this, TQ_SLOT(openWallet()));
+ accel->connectItem(accel->insertItem(Key_Delete), this, TQ_SLOT(deleteWallet()));
if (_tray) {
_tray->show();
@@ -208,11 +208,11 @@ TQPtrStack<TQIconViewItem> trash;
void TDEWalletManager::contextMenu(TQIconViewItem *item, const TQPoint& pos) {
if (item) {
TQGuardedPtr<TDEWalletPopup> popupMenu = new TDEWalletPopup(item->text(), this);
- connect(popupMenu, TQT_SIGNAL(walletOpened(const TQString&)), this, TQT_SLOT(openWallet(const TQString&)));
- connect(popupMenu, TQT_SIGNAL(walletClosed(const TQString&)), this, TQT_SLOT(closeWallet(const TQString&)));
- connect(popupMenu, TQT_SIGNAL(walletDeleted(const TQString&)), this, TQT_SLOT(deleteWallet(const TQString&)));
- connect(popupMenu, TQT_SIGNAL(walletChangePassword(const TQString&)), this, TQT_SLOT(changeWalletPassword(const TQString&)));
- connect(popupMenu, TQT_SIGNAL(walletCreated()), this, TQT_SLOT(createWallet()));
+ connect(popupMenu, TQ_SIGNAL(walletOpened(const TQString&)), this, TQ_SLOT(openWallet(const TQString&)));
+ connect(popupMenu, TQ_SIGNAL(walletClosed(const TQString&)), this, TQ_SLOT(closeWallet(const TQString&)));
+ connect(popupMenu, TQ_SIGNAL(walletDeleted(const TQString&)), this, TQ_SLOT(deleteWallet(const TQString&)));
+ connect(popupMenu, TQ_SIGNAL(walletChangePassword(const TQString&)), this, TQ_SLOT(changeWalletPassword(const TQString&)));
+ connect(popupMenu, TQ_SIGNAL(walletCreated()), this, TQ_SLOT(createWallet()));
popupMenu->exec(pos);
delete popupMenu;
}
@@ -256,8 +256,8 @@ void TDEWalletManager::changeWalletPassword(const TQString& walletName) {
void TDEWalletManager::openWalletFile(const TQString& path) {
TDEWalletEditor *we = new TDEWalletEditor(path, true, this, "Wallet Editor");
if (we->isOpen()) {
- connect(we, TQT_SIGNAL(editorClosed(TDEMainWindow*)),
- this, TQT_SLOT(editorClosed(TDEMainWindow*)));
+ connect(we, TQ_SIGNAL(editorClosed(TDEMainWindow*)),
+ this, TQ_SLOT(editorClosed(TDEMainWindow*)));
we->show();
} else {
KMessageBox::sorry(this, i18n("Error opening wallet %1.").arg(path));
@@ -297,8 +297,8 @@ void TDEWalletManager::openWallet(const TQString& walletName, bool newWallet) {
TDEWalletEditor *we = new TDEWalletEditor(walletName, false, this, "Wallet Editor");
we->setNewWallet(newWallet);
if (we->isOpen()) {
- connect(we, TQT_SIGNAL(editorClosed(TDEMainWindow*)),
- this, TQT_SLOT(editorClosed(TDEMainWindow*)));
+ connect(we, TQ_SIGNAL(editorClosed(TDEMainWindow*)),
+ this, TQ_SLOT(editorClosed(TDEMainWindow*)));
we->show();
_windows.append(we);
} else if (!newWallet) {
diff --git a/tdewallet/tdewalletpopup.cpp b/tdewallet/tdewalletpopup.cpp
index e4939cc..5639f55 100644
--- a/tdewallet/tdewalletpopup.cpp
+++ b/tdewallet/tdewalletpopup.cpp
@@ -35,15 +35,15 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c
TDEAction *act;
act = new TDEAction(i18n("&New Wallet..."), 0, 0, this,
- TQT_SLOT(createWallet()), ac, "wallet_create");
+ TQ_SLOT(createWallet()), ac, "wallet_create");
act->plug(this);
act = new TDEAction(i18n("&Open..."), 0, Key_Return, this,
- TQT_SLOT(openWallet()), ac, "wallet_open");
+ TQ_SLOT(openWallet()), ac, "wallet_open");
act->plug(this);
act = new TDEAction(i18n("Change &Password..."), 0, 0, this,
- TQT_SLOT(changeWalletPassword()), ac, "wallet_password");
+ TQ_SLOT(changeWalletPassword()), ac, "wallet_password");
act->plug(this);
TQStringList ul = TDEWallet::Wallet::users(wallet);
@@ -52,7 +52,7 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c
int id = 7000;
for (TQStringList::Iterator it = ul.begin(); it != ul.end(); ++it) {
_appMap[id] = *it;
- pm->insertItem(*it, this, TQT_SLOT(disconnectApp(int)), 0, id);
+ pm->insertItem(*it, this, TQ_SLOT(disconnectApp(int)), 0, id);
pm->setItemParameter(id, id);
id++;
}
@@ -61,14 +61,14 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c
}
act = KStdAction::close( this,
- TQT_SLOT(closeWallet()), ac, "wallet_close");
+ TQ_SLOT(closeWallet()), ac, "wallet_close");
// FIXME: let's track this inside the manager so we don't need a dcop
// roundtrip here.
act->setEnabled(TDEWallet::Wallet::isOpen(wallet));
act->plug(this);
act = new TDEAction(i18n("&Delete"), 0, Key_Delete, this,
- TQT_SLOT(deleteWallet()), ac, "wallet_delete");
+ TQ_SLOT(deleteWallet()), ac, "wallet_delete");
act->plug(this);
}