diff options
Diffstat (limited to 'src/basket.cpp')
| -rw-r--r-- | src/basket.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/basket.cpp b/src/basket.cpp index 0ec22ca..f18c8cc 100644 --- a/src/basket.cpp +++ b/src/basket.cpp @@ -827,7 +827,7 @@ void Basket::loadProperties(const TQDomElement &properties) TQDomElement shortcut = XMLWork::getElement(properties, "shortcut"); TQString actionStrings[] = { "show", "globalShow", "globalSwitch" }; - KShortcut combination = KShortcut( shortcut.attribute( "combination", m_action->shortcut().toStringInternal() ) ); + TDEShortcut combination = TDEShortcut( shortcut.attribute( "combination", m_action->shortcut().toStringInternal() ) ); TQString actionString = shortcut.attribute( "action" ); int action = shortcutAction(); if (actionString == actionStrings[0]) action = 0; @@ -1293,7 +1293,7 @@ TQString Basket::fullPathForFileName(const TQString &fileName) } -void Basket::setShortcut(KShortcut shortcut, int action) +void Basket::setShortcut(TDEShortcut shortcut, int action) { if(!Global::globalAccel) return; @@ -1305,7 +1305,7 @@ void Basket::setShortcut(KShortcut shortcut, int action) m_shortcutAction = action; if (action > 0) - Global::globalAccel->insert(sAction, m_action->text(), /*whatsThis=*/"", m_action->shortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(activatedShortcut()), /*configurable=*/false); + Global::globalAccel->insert(sAction, m_action->text(), /*whatsThis=*/"", m_action->shortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(activatedShortcut()), /*configurable=*/false); Global::globalAccel->updateConnections(); } @@ -1354,7 +1354,7 @@ Basket::Basket(TQWidget *parent, const TQString &folderName) m_finishLoadOnFirstShow(false), m_relayoutOnNextShow(false) { TQString sAction = "local_basket_activate_" + folderName; - m_action = new KAction("FAKE TEXT", "FAKE ICON", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(activatedShortcut()), Global::bnpView->actionCollection(), sAction); + m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(activatedShortcut()), Global::bnpView->actionCollection(), sAction); m_action->setShortcutConfigurable(false); // We do it in the basket properties dialog (and keep it in sync with the global one) if (!m_folderName.endsWith("/")) @@ -1579,7 +1579,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event) m_clickedToInsert = clicked; m_zoneToInsert = zone; m_posToInsert = event->pos(); - KPopupMenu* menu = (KPopupMenu*)(Global::bnpView->popupMenu("insert_popup")); + TDEPopupMenu* menu = (TDEPopupMenu*)(Global::bnpView->popupMenu("insert_popup")); if (!menu->title(/*id=*/120).isEmpty()) // If we already added a title, remove it because it would be kept and then added several times: menu->removeItem(/*id=*/120); menu->insertTitle((zone == Note::TopGroup || zone == Note::BottomGroup ? i18n("The verb (Group New Note)", "Group") : i18n("The verb (Insert New Note)", "Insert")), /*id=*/120, /*index=*/0); @@ -3374,7 +3374,7 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber) TQKeySequence sequence = tag->shortcut().operator TQKeySequence(); bool sequenceOnDelete = (nextState == 0 && !tag->shortcut().isNull()); - KPopupMenu menu(this); + TDEPopupMenu menu(this); if (tag->countStates() == 1) { menu.insertTitle(/*SmallIcon(state->icon()), */tag->name()); menu.insertItem( SmallIconSet("editdelete"), i18n("&Remove"), 1 ); @@ -3481,7 +3481,7 @@ void Basket::popupTagsMenu(Note *note) { m_tagPopupNote = note; - KPopupMenu menu(this); + TDEPopupMenu menu(this); menu.insertTitle(i18n("Tags")); // TQValueList<Tag*>::iterator it; // Tag *currentTag; @@ -4285,7 +4285,7 @@ void Basket::noteOpen(Note *note) */ bool KRun__displayOpenWithDialog(const KURL::List& lst, bool tempFiles, const TQString &text) { - if (kapp && !kapp->authorizeKAction("openwith")) { + if (kapp && !kapp->authorizeTDEAction("openwith")) { KMessageBox::sorry(0L, i18n("You are not authorized to open this file.")); // TODO: Better message, i18n freeze :-( return false; } |