From 74a2067d286867e313f736d6733407586b71195e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:10:05 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kate/cppsymbolviewer/plugin_katesymbolviewer.cpp | 6 +++--- kate/cppsymbolviewer/plugin_katesymbolviewer.h | 2 +- kate/filelistloader/katefll_plugin.cpp | 10 ++++----- kate/filelistloader/katefll_plugin.h | 2 +- kate/filetemplates/plugin/filetemplates.cpp | 24 +++++++++++----------- kate/filetemplates/plugin/filetemplates.h | 8 ++++---- kate/helloworld/plugin_katehelloworld.cpp | 2 +- kate/htmltools/plugin_katehtmltools.cpp | 2 +- kate/insertcommand/plugin_kateinsertcommand.cpp | 2 +- kate/kjswrapper/samples/katekjsconsolewindow.js | 2 +- kate/kjswrapper/samples/katekjsselect.js | 2 +- kate/kjswrapper/samples/katekjstest1.js | 2 +- kate/kpybrowser/kpybrowser.cpp | 2 +- kate/kpybrowser/kpybrowser.h | 2 +- kate/kpybrowser/pybrowse_part.cpp | 2 +- kate/make/plugin_katemake.cpp | 8 ++++---- kate/modeline/ModelinePlugin.cpp | 2 +- kate/openheader/plugin_kateopenheader.cpp | 2 +- .../tabbarextension/plugin_katetabbarextension.cpp | 4 ++-- kate/textfilter/plugin_katetextfilter.cpp | 2 +- kate/xmlcheck/plugin_katexmlcheck.cpp | 4 ++-- kate/xmltools/plugin_katexmltools.cpp | 6 +++--- 22 files changed, 49 insertions(+), 49 deletions(-) (limited to 'kate') diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp index 39abc4a..d12bb99 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp @@ -14,7 +14,7 @@ * Jun 19 2003 v.1.0 - Removed TQTimer (polling is Evil(tm)... ) * - Captured documentChanged() event to refresh symbol list * - Tooltips vanished into nowhere...sigh :( - * May 04 2003 v 0.6 - Symbol List becomes a KListView object. Removed Tooltip class. + * May 04 2003 v 0.6 - Symbol List becomes a TDEListView object. Removed Tooltip class. * Added a TQTimer that every 200ms checks: * * if the list width has changed * * if the document has changed @@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY( katecppsymbolviewerplugin, KGenericFactoryinsertCatalogue("katecppsymbolviewer"); - KToggleAction* act = new KToggleAction ( i18n("Hide Symbols"), 0, this, TQT_SLOT( slotInsertSymbol() ), actionCollection(), "view_insert_symbolviewer" ); + TDEToggleAction* act = new TDEToggleAction ( i18n("Hide Symbols"), 0, this, TQT_SLOT( slotInsertSymbol() ), actionCollection(), "view_insert_symbolviewer" ); act->setCheckedState(i18n("Show Symbols")); setInstance (new TDEInstance("kate")); @@ -123,7 +123,7 @@ void KatePluginSymbolViewerView::slotInsertSymbol() { dock = win->toolViewManager()->createToolView("kate_plugin_cppsymbolviewer", Kate::ToolViewManager::Left, cls, i18n("Symbol List")); - symbols = new KListView(dock); + symbols = new TDEListView(dock); treeMode = 0; connect(symbols, TQT_SIGNAL(executed(TQListViewItem *)), this, TQT_SLOT(goToSymbol(TQListViewItem *))); diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h index 1f18dfb..9e7a59a 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h @@ -69,7 +69,7 @@ class KatePluginSymbolViewerView : public TQObject, public KXMLGUIClient void slotViewChanged(TQResizeEvent *e); private: TQPopupMenu *popup; - KListView *symbols; + TDEListView *symbols; TQWidget *dock; bool m_Active; int m_macro, m_struct, m_func, m_sort; diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp index 6852485..f3f6f4d 100644 --- a/kate/filelistloader/katefll_plugin.cpp +++ b/kate/filelistloader/katefll_plugin.cpp @@ -39,7 +39,7 @@ class PluginView : public KXMLGUIClient public: Kate::MainWindow *win; - KRecentFilesAction *recentFiles; + TDERecentFilesAction *recentFiles; }; PluginKateFileListLoader::PluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList) @@ -74,20 +74,20 @@ void PluginKateFileListLoader::addView(Kate::MainWindow *win) { PluginView *view = new PluginView (); - (void) new KAction( i18n("Open File List..."), 0, + (void) new TDEAction( i18n("Open File List..."), 0, this, TQT_SLOT( slotOpenList() ), view->actionCollection(), "file_kfllopen" ); - view->recentFiles = new KRecentFilesAction( i18n("Open Recent"), KShortcut::null(), + view->recentFiles = new TDERecentFilesAction( i18n("Open Recent"), TDEShortcut::null(), this, TQT_SLOT(slotOpenList(const KURL&)), view->actionCollection(), "file_kfllopenrecent"); view->recentFiles->loadEntries(m_config, "Recent Files"); - (void) new KAction( i18n("Save File List"), 0, + (void) new TDEAction( i18n("Save File List"), 0, this, TQT_SLOT( slotSaveList() ), view->actionCollection(), "file_kfllsave" ); - (void) new KAction( i18n("Save File List As..."), 0, + (void) new TDEAction( i18n("Save File List As..."), 0, this, TQT_SLOT( slotSaveListAs() ), view->actionCollection(), "file_kfllsaveas" ); diff --git a/kate/filelistloader/katefll_plugin.h b/kate/filelistloader/katefll_plugin.h index dc5a85b..ed7c1a8 100644 --- a/kate/filelistloader/katefll_plugin.h +++ b/kate/filelistloader/katefll_plugin.h @@ -58,7 +58,7 @@ class PluginKateFileListLoader : public Kate::Plugin, Kate::PluginViewInterface private: TQPtrList m_views; - KRecentFilesAction *m_recentFiles; + TDERecentFilesAction *m_recentFiles; TDEConfig* m_config; KURL m_oldInitURL; KURL m_saveURL; diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index 5488f48..4fdf1d8 100644 --- a/kate/filetemplates/plugin/filetemplates.cpp +++ b/kate/filetemplates/plugin/filetemplates.cpp @@ -127,16 +127,16 @@ class TemplateInfo //BEGIN KateFileTemplates KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ), - m_actionCollection( new KActionCollection( this, "template_actions", new TDEInstance("kate") ) ) + m_actionCollection( new TDEActionCollection( this, "template_actions", new TDEInstance("kate") ) ) { // create actions, so that they are shared. // We plug them into each view's menus, and update them centrally, so that // new plugins can automatically become visible in all windows. - (void) new KAction ( i18n("Any File..."), 0, this, + (void) new TDEAction ( i18n("Any File..."), 0, this, TQT_SLOT( slotAny() ), m_actionCollection, "file_template_any" ); // recent templates - m_acRecentTemplates = new KRecentFilesAction( i18n("&Use Recent"), 0, this, + m_acRecentTemplates = new TDERecentFilesAction( i18n("&Use Recent"), 0, this, TQT_SLOT(slotOpenTemplate(const KURL &)), m_actionCollection, "file_templates_recent" ); @@ -248,11 +248,11 @@ void KateFileTemplates::addView(Kate::MainWindow *win) { PluginView *view = new PluginView (); - (void) new KAction( i18n("&Manage Templates..."), 0, + (void) new TDEAction( i18n("&Manage Templates..."), 0, this, TQT_SLOT(slotEditTemplate()), view->actionCollection(), "settings_manage_templates" ); - (void)new KActionMenu( i18n("New From &Template"), "make", + (void)new TDEActionMenu( i18n("New From &Template"), "make", view->actionCollection(), "file_new_fromtemplate" ); refreshMenu( view ); @@ -293,7 +293,7 @@ TQStringList KateFileTemplates::groups() void KateFileTemplates::refreshMenu( PluginView *v ) { - TQPopupMenu *m = (TQPopupMenu*)(((KActionMenu*)(v->actionCollection()->action("file_new_fromtemplate")))->popupMenu()); + TQPopupMenu *m = (TQPopupMenu*)(((TDEActionMenu*)(v->actionCollection()->action("file_new_fromtemplate")))->popupMenu()); // clear the menu for templates m->clear(); @@ -1069,11 +1069,11 @@ void KateTemplateWizard::accept() //END KateTemplateWizard //BEGIN KateTemplateItem -class KateTemplateItem : public KListViewItem +class KateTemplateItem : public TDEListViewItem { public: - KateTemplateItem( KListViewItem *parent, TemplateInfo *templateinfo ) - : KListViewItem( parent, templateinfo->tmplate ), templateinfo( templateinfo ) + KateTemplateItem( TDEListViewItem *parent, TemplateInfo *templateinfo ) + : TDEListViewItem( parent, templateinfo->tmplate ), templateinfo( templateinfo ) { } TemplateInfo *templateinfo; @@ -1105,7 +1105,7 @@ KateTemplateManager::KateTemplateManager( KateFileTemplates *kft, TQWidget *pare { TQGridLayout *lo = new TQGridLayout( this, 2, 6 ); lo->setSpacing( KDialogBase::spacingHint() ); - lvTemplates = new KListView( this ); + lvTemplates = new TDEListView( this ); lvTemplates->addColumn( i18n("Template") ); lo->addMultiCellWidget( lvTemplates, 1, 1, 1, 6 ); connect( lvTemplates, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateState()) ); @@ -1146,12 +1146,12 @@ void KateTemplateManager::reload() { lvTemplates->clear(); - TQDict groupitems; // FIXME TQMAP + TQDict groupitems; // FIXME TQMAP for ( uint i = 0; i < kft->templates().count(); i++ ) { if ( ! groupitems[ kft->templates().at( i )->group ] ) { - groupitems.insert( kft->templates().at( i )->group , new KListViewItem( lvTemplates, kft->templates().at( i )->group ) ); + groupitems.insert( kft->templates().at( i )->group , new TDEListViewItem( lvTemplates, kft->templates().at( i )->group ) ); groupitems[ kft->templates().at( i )->group ]->setOpen( true ); } new KateTemplateItem( groupitems[ kft->templates().at( i )->group ], kft->templates().at( i ) ); diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h index bb7f912..c1fa754 100644 --- a/kate/filetemplates/plugin/filetemplates.h +++ b/kate/filetemplates/plugin/filetemplates.h @@ -142,13 +142,13 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface void refreshMenu( class PluginView */*class TQPopupMenu **/ ); TQPtrList m_views; - class KActionCollection *m_actionCollection; - class KRecentFilesAction *m_acRecentTemplates; + class TDEActionCollection *m_actionCollection; + class TDERecentFilesAction *m_acRecentTemplates; TQPtrList m_templates; class KDirWatch *m_dw; class KUser *m_user; class TDEConfig *m_emailstuff; - class KActionMenu *m_menu; + class TDEActionMenu *m_menu; }; class TemplateInfo; @@ -252,7 +252,7 @@ class KateTemplateManager : public TQWidget void slotRemoveTemplate(); private: - class KListView *lvTemplates; + class TDEListView *lvTemplates; class TQPushButton *btnNew, *btnEdit, *btnRemove, *btnDownload, *btnUpload; KateFileTemplates *kft; TQPtrList *remove; diff --git a/kate/helloworld/plugin_katehelloworld.cpp b/kate/helloworld/plugin_katehelloworld.cpp index 16a0074..f44cd66 100644 --- a/kate/helloworld/plugin_katehelloworld.cpp +++ b/kate/helloworld/plugin_katehelloworld.cpp @@ -30,7 +30,7 @@ void KatePluginHelloWorld::addView(Kate::MainWindow *win) // TODO: doesn't this have to be deleted? PluginView *view = new PluginView (); - (void) new KAction ( i18n("Insert Hello World"), 0, this, + (void) new TDEAction ( i18n("Insert Hello World"), 0, this, TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_helloworld" ); diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp index 155fb16..a1fb5e1 100644 --- a/kate/htmltools/plugin_katehtmltools.cpp +++ b/kate/htmltools/plugin_katehtmltools.cpp @@ -50,7 +50,7 @@ void PluginKateHtmlTools::addView(Kate::MainWindow *win) // TODO: doesn't this have to be deleted? PluginView *view = new PluginView (); - (void) new KAction ( i18n("HT&ML Tag..."), /*"edit_HTML_tag",*/ ALT + Key_Minus, this, + (void) new TDEAction ( i18n("HT&ML Tag..."), /*"edit_HTML_tag",*/ ALT + Key_Minus, this, TQT_SLOT( slotEditHTMLtag() ), view->actionCollection(), "edit_HTML_tag" ); view->setInstance (new TDEInstance("kate")); diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index 2d0587f..edf269e 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -83,7 +83,7 @@ void PluginKateInsertCommand::addView(Kate::MainWindow *win) // TODO: doesn't this have to be deleted? PluginView *view = new PluginView (); - (void) new KAction ( i18n("Insert Command..."), "", 0, this, + (void) new TDEAction ( i18n("Insert Command..."), "", 0, this, TQT_SLOT( slotInsertCommand() ), view->actionCollection(), "edit_insert_command" ); diff --git a/kate/kjswrapper/samples/katekjsconsolewindow.js b/kate/kjswrapper/samples/katekjsconsolewindow.js index e253ce0..ef19ac1 100644 --- a/kate/kjswrapper/samples/katekjsconsolewindow.js +++ b/kate/kjswrapper/samples/katekjsconsolewindow.js @@ -1,6 +1,6 @@ function newWindowCallBack(mainwindow) { var ac=mainwindow.actionCollection(); - action = new KAction( ac, 'kjsconsole_show_action' ); + action = new TDEAction( ac, 'kjsconsole_show_action' ); action.text = 'Javascript Console Window'; action.icon = 'konsole'; diff --git a/kate/kjswrapper/samples/katekjsselect.js b/kate/kjswrapper/samples/katekjsselect.js index d6a33fb..6426879 100644 --- a/kate/kjswrapper/samples/katekjsselect.js +++ b/kate/kjswrapper/samples/katekjsselect.js @@ -1,6 +1,6 @@ function newWindowCallBack(mainwindow) { var ac=mainwindow.actionCollection(); - action = new KAction( ac, 'kjsselect_select_action' ); + action = new TDEAction( ac, 'kjsselect_select_action' ); action.text = 'Select enclosing block'; //action.icon = 'konsole'; diff --git a/kate/kjswrapper/samples/katekjstest1.js b/kate/kjswrapper/samples/katekjstest1.js index 7e4e041..093723c 100644 --- a/kate/kjswrapper/samples/katekjstest1.js +++ b/kate/kjswrapper/samples/katekjstest1.js @@ -66,7 +66,7 @@ function MyToolView1 (mainwindow,parentwidget) { parentwidget.caption="This is my first JS Toolview"; parentwidget.icon=StdIcons.BarIcon("yes"); - this.lv = new KListView( parentwidget ); + this.lv = new TDEListView( parentwidget ); this.lv.addColumn('Pix'); this.lv.addColumn('One'); diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp index 183e1e7..71e667d 100644 --- a/kate/kpybrowser/kpybrowser.cpp +++ b/kate/kpybrowser/kpybrowser.cpp @@ -182,7 +182,7 @@ getOpenNodes (TQValueList < TQString > *open_nodes, PyBrowseNode * node) KPyBrowser::KPyBrowser (TQWidget * parent, const char *name): -KListView (parent, name) +TDEListView (parent, name) { addColumn(i18n("Name")); diff --git a/kate/kpybrowser/kpybrowser.h b/kate/kpybrowser/kpybrowser.h index 8d2a648..d8a0afb 100644 --- a/kate/kpybrowser/kpybrowser.h +++ b/kate/kpybrowser/kpybrowser.h @@ -32,7 +32,7 @@ /** KPyBrowser is the base class of the project */ -class KPyBrowser : public KListView +class KPyBrowser : public TDEListView { Q_OBJECT diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp index 90e4aca..788bac8 100644 --- a/kate/kpybrowser/pybrowse_part.cpp +++ b/kate/kpybrowser/pybrowse_part.cpp @@ -33,7 +33,7 @@ K_EXPORT_COMPONENT_FACTORY( katepybrowseplugin, KGenericFactoryactionCollection(), "edit_apply_modeline" ); diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp index f6ede42..fde6fad 100644 --- a/kate/openheader/plugin_kateopenheader.cpp +++ b/kate/openheader/plugin_kateopenheader.cpp @@ -50,7 +50,7 @@ void PluginKateOpenHeader::addView(Kate::MainWindow *win) // TODO: doesn't this have to be deleted? PluginView *view = new PluginView (); - (void) new KAction( i18n("Open .h/.cpp/.c"), Key_F12, + (void) new TDEAction( i18n("Open .h/.cpp/.c"), Key_F12, this, TQT_SLOT( slotOpenHeader() ), view->actionCollection(), "file_openheader" ); diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp index 3c9e5f3..4f553d3 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.cpp +++ b/kate/tabbarextension/plugin_katetabbarextension.cpp @@ -110,7 +110,7 @@ void KatePluginTabBarExtension::addView(Kate::MainWindow *win) win, bHoriz, sort, 0, "tabs_hbox"); new KWidgetAction(view->tabbar, "tab_bar_widget", - KShortcut::null(), 0, 0, view->actionCollection(), "tabbar_widget"); + TDEShortcut::null(), 0, 0, view->actionCollection(), "tabbar_widget"); view->setInstance (new TDEInstance("kate")); view->setXMLFile("plugins/katetabbarextension/ui.rc"); @@ -119,7 +119,7 @@ void KatePluginTabBarExtension::addView(Kate::MainWindow *win) m_views.append (view); - KToolBar* toolbar = dynamic_cast + TDEToolBar* toolbar = dynamic_cast (win->guiFactory()->container("tabbarExtensionToolBar", view)); if (toolbar) { connect(toolbar, TQT_SIGNAL( orientationChanged(Qt::Orientation) ), diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp index ca95595..f1c10e5 100644 --- a/kate/textfilter/plugin_katetextfilter.cpp +++ b/kate/textfilter/plugin_katetextfilter.cpp @@ -63,7 +63,7 @@ void PluginKateTextFilter::addView(Kate::MainWindow *win) // TODO: doesn't this have to be deleted? PluginView *view = new PluginView (); - (void) new KAction ( i18n("Filter Te&xt..."), /*"edit_filter",*/ CTRL + Key_Backslash, this, + (void) new TDEAction ( i18n("Filter Te&xt..."), /*"edit_filter",*/ CTRL + Key_Backslash, this, TQT_SLOT( slotEditFilter() ), view->actionCollection(), "edit_filter" ); view->setInstance (new TDEInstance("kate")); diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index 76d674a..49f2af2 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.cpp +++ b/kate/xmlcheck/plugin_katexmlcheck.cpp @@ -99,10 +99,10 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow { m_tmp_file=0; m_proc=0; - (void) new KAction ( i18n("Validate XML"), 0, TQT_TQOBJECT(this), + (void) new TDEAction ( i18n("Validate XML"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotValidate() ), actionCollection(), "xml_check" ); // TODO?: - //(void) new KAction ( i18n("Indent XML"), 0, this, + //(void) new TDEAction ( i18n("Indent XML"), 0, this, // TQT_SLOT( slotIndent() ), actionCollection(), "xml_indent" ); setInstance(new TDEInstance("kate")); diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index 05ff8ae..8daeb83 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -149,11 +149,11 @@ void PluginKateXMLTools::addView( Kate::MainWindow *win ) { // TODO: doesn't this have to be deleted? PluginView *view = new PluginView (); - ( void) new KAction ( i18n("&Insert Element..."), CTRL+Key_Return, this, + ( void) new TDEAction ( i18n("&Insert Element..."), CTRL+Key_Return, this, TQT_SLOT( slotInsertElement()), view->actionCollection(), "xml_tool_insert_element" ); - ( void) new KAction ( i18n("&Close Element"), CTRL+Key_Less, this, + ( void) new TDEAction ( i18n("&Close Element"), CTRL+Key_Less, this, TQT_SLOT( slotCloseElement()), view->actionCollection(), "xml_tool_close_element" ); - ( void) new KAction ( i18n("Assign Meta &DTD..." ), 0, this, + ( void) new TDEAction ( i18n("Assign Meta &DTD..." ), 0, this, TQT_SLOT( getDTD()), view->actionCollection(), "xml_tool_assign" ); view->setInstance( new TDEInstance("kate") ); -- cgit v1.2.1