summaryrefslogtreecommitdiffstats
path: root/knotes
diff options
context:
space:
mode:
Diffstat (limited to 'knotes')
-rw-r--r--knotes/ChangeLog2
-rw-r--r--knotes/knote.cpp38
-rw-r--r--knotes/knote.h22
-rw-r--r--knotes/knoteconfigdlg.cpp4
-rw-r--r--knotes/knoteedit.cpp36
-rw-r--r--knotes/knoteedit.h64
-rw-r--r--knotes/knotesapp.cpp34
-rw-r--r--knotes/knotesapp.h14
8 files changed, 107 insertions, 107 deletions
diff --git a/knotes/ChangeLog b/knotes/ChangeLog
index fa22d2ec4..dfe1fc951 100644
--- a/knotes/ChangeLog
+++ b/knotes/ChangeLog
@@ -825,7 +825,7 @@ ChangeLog for KNotes
I do this for the popup menu in the taskbar as well. I assume this
is correct?
- Replaced QPopupMenu with KPopupMenu in the taskbar widget.
+ Replaced QPopupMenu with TDEPopupMenu in the taskbar widget.
1999/12/30 Espen Sand <espen@kde.org>
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index e59be706b..ea96d4c80 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -104,47 +104,47 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
// create the menu items for the note - not the editor...
// rename, mail, print, save as, insert date, alarm, close, delete, new note
- new KAction( i18n("New"), "filenew", 0,
+ new TDEAction( i18n("New"), "filenew", 0,
TQT_TQOBJECT(this),TQT_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" );
- new KAction( i18n("Rename..."), "text", 0,
+ new TDEAction( i18n("Rename..."), "text", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "rename_note" );
- m_readOnly = new KToggleAction( i18n("Lock"), "lock" , 0,
+ m_readOnly = new TDEToggleAction( i18n("Lock"), "lock" , 0,
TQT_TQOBJECT(this), TQT_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" );
m_readOnly->setCheckedState( KGuiItem( i18n("Unlock"), "unlock" ) );
- new KAction( i18n("Hide"), "fileclose" , Key_Escape,
+ new TDEAction( i18n("Hide"), "fileclose" , Key_Escape,
TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection(), "hide_note" );
- new KAction( i18n("Delete"), "knotes_delete", 0,
+ new TDEAction( i18n("Delete"), "knotes_delete", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotKill()), actionCollection(), "delete_note" );
- new KAction( i18n("Insert Date"), "knotes_date", 0 ,
+ new TDEAction( i18n("Insert Date"), "knotes_date", 0 ,
TQT_TQOBJECT(this), TQT_SLOT(slotInsDate()), actionCollection(), "insert_date" );
- new KAction( i18n("Set Alarm..."), "knotes_alarm", 0 ,
+ new TDEAction( i18n("Set Alarm..."), "knotes_alarm", 0 ,
TQT_TQOBJECT(this), TQT_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" );
- new KAction( i18n("Send..."), "network", 0,
+ new TDEAction( i18n("Send..."), "network", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSend()), actionCollection(), "send_note" );
- new KAction( i18n("Mail..."), "mail_send", 0,
+ new TDEAction( i18n("Mail..."), "mail_send", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection(), "mail_note" );
- new KAction( i18n("Save As..."), "filesaveas", 0,
+ new TDEAction( i18n("Save As..."), "filesaveas", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection(), "save_note" );
KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection(), "print_note" );
- new KAction( i18n("Preferences..."), "configure", 0,
+ new TDEAction( i18n("Preferences..."), "configure", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection(), "configure_note" );
- m_keepAbove = new KToggleAction( i18n("Keep Above Others"), "up", 0,
+ m_keepAbove = new TDEToggleAction( i18n("Keep Above Others"), "up", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" );
m_keepAbove->setExclusiveGroup( "keepAB" );
- m_keepBelow = new KToggleAction( i18n("Keep Below Others"), "down", 0,
+ m_keepBelow = new TDEToggleAction( i18n("Keep Below Others"), "down", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" );
m_keepBelow->setExclusiveGroup( "keepAB" );
- m_toDesktop = new KListAction( i18n("To Desktop"), 0,
+ m_toDesktop = new TDEListAction( i18n("To Desktop"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" );
connect( m_toDesktop->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateDesktopActions()) );
// invisible action to walk through the notes to make this configurable
- new KAction( i18n("Walk Through Notes"), 0, SHIFT+Key_BackTab,
+ new TDEAction( i18n("Walk Through Notes"), 0, SHIFT+Key_BackTab,
TQT_TQOBJECT(this), TQT_SIGNAL(sigShowNextNote()), actionCollection(), "walk_notes" );
// create the note header, button and label...
@@ -168,14 +168,14 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) );
factory.addClient( this );
- m_menu = dynamic_cast<KPopupMenu*>(factory.container( "note_context", this ));
- m_edit_menu = dynamic_cast<KPopupMenu*>(factory.container( "note_edit", this ));
- m_tool = dynamic_cast<KToolBar*>(factory.container( "note_tool", this ));
+ m_menu = dynamic_cast<TDEPopupMenu*>(factory.container( "note_context", this ));
+ m_edit_menu = dynamic_cast<TDEPopupMenu*>(factory.container( "note_edit", this ));
+ m_tool = dynamic_cast<TDEToolBar*>(factory.container( "note_tool", this ));
if ( m_tool ) {
m_tool->setIconSize( 10 );
m_tool->setFixedHeight( 16 );
- m_tool->setIconText( KToolBar::IconOnly );
+ m_tool->setIconText( TDEToolBar::IconOnly );
// if there was just a way of making KComboBox adhere the toolbar height...
TQObjectList *list = m_tool->queryList( "KComboBox" );
diff --git a/knotes/knote.h b/knotes/knote.h
index 3b7928c42..43444b991 100644
--- a/knotes/knote.h
+++ b/knotes/knote.h
@@ -35,13 +35,13 @@ class TQLabel;
class KXMLGUIBuilder;
class KFind;
-class KPopupMenu;
+class TDEPopupMenu;
class KNoteButton;
class KNoteEdit;
class KNoteConfig;
-class KToolBar;
-class KListAction;
-class KToggleAction;
+class TDEToolBar;
+class TDEListAction;
+class TDEToggleAction;
namespace KCal {
class Journal;
@@ -159,7 +159,7 @@ private:
private:
TQLabel *m_label, *m_pushpin, *m_fold;
KNoteButton *m_button;
- KToolBar *m_tool;
+ TDEToolBar *m_tool;
KNoteEdit *m_editor;
KNoteConfig *m_config;
@@ -167,14 +167,14 @@ private:
KFind *m_find;
- KPopupMenu *m_menu;
- KPopupMenu *m_edit_menu;
+ TDEPopupMenu *m_menu;
+ TDEPopupMenu *m_edit_menu;
- KToggleAction *m_readOnly;
+ TDEToggleAction *m_readOnly;
- KListAction *m_toDesktop;
- KToggleAction *m_keepAbove;
- KToggleAction *m_keepBelow;
+ TDEListAction *m_toDesktop;
+ TDEToggleAction *m_keepAbove;
+ TDEToggleAction *m_keepBelow;
TDESharedConfig::Ptr m_twinConf;
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index 6b01b7b86..17ede6699 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -158,14 +158,14 @@ TQWidget *KNoteConfigDlg::makeEditorPage( bool defaults )
TQLabel *label_Font = new TQLabel( i18n("Text font:"), editorPage, "label_Font" );
layout->addWidget( label_Font, 3, 0 );
- KFontRequester *kcfg_Font = new KFontRequester( editorPage, "kcfg_Font" );
+ TDEFontRequester *kcfg_Font = new TDEFontRequester( editorPage, "kcfg_Font" );
kcfg_Font->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
layout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 );
TQLabel *label_TitleFont = new TQLabel( i18n("Title font:"), editorPage, "label_TitleFont" );
layout->addWidget( label_TitleFont, 2, 0 );
- KFontRequester *kcfg_TitleFont = new KFontRequester( editorPage, "kcfg_TitleFont" );
+ TDEFontRequester *kcfg_TitleFont = new TDEFontRequester( editorPage, "kcfg_TitleFont" );
kcfg_TitleFont->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
layout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 );
diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp
index 2844c29f3..62fe2a4be 100644
--- a/knotes/knoteedit.cpp
+++ b/knotes/knoteedit.cpp
@@ -36,7 +36,7 @@ static const short SEP = 5;
static const short ICON_SIZE = 10;
-KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char *name )
+KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char *name )
: KTextEdit( parent, name ), m_note( 0 )
{
setAcceptDrops( true );
@@ -64,17 +64,17 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char *
connect( this, TQT_SIGNAL(copyAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT( slotCutEnabled( bool ) ) );
connect( this, TQT_SIGNAL(copyAvailable(bool)), m_copy, TQT_SLOT(setEnabled(bool)) );
- new KAction( KStdGuiItem::clear(), 0, TQT_TQOBJECT(this), TQT_SLOT(clear()), actions, "edit_clear" );
+ new TDEAction( KStdGuiItem::clear(), 0, TQT_TQOBJECT(this), TQT_SLOT(clear()), actions, "edit_clear" );
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(selectAll()), actions );
// create the actions modifying the text format
- m_textBold = new KToggleAction( i18n("Bold"), "text_bold", CTRL + Key_B, 0, 0,
+ m_textBold = new TDEToggleAction( i18n("Bold"), "text_bold", CTRL + Key_B, 0, 0,
actions, "format_bold" );
- m_textItalic = new KToggleAction( i18n("Italic"), "text_italic", CTRL + Key_I, 0, 0,
+ m_textItalic = new TDEToggleAction( i18n("Italic"), "text_italic", CTRL + Key_I, 0, 0,
actions, "format_italic" );
- m_textUnderline = new KToggleAction( i18n("Underline"), "text_under", CTRL + Key_U, 0, 0,
+ m_textUnderline = new TDEToggleAction( i18n("Underline"), "text_under", CTRL + Key_U, 0, 0,
actions, "format_underline" );
- m_textStrikeOut = new KToggleAction( i18n("Strike Out"), "text_strike", CTRL + Key_S, 0, 0,
+ m_textStrikeOut = new TDEToggleAction( i18n("Strike Out"), "text_strike", CTRL + Key_S, 0, 0,
actions, "format_strikeout" );
connect( m_textBold, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setBold(bool)) );
@@ -82,17 +82,17 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char *
connect( m_textUnderline, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setUnderline(bool)) );
connect( m_textStrikeOut, TQT_SIGNAL(toggled(bool)), TQT_SLOT(textStrikeOut(bool)) );
- m_textAlignLeft = new KToggleAction( i18n("Align Left"), "text_left", ALT + Key_L,
+ m_textAlignLeft = new TDEToggleAction( i18n("Align Left"), "text_left", ALT + Key_L,
TQT_TQOBJECT(this), TQT_SLOT(textAlignLeft()),
actions, "format_alignleft" );
m_textAlignLeft->setChecked( true ); // just a dummy, will be updated later
- m_textAlignCenter = new KToggleAction( i18n("Align Center"), "text_center", ALT + Key_C,
+ m_textAlignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", ALT + Key_C,
TQT_TQOBJECT(this), TQT_SLOT(textAlignCenter()),
actions, "format_aligncenter" );
- m_textAlignRight = new KToggleAction( i18n("Align Right"), "text_right", ALT + Key_R,
+ m_textAlignRight = new TDEToggleAction( i18n("Align Right"), "text_right", ALT + Key_R,
TQT_TQOBJECT(this), TQT_SLOT(textAlignRight()),
actions, "format_alignright" );
- m_textAlignBlock = new KToggleAction( i18n("Align Block"), "text_block", ALT + Key_B,
+ m_textAlignBlock = new TDEToggleAction( i18n("Align Block"), "text_block", ALT + Key_B,
TQT_TQOBJECT(this), TQT_SLOT(textAlignBlock()),
actions, "format_alignblock" );
@@ -101,16 +101,16 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char *
m_textAlignRight->setExclusiveGroup( "align" );
m_textAlignBlock->setExclusiveGroup( "align" );
- m_textList = new KToggleAction( i18n("List"), "enum_list", 0,
+ m_textList = new TDEToggleAction( i18n("List"), "enum_list", 0,
TQT_TQOBJECT(this), TQT_SLOT(textList()),
actions, "format_list" );
m_textList->setExclusiveGroup( "style" );
- m_textSuper = new KToggleAction( i18n("Superscript"), "text_super", 0,
+ m_textSuper = new TDEToggleAction( i18n("Superscript"), "text_super", 0,
TQT_TQOBJECT(this), TQT_SLOT(textSuperScript()),
actions, "format_super" );
- m_textSub = new KToggleAction( i18n("Subscript"), "text_sub", 0,
+ m_textSub = new TDEToggleAction( i18n("Subscript"), "text_sub", 0,
TQT_TQOBJECT(this), TQT_SLOT(textSubScript()),
actions, "format_sub" );
@@ -119,25 +119,25 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char *
// There is no easy possibility to implement text indenting with TQTextEdit
//
-// m_textIncreaseIndent = new KAction( i18n("Increase Indent"), "format_increaseindent", 0,
+// m_textIncreaseIndent = new TDEAction( i18n("Increase Indent"), "format_increaseindent", 0,
// TQT_TQOBJECT(this), TQT_SLOT(textIncreaseIndent()),
// actions, "format_increaseindent" );
//
-// m_textDecreaseIndent = new KAction( i18n("Decrease Indent"), "format_decreaseindent", 0,
+// m_textDecreaseIndent = new TDEAction( i18n("Decrease Indent"), "format_decreaseindent", 0,
// TQT_TQOBJECT(this), TQT_SLOT(textDecreaseIndent()),
// actions, "format_decreaseindent" );
TQPixmap pix( ICON_SIZE, ICON_SIZE );
pix.fill( black ); // just a dummy, gets updated before widget is shown
- m_textColor = new KAction( i18n("Text Color..."), pix, 0, TQT_TQOBJECT(this),
+ m_textColor = new TDEAction( i18n("Text Color..."), pix, 0, TQT_TQOBJECT(this),
TQT_SLOT(textColor()), actions, "format_color" );
- m_textFont = new KFontAction( i18n("Text Font"), "text", KKey(),
+ m_textFont = new TDEFontAction( i18n("Text Font"), "text", KKey(),
actions, "format_font" );
connect( m_textFont, TQT_SIGNAL(activated( const TQString & )),
TQT_TQOBJECT(this), TQT_SLOT(setFamily( const TQString & )) );
- m_textSize = new KFontSizeAction( i18n("Text Size"), KKey(),
+ m_textSize = new TDEFontSizeAction( i18n("Text Size"), KKey(),
actions, "format_size" );
connect( m_textSize, TQT_SIGNAL(fontSizeChanged( int )),
TQT_TQOBJECT(this), TQT_SLOT(setPointSize( int )) );
diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h
index 65de3e45a..caa2c51a1 100644
--- a/knotes/knoteedit.h
+++ b/knotes/knoteedit.h
@@ -28,11 +28,11 @@ class KNote;
class TQFont;
class TQColor;
class TQPushButton;
-class KAction;
-class KActionCollection;
-class KToggleAction;
-class KFontAction;
-class KFontSizeAction;
+class TDEAction;
+class TDEActionCollection;
+class TDEToggleAction;
+class TDEFontAction;
+class TDEFontSizeAction;
class KNoteEdit : public KTextEdit
@@ -40,7 +40,7 @@ class KNoteEdit : public KTextEdit
Q_OBJECT
public:
- KNoteEdit( KActionCollection *actions, TQWidget *parent=0, const char *name=0 );
+ KNoteEdit( TDEActionCollection *actions, TQWidget *parent=0, const char *name=0 );
~KNoteEdit();
void setNote( KNote *_note ) {
m_note = _note;
@@ -99,32 +99,32 @@ private:
void disableRichTextActions();
private:
- KAction *m_cut;
- KAction *m_copy;
- KAction *m_paste;
-
- KToggleAction *m_textBold;
- KToggleAction *m_textItalic;
- KToggleAction *m_textUnderline;
- KToggleAction *m_textStrikeOut;
-
- KToggleAction *m_textAlignLeft;
- KToggleAction *m_textAlignCenter;
- KToggleAction *m_textAlignRight;
- KToggleAction *m_textAlignBlock;
-
- KToggleAction *m_textList;
- KToggleAction *m_textSuper;
- KToggleAction *m_textSub;
-
- //KAction *m_textIncreaseIndent;
- //KAction *m_textDecreaseIndent;
-
- KAction *m_textColor;
- KFontAction *m_textFont;
- KFontSizeAction *m_textSize;
- KAction* undo;
- KAction* redo;
+ TDEAction *m_cut;
+ TDEAction *m_copy;
+ TDEAction *m_paste;
+
+ TDEToggleAction *m_textBold;
+ TDEToggleAction *m_textItalic;
+ TDEToggleAction *m_textUnderline;
+ TDEToggleAction *m_textStrikeOut;
+
+ TDEToggleAction *m_textAlignLeft;
+ TDEToggleAction *m_textAlignCenter;
+ TDEToggleAction *m_textAlignRight;
+ TDEToggleAction *m_textAlignBlock;
+
+ TDEToggleAction *m_textList;
+ TDEToggleAction *m_textSuper;
+ TDEToggleAction *m_textSub;
+
+ //TDEAction *m_textIncreaseIndent;
+ //TDEAction *m_textDecreaseIndent;
+
+ TDEAction *m_textColor;
+ TDEFontAction *m_textFont;
+ TDEFontSizeAction *m_textSize;
+ TDEAction* undo;
+ TDEAction* redo;
bool m_autoIndentMode;
KNote *m_note;
};
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 718a35004..069bf9da8 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -68,7 +68,7 @@ public:
connect( this, TQT_SIGNAL(defaultClicked()), m_keyChooser, TQT_SLOT(allDefault()) );
}
- void insert( KActionCollection *actions )
+ void insert( TDEActionCollection *actions )
{
m_keyChooser->insert( actions, i18n("Note Actions") );
}
@@ -86,9 +86,9 @@ private:
int KNotesApp::KNoteActionList::compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 )
{
- if ( ((KAction*)s1)->text() == ((KAction*)s2)->text() )
+ if ( ((TDEAction*)s1)->text() == ((TDEAction*)s2)->text() )
return 0;
- return ( ((KAction*)s1)->text() < ((KAction*)s2)->text() ? -1 : 1 );
+ return ( ((TDEAction*)s1)->text() < ((TDEAction*)s2)->text() ? -1 : 1 );
}
@@ -111,13 +111,13 @@ KNotesApp::KNotesApp()
KNote::setStyle( KNotesGlobalConfig::style() );
// create the GUI...
- new KAction( i18n("New Note"), "filenew", 0,
+ new TDEAction( i18n("New Note"), "filenew", 0,
TQT_TQOBJECT(this), TQT_SLOT(newNote()), actionCollection(), "new_note" );
- new KAction( i18n("New Note From Clipboard"), "editpaste", 0,
+ new TDEAction( i18n("New Note From Clipboard"), "editpaste", 0,
TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" );
- new KAction( i18n("Show All Notes"), "knotes", 0,
+ new TDEAction( i18n("Show All Notes"), "knotes", 0,
TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), actionCollection(), "show_all_notes" );
- new KAction( i18n("Hide All Notes"), "fileclose", 0,
+ new TDEAction( i18n("Hide All Notes"), "fileclose", 0,
TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" );
new KHelpMenu( this, kapp->aboutData(), false, actionCollection() );
@@ -133,8 +133,8 @@ KNotesApp::KNotesApp()
m_guiFactory = new KXMLGUIFactory( m_guiBuilder, TQT_TQOBJECT(this) );
m_guiFactory->addClient( this );
- m_context_menu = static_cast<KPopupMenu*>(m_guiFactory->container( "knotes_context", this ));
- m_note_menu = static_cast<KPopupMenu*>(m_guiFactory->container( "notes_menu", this ));
+ m_context_menu = static_cast<TDEPopupMenu*>(m_guiFactory->container( "knotes_context", this ));
+ m_note_menu = static_cast<TDEPopupMenu*>(m_guiFactory->container( "notes_menu", this ));
// get the most recent XML UI file
TQString xmlFileName = instance()->instanceName() + "ui.rc";
@@ -579,13 +579,13 @@ void KNotesApp::slotConfigureAccels()
return;
notes.toFirst();
- TQValueList<KAction *> list = (*notes)->actionCollection()->actions();
- for ( TQValueList<KAction *>::iterator it = list.begin(); it != list.end(); ++it )
+ TQValueList<TDEAction *> list = (*notes)->actionCollection()->actions();
+ for ( TQValueList<TDEAction *>::iterator it = list.begin(); it != list.end(); ++it )
{
notes.toFirst();
for ( ++notes; *notes; ++notes )
{
- KAction *toChange = (*notes)->actionCollection()->action( (*it)->name() );
+ TDEAction *toChange = (*notes)->actionCollection()->action( (*it)->name() );
if ( toChange->shortcut() != (*it)->shortcut() )
toChange->setShortcut( (*it)->shortcut() );
}
@@ -703,8 +703,8 @@ void KNotesApp::updateNoteActions()
for ( TQDictIterator<KNote> it( m_noteList ); it.current(); ++it )
{
- KAction *action = new KAction( it.current()->name().replace("&", "&&"),
- KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()),
+ TDEAction *action = new TDEAction( it.current()->name().replace("&", "&&"),
+ TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()),
(TQObject *)0,
it.current()->noteId().utf8() );
KIconEffect effect;
@@ -719,7 +719,7 @@ void KNotesApp::updateNoteActions()
actionCollection()->action( "hide_all_notes" )->setEnabled( false );
actionCollection()->action( "show_all_notes" )->setEnabled( false );
m_findAction->setEnabled( false );
- KAction *action = new KAction( i18n("No Notes") );
+ TDEAction *action = new TDEAction( i18n("No Notes") );
m_noteActions.append( action );
}
else
@@ -736,7 +736,7 @@ void KNotesApp::updateGlobalAccels()
{
if ( m_globalAccel->isEnabled() )
{
- KAction *action = actionCollection()->action( "new_note" );
+ TDEAction *action = actionCollection()->action( "new_note" );
if ( action )
action->setShortcut( m_globalAccel->shortcut( "global_new_note" ) );
action = actionCollection()->action( "new_note_clipboard" );
@@ -753,7 +753,7 @@ void KNotesApp::updateGlobalAccels()
}
else
{
- KAction *action = actionCollection()->action( "new_note" );
+ TDEAction *action = actionCollection()->action( "new_note" );
if ( action )
action->setShortcut( 0 );
action = actionCollection()->action( "new_note_clipboard" );
diff --git a/knotes/knotesapp.h b/knotes/knotesapp.h
index a850bec73..74a8fdc89 100644
--- a/knotes/knotesapp.h
+++ b/knotes/knotesapp.h
@@ -34,9 +34,9 @@
class KFind;
class KNote;
-class KPopupMenu;
-class KAction;
-class KActionMenu;
+class TDEPopupMenu;
+class TDEAction;
+class TDEActionMenu;
class TDEGlobalAccel;
class KXMLGUIFactory;
class KXMLGUIBuilder;
@@ -136,7 +136,7 @@ private slots:
void killNote( KCal::Journal *journal );
private:
- class KNoteActionList : public TQPtrList<KAction>
+ class KNoteActionList : public TQPtrList<TDEAction>
{
public:
virtual int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 );
@@ -153,15 +153,15 @@ private:
KFind *m_find;
TQDictIterator<KNote> *m_findPos;
- KPopupMenu *m_note_menu;
- KPopupMenu *m_context_menu;
+ TDEPopupMenu *m_note_menu;
+ TDEPopupMenu *m_context_menu;
TDEGlobalAccel *m_globalAccel;
KXMLGUIFactory *m_guiFactory;
KXMLGUIBuilder *m_guiBuilder;
TQDomDocument m_noteGUI;
- KAction *m_findAction;
+ TDEAction *m_findAction;
TQString m_noteUidModify;
};
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 08:50:17 +0000