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/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 ++++++------ 8 files changed, 32 insertions(+), 32 deletions(-) (limited to 'kate/plugins') 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.3