From deac2ca49faed824fe83066080714eb6d653615b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:13:01 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kate/interfaces/document.h | 4 +- kate/part/kateautoindent.cpp | 2 +- kate/part/kateautoindent.h | 4 +- kate/part/katebookmarks.cpp | 12 +- kate/part/katebookmarks.h | 16 +- kate/part/katedialogs.cpp | 2 +- kate/part/katedialogs.h | 8 +- kate/part/kateprinter.cpp | 2 +- kate/part/kateschema.cpp | 6 +- kate/part/kateschema.h | 6 +- kate/part/katesearch.cpp | 2 +- kate/part/katesearch.h | 4 +- kate/part/katespell.cpp | 6 +- kate/part/katespell.h | 6 +- kate/part/kateview.cpp | 174 +++++++++++----------- kate/part/kateview.h | 60 ++++---- kate/part/kateviewhelpers.cpp | 2 +- kate/part/kateviewhelpers.h | 2 +- kate/part/test_regression.cpp | 2 +- kate/plugins/autobookmarker/autobookmarker.cpp | 4 +- kate/plugins/autobookmarker/autobookmarker.h | 2 +- kate/plugins/insertfile/insertfileplugin.cpp | 2 +- kate/plugins/isearch/ISearchPlugin.cpp | 24 +-- kate/plugins/isearch/ISearchPlugin.h | 4 +- kate/plugins/kdatatool/kate_kdatatool.cpp | 8 +- kate/plugins/kdatatool/kate_kdatatool.h | 8 +- kate/plugins/wordcompletion/docwordcompletion.cpp | 12 +- 27 files changed, 192 insertions(+), 192 deletions(-) (limited to 'kate') diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h index c56600357..4d596fb01 100644 --- a/kate/interfaces/document.h +++ b/kate/interfaces/document.h @@ -77,13 +77,13 @@ class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage void slotChanged(); }; -class KATEPARTINTERFACES_EXPORT ActionMenu : public KActionMenu +class KATEPARTINTERFACES_EXPORT ActionMenu : public TDEActionMenu { Q_OBJECT public: ActionMenu ( const TQString& text, TQObject* parent = 0, const char* name = 0 ) - : KActionMenu(text, parent, name) { ; }; + : TDEActionMenu(text, parent, name) { ; }; virtual ~ActionMenu () { ; }; public: diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp index ed9a6169b..792c53385 100644 --- a/kate/part/kateautoindent.cpp +++ b/kate/part/kateautoindent.cpp @@ -159,7 +159,7 @@ KateAutoIndent::~KateAutoIndent () //BEGIN KateViewIndentAction KateViewIndentationAction::KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent, const char* name) - : KActionMenu (text, parent, name), doc(_doc) + : TDEActionMenu (text, parent, name), doc(_doc) { connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); } diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h index 6c0d15d45..abdab7777 100644 --- a/kate/part/kateautoindent.h +++ b/kate/part/kateautoindent.h @@ -190,9 +190,9 @@ class KateAutoIndent : public TQObject /** * This action provides a list of available indenters and gets plugged - * into the KateView's KActionCollection. + * into the KateView's TDEActionCollection. */ -class KateViewIndentationAction : public KActionMenu +class KateViewIndentationAction : public TDEActionMenu { Q_OBJECT diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp index ac1ee73d9..d3fb52a72 100644 --- a/kate/part/katebookmarks.cpp +++ b/kate/part/katebookmarks.cpp @@ -71,34 +71,34 @@ KateBookmarks::~KateBookmarks() { } -void KateBookmarks::createActions( KActionCollection* ac ) +void KateBookmarks::createActions( TDEActionCollection* ac ) { - m_bookmarkToggle = new KToggleAction( + m_bookmarkToggle = new TDEToggleAction( i18n("Set &Bookmark"), "bookmark", CTRL+Key_B, this, TQT_SLOT(toggleBookmark()), ac, "bookmarks_toggle" ); m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it.")); m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") ); - m_bookmarkClear = new KAction( + m_bookmarkClear = new TDEAction( i18n("Clear &All Bookmarks"), 0, this, TQT_SLOT(clearBookmarks()), ac, "bookmarks_clear"); m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document.")); - m_goNext = new KAction( + m_goNext = new TDEAction( i18n("Next Bookmark"), "next", ALT + Key_PageDown, this, TQT_SLOT(goNext()), ac, "bookmarks_next"); m_goNext->setWhatsThis(i18n("Go to the next bookmark.")); - m_goPrevious = new KAction( + m_goPrevious = new TDEAction( i18n("Previous Bookmark"), "previous", ALT + Key_PageUp, this, TQT_SLOT(goPrevious()), ac, "bookmarks_previous"); m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark.")); - m_bookmarksMenu = (new KActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu(); + m_bookmarksMenu = (new TDEActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu(); //connect the aboutToShow() and aboutToHide() signals with //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots diff --git a/kate/part/katebookmarks.h b/kate/part/katebookmarks.h index 63928800e..ae4151812 100644 --- a/kate/part/katebookmarks.h +++ b/kate/part/katebookmarks.h @@ -29,9 +29,9 @@ namespace KTextEditor { class Mark; } namespace Kate { class View; } -class KAction; -class KToggleAction; -class KActionCollection; +class TDEAction; +class TDEToggleAction; +class TDEActionCollection; class TQPopupMenu; class TQMenuData; @@ -44,7 +44,7 @@ class KateBookmarks : public TQObject KateBookmarks( KateView* parent, Sorting sort=Position ); virtual ~KateBookmarks(); - void createActions( KActionCollection* ); + void createActions( TDEActionCollection* ); KateBookmarks::Sorting sorting() { return m_sorting; }; void setSorting( Sorting s ) { m_sorting = s; }; @@ -69,10 +69,10 @@ class KateBookmarks : public TQObject private: KateView* m_view; - KToggleAction* m_bookmarkToggle; - KAction* m_bookmarkClear; - KAction* m_goNext; - KAction* m_goPrevious; + TDEToggleAction* m_bookmarkToggle; + TDEAction* m_bookmarkClear; + TDEAction* m_goNext; + TDEAction* m_goPrevious; Sorting m_sorting; TQPopupMenu* m_bookmarksMenu; diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index 5006ddd6c..099dad99d 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -1095,7 +1095,7 @@ void KatePartPluginListItem::stateChange(bool b) //BEGIN PluginListView KatePartPluginListView::KatePartPluginListView(TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { } diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h index fc9fa0a1a..c97f45d9a 100644 --- a/kate/part/katedialogs.h +++ b/kate/part/katedialogs.h @@ -52,13 +52,13 @@ namespace TDEIO class TransferJob; } -class KAccel; +class TDEAccel; class KColorButton; class KComboBox; class KIntNumInput; class KKeyButton; class KKeyChooser; -class KMainWindow; +class TDEMainWindow; class KPushButton; class KRegExpDialog; class KIntNumInput; @@ -235,7 +235,7 @@ class KateEditKeyConfiguration: public KateConfigPage bool m_ready; class KateDocument *m_doc; KKeyChooser* m_keyChooser; - class KActionCollection *m_ac; + class TDEActionCollection *m_ac; }; class KateSaveConfigTab : public KateConfigPage @@ -263,7 +263,7 @@ class KateSaveConfigTab : public KateConfigPage class KatePartPluginListItem; -class KatePartPluginListView : public KListView +class KatePartPluginListView : public TDEListView { Q_OBJECT diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index 7f4481722..1b264a602 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -888,7 +888,7 @@ void KatePrintHeaderFooter::setHFFont() { TQFont fnt( lFontPreview->font() ); // display a font dialog - if ( KFontDialog::getFont( fnt, false, this ) == KFontDialog::Accepted ) + if ( TDEFontDialog::getFont( fnt, false, this ) == TDEFontDialog::Accepted ) { // change strFont strFont = fnt.toString(); diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index 0cb802e97..9a7e4e1ab 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -541,8 +541,8 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char * // sizemanagment TQGridLayout *grid = new TQGridLayout( this, 1, 1 ); - m_fontchooser = new KFontChooser ( this, 0L, false, TQStringList(), false ); - m_fontchooser->enableColumn(KFontChooser::StyleList, false); + m_fontchooser = new TDEFontChooser ( this, 0L, false, TQStringList(), false ); + m_fontchooser->enableColumn(TDEFontChooser::StyleList, false); grid->addWidget( m_fontchooser, 0, 0); connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); @@ -1078,7 +1078,7 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob { if ( !dynamic_cast(i) ) return; - KPopupMenu m( this ); + TDEPopupMenu m( this ); KateAttribute *is = i->style(); int id; // the title is used, because the menu obscures the context name when diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h index 2e92812de..6675a6bc8 100644 --- a/kate/part/kateschema.h +++ b/kate/part/kateschema.h @@ -90,13 +90,13 @@ class KateSchemaManager }; -class KateViewSchemaAction : public KActionMenu +class KateViewSchemaAction : public TDEActionMenu { Q_OBJECT public: KateViewSchemaAction(const TQString& text, TQObject* parent = 0, const char* name = 0) - : KActionMenu(text, parent, name) { init(); }; + : TDEActionMenu(text, parent, name) { init(); }; ~KateViewSchemaAction(){;}; @@ -226,7 +226,7 @@ class KateSchemaConfigFontTab : public TQWidget void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) private: - class KFontChooser *m_fontchooser; + class TDEFontChooser *m_fontchooser; FontMap m_fonts; int m_schema; diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp index a7d37ead5..9d0dc896b 100644 --- a/kate/part/katesearch.cpp +++ b/kate/part/katesearch.cpp @@ -66,7 +66,7 @@ KateSearch::~KateSearch() delete m_arbitraryHLList; } -void KateSearch::createActions( KActionCollection* ac ) +void KateSearch::createActions( TDEActionCollection* ac ) { KStdAction::find( this, TQT_SLOT(find()), ac )->setWhatsThis( i18n("Look up the first occurrence of a piece of text or regular expression.")); diff --git a/kate/part/katesearch.h b/kate/part/katesearch.h index bec9eb51a..5ae92f568 100644 --- a/kate/part/katesearch.h +++ b/kate/part/katesearch.h @@ -37,7 +37,7 @@ class KateView; class KateDocument; class KateSuperRangeList; -class KActionCollection; +class TDEActionCollection; class KateSearch : public TQObject { @@ -87,7 +87,7 @@ class KateSearch : public TQObject KateSearch( KateView* ); ~KateSearch(); - void createActions( KActionCollection* ); + void createActions( TDEActionCollection* ); public slots: void find(); diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp index 77e693fa6..53767d672 100644 --- a/kate/part/katespell.cpp +++ b/kate/part/katespell.cpp @@ -51,13 +51,13 @@ KateSpell::~KateSpell() } } -void KateSpell::createActions( KActionCollection* ac ) +void KateSpell::createActions( TDEActionCollection* ac ) { KStdAction::spelling( this, TQT_SLOT(spellcheck()), ac ); - KAction *a = new KAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" ); + TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" ); a->setWhatsThis(i18n("Check the document's spelling from the cursor and forward")); - m_spellcheckSelection = new KAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" ); + m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" ); m_spellcheckSelection->setWhatsThis(i18n("Check spelling of the selected text")); } diff --git a/kate/part/katespell.h b/kate/part/katespell.h index f5a776c8d..9ce41666c 100644 --- a/kate/part/katespell.h +++ b/kate/part/katespell.h @@ -27,7 +27,7 @@ class KateView; -class KAction; +class TDEAction; class KSpell; class KateSpell : public TQObject @@ -38,7 +38,7 @@ class KateSpell : public TQObject KateSpell( KateView* ); ~KateSpell(); - void createActions( KActionCollection* ); + void createActions( TDEActionCollection* ); void updateActions (); @@ -69,7 +69,7 @@ class KateSpell : public TQObject private: KateView *m_view; - KAction *m_spellcheckSelection; + TDEAction *m_spellcheckSelection; KSpell *m_tdespell; diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index 22a4799d6..03b1fa5d3 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -207,8 +207,8 @@ void KateView::setupConnections() void KateView::setupActions() { - KActionCollection *ac = this->actionCollection (); - KAction *a; + TDEActionCollection *ac = this->actionCollection (); + TDEAction *a; m_toggleWriteLock = 0; @@ -221,7 +221,7 @@ void KateView::setupActions() m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac); a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard.")); - m_copyHTML = a = new KAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html"); + m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html"); a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard.")); if (!m_doc->readOnly()) @@ -235,56 +235,56 @@ void KateView::setupActions() a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac); a->setWhatsThis(i18n("Revert the most recent undo operation")); - (new KAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( + (new TDEAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( i18n("Use this command to wrap all lines of the current document which are longer than the width of the" " current view, to fit into this view.

This is a static word wrap, meaning it is not updated" " when the view is resized.")); // setup Tools menu - a=new KAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent"); + a=new TDEAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent"); a->setWhatsThis(i18n("Use this to indent a selected block of text.

" "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); - a=new KAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent"); + a=new TDEAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent"); a->setWhatsThis(i18n("Use this to unindent a selected block of text.")); - a=new KAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); + a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)

" "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); - a=new KAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align"); + a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align"); a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level.")); - a=new KAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()), + a=new TDEAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()), ac, "tools_comment"); a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.

" "The characters for single/multiple line comments are defined within the language's highlighting.")); - a=new KAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()), + a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()), ac, "tools_uncomment"); a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.

" "The characters for single/multiple line comments are defined within the language's highlighting.")); - a = m_toggleWriteLock = new KToggleAction( + a = m_toggleWriteLock = new TDEToggleAction( i18n("&Read Only Mode"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( toggleWriteLock() ), ac, "tools_toggle_write_lock" ); a->setWhatsThis( i18n("Lock/unlock the document for writing") ); - a = new KAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this), TQT_SLOT(uppercase()), ac, "tools_uppercase" ); a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the " "right of the cursor if no text is selected.") ); - a = new KAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this), TQT_SLOT(lowercase()), ac, "tools_lowercase" ); a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the " "right of the cursor if no text is selected.") ); - a = new KAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this), TQT_SLOT(capitalize()), ac, "tools_capitalize" ); a->setWhatsThis( i18n("Capitalize the selection, or the word under the " "cursor if no text is selected.") ); - a = new KAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this), TQT_SLOT( joinLines() ), ac, "tools_join_lines" ); } else @@ -298,7 +298,7 @@ void KateView::setupActions() a=KStdAction::print( m_doc, TQT_SLOT(print()), ac ); a->setWhatsThis(i18n("Print the current document.")); - a=new KAction(i18n("Reloa&d"), "reload", KStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload"); + a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload"); a->setWhatsThis(i18n("Reload the current document from disk.")); a=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), ac); @@ -307,7 +307,7 @@ void KateView::setupActions() a=KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), ac); a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to.")); - a=new KAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg"); + a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg"); a->setWhatsThis(i18n("Configure various aspects of this editor.")); KateViewHighlightAction *menu = new KateViewHighlightAction (i18n("&Highlighting"), ac, "set_highlight"); @@ -324,7 +324,7 @@ void KateView::setupActions() new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation"); // html export - a = new KAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html"); + a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html"); a->setWhatsThis(i18n("This command allows you to export the current document" " with all highlighting information into a HTML document.")); @@ -334,32 +334,32 @@ void KateView::setupActions() m_deSelect = a=KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(clearSelection()), ac); a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected.")); - a=new KAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes"); + a=new TDEAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes"); a->setWhatsThis(i18n("This increases the display font size.")); - a=new KAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes"); + a=new TDEAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes"); a->setWhatsThis(i18n("This decreases the display font size.")); - a= m_toggleBlockSelection = new KToggleAction( + a= m_toggleBlockSelection = new TDEToggleAction( i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBlockSelectionMode()), ac, "set_verticalSelect"); a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode.")); - a= m_toggleInsert = new KToggleAction( + a= m_toggleInsert = new TDEToggleAction( i18n("Overwr&ite Mode"), Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(toggleInsert()), ac, "set_insert" ); a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text.")); - KToggleAction *toggleAction; - a= m_toggleDynWrap = toggleAction = new KToggleAction( + TDEToggleAction *toggleAction; + a= m_toggleDynWrap = toggleAction = new TDEToggleAction( i18n("&Dynamic Word Wrap"), Key_F10, TQT_TQOBJECT(this), TQT_SLOT(toggleDynWordWrap()), ac, "view_dynamic_word_wrap" ); a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen.")); - a= m_setDynWrapIndicators = new KSelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators"); + a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators"); a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed")); connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setDynWrapIndicators(int))); @@ -369,14 +369,14 @@ void KateView::setupActions() list2.append(i18n("&Always On")); m_setDynWrapIndicators->setItems(list2); - a= toggleAction=m_toggleFoldingMarkers = new KToggleAction( + a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction( i18n("Show Folding &Markers"), Key_F9, TQT_TQOBJECT(this), TQT_SLOT(toggleFoldingMarkers()), ac, "view_folding_markers" ); a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible.")); toggleAction->setCheckedState(i18n("Hide Folding &Markers")); - a= m_toggleIconBar = toggleAction = new KToggleAction( + a= m_toggleIconBar = toggleAction = new TDEToggleAction( i18n("Show &Icon Border"), Key_F6, TQT_TQOBJECT(this), TQT_SLOT(toggleIconBorder()), ac, "view_border"); @@ -384,21 +384,21 @@ void KateView::setupActions() a->setWhatsThis(i18n("Show/hide the icon border.

The icon border shows bookmark symbols, for instance.")); toggleAction->setCheckedState(i18n("Hide &Icon Border")); - a= toggleAction=m_toggleLineNumbers = new KToggleAction( + a= toggleAction=m_toggleLineNumbers = new TDEToggleAction( i18n("Show &Line Numbers"), Key_F11, TQT_TQOBJECT(this), TQT_SLOT(toggleLineNumbersOn()), ac, "view_line_numbers" ); a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view.")); toggleAction->setCheckedState(i18n("Hide &Line Numbers")); - a= m_toggleScrollBarMarks = toggleAction = new KToggleAction( + a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction( i18n("Show Scroll&bar Marks"), 0, TQT_TQOBJECT(this), TQT_SLOT(toggleScrollBarMarks()), ac, "view_scrollbar_marks"); a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.

The marks, for instance, show bookmarks.")); toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks")); - a = toggleAction = m_toggleWWMarker = new KToggleAction( + a = toggleAction = m_toggleWWMarker = new TDEToggleAction( i18n("Show Static &Word Wrap Marker"), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleWWMarker() ), ac, "view_word_wrap_marker" ); @@ -407,13 +407,13 @@ void KateView::setupActions() "wrap column as defined in the editing properties" )); toggleAction->setCheckedState(i18n("Hide Static &Word Wrap Marker")); - a= m_switchCmdLine = new KAction( + a= m_switchCmdLine = new TDEAction( i18n("Switch to Command Line"), Key_F7, TQT_TQOBJECT(this), TQT_SLOT(switchToCmdLine()), ac, "switch_to_cmd_line" ); a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view.")); - a=m_setEndOfLine = new KSelectAction(i18n("&End of Line"), 0, ac, "set_eol"); + a=m_setEndOfLine = new TDESelectAction(i18n("&End of Line"), 0, ac, "set_eol"); a->setWhatsThis(i18n("Choose which line endings should be used, when you save the document")); TQStringList list; list.append("&UNIX"); @@ -437,137 +437,137 @@ void KateView::setupActions() void KateView::setupEditActions() { - m_editActions = new KActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" ); - KActionCollection* ac = m_editActions; + m_editActions = new TDEActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" ); + TDEActionCollection* ac = m_editActions; - new KAction( + new TDEAction( i18n("Move Word Left"), CTRL + Key_Left, TQT_TQOBJECT(this),TQT_SLOT(wordLeft()), ac, "word_left" ); - new KAction( + new TDEAction( i18n("Select Character Left"), SHIFT + Key_Left, TQT_TQOBJECT(this),TQT_SLOT(shiftCursorLeft()), ac, "select_char_left" ); - new KAction( + new TDEAction( i18n("Select Word Left"), SHIFT + CTRL + Key_Left, TQT_TQOBJECT(this), TQT_SLOT(shiftWordLeft()), ac, "select_word_left" ); - new KAction( + new TDEAction( i18n("Move Word Right"), CTRL + Key_Right, TQT_TQOBJECT(this), TQT_SLOT(wordRight()), ac, "word_right" ); - new KAction( + new TDEAction( i18n("Select Character Right"), SHIFT + Key_Right, TQT_TQOBJECT(this), TQT_SLOT(shiftCursorRight()), ac, "select_char_right" ); - new KAction( + new TDEAction( i18n("Select Word Right"), SHIFT + CTRL + Key_Right, TQT_TQOBJECT(this),TQT_SLOT(shiftWordRight()), ac, "select_word_right" ); - new KAction( + new TDEAction( i18n("Move to Beginning of Line"), Key_Home, TQT_TQOBJECT(this), TQT_SLOT(home()), ac, "beginning_of_line" ); - new KAction( - i18n("Move to Beginning of Document"), KStdAccel::home(), + new TDEAction( + i18n("Move to Beginning of Document"), TDEStdAccel::home(), TQT_TQOBJECT(this), TQT_SLOT(top()), ac, "beginning_of_document" ); - new KAction( + new TDEAction( i18n("Select to Beginning of Line"), SHIFT + Key_Home, TQT_TQOBJECT(this), TQT_SLOT(shiftHome()), ac, "select_beginning_of_line" ); - new KAction( + new TDEAction( i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home, TQT_TQOBJECT(this), TQT_SLOT(shiftTop()), ac, "select_beginning_of_document" ); - new KAction( + new TDEAction( i18n("Move to End of Line"), Key_End, TQT_TQOBJECT(this), TQT_SLOT(end()), ac, "end_of_line" ); - new KAction( - i18n("Move to End of Document"), KStdAccel::end(), + new TDEAction( + i18n("Move to End of Document"), TDEStdAccel::end(), TQT_TQOBJECT(this), TQT_SLOT(bottom()), ac, "end_of_document" ); - new KAction( + new TDEAction( i18n("Select to End of Line"), SHIFT + Key_End, TQT_TQOBJECT(this), TQT_SLOT(shiftEnd()), ac, "select_end_of_line" ); - new KAction( + new TDEAction( i18n("Select to End of Document"), SHIFT + CTRL + Key_End, TQT_TQOBJECT(this), TQT_SLOT(shiftBottom()), ac, "select_end_of_document" ); - new KAction( + new TDEAction( i18n("Select to Previous Line"), SHIFT + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(shiftUp()), ac, "select_line_up" ); - new KAction( + new TDEAction( i18n("Scroll Line Up"),"", CTRL + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(scrollUp()), ac, "scroll_line_up" ); - new KAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), + new TDEAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), ac, "move_line_down"); - new KAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), + new TDEAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), ac, "move_line_up"); - new KAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this), + new TDEAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this), TQT_SLOT(cursorRight()), ac, "move_cursor_right"); - new KAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()), + new TDEAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()), ac, "move_cusor_left"); - new KAction( + new TDEAction( i18n("Select to Next Line"), SHIFT + Key_Down, TQT_TQOBJECT(this), TQT_SLOT(shiftDown()), ac, "select_line_down" ); - new KAction( + new TDEAction( i18n("Scroll Line Down"), CTRL + Key_Down, TQT_TQOBJECT(this), TQT_SLOT(scrollDown()), ac, "scroll_line_down" ); - new KAction( - i18n("Scroll Page Up"), KStdAccel::prior(), + new TDEAction( + i18n("Scroll Page Up"), TDEStdAccel::prior(), TQT_TQOBJECT(this), TQT_SLOT(pageUp()), ac, "scroll_page_up" ); - new KAction( + new TDEAction( i18n("Select Page Up"), SHIFT + Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(shiftPageUp()), ac, "select_page_up" ); - new KAction( + new TDEAction( i18n("Move to Top of View"), CTRL + Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(topOfView()), ac, "move_top_of_view" ); - new KAction( + new TDEAction( i18n("Select to Top of View"), CTRL + SHIFT + Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(shiftTopOfView()), ac, "select_top_of_view" ); - new KAction( - i18n("Scroll Page Down"), KStdAccel::next(), + new TDEAction( + i18n("Scroll Page Down"), TDEStdAccel::next(), TQT_TQOBJECT(this), TQT_SLOT(pageDown()), ac, "scroll_page_down" ); - new KAction( + new TDEAction( i18n("Select Page Down"), SHIFT + Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(shiftPageDown()), ac, "select_page_down" ); - new KAction( + new TDEAction( i18n("Move to Bottom of View"), CTRL + Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(bottomOfView()), ac, "move_bottom_of_view" ); - new KAction( + new TDEAction( i18n("Select to Bottom of View"), CTRL + SHIFT + Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(shiftBottomOfView()), ac, "select_bottom_of_view" ); - new KAction( + new TDEAction( i18n("Move to Matching Bracket"), CTRL + Key_6, TQT_TQOBJECT(this), TQT_SLOT(toMatchingBracket()), ac, "to_matching_bracket" ); - new KAction( + new TDEAction( i18n("Select to Matching Bracket"), SHIFT + CTRL + Key_6, TQT_TQOBJECT(this), TQT_SLOT(shiftToMatchingBracket()), ac, "select_matching_bracket" ); @@ -575,34 +575,34 @@ void KateView::setupEditActions() // anders: shortcuts doing any changes should not be created in browserextension if ( !m_doc->readOnly() ) { - new KAction( + new TDEAction( i18n("Transpose Characters"), CTRL + Key_T, TQT_TQOBJECT(this), TQT_SLOT(transpose()), ac, "transpose_char" ); - new KAction( + new TDEAction( i18n("Delete Line"), CTRL + Key_K, TQT_TQOBJECT(this), TQT_SLOT(killLine()), ac, "delete_line" ); - new KAction( - i18n("Delete Word Left"), KStdAccel::deleteWordBack(), + new TDEAction( + i18n("Delete Word Left"), TDEStdAccel::deleteWordBack(), TQT_TQOBJECT(this), TQT_SLOT(deleteWordLeft()), ac, "delete_word_left" ); - new KAction( - i18n("Delete Word Right"), KStdAccel::deleteWordForward(), + new TDEAction( + i18n("Delete Word Right"), TDEStdAccel::deleteWordForward(), TQT_TQOBJECT(this), TQT_SLOT(deleteWordRight()), ac, "delete_word_right" ); - new KAction(i18n("Delete Next Character"), Key_Delete, + new TDEAction(i18n("Delete Next Character"), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(keyDelete()), ac, "delete_next_character"); - KAction *a = new KAction(i18n("Backspace"), Key_Backspace, + TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(backspace()), ac, "backspace"); - KShortcut cut = a->shortcut(); + TDEShortcut cut = a->shortcut(); cut.append( KKey( SHIFT + Key_Backspace ) ); a->setShortcut( cut ); } @@ -624,18 +624,18 @@ void KateView::setupEditActions() void KateView::setupCodeFolding() { - KActionCollection *ac=this->actionCollection(); - new KAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus, + TDEActionCollection *ac=this->actionCollection(); + new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus, m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel"); - new KAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus, + new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus, TQT_TQOBJECT(this),TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel"); - new KAction( i18n("Collapse One Local Level"), CTRL+Key_Minus, + new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus, TQT_TQOBJECT(this),TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal"); - new KAction( i18n("Expand One Local Level"), CTRL+Key_Plus, + new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus, TQT_TQOBJECT(this),TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal"); #ifdef DEBUGACCELS - KAccel* debugAccels = new KAccel(this,TQT_TQOBJECT(this)); + TDEAccel* debugAccels = new TDEAccel(this,TQT_TQOBJECT(this)); debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree())); debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode())); debugAccels->setEnabled(true); @@ -760,7 +760,7 @@ void KateView::slotReadWriteChanged () << "edit_undo" << "edit_redo" << "tools_spelling_from_cursor" << "tools_spelling_selection"; - KAction *a = 0; + TDEAction *a = 0; for (uint z = 0; z < l.size(); z++) if ((a = actionCollection()->action( l[z].ascii() ))) a->setEnabled (m_doc->isReadWrite()); @@ -1256,7 +1256,7 @@ void KateView::updateFoldingConfig () l << "folding_toplevel" << "folding_expandtoplevel" << "folding_collapselocal" << "folding_expandlocal"; - KAction *a = 0; + TDEAction *a = 0; for (uint z = 0; z < l.size(); z++) if ((a = actionCollection()->action( l[z].ascii() ))) a->setEnabled (m_doc->highlight() && m_doc->highlight()->allowsFolding()); diff --git a/kate/part/kateview.h b/kate/part/kateview.h index 1d6a1016f..0a00ab1fc 100644 --- a/kate/part/kateview.h +++ b/kate/part/kateview.h @@ -44,10 +44,10 @@ class KateViewSchemaAction; class KateRenderer; class KateSpell; -class KToggleAction; -class KAction; -class KRecentFilesAction; -class KSelectAction; +class TDEToggleAction; +class TDEAction; +class TDERecentFilesAction; +class TDESelectAction; class TQGridLayout; @@ -429,7 +429,7 @@ class KateView : public Kate::View, // Is it really necessary to have 3 methods for this?! :) KateDocument* doc() const { return m_doc; } - KActionCollection* editActionCollection() const { return m_editActions; } + TDEActionCollection* editActionCollection() const { return m_editActions; } public slots: void slotNewUndo(); @@ -472,31 +472,31 @@ class KateView : public Kate::View, void setupCodeFolding(); void setupCodeCompletion(); - KActionCollection* m_editActions; - KAction* m_editUndo; - KAction* m_editRedo; - KRecentFilesAction* m_fileRecent; - KToggleAction* m_toggleFoldingMarkers; - KToggleAction* m_toggleIconBar; - KToggleAction* m_toggleLineNumbers; - KToggleAction* m_toggleScrollBarMarks; - KToggleAction* m_toggleDynWrap; - KSelectAction* m_setDynWrapIndicators; - KToggleAction* m_toggleWWMarker; - KAction* m_switchCmdLine; - - KSelectAction* m_setEndOfLine; - - KAction *m_cut; - KAction *m_copy; - KAction *m_copyHTML; - KAction *m_paste; - KAction *m_selectAll; - KAction *m_deSelect; - - KToggleAction *m_toggleBlockSelection; - KToggleAction *m_toggleInsert; - KToggleAction *m_toggleWriteLock; + TDEActionCollection* m_editActions; + TDEAction* m_editUndo; + TDEAction* m_editRedo; + TDERecentFilesAction* m_fileRecent; + TDEToggleAction* m_toggleFoldingMarkers; + TDEToggleAction* m_toggleIconBar; + TDEToggleAction* m_toggleLineNumbers; + TDEToggleAction* m_toggleScrollBarMarks; + TDEToggleAction* m_toggleDynWrap; + TDESelectAction* m_setDynWrapIndicators; + TDEToggleAction* m_toggleWWMarker; + TDEAction* m_switchCmdLine; + + TDESelectAction* m_setEndOfLine; + + TDEAction *m_cut; + TDEAction *m_copy; + TDEAction *m_copyHTML; + TDEAction *m_paste; + TDEAction *m_selectAll; + TDEAction *m_deSelect; + + TDEToggleAction *m_toggleBlockSelection; + TDEToggleAction *m_toggleInsert; + TDEToggleAction *m_toggleWriteLock; KateDocument* m_doc; KateViewInternal* m_viewInternal; diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index eca6716c4..fc0072982 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -1168,7 +1168,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos ) //END KateIconBorder KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent, const char* name) - : KActionMenu (text, parent, name), doc(_doc), view (_view) + : TDEActionMenu (text, parent, name), doc(_doc), view (_view) { connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); } diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h index 1205ea99a..0faa90309 100644 --- a/kate/part/kateviewhelpers.h +++ b/kate/part/kateviewhelpers.h @@ -182,7 +182,7 @@ class KateIconBorder : public TQWidget mutable TQColor m_oldBackgroundColor; }; -class KateViewEncodingAction : public KActionMenu +class KateViewEncodingAction : public TDEActionMenu { Q_OBJECT diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index 1463c8bcd..1a7b73bf3 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -511,7 +511,7 @@ int main(int argc, char *argv[]) // create widgets KateFactory *fac = KateFactory::self(); - KMainWindow *toplevel = new KMainWindow(); + TDEMainWindow *toplevel = new TDEMainWindow(); KateDocument *part = new KateDocument(/*bSingleViewMode*/true, /*bBrowserView*/false, /*bReadOnly*/false, diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index cf3190c4e..449675f6c 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -253,7 +253,7 @@ void ABGlobal::writeConfig() class AutoBookmarkEntItem : public QListViewItem { public: - AutoBookmarkEntItem( KListView *lv, AutoBookmarkEnt *e ) + AutoBookmarkEntItem( TDEListView *lv, AutoBookmarkEnt *e ) : TQListViewItem( lv ), ent( e ) { @@ -383,7 +383,7 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char TQLabel *l = new TQLabel( i18n("&Patterns"), this ); lo->addWidget( l ); - lvPatterns = new KListView( this ); + lvPatterns = new TDEListView( this ); lvPatterns->addColumn( i18n("Pattern") ); lvPatterns->addColumn( i18n("Mime Types") ); lvPatterns->addColumn( i18n("File Masks") ); diff --git a/kate/plugins/autobookmarker/autobookmarker.h b/kate/plugins/autobookmarker/autobookmarker.h index 4a7b998de..9687d8ceb 100644 --- a/kate/plugins/autobookmarker/autobookmarker.h +++ b/kate/plugins/autobookmarker/autobookmarker.h @@ -111,7 +111,7 @@ class AutoBookmarkerConfigPage : public KTextEditor::ConfigPage void slotEdit(); private: - class KListView *lvPatterns; + class TDEListView *lvPatterns; class TQPushButton *btnNew, *btnDel, *btnEdit; ABEntityList *m_ents; }; diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp index aa9f998b6..2f0d01ed4 100644 --- a/kate/plugins/insertfile/insertfileplugin.cpp +++ b/kate/plugins/insertfile/insertfileplugin.cpp @@ -76,7 +76,7 @@ InsertFilePluginView::InsertFilePluginView( KTextEditor::View *view, const char view->insertChildClient( this ); setInstance( KGenericFactory::instance() ); _job = 0; - (void) new KAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" ); + (void) new TDEAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" ); setXMLFile( "tdetexteditor_insertfileui.rc" ); } diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index de1c1c376..758449fbe 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -64,11 +64,11 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) setInstance( KGenericFactory::instance() ); - m_searchForwardAction = new KAction( + m_searchForwardAction = new TDEAction( i18n("Search Incrementally"), CTRL+ALT+Key_F, this, TQT_SLOT(slotSearchForwardAction()), actionCollection(), "edit_isearch" ); - m_searchBackwardAction = new KAction( + m_searchBackwardAction = new TDEAction( i18n("Search Incrementally Backwards"), CTRL+ALT+SHIFT+Key_F, this, TQT_SLOT(slotSearchBackwardAction()), actionCollection(), "edit_isearch_reverse" ); @@ -97,13 +97,13 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) m_comboAction->setAutoSized( true ); m_comboAction->setShortcutConfigurable( false ); - KActionMenu* optionMenu = new KActionMenu( + TDEActionMenu* optionMenu = new TDEActionMenu( i18n("Search Options"), "configure", actionCollection(), "isearch_options" ); optionMenu->setDelayed( false ); - KToggleAction* action = new KToggleAction( - i18n("Case Sensitive"), KShortcut(), + TDEToggleAction* action = new TDEToggleAction( + i18n("Case Sensitive"), TDEShortcut(), actionCollection(), "isearch_case_sensitive" ); action->setShortcutConfigurable( false ); connect( action, TQT_SIGNAL(toggled(bool)), @@ -111,8 +111,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) action->setChecked( m_caseSensitive ); optionMenu->insert( action ); - action = new KToggleAction( - i18n("From Beginning"), KShortcut(), + action = new TDEToggleAction( + i18n("From Beginning"), TDEShortcut(), actionCollection(), "isearch_from_beginning" ); action->setShortcutConfigurable( false ); connect( action, TQT_SIGNAL(toggled(bool)), @@ -120,8 +120,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) action->setChecked( m_fromBeginning ); optionMenu->insert( action ); - action = new KToggleAction( - i18n("Regular Expression"), KShortcut(), + action = new TDEToggleAction( + i18n("Regular Expression"), TDEShortcut(), actionCollection(), "isearch_reg_exp" ); action->setShortcutConfigurable( false ); connect( action, TQT_SIGNAL(toggled(bool)), @@ -129,10 +129,10 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) action->setChecked( m_regExp ); optionMenu->insert( action ); -// optionMenu->insert( new KActionSeparator() ); +// optionMenu->insert( new TDEActionSeparator() ); // -// action = new KToggleAction( -// i18n("Auto-Wrap Search"), KShortcut(), +// action = new TDEToggleAction( +// i18n("Auto-Wrap Search"), TDEShortcut(), // actionCollection(), "isearch_auto_wrap" ); // connect( action, TQT_SIGNAL(toggled(bool)), // this, TQT_SLOT(setAutoWrap(bool)) ); diff --git a/kate/plugins/isearch/ISearchPlugin.h b/kate/plugins/isearch/ISearchPlugin.h index 980630795..b11b2a8b6 100644 --- a/kate/plugins/isearch/ISearchPlugin.h +++ b/kate/plugins/isearch/ISearchPlugin.h @@ -92,8 +92,8 @@ private: KTextEditor::SearchInterface* m_searchIF; KTextEditor::ViewCursorInterface* m_cursorIF; KTextEditor::SelectionInterface* m_selectIF; - KAction* m_searchForwardAction; - KAction* m_searchBackwardAction; + TDEAction* m_searchForwardAction; + TDEAction* m_searchBackwardAction; KWidgetAction* m_comboAction; TQGuardedPtr m_label; TQGuardedPtr m_combo; diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index 832ff5eb7..829a0f31f 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.cpp +++ b/kate/plugins/kdatatool/kate_kdatatool.cpp @@ -75,7 +75,7 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view ) view->insertChildClient (this); setInstance( KGenericFactory::instance() ); - m_menu = new KActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool"); + m_menu = new TDEActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool"); connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow())); setXMLFile("tdetexteditor_kdatatoolui.rc"); @@ -96,7 +96,7 @@ void KDataToolPluginView::aboutToShow() m_wordUnderCursor = TQString::null; // unplug old actions, if any: - KAction *ac; + TDEAction *ac; for ( ac = m_actionList.first(); ac; ac = m_actionList.next() ) { m_menu->remove(ac); } @@ -150,7 +150,7 @@ void KDataToolPluginView::aboutToShow() m_singleWord = true; m_singleWord_line = line; } else { - m_notAvailable = new KAction(i18n("(not available)"), TQString::null, 0, this, + m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this, TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); m_menu->insert(m_notAvailable); return; @@ -172,7 +172,7 @@ void KDataToolPluginView::aboutToShow() } if( m_actionList.isEmpty() ) { - m_notAvailable = new KAction(i18n("(not available)"), TQString::null, 0, this, + m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this, TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); m_menu->insert(m_notAvailable); } diff --git a/kate/plugins/kdatatool/kate_kdatatool.h b/kate/plugins/kdatatool/kate_kdatatool.h index ac437dd16..a217c6f27 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.h +++ b/kate/plugins/kdatatool/kate_kdatatool.h @@ -26,7 +26,7 @@ #include #include -class KActionMenu; +class TDEActionMenu; class KDataToolInfo; namespace KTextEditor @@ -62,9 +62,9 @@ private: bool m_singleWord; int m_singleWord_line, m_singleWord_start, m_singleWord_end; TQString m_wordUnderCursor; - TQPtrList m_actionList; - TQGuardedPtr m_menu; - KAction *m_notAvailable; + TQPtrList m_actionList; + TQGuardedPtr m_menu; + TDEAction *m_notAvailable; protected slots: void aboutToShow(); void slotToolActivated( const KDataToolInfo &datatoolinfo, const TQString &string ); diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp index fbd5a4db7..4c38b1287 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.cpp +++ b/kate/plugins/wordcompletion/docwordcompletion.cpp @@ -130,7 +130,7 @@ struct DocWordCompletionPluginViewPrivate TQString last; // last word we were trying to match TQString lastIns; // latest applied completion TQRegExp re; // hrm - KToggleAction *autopopup; // for accessing state + TDEToggleAction *autopopup; // for accessing state uint treshold; // the required length of a word before popping up the completion list automatically int directionalPos; // be able to insert "" at the correct time }; @@ -145,15 +145,15 @@ DocWordCompletionPluginView::DocWordCompletionPluginView( uint treshold, bool au view->insertChildClient( this ); setInstance( KGenericFactory::instance() ); - (void) new KAction( i18n("Reuse Word Above"), CTRL+Key_8, this, + (void) new TDEAction( i18n("Reuse Word Above"), CTRL+Key_8, this, TQT_SLOT(completeBackwards()), actionCollection(), "doccomplete_bw" ); - (void) new KAction( i18n("Reuse Word Below"), CTRL+Key_9, this, + (void) new TDEAction( i18n("Reuse Word Below"), CTRL+Key_9, this, TQT_SLOT(completeForwards()), actionCollection(), "doccomplete_fw" ); - (void) new KAction( i18n("Pop Up Completion List"), 0, this, + (void) new TDEAction( i18n("Pop Up Completion List"), 0, this, TQT_SLOT(popupCompletionList()), actionCollection(), "doccomplete_pu" ); - (void) new KAction( i18n("Shell Completion"), 0, this, + (void) new TDEAction( i18n("Shell Completion"), 0, this, TQT_SLOT(shellComplete()), actionCollection(), "doccomplete_sh" ); - d->autopopup = new KToggleAction( i18n("Automatic Completion Popup"), 0, this, + d->autopopup = new TDEToggleAction( i18n("Automatic Completion Popup"), 0, this, TQT_SLOT(toggleAutoPopup()), actionCollection(), "enable_autopopup" ); d->autopopup->setChecked( autopopup ); -- cgit v1.2.1