diff options
127 files changed, 452 insertions, 452 deletions
diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index 3ed7e24..35b64fb 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -36,7 +36,7 @@ #include "designer.h" AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) - : KMainWindow(parent, name) + : TDEMainWindow(parent, name) { firstBoard = true; estates.setAutoDelete(true); @@ -53,23 +53,23 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) (void) KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); (void) KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); (void) KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); - (void) new KAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(info()), actionCollection(), "boardinfo"); - (void) new KAction(i18n("&Edit Groups..."), CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(editGroups()), actionCollection(), "groupeditor"); + (void) new TDEAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(info()), actionCollection(), "boardinfo"); + (void) new TDEAction(i18n("&Edit Groups..."), CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(editGroups()), actionCollection(), "groupeditor"); - (void) new KAction(i18n("&Add 4 Squares"), "viewmag+", 0, TQT_TQOBJECT(this), TQT_SLOT(larger()), actionCollection(), "larger"); - (void) new KAction(i18n("&Remove 4 Squares"), "viewmag-", 0, TQT_TQOBJECT(this), TQT_SLOT(smaller()), actionCollection(), "smaller"); + (void) new TDEAction(i18n("&Add 4 Squares"), "viewmag+", 0, TQT_TQOBJECT(this), TQT_SLOT(larger()), actionCollection(), "larger"); + (void) new TDEAction(i18n("&Remove 4 Squares"), "viewmag-", 0, TQT_TQOBJECT(this), TQT_SLOT(smaller()), actionCollection(), "smaller"); (void) KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection()); (void) KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection()); - (void) new KAction(i18n("&Up"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), actionCollection(), "up"); - (void) new KAction(i18n("&Down"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), actionCollection(), "down"); - (void) new KAction(i18n("&Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(left()), actionCollection(), "left"); - (void) new KAction(i18n("&Right"), Key_Right, TQT_TQOBJECT(this), TQT_SLOT(right()), actionCollection(), "right"); + (void) new TDEAction(i18n("&Up"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), actionCollection(), "up"); + (void) new TDEAction(i18n("&Down"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), actionCollection(), "down"); + (void) new TDEAction(i18n("&Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(left()), actionCollection(), "left"); + (void) new TDEAction(i18n("&Right"), Key_Right, TQT_TQOBJECT(this), TQT_SLOT(right()), actionCollection(), "right"); recentAct = KStdAction::openRecent(0, 0, actionCollection()); connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL &))); recentAct->loadEntries(TDEGlobal::config(), "Designer recent files"); - estateAct = new KListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num"); + estateAct = new TDEListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num"); connect(estateAct, TQT_SIGNAL(activated(int)), TQT_SLOT(changeEstate(int))); createGUI("atlantikdesignerui.rc"); diff --git a/atlantikdesigner/designer/designer.h b/atlantikdesigner/designer/designer.h index e4bbff7..a10ee1e 100644 --- a/atlantikdesigner/designer/designer.h +++ b/atlantikdesigner/designer/designer.h @@ -15,14 +15,14 @@ class EstateEdit; class TQCloseEvent; -class KListAction; -class KRecentFilesAction; +class TDEListAction; +class TDERecentFilesAction; class Estate; class Player; class ConfigEstate; class AtlantikBoard; -class AtlanticDesigner : public KMainWindow +class AtlanticDesigner : public TDEMainWindow { Q_OBJECT @@ -80,8 +80,8 @@ class AtlanticDesigner : public KMainWindow TQGuardedPtr<GroupEditor> groupEditor; TQGuardedPtr<BoardInfoDlg> boardInfoDlg; EstateList estates; - KListAction *estateAct; - KRecentFilesAction *recentAct; + TDEListAction *estateAct; + TDERecentFilesAction *recentAct; TQValueList<CardStack> cards; BoardInfo boardInfo; diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp index 5687a02..4825362 100644 --- a/atlantikdesigner/designer/editor.cpp +++ b/atlantikdesigner/designer/editor.cpp @@ -664,7 +664,7 @@ CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del())); hlayout->addWidget(delButton); - List = new KListBox(this); + List = new TDEListBox(this); layout->addWidget(List); connect(List, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(selected(int))); diff --git a/atlantikdesigner/designer/editor.h b/atlantikdesigner/designer/editor.h index 408c516..3439f81 100644 --- a/atlantikdesigner/designer/editor.h +++ b/atlantikdesigner/designer/editor.h @@ -17,7 +17,7 @@ class TQSpinBox; class KColorButton; class KComboBox; -class KListBox; +class TDEListBox; class KPushButton; enum EstateType { Street = 0, Cards, FreeParking, ToJail, Tax, Jail }; @@ -209,7 +209,7 @@ class CardView : public TQWidget void updateButtonsEnabled(); private: - KListBox *List; + TDEListBox *List; KPushButton *addButton; KPushButton *renameButton; KPushButton *delButton; diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp index 79b0205..03dabbf 100644 --- a/atlantikdesigner/designer/group.cpp +++ b/atlantikdesigner/designer/group.cpp @@ -28,7 +28,7 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) TQFrame *page = plainPage(); TQHBoxLayout *hlayout = new TQHBoxLayout(page, marginHint(), spacingHint()); - groups = new KListBox(page); + groups = new TDEListBox(page); hlayout->addWidget(groups); connect(groups, TQT_SIGNAL(highlighted(TQListBoxItem *)), this, TQT_SLOT(updateSettings(TQListBoxItem *))); TQStringList newgroups; diff --git a/atlantikdesigner/designer/group.h b/atlantikdesigner/designer/group.h index 657a590..791e617 100644 --- a/atlantikdesigner/designer/group.h +++ b/atlantikdesigner/designer/group.h @@ -10,7 +10,7 @@ class KColorButton; class KLineEdit; -class KListBox; +class TDEListBox; class KPushButton; class TQComboBox; @@ -78,7 +78,7 @@ class GroupEditor : public KDialogBase void selectionChanged(); private: - KListBox *groups; + TDEListBox *groups; KLineEdit *rentMathEdit; KColorButton *fgButton; KColorButton *bgButton; 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, KGenericFactory<KatePlugi KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w) { TDEGlobal::locale()->insertCatalogue("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<class PluginView> 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<KListViewItem> groupitems; // FIXME TQMAP + TQDict<TDEListViewItem> 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<class PluginView> m_views; - class KActionCollection *m_actionCollection; - class KRecentFilesAction *m_acRecentTemplates; + class TDEActionCollection *m_actionCollection; + class TDERecentFilesAction *m_acRecentTemplates; TQPtrList<class TemplateInfo> 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<class TemplateInfo> *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, KGenericFactory<KatePluginPyBrow PluginViewPyBrowse::PluginViewPyBrowse (Kate::MainWindow *w) : win (w) { - (void) new KAction ( i18n("Update Python Browser"), 0, this, + (void) new TDEAction ( i18n("Update Python Browser"), 0, this, TQT_SLOT( slotUpdatePyBrowser() ), actionCollection(), "python_update_pybrowse" ); diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index 3d0cbb2..f2dfd1f 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -333,19 +333,19 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, FUNCTIONSETUP; m_proc=0; - (void) new KAction ( i18n("Next Error"), KShortcut(ALT+CTRL+Key_Right), + (void) new TDEAction ( i18n("Next Error"), TDEShortcut(ALT+CTRL+Key_Right), TQT_TQOBJECT(this), TQT_SLOT( slotNext() ), actionCollection(), "make_right" ); - (void) new KAction ( i18n("Previous Error"), KShortcut(ALT+CTRL+Key_Left), + (void) new TDEAction ( i18n("Previous Error"), TDEShortcut(ALT+CTRL+Key_Left), TQT_TQOBJECT(this), TQT_SLOT( slotPrev() ), actionCollection(), "make_left" ); - (void) new KAction ( i18n("Make"), KShortcut(ALT+Key_R), + (void) new TDEAction ( i18n("Make"), TDEShortcut(ALT+Key_R), TQT_TQOBJECT(this), TQT_SLOT( slotValidate() ), actionCollection(), "make_check" ); - (void) new KAction ( i18n("Configure..."), KShortcut(), + (void) new TDEAction ( i18n("Configure..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigure() ), actionCollection(), "make_settings" ); diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp index e724ae3..59f6a27 100644 --- a/kate/modeline/ModelinePlugin.cpp +++ b/kate/modeline/ModelinePlugin.cpp @@ -55,7 +55,7 @@ void ModelinePlugin::addView(Kate::MainWindow *win) // TODO: doesn't this have to be deleted? PluginView *view = new PluginView (); - new KAction( i18n("Apply Modeline"), 0, + new TDEAction( i18n("Apply Modeline"), 0, this, TQT_SLOT(applyModeline()), view->actionCollection(), "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<KToolBar*> + TDEToolBar* toolbar = dynamic_cast<TDEToolBar*> (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") ); diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index 7187c03..4bbba09 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -286,13 +286,13 @@ void KBinaryClock::updateClock(){ void KBinaryClock::openContextMenu() { bool bImmutable = config()->isImmutable(); - KPopupMenu *menu = new KPopupMenu(); + TDEPopupMenu *menu = new TDEPopupMenu(); menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) ); TDELocale *loc = TDEGlobal::locale(); TQDateTime dt = TQDateTime::currentDateTime(); - KPopupMenu *copyMenu = new KPopupMenu( menu ); + TDEPopupMenu *copyMenu = new TDEPopupMenu( menu ); copyMenu->insertItem(loc->formatDateTime(dt), 201); copyMenu->insertItem(loc->formatDate(dt.date()), 202); copyMenu->insertItem(loc->formatDate(dt.date(), true), 203); diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index 164e1ab..37dd1ca 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -129,7 +129,7 @@ void KolourPicker::slotPick() void KolourPicker::slotHistory() { - KPopupMenu popup; + TDEPopupMenu popup; popup.insertTitle(SmallIcon("colorize"), i18n("History")); TQPtrList<TQPopupMenu> subMenus; subMenus.setAutoDelete(true); @@ -284,7 +284,7 @@ void KolourPicker::arrangeButtons() TQPopupMenu *KolourPicker::copyPopup(const TQColor &c, bool title) const { - KPopupMenu *popup = new KPopupMenu; + TDEPopupMenu *popup = new TDEPopupMenu; if (title) popup->insertTitle(colorPixmap(c), i18n("Copy Color Value")); TQString value; diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc index 43c6fe8..1487a81 100644 --- a/kicker-applets/ktimemon/timemon.cc +++ b/kicker-applets/ktimemon/timemon.cc @@ -241,7 +241,7 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions, "Based on timemon by H. Maierhofer"); hmenu = new KHelpMenu(this, aboutmsg); - menu = new KPopupMenu(this); + menu = new TDEPopupMenu(this); menu->insertTitle( SmallIcon( "ktimemon" ), i18n( "System Monitor" ) ) ; menu->insertItem(i18n("Horizontal Bars"), 4); diff --git a/kicker-applets/ktimemon/timemon.h b/kicker-applets/ktimemon/timemon.h index 6e454d8..a639b3a 100644 --- a/kicker-applets/ktimemon/timemon.h +++ b/kicker-applets/ktimemon/timemon.h @@ -32,7 +32,7 @@ class TQPainter; class TDEProcess; class KShellProcess; class KHelpMenu; -class KPopupMenu; +class TDEPopupMenu; // -- KTimeMon declaration ----------------------------------------------- @@ -88,7 +88,7 @@ private: unsigned interval; bool autoScale; unsigned pageScale, swapScale, ctxScale; - KPopupMenu* menu; + TDEPopupMenu* menu; KHelpMenu* hmenu; TQTimer* timer; KConfDialog *configDialog; diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp index 7856142..88350fb 100644 --- a/kicker-applets/math/mathapplet.cpp +++ b/kicker-applets/math/mathapplet.cpp @@ -110,7 +110,7 @@ MathApplet::MathApplet(const TQString& configFile, Type type, int actions, void MathApplet::initContextMenu() { - mContextMenu = new KPopupMenu(this); + mContextMenu = new TDEPopupMenu(this); mContextMenu->setCheckable(true); mContextMenu->insertItem(i18n("Use &Degrees"), this, TQT_SLOT(useDegrees()), 0, 0, 0); mContextMenu->insertItem(i18n("Use &Radians"), this, TQT_SLOT(useRadians()), 0, 1, 1); diff --git a/kicker-applets/math/mathapplet.h b/kicker-applets/math/mathapplet.h index dad1e8c..e8792b9 100644 --- a/kicker-applets/math/mathapplet.h +++ b/kicker-applets/math/mathapplet.h @@ -33,7 +33,7 @@ class TQLabel; class TQHBox; class TQPushButton; class KHistoryCombo; -class KPopupMenu; +class TDEPopupMenu; class MathApplet : public KPanelApplet { @@ -68,7 +68,7 @@ private: TQLabel *_label; TQPushButton *_btn; TQHBox *_hbox; - KPopupMenu *mContextMenu; + TDEPopupMenu *mContextMenu; bool m_hasFocus; }; diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp index c320ff9..ec09ddb 100644 --- a/kicker-applets/mediacontrol/mediacontrol.cpp +++ b/kicker-applets/mediacontrol/mediacontrol.cpp @@ -151,7 +151,7 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions, reparseConfig(); - rmbMenu = new KPopupMenu(this, "RMBMenu"); + rmbMenu = new TDEPopupMenu(this, "RMBMenu"); rmbMenu->insertTitle(i18n("MediaControl"), 0, 0); rmbMenu->insertItem(SmallIcon("configure"), i18n("Configure MediaControl..."), this, TQT_SLOT(preferences())); diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h index 0704da5..7e1a8ae 100644 --- a/kicker-applets/mediacontrol/mediacontrol.h +++ b/kicker-applets/mediacontrol/mediacontrol.h @@ -42,7 +42,7 @@ #define MEDIACONTROL_VERSION "0.4" class MCSlider; -class KPopupMenu; +class TDEPopupMenu; class TDEInstance; class MediaControlConfig; class TDEAboutData; @@ -96,7 +96,7 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface TrayButton *next_button; // GoTo Next Playlist-Item MCSlider *time_slider; int mLastLen, mLastTime, mLastStatus; - KPopupMenu *rmbMenu; + TDEPopupMenu *rmbMenu; virtual void mousePressEvent(TQMouseEvent* e); virtual void moveEvent(TQMoveEvent*); diff --git a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui index df36762..1f1b835 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui +++ b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui @@ -60,7 +60,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListBox" row="0" column="0"> + <widget class="TDEListBox" row="0" column="0"> <property name="name"> <cstring>playerListBox</cstring> </property> @@ -120,7 +120,7 @@ <string>&Use themes</string> </property> </widget> - <widget class="KListBox"> + <widget class="TDEListBox"> <item> <property name="text"> <string>default</string> diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index 07dbede..f52fbc0 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -63,7 +63,7 @@ AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) : m_part = dynamic_cast<TDEHTMLPart *>(parent); if(!m_part) { kdDebug() << "couldn't get TDEHTMLPart" << endl; return; } - m_menu = new KPopupMenu(m_part->widget()); + m_menu = new TDEPopupMenu(m_part->widget()); m_menu->insertTitle(i18n("Adblock")); m_menu->insertItem(i18n("Configure"), this, TQT_SLOT(showTDECModule())); m_menu->insertItem(i18n("Show Elements"), this, TQT_SLOT(showDialogue())); diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h index dbb4549..b6c2657 100644 --- a/konq-plugins/adblock/adblock.h +++ b/konq-plugins/adblock/adblock.h @@ -29,7 +29,7 @@ class TDEHTMLPart; class KURLLabel; class TDEHTMLSettings; class AdElement; -class KPopupMenu; +class TDEPopupMenu; namespace KParts { @@ -55,7 +55,7 @@ public: private: TQGuardedPtr<TDEHTMLPart> m_part; KURLLabel *m_label; - KPopupMenu *m_menu; + TDEPopupMenu *m_menu; void fillBlockableElements(AdElementList &elements); void fillWithImages(AdElementList &elements); diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp index 1aff0f6..48c7090 100644 --- a/konq-plugins/adblock/adblockdialogue.cpp +++ b/konq-plugins/adblock/adblockdialogue.cpp @@ -71,7 +71,7 @@ AdBlockDlg::AdBlockDlg(TQWidget *parent, AdElementList &elements) : connect(this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( validateFilter() )); connect(m_list, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(updateFilter(TQListViewItem *)) ); - m_menu = new KPopupMenu(this); + m_menu = new TDEPopupMenu(this); m_menu->insertItem(i18n("Filter this item"), this, TQT_SLOT(filterItem())); m_menu->insertItem(i18n("Filter all items at same path"), this, TQT_SLOT(filterPath())); diff --git a/konq-plugins/adblock/adblockdialogue.h b/konq-plugins/adblock/adblockdialogue.h index 793b7c5..38ffca3 100644 --- a/konq-plugins/adblock/adblockdialogue.h +++ b/konq-plugins/adblock/adblockdialogue.h @@ -25,7 +25,7 @@ class TQLabel; class TQLineEdit; -class KPopupMenu; +class TDEPopupMenu; class AdBlockDlg : public KDialogBase { @@ -37,7 +37,7 @@ private: TQListView *m_list; TQLabel *m_label1; TQLabel *m_label2; - KPopupMenu *m_menu; + TDEPopupMenu *m_menu; public: AdBlockDlg(TQWidget *parent, AdElementList &elements); diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index f798a27..72a73d1 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -84,7 +84,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const if (isFeedUrl(it)) { kdDebug() << "AkregatorMenu: found feed URL " << it->url().prettyURL() << endl; - KAction *action = new KAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" ); + TDEAction *action = new TDEAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" ); addAction( action ); addSeparator(); m_feedURL = it->url().url(); diff --git a/konq-plugins/akregator/akregatorplugin.h b/konq-plugins/akregator/akregatorplugin.h index fd4267d..7f94cec 100644 --- a/konq-plugins/akregator/akregatorplugin.h +++ b/konq-plugins/akregator/akregatorplugin.h @@ -27,7 +27,7 @@ #include "pluginbase.h" -class KAction; +class TDEAction; class TDEHTMLPart; namespace Akregator diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index a888c6e..80e4224 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -123,7 +123,7 @@ bool KonqFeedIcon::feedFound() void KonqFeedIcon::contextMenu() { delete m_menu; - m_menu = new KPopupMenu(m_part->widget()); + m_menu = new TDEPopupMenu(m_part->widget()); if(m_feedList.count() == 1) { m_menu->insertTitle(m_feedList.first().title()); m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add Feed to Akregator"), this, TQT_SLOT(addFeeds()) ); diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h index d186e08..3b6b470 100644 --- a/konq-plugins/akregator/konqfeedicon.h +++ b/konq-plugins/akregator/konqfeedicon.h @@ -63,7 +63,7 @@ private: KURLLabel *m_feedIcon; KParts::StatusBarExtension *m_statusBarEx; FeedDetectorEntryList m_feedList; - TQGuardedPtr<KPopupMenu> m_menu; + TQGuardedPtr<TDEPopupMenu> m_menu; private slots: void waitPartToLoad(); diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp index 4bfc14b..9e812c3 100644 --- a/konq-plugins/arkplugin/arkplugin.cpp +++ b/konq-plugins/arkplugin/arkplugin.cpp @@ -87,33 +87,33 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis } TQString ext; - KActionMenu * actionMenu; - KAction * action; + TDEActionMenu * actionMenu; + TDEAction * action; if ( hasOther && itemList.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() ) // don't try to compress if we right click on a folder without files selected { compMimeTypes(); - actionMenu = new KActionMenu( i18n( "Compress" ), "ark", actionCollection(), "ark_compress_menu" ); + actionMenu = new TDEActionMenu( i18n( "Compress" ), "ark", actionCollection(), "ark_compress_menu" ); m_ext = m_conf->readEntry( "LastExtension", ".tar.gz" ); if ( itemCount == 1 ) { item = itemList.first(); m_name = itemList.first()->name(); - action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this, + action = new TDEAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this, TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); } else { - action = new KAction( KMimeType::mimeType( m_conf->readEntry( + action = new TDEAction( KMimeType::mimeType( m_conf->readEntry( "LastMimeType", "application/x-tgz" ) )->comment(), 0, this, TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); } actionMenu->insert( action ); - m_compAsMenu = new KActionMenu( i18n( "Compress As" ), actionCollection(), "arkcmpasmnu" ); + m_compAsMenu = new TDEActionMenu( i18n( "Compress As" ), actionCollection(), "arkcmpasmnu" ); actionMenu->insert( m_compAsMenu ); - m_addToMenu = new KActionMenu( i18n( "Add To" ), actionCollection(), "arkaddtomnu" ); + m_addToMenu = new TDEActionMenu( i18n( "Add To" ), actionCollection(), "arkaddtomnu" ); if ( itemList.first()->url().isLocalFile() ) actionMenu->insert( m_addToMenu ); @@ -123,7 +123,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis this, TQT_SLOT( slotPrepareAddToMenu() ) ); - action = new KAction( i18n( "Add to Archive..." ), 0, this, + action = new TDEAction( i18n( "Add to Archive..." ), 0, this, TQT_SLOT( slotAdd() ), actionCollection() ); actionMenu->insert( action ); addAction( actionMenu ); @@ -133,9 +133,9 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis { if ( popupmenu->protocolInfo().supportsWriting() ) { - actionMenu = new KActionMenu( i18n( "Extract" ), "ark", actionCollection(), "ark_extract_menu" ); + actionMenu = new TDEActionMenu( i18n( "Extract" ), "ark", actionCollection(), "ark_extract_menu" ); - action = new KAction( i18n( "Extract Here" ), 0, this, + action = new TDEAction( i18n( "Extract Here" ), 0, this, TQT_SLOT( slotExtractHere() ), actionCollection() ); actionMenu->insert( action ); // stolen from arkwidget.cpp @@ -143,23 +143,23 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis { TQString targetName = itemList.first()->name(); stripExtension( targetName ); - action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this, + action = new TDEAction( i18n( "Extract to %1" ).arg( targetName ), 0, this, TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); } else { - action = new KAction( i18n( "Extract to Subfolders" ), 0, this, + action = new TDEAction( i18n( "Extract to Subfolders" ), 0, this, TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); } actionMenu->insert( action ); - action = new KAction( i18n( "Extract To..." ), 0 , this, + action = new TDEAction( i18n( "Extract To..." ), 0 , this, TQT_SLOT( slotExtractTo() ), actionCollection() ); actionMenu->insert( action ); addAction( actionMenu ); } else { - action = new KAction( i18n( "Extract To..." ), "ark", 0, this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" ); + action = new TDEAction( i18n( "Extract To..." ), "ark", 0, this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" ); addAction( action ); } } @@ -176,7 +176,7 @@ void ArkMenu::slotPrepareCompAsMenu() disconnect( m_compAsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotPrepareCompAsMenu() ) ); - KAction * action; + TDEAction * action; m_compAsMapper = new TQSignalMapper( this, "compAsMapper" ); TQString ext; TQStringList newExt; @@ -194,13 +194,13 @@ void ArkMenu::slotPrepareCompAsMenu() *eit = ".tar.bz2"; if ( m_urlList.count() == 1 ) { - action = new KAction( m_name + (*eit), 0, m_compAsMapper, + action = new TDEAction( m_name + (*eit), 0, m_compAsMapper, TQT_SLOT( map() ), actionCollection() ); } else { ext = KMimeType::mimeType(*mit)->comment(); - action = new KAction( ext, 0, m_compAsMapper, + action = new TDEAction( ext, 0, m_compAsMapper, TQT_SLOT( map() ), actionCollection() ); } @@ -231,7 +231,7 @@ void ArkMenu::slotPrepareAddToMenu() slotPrepareCompAsMenu(); unsigned int counter = 0; - KAction * action; + TDEAction * action; m_addToMapper = new TQSignalMapper( this, "addToMapper" ); TQCString actionName; TQStringList::Iterator mit; @@ -244,7 +244,7 @@ void ArkMenu::slotPrepareAddToMenu() for ( mit = m_extensionList.begin(); mit != m_extensionList.end(); ++mit ) if ( (*uit).endsWith(*mit) ) { - action = new KAction( *uit, 0, m_addToMapper, + action = new TDEAction( *uit, 0, m_addToMapper, TQT_SLOT( map() ), actionCollection() ); m_addToMenu->insert( action ); m_addToMapper->setMapping( action, counter ); diff --git a/konq-plugins/arkplugin/arkplugin.h b/konq-plugins/arkplugin/arkplugin.h index 0d13158..b59697c 100644 --- a/konq-plugins/arkplugin/arkplugin.h +++ b/konq-plugins/arkplugin/arkplugin.h @@ -25,7 +25,7 @@ #include <tdefileitem.h> #include <tdeconfig.h> -class KAction; +class TDEAction; class TQSignalMapper; class ArkMenu : public KonqPopupMenuPlugin { @@ -61,8 +61,8 @@ private: TQStringList m_archiveMimeTypes; TQStringList m_extractMimeTypes; TQStringList m_extensionList; - KActionMenu * m_compAsMenu; - KActionMenu * m_addToMenu; + TDEActionMenu * m_compAsMenu; + TDEActionMenu * m_addToMenu; TQSignalMapper * m_compAsMapper; TQSignalMapper * m_addToMapper; TDEConfig * m_conf; diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp index bce4995..9393aba 100644 --- a/konq-plugins/autorefresh/autorefresh.cpp +++ b/konq-plugins/autorefresh/autorefresh.cpp @@ -22,7 +22,7 @@ AutoRefresh::AutoRefresh( TQObject* parent, const char* name, const TQStringList timer = new TQTimer( this ); connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRefresh() ) ); - refresher = new KSelectAction( i18n("&Auto Refresh"), + refresher = new TDESelectAction( i18n("&Auto Refresh"), "reload", 0, this, TQT_SLOT(slotIntervalChanged()), actionCollection(), "autorefresh" ); diff --git a/konq-plugins/autorefresh/autorefresh.h b/konq-plugins/autorefresh/autorefresh.h index ca03bb1..251ab8b 100644 --- a/konq-plugins/autorefresh/autorefresh.h +++ b/konq-plugins/autorefresh/autorefresh.h @@ -49,7 +49,7 @@ public slots: void slotIntervalChanged(); private: - KSelectAction *refresher; + TDESelectAction *refresher; TQTimer *timer; }; diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp index a575396..98c37c6 100644 --- a/konq-plugins/babelfish/plugin_babelfish.cpp +++ b/konq-plugins/babelfish/plugin_babelfish.cpp @@ -40,123 +40,123 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, { setInstance(BabelFishFactory::instance()); - m_menu = new KActionMenu( i18n("Translate Web &Page"), "babelfish", + m_menu = new TDEActionMenu( i18n("Translate Web &Page"), "babelfish", actionCollection(), "translatewebpage" ); m_menu->setDelayed( false ); - m_en = new KActionMenu( i18n("&English To"), "babelfish", + m_en = new TDEActionMenu( i18n("&English To"), "babelfish", actionCollection(), "translatewebpage_en" ); - m_fr = new KActionMenu( i18n("&French To"), "babelfish", + m_fr = new TDEActionMenu( i18n("&French To"), "babelfish", actionCollection(), "translatewebpage_fr" ); - m_de = new KActionMenu( i18n("&German To"), "babelfish", + m_de = new TDEActionMenu( i18n("&German To"), "babelfish", actionCollection(), "translatewebpage_de" ); - m_es = new KActionMenu( i18n("&Spanish To"), "babelfish", + m_es = new TDEActionMenu( i18n("&Spanish To"), "babelfish", actionCollection(), "translatewebpage_es" ); - m_pt = new KActionMenu( i18n("&Portuguese To"), "babelfish", + m_pt = new TDEActionMenu( i18n("&Portuguese To"), "babelfish", actionCollection(), "translatewebpage_pt" ); - m_it = new KActionMenu( i18n("&Italian To"), "babelfish", + m_it = new TDEActionMenu( i18n("&Italian To"), "babelfish", actionCollection(), "translatewebpage_it" ); - m_nl = new KActionMenu( i18n("&Dutch To"), "babelfish", + m_nl = new TDEActionMenu( i18n("&Dutch To"), "babelfish", actionCollection(), "translatewebpage_nl" ); - m_en->insert( new KAction( i18n("&Chinese (Simplified)"), 0, + m_en->insert( new TDEAction( i18n("&Chinese (Simplified)"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "en_zh") ); - m_en->insert( new KAction( i18n("Chinese (&Traditional)"), 0, + m_en->insert( new TDEAction( i18n("Chinese (&Traditional)"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "en_zhTW") ); - m_en->insert( new KAction( i18n("&Dutch"), 0, + m_en->insert( new TDEAction( i18n("&Dutch"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "en_nl") ); - m_en->insert( new KAction( i18n("&French"), 0, + m_en->insert( new TDEAction( i18n("&French"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "en_fr") ); - m_en->insert( new KAction( i18n("&German"), 0, + m_en->insert( new TDEAction( i18n("&German"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "en_de") ); - m_en->insert( new KAction( i18n("&Italian"), 0, + m_en->insert( new TDEAction( i18n("&Italian"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "en_it") ); - m_en->insert( new KAction( i18n("&Japanese"), 0, + m_en->insert( new TDEAction( i18n("&Japanese"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "en_ja") ); - m_en->insert( new KAction( i18n("&Korean"), 0, + m_en->insert( new TDEAction( i18n("&Korean"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "en_ko") ); - m_en->insert( new KAction( i18n("&Norwegian"), 0, + m_en->insert( new TDEAction( i18n("&Norwegian"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "en_no") ); - m_en->insert( new KAction( i18n("&Portuguese"), 0, + m_en->insert( new TDEAction( i18n("&Portuguese"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "en_pt") ); - m_en->insert( new KAction( i18n("&Russian"), 0, + m_en->insert( new TDEAction( i18n("&Russian"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "en_ru") ); - m_en->insert( new KAction( i18n("&Spanish"), 0, + m_en->insert( new TDEAction( i18n("&Spanish"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "en_es") ); - m_en->insert( new KAction( i18n("T&hai"), 0, + m_en->insert( new TDEAction( i18n("T&hai"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "en_th") ); - m_fr->insert( new KAction( i18n("&Dutch"), 0, + m_fr->insert( new TDEAction( i18n("&Dutch"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "fr_nl") ); - m_fr->insert( new KAction( i18n("&English"), 0, + m_fr->insert( new TDEAction( i18n("&English"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "fr_en") ); - m_fr->insert( new KAction( i18n("&German"), 0, + m_fr->insert( new TDEAction( i18n("&German"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "fr_de") ); - m_fr->insert( new KAction( i18n("&Italian"), 0, + m_fr->insert( new TDEAction( i18n("&Italian"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "fr_it") ); - m_fr->insert( new KAction( i18n("&Portuguese"), 0, + m_fr->insert( new TDEAction( i18n("&Portuguese"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "fr_pt") ); - m_fr->insert( new KAction( i18n("&Spanish"), 0, + m_fr->insert( new TDEAction( i18n("&Spanish"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "fr_es") ); - m_de->insert( new KAction( i18n("&English"), 0, + m_de->insert( new TDEAction( i18n("&English"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "de_en") ); - m_de->insert( new KAction( i18n("&French"), 0, + m_de->insert( new TDEAction( i18n("&French"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "de_fr") ); - m_es->insert( new KAction( i18n("&English"), 0, + m_es->insert( new TDEAction( i18n("&English"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "es_en") ); - m_es->insert( new KAction( i18n("&French"), 0, + m_es->insert( new TDEAction( i18n("&French"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "es_fr") ); - m_pt->insert( new KAction( i18n("&English"), 0, + m_pt->insert( new TDEAction( i18n("&English"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "pt_en") ); - m_pt->insert( new KAction( i18n("&French"), 0, + m_pt->insert( new TDEAction( i18n("&French"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "pt_fr") ); - m_it->insert( new KAction( i18n("&English"), 0, + m_it->insert( new TDEAction( i18n("&English"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "it_en") ); - m_it->insert( new KAction( i18n("&French"), 0, + m_it->insert( new TDEAction( i18n("&French"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "it_fr") ); - m_nl->insert( new KAction( i18n("&English"), 0, + m_nl->insert( new TDEAction( i18n("&English"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "nl_en") ); - m_nl->insert( new KAction( i18n("&French"), 0, + m_nl->insert( new TDEAction( i18n("&French"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "nl_fr") ); - m_menu->insert( new KAction( i18n("&Chinese (Simplified) to English"), 0, + m_menu->insert( new TDEAction( i18n("&Chinese (Simplified) to English"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "zh_en") ); - m_menu->insert( new KAction( i18n("Chinese (&Traditional) to English"), 0, + m_menu->insert( new TDEAction( i18n("Chinese (&Traditional) to English"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "zhTW_en") ); m_menu->insert( m_nl ); @@ -164,14 +164,14 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, m_menu->insert( m_fr ); m_menu->insert( m_de ); m_menu->insert( m_it ); - m_menu->insert( new KAction( i18n("&Japanese to English"), 0, + m_menu->insert( new TDEAction( i18n("&Japanese to English"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "ja_en") ); - m_menu->insert( new KAction( i18n("&Korean to English"), 0, + m_menu->insert( new TDEAction( i18n("&Korean to English"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "ko_en") ); m_menu->insert( m_pt ); - m_menu->insert( new KAction( i18n("&Russian to English"), 0, + m_menu->insert( new TDEAction( i18n("&Russian to English"), 0, this, TQT_SLOT(translateURL()), actionCollection(), "ru_en") ); m_menu->insert( m_es ); diff --git a/konq-plugins/babelfish/plugin_babelfish.h b/konq-plugins/babelfish/plugin_babelfish.h index 26463e0..dd25087 100644 --- a/konq-plugins/babelfish/plugin_babelfish.h +++ b/konq-plugins/babelfish/plugin_babelfish.h @@ -40,14 +40,14 @@ protected slots: void slotStarted( TDEIO::Job* ); private: - KActionMenu* m_menu; - KActionMenu* m_de; - KActionMenu* m_en; - KActionMenu* m_es; - KActionMenu* m_fr; - KActionMenu* m_it; - KActionMenu* m_nl; - KActionMenu* m_pt; + TDEActionMenu* m_menu; + TDEActionMenu* m_de; + TDEActionMenu* m_en; + TDEActionMenu* m_es; + TDEActionMenu* m_fr; + TDEActionMenu* m_it; + TDEActionMenu* m_nl; + TDEActionMenu* m_pt; }; #endif diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp index dda25ce..6aec893 100644 --- a/konq-plugins/crashes/crashesplugin.cpp +++ b/konq-plugins/crashes/crashesplugin.cpp @@ -42,7 +42,7 @@ CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQString { m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast<TDEHTMLPart*>(parent) : 0L; - m_pCrashesMenu = new KActionMenu( i18n("&Crashes"), "core", + m_pCrashesMenu = new TDEActionMenu( i18n("&Crashes"), "core", actionCollection(), "crashes" ); m_pCrashesMenu->setDelayed( false ); diff --git a/konq-plugins/crashes/crashesplugin.h b/konq-plugins/crashes/crashesplugin.h index f3ef55a..65a8e37 100644 --- a/konq-plugins/crashes/crashesplugin.h +++ b/konq-plugins/crashes/crashesplugin.h @@ -30,7 +30,7 @@ #include <tdeparts/plugin.h> class TDEHTMLPart; -class KActionMenu; +class TDEActionMenu; class CrashesPlugin : public KParts::Plugin { @@ -54,7 +54,7 @@ private: int m_selectedItem; TDEHTMLPart* m_part; - KActionMenu* m_pCrashesMenu; + TDEActionMenu* m_pCrashesMenu; typedef TQPair<TQString,TQCString> Crash; typedef TQValueList<Crash> CrashesList; diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp index a0a0980..d92ce52 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.cpp +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp @@ -153,7 +153,7 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, if ( !m_part || !m_part->scrollWidget() ) return; - m_pFilterMenu = new KActionMenu (i18n("View F&ilter"), "filter", + m_pFilterMenu = new TDEActionMenu (i18n("View F&ilter"), "filter", actionCollection(), "filterdir"); m_pFilterMenu->setDelayed (false); m_pFilterMenu->setWhatsThis(i18n("Allow to filter the currently displayed items by filetype.")); @@ -173,16 +173,16 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, TQHBox *hbox = new TQHBox(m_part->widget()); hbox->hide(); - KAction *clear = new KAction(i18n("Clear Filter Field"), + TDEAction *clear = new TDEAction(i18n("Clear Filter Field"), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, 0, 0, actionCollection(), "clear_filter"); clear->setWhatsThis(i18n("Clear filter field<p>Clears the content of the filter field.")); - if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) ) + if ( ::tqqt_cast<TDEListView*>(m_part->scrollWidget()) ) { - m_searchWidget = new KListViewSearchLine(hbox); - static_cast<KListViewSearchLine*>(m_searchWidget)->setListView(static_cast<KListView*>(m_part->scrollWidget())); + m_searchWidget = new TDEListViewSearchLine(hbox); + static_cast<TDEListViewSearchLine*>(m_searchWidget)->setListView(static_cast<TDEListView*>(m_part->scrollWidget())); } else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) { @@ -416,9 +416,9 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list) m_pFilterMenu->setEnabled (m_part->nameFilter().isEmpty()); return; } - if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) ) + if ( ::tqqt_cast<TDEListView*>(m_part->scrollWidget()) ) { - static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch(); + static_cast<TDEListViewSearchLine*>(m_searchWidget)->updateSearch(); } else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) { @@ -506,8 +506,8 @@ void DirFilterPlugin::activateSearch() m_oldFilterString = m_searchWidget->text(); - if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) ) { - static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch(); + if ( ::tqqt_cast<TDEListView*>(m_part->scrollWidget()) ) { + static_cast<TDEListViewSearchLine*>(m_searchWidget)->updateSearch(); } else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) { static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch(); diff --git a/konq-plugins/dirfilter/dirfilterplugin.h b/konq-plugins/dirfilter/dirfilterplugin.h index c9a3a27..1bf914e 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.h +++ b/konq-plugins/dirfilter/dirfilterplugin.h @@ -29,7 +29,7 @@ #include <klibloader.h> #include <tdeparts/plugin.h> -class KActionMenu; +class TDEActionMenu; class KonqDirPart; class KLineEdit; @@ -130,7 +130,7 @@ private: KonqDirPart* m_part; TQTimer *m_refreshTimer; TQTimer *m_reactivateRefreshTimer; - KActionMenu* m_pFilterMenu; + TDEActionMenu* m_pFilterMenu; TQString m_oldFilterString; KLineEdit *m_searchWidget; diff --git a/konq-plugins/domtreeviewer/Makefile.am b/konq-plugins/domtreeviewer/Makefile.am index ce5cbb4..e6d19e3 100644 --- a/konq-plugins/domtreeviewer/Makefile.am +++ b/konq-plugins/domtreeviewer/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = $(all_includes) # Needed to catch DOM exceptions KDE_CXXFLAGS = $(USE_EXCEPTIONS) -# -DKListView=DOMListView +# -DTDEListView=DOMListView # Install this plugin in the KDE modules directory kde_module_LTLIBRARIES = libdomtreeviewerplugin.la diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h index 250bc77..b8636c9 100644 --- a/konq-plugins/domtreeviewer/domtreeview.h +++ b/konq-plugins/domtreeviewer/domtreeview.h @@ -154,7 +154,7 @@ class DOMTreeView : public DOMTreeViewBase TDEHTMLPart *part; TQTextStream* m_textStream; - const KListView* m_rootListView; + const TDEListView* m_rootListView; KPushButton* m_saveButton; TQObject *focused_child; diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui index 4b79c2d..fb0a39e 100644 --- a/konq-plugins/domtreeviewer/domtreeviewbase.ui +++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui @@ -141,7 +141,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>DOM Tree</string> @@ -326,7 +326,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Name</string> diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp index 03e3581..4eb5dce 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.cpp +++ b/konq-plugins/domtreeviewer/domtreewindow.cpp @@ -56,7 +56,7 @@ using domtreeviewer::ManipulationCommand; DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin) - : KMainWindow( 0, "DOMTreeWindow" ), + : TDEMainWindow( 0, "DOMTreeWindow" ), m_plugin(plugin), m_view(new DOMTreeView(this, "DOMTreeView", false)) { part_manager = 0; @@ -67,7 +67,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin) // accept dnd setAcceptDrops(true); - // tell the KMainWindow that this is indeed the main widget + // tell the TDEMainWindow that this is indeed the main widget setCentralWidget(m_view); // message window dialog @@ -132,22 +132,22 @@ void DOMTreeWindow::setupActions() KStdAction::redisplay(TQT_TQOBJECT(m_view), TQT_SLOT(refresh()), actionCollection()); // toggle manipulation dialog - KAction *showMsgDlg = new KAction(i18n("Show Message Log"), + TDEAction *showMsgDlg = new TDEAction(i18n("Show Message Log"), CTRL+Key_E, actionCollection(), "show_msg_dlg"); connect(showMsgDlg, TQT_SIGNAL(activated()), TQT_SLOT(showMessageLog())); -// KAction *custom = new KAction(i18n("Cus&tom Menuitem"), 0, +// TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0, // this, TQT_SLOT(optionsPreferences()), // actionCollection(), "custom_action"); // actions for the dom tree list view toolbar KStdAction::up(TQT_TQOBJECT(view()), TQT_SLOT(moveToParent()), actionCollection(), "tree_up"); - KAction *tree_inc_level = new KAction(i18n("Expand"), + TDEAction *tree_inc_level = new TDEAction(i18n("Expand"), "1rightarrow", CTRL+Key_Greater, TQT_TQOBJECT(view()), TQT_SLOT(increaseExpansionDepth()), actionCollection(), "tree_inc_level"); tree_inc_level->setToolTip(i18n("Increase expansion level")); - KAction *tree_dec_level = new KAction(i18n("Collapse"), + TDEAction *tree_dec_level = new TDEAction(i18n("Collapse"), "1leftarrow", CTRL+Key_Less, TQT_TQOBJECT(view()), TQT_SLOT(decreaseExpansionDepth()), actionCollection(), "tree_dec_level"); @@ -155,20 +155,20 @@ void DOMTreeWindow::setupActions() // actions for the dom tree list view context menu - del_tree = new KAction(i18n("&Delete"), "editdelete", + del_tree = new TDEAction(i18n("&Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteNodes()), actionCollection(), "tree_delete"); del_tree->setToolTip(i18n("Delete nodes")); - /*KAction *new_elem = */new KAction(i18n("New &Element ..."), - "bookmark", KShortcut(), TQT_TQOBJECT(view()), + /*TDEAction *new_elem = */new TDEAction(i18n("New &Element ..."), + "bookmark", TDEShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddElementDlg()), actionCollection(), "tree_add_element"); - /*KAction *new_text = */new KAction(i18n("New &Text Node ..."), - "text", KShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddTextDlg()), + /*TDEAction *new_text = */new TDEAction(i18n("New &Text Node ..."), + "text", TDEShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddTextDlg()), actionCollection(), "tree_add_text"); // actions for the info panel attribute list context menu - del_attr = new KAction(i18n("&Delete"), "editdelete", + del_attr = new TDEAction(i18n("&Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteAttributes()), actionCollection(), "attr_delete"); del_attr->setToolTip(i18n("Delete attributes")); diff --git a/konq-plugins/domtreeviewer/domtreewindow.h b/konq-plugins/domtreeviewer/domtreewindow.h index 9681df2..b2b0042 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.h +++ b/konq-plugins/domtreeviewer/domtreewindow.h @@ -41,7 +41,7 @@ namespace KParts { class DOMTreeView; class PluginDomtreeviewer; -class KAction; +class TDEAction; class TDEConfig; class KPrinter; class KURL; @@ -58,7 +58,7 @@ class TQPopupMenu; * @short Main window class * @author Leo Savernik */ -class DOMTreeWindow : public KMainWindow +class DOMTreeWindow : public TDEMainWindow { Q_OBJECT @@ -116,9 +116,9 @@ public: TDEConfig *config() const { return _config; } /** returns the attribute delete action */ - KAction *deleteAttributeAction() const { return del_attr; } + TDEAction *deleteAttributeAction() const { return del_attr; } /** returns the node delete action */ - KAction *deleteNodeAction() const { return del_tree; } + TDEAction *deleteNodeAction() const { return del_tree; } public slots: /** @@ -187,7 +187,7 @@ private: TQPopupMenu *domtree_ctx; TDEConfig *_config; - KAction *del_tree, *del_attr; + TDEAction *del_tree, *del_attr; TQGuardedPtr<KParts::PartManager> part_manager; }; diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp index 1993526..a83bd1d 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp @@ -19,7 +19,7 @@ PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name, const TQStringList & ) : Plugin( parent, name ), m_dialog( 0 ) { - (void) new KAction( i18n("Show &DOM Tree"), + (void) new TDEAction( i18n("Show &DOM Tree"), "domtreeviewer", 0, this, TQT_SLOT(slotShowDOMTree()), actionCollection(), "viewdomtree" ); diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index b2b40ce..cff68f1 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -118,18 +118,18 @@ FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName, _ext = new FSViewBrowserExtension(this); _job = 0; - _areaMenu = new KActionMenu (i18n("Stop at Area"), + _areaMenu = new TDEActionMenu (i18n("Stop at Area"), actionCollection(), "treemap_areadir"); - _depthMenu = new KActionMenu (i18n("Stop at Depth"), + _depthMenu = new TDEActionMenu (i18n("Stop at Depth"), actionCollection(), "treemap_depthdir"); - _visMenu = new KActionMenu (i18n("Visualization"), + _visMenu = new TDEActionMenu (i18n("Visualization"), actionCollection(), "treemap_visdir"); - _colorMenu = new KActionMenu (i18n("Color Mode"), + _colorMenu = new TDEActionMenu (i18n("Color Mode"), actionCollection(), "treemap_colordir"); - KAction* action; - action = new KAction( i18n( "&FSView Manual" ), "fsview", - KShortcut(), this, TQT_SLOT(showHelp()), + TDEAction* action; + action = new TDEAction( i18n( "&FSView Manual" ), "fsview", + TDEShortcut(), this, TQT_SLOT(showHelp()), actionCollection(), "help_fsview" ); action->setToolTip(i18n("Show FSView manual")); action->setWhatsThis(i18n("Opens the help browser with the " diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h index 3cd4f97..0af12d5 100644 --- a/konq-plugins/fsview/fsview_part.h +++ b/konq-plugins/fsview/fsview_part.h @@ -30,7 +30,7 @@ #include "fsview.h" class TDEAboutData; -class KActionMenu; +class TDEActionMenu; class FSViewPart; @@ -119,7 +119,7 @@ private: FSView* _view; FSJob* _job; FSViewBrowserExtension* _ext; - KActionMenu *_visMenu, *_areaMenu, *_depthMenu, *_colorMenu; + TDEActionMenu *_visMenu, *_areaMenu, *_depthMenu, *_colorMenu; }; #endif // FSVIEW_PART_H diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp index 016f58a..183ff13 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp @@ -125,7 +125,7 @@ void KIGPDialog::setupLookPage(const TQString& path) { m_fontName = new TQComboBox( false,page ); TQStringList standardFonts; - KFontChooser::getFontList(standardFonts, 0); + TDEFontChooser::getFontList(standardFonts, 0); m_fontName->insertStringList( standardFonts ); m_fontName->setCurrentText( m_config->readEntry("FontName", TDEGlobalSettings::generalFont().family() ) ); diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index eee6d9d..71b3dce 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -51,7 +51,7 @@ K_EXPORT_COMPONENT_FACTORY( libkimgallery, KImGalleryPluginFactory( "imgallerypl KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQStringList & ) : KParts::Plugin( parent, name ), m_commentMap(0) { - new KAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this, + new TDEAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this, TQT_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); } diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 754de2b..20c2033 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -50,7 +50,7 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, TQFileInfo fileInfo(path); if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable()) - action = new KAction(name, 0, TQT_TQOBJECT(this), TQT_SLOT(new_slot( ) ), TQT_TQOBJECT(this)); + action = new TDEAction(name, 0, TQT_TQOBJECT(this), TQT_SLOT(new_slot( ) ), TQT_TQOBJECT(this)); } KDirMenu::~KDirMenu( ) { delete action; diff --git a/konq-plugins/kuick/kdirmenu.h b/konq-plugins/kuick/kdirmenu.h index 8906dc7..b01b902 100644 --- a/konq-plugins/kuick/kdirmenu.h +++ b/konq-plugins/kuick/kdirmenu.h @@ -25,7 +25,7 @@ #include <tqptrlist.h> #include <tqmap.h> -class KAction; +class TDEAction; class KURL; class KDirMenu : public TQPopupMenu { @@ -47,7 +47,7 @@ private: TQString path; TQString name; KURL src; - KAction *action; + TDEAction *action; TQPtrList<KDirMenu> children; void initIconMap( ); public slots: diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index 7ba7a87..9309a74 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -111,7 +111,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, } - m_browse = new KAction(i18n("&Browse..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBrowse()), TQT_TQOBJECT(this) ); + m_browse = new TDEAction(i18n("&Browse..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBrowse()), TQT_TQOBJECT(this) ); m_browse->plug(this); // read the last chosen dirs // first set the group according to our parameter @@ -133,7 +133,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, continue; } TQString escapedDir = *it; - KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this)); + TDEAction *action = new TDEAction(escapedDir.replace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this)); action->plug(this ); actions.append( action ); ++it; @@ -158,8 +158,8 @@ void KMetaMenu::slotFileChosen(const TQString &path ){ } void KMetaMenu::slotFastPath( ) { - KAction *action; - action = (KAction*) sender(); + TDEAction *action; + action = (TDEAction*) sender(); TQString text = action->plainText( ); slotFileChosen( text ); } diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h index 3d60b86..e22ff19 100644 --- a/konq-plugins/kuick/kmetamenu.h +++ b/konq-plugins/kuick/kmetamenu.h @@ -57,11 +57,11 @@ private: KDirMenu *m_current; KIMContactMenu *m_contacts; KIMProxy *m_proxy; - KAction *m_browse; + TDEAction *m_browse; TQStringList list; TDEConfig *conf; TQString group; - TQPtrList<KAction> actions; + TQPtrList<TDEAction> actions; }; #endif diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index b0ccaef..cb8730a 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -42,7 +42,7 @@ KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const TQString popup= popupmenu ; meta_copy_mmu = 0L; meta_move_mmu = 0L; - my_action = new KAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); + my_action = new TDEAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); addAction( my_action ); addSeparator(); //popupmenu->addMerge(); diff --git a/konq-plugins/kuick/kuick_plugin.h b/konq-plugins/kuick/kuick_plugin.h index caaba8d..d39fad2 100644 --- a/konq-plugins/kuick/kuick_plugin.h +++ b/konq-plugins/kuick/kuick_plugin.h @@ -24,7 +24,7 @@ #include "kmetamenu.h" -class KAction; +class TDEAction; class KURL; class KTestMenu : public KonqPopupMenuPlugin { Q_OBJECT @@ -37,7 +37,7 @@ public: KonqPopupMenu *popup; private: - KAction *my_action; + TDEAction *my_action; KIMProxy *m_imProxy; public slots: diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index d3f5239..062a28c 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -245,7 +245,7 @@ bool KonqMFIcon::mfFound() { void KonqMFIcon::contextMenu() { delete m_menu; - m_menu = new KPopupMenu(m_part->widget()); + m_menu = new TDEPopupMenu(m_part->widget()); m_menu->insertTitle(i18n("Microformats")); connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addMF(int))); int id = 0; diff --git a/konq-plugins/microformat/konqmficon.h b/konq-plugins/microformat/konqmficon.h index 33dac4c..d29a750 100644 --- a/konq-plugins/microformat/konqmficon.h +++ b/konq-plugins/microformat/konqmficon.h @@ -56,7 +56,7 @@ class KonqMFIcon : public KParts::Plugin, PluginBase { TQGuardedPtr<TDEHTMLPart> m_part; KURLLabel *m_mfIcon; KParts::StatusBarExtension *m_statusBarEx; - TQGuardedPtr<KPopupMenu> m_menu; + TQGuardedPtr<TDEPopupMenu> m_menu; TQValueList<TQPair<TQString, TQString> > _events, _cards; private slots: diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index a6837ba..3059584 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -46,7 +46,7 @@ MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStr : KParts::Plugin(parent, name) { m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast<TDEHTMLPart*>(parent) : 0L; - m_pMinitoolsMenu = new KActionMenu(i18n("&Minitools"), "minitools", actionCollection(), "minitools"); + m_pMinitoolsMenu = new TDEActionMenu(i18n("&Minitools"), "minitools", actionCollection(), "minitools"); m_pMinitoolsMenu->setDelayed(false); m_pMinitoolsMenu->setEnabled(true); diff --git a/konq-plugins/minitools/minitoolsplugin.h b/konq-plugins/minitools/minitoolsplugin.h index f30c7b2..c4a1b63 100644 --- a/konq-plugins/minitools/minitoolsplugin.h +++ b/konq-plugins/minitools/minitoolsplugin.h @@ -30,7 +30,7 @@ #include <tdeparts/plugin.h> class TDEHTMLPart; -class KActionMenu; +class TDEActionMenu; class MinitoolsPlugin : public KParts::Plugin { Q_OBJECT @@ -56,7 +56,7 @@ private: int m_selectedItem; TDEHTMLPart* m_part; - KActionMenu* m_pMinitoolsMenu; + TDEActionMenu* m_pMinitoolsMenu; typedef TQPair<TQString,TQCString> Minitool; typedef TQValueList<Minitool> MinitoolsList; diff --git a/konq-plugins/rellinks/TODO b/konq-plugins/rellinks/TODO index 28f206b..47f6f54 100644 --- a/konq-plugins/rellinks/TODO +++ b/konq-plugins/rellinks/TODO @@ -3,7 +3,7 @@ Rellinks : * Support multiple same relations for all relations in a beautiful way (as FireFox Link Toolbar Extension do) : - by transfoming buttons (KAction) in menus (KActionMenu) if more than one item is found for a relation ? + by transfoming buttons (TDEAction) in menus (TDEActionMenu) if more than one item is found for a relation ? * Possibility to configure keyboard shortcuts * Manage "rel" and "rev" differently * Manage "media" diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index 6bb3cbd..880a448 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -70,102 +70,102 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin setInstance(RelLinksFactory::instance()); // ------------- Navigation links -------------- - kaction_map["home"] = new KAction( i18n("&Top"), "2uparrow", KShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" ); + kaction_map["home"] = new TDEAction( i18n("&Top"), "2uparrow", TDEShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" ); kaction_map["home"]->setWhatsThis( i18n("<p>This link references a home page or the top of some hierarchy.</p>") ); - kaction_map["up"] = new KAction( i18n("&Up"), "1uparrow", KShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" ); + kaction_map["up"] = new TDEAction( i18n("&Up"), "1uparrow", TDEShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" ); kaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate parent of the current document.</p>") ); bool isRTL = TQApplication::reverseLayout(); - kaction_map["begin"] = new KAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", KShortcut("Ctrl+Alt+F"), this, TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" ); + kaction_map["begin"] = new TDEAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", TDEShortcut("Ctrl+Alt+F"), this, TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" ); kaction_map["begin"]->setWhatsThis( i18n("<p>This link type tells search engines which document is considered by the author to be the starting point of the collection.</p>") ); - kaction_map["prev"] = new KAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", KShortcut("Ctrl+Alt+P"), this, TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" ); + kaction_map["prev"] = new TDEAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", TDEShortcut("Ctrl+Alt+P"), this, TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" ); kaction_map["prev"]->setWhatsThis( i18n("<p>This link references the previous document in an ordered series of documents.</p>") ); - kaction_map["next"] = new KAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", KShortcut("Ctrl+Alt+N"), this, TQT_SLOT(goNext()), actionCollection(), "rellinks_next" ); + kaction_map["next"] = new TDEAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", TDEShortcut("Ctrl+Alt+N"), this, TQT_SLOT(goNext()), actionCollection(), "rellinks_next" ); kaction_map["next"]->setWhatsThis( i18n("<p>This link references the next document in an ordered series of documents.</p>") ); - kaction_map["last"] = new KAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", KShortcut("Ctrl+Alt+L"), this, TQT_SLOT(goLast()), actionCollection(), "rellinks_last" ); + kaction_map["last"] = new TDEAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", TDEShortcut("Ctrl+Alt+L"), this, TQT_SLOT(goLast()), actionCollection(), "rellinks_last" ); kaction_map["last"]->setWhatsThis( i18n("<p>This link references the end of a sequence of documents.</p>") ); // ------------ special items -------------------------- - kaction_map["search"] = new KAction( i18n("&Search"), "filefind", KShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" ); + kaction_map["search"] = new TDEAction( i18n("&Search"), "filefind", TDEShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" ); kaction_map["search"]->setWhatsThis( i18n("<p>This link references the search.</p>") ); // ------------ Document structure links --------------- - m_document = new KActionMenu( i18n("Document"), "contents", actionCollection(), "rellinks_document" ); + m_document = new TDEActionMenu( i18n("Document"), "contents", actionCollection(), "rellinks_document" ); m_document->setWhatsThis( i18n("<p>This menu contains the links referring the document information.</p>") ); m_document->setDelayed(false); - kaction_map["contents"] = new KAction( i18n("Table of &Contents"), "contents", KShortcut("Ctrl+Alt+C"), this, TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" ); + kaction_map["contents"] = new TDEAction( i18n("Table of &Contents"), "contents", TDEShortcut("Ctrl+Alt+C"), this, TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" ); m_document->insert(kaction_map["contents"]); kaction_map["contents"]->setWhatsThis( i18n("<p>This link references the table of contents.</p>") ); - kactionmenu_map["chapter"] = new KActionMenu( i18n("Chapters"), "fileopen", actionCollection(), "rellinks_chapters" ); + kactionmenu_map["chapter"] = new TDEActionMenu( i18n("Chapters"), "fileopen", actionCollection(), "rellinks_chapters" ); m_document->insert(kactionmenu_map["chapter"]); connect( kactionmenu_map["chapter"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(goChapter(int))); kactionmenu_map["chapter"]->setWhatsThis( i18n("<p>This menu references the chapters of the document.</p>") ); kactionmenu_map["chapter"]->setDelayed(false); - kactionmenu_map["section"] = new KActionMenu( i18n("Sections"), "fileopen", actionCollection(), "rellinks_sections" ); + kactionmenu_map["section"] = new TDEActionMenu( i18n("Sections"), "fileopen", actionCollection(), "rellinks_sections" ); m_document->insert(kactionmenu_map["section"]); connect( kactionmenu_map["section"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSection( int ) ) ); kactionmenu_map["section"]->setWhatsThis( i18n("<p>This menu references the sections of the document.</p>") ); kactionmenu_map["section"]->setDelayed(false); - kactionmenu_map["subsection"] = new KActionMenu( i18n("Subsections"), "fileopen", actionCollection(), "rellinks_subsections" ); + kactionmenu_map["subsection"] = new TDEActionMenu( i18n("Subsections"), "fileopen", actionCollection(), "rellinks_subsections" ); m_document->insert(kactionmenu_map["subsection"]); connect( kactionmenu_map["subsection"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSubsection( int ) ) ); kactionmenu_map["subsection"]->setWhatsThis( i18n("<p>This menu references the subsections of the document.</p>") ); kactionmenu_map["subsection"]->setDelayed(false); - kactionmenu_map["appendix"] = new KActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" ); + kactionmenu_map["appendix"] = new TDEActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" ); m_document->insert(kactionmenu_map["appendix"]); connect( kactionmenu_map["appendix"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAppendix( int ) ) ); kactionmenu_map["appendix"]->setWhatsThis( i18n("<p>This link references the appendix.</p>") ); kactionmenu_map["appendix"]->setDelayed(false); - kaction_map["glossary"] = new KAction( i18n("&Glossary"), "flag", KShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" ); + kaction_map["glossary"] = new TDEAction( i18n("&Glossary"), "flag", TDEShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" ); m_document->insert(kaction_map["glossary"]); kaction_map["glossary"]->setWhatsThis( i18n("<p>This link references the glossary.</p>") ); - kaction_map["index"] = new KAction( i18n("&Index"), "info", KShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" ); + kaction_map["index"] = new TDEAction( i18n("&Index"), "info", TDEShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" ); m_document->insert(kaction_map["index"]); kaction_map["index"]->setWhatsThis( i18n("<p>This link references the index.</p>") ); // Other links - m_more = new KActionMenu( i18n("More"), "misc", actionCollection(), "rellinks_more" ); + m_more = new TDEActionMenu( i18n("More"), "misc", actionCollection(), "rellinks_more" ); m_more->setWhatsThis( i18n("<p>This menu contains other important links.</p>") ); m_more->setDelayed(false); - kaction_map["help"] = new KAction( i18n("&Help"), "help", KShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" ); + kaction_map["help"] = new TDEAction( i18n("&Help"), "help", TDEShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" ); m_more->insert(kaction_map["help"]); kaction_map["help"]->setWhatsThis( i18n("<p>This link references the help.</p>") ); - kaction_map["author"] = new KAction( i18n("&Authors"), "mail_new", KShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" ); + kaction_map["author"] = new TDEAction( i18n("&Authors"), "mail_new", TDEShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" ); m_more->insert(kaction_map["author"]); kaction_map["author"]->setWhatsThis( i18n("<p>This link references the author.</p>") ); - kaction_map["copyright"] = new KAction( i18n("Copy&right"), "signature", KShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" ); + kaction_map["copyright"] = new TDEAction( i18n("Copy&right"), "signature", TDEShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" ); m_more->insert(kaction_map["copyright"]); kaction_map["copyright"]->setWhatsThis( i18n("<p>This link references the copyright.</p>") ); - kactionmenu_map["bookmark"] = new KActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" ); + kactionmenu_map["bookmark"] = new TDEActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" ); m_more->insert(kactionmenu_map["bookmark"]); kactionmenu_map["bookmark"]->setWhatsThis( i18n("<p>This menu references the bookmarks.</p>") ); connect( kactionmenu_map["bookmark"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goBookmark( int ) ) ); kactionmenu_map["bookmark"]->setDelayed(false); - kactionmenu_map["alternate"] = new KActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" ); + kactionmenu_map["alternate"] = new TDEActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" ); m_more->insert(kactionmenu_map["alternate"]); kactionmenu_map["alternate"]->setWhatsThis( i18n("<p>This link references the alternate versions of this document.</p>") ); connect( kactionmenu_map["alternate"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAlternate( int ) ) ); kactionmenu_map["alternate"]->setDelayed(false); // Unclassified menu - m_links = new KActionMenu( i18n("Miscellaneous"), "rellinks", actionCollection(), "rellinks_links" ); + m_links = new TDEActionMenu( i18n("Miscellaneous"), "rellinks", actionCollection(), "rellinks_links" ); kactionmenu_map["unclassified"] = m_links; kactionmenu_map["unclassified"]->setWhatsThis( i18n("<p>Miscellaneous links.</p>") ); connect( kactionmenu_map["unclassified"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAllElements( int ) ) ); @@ -532,7 +532,7 @@ void RelLinksPlugin::disableAll() { element_map.clear(); // Clear actions - KActionMap::Iterator it; + TDEActionMap::Iterator it; for ( it = kaction_map.begin(); it != kaction_map.end(); ++it ) { // If I don't test it crash :( if (it.data()) { @@ -542,7 +542,7 @@ void RelLinksPlugin::disableAll() { } // Clear actions - KActionMenuMap::Iterator itmenu; + TDEActionMenuMap::Iterator itmenu; for ( itmenu = kactionmenu_map.begin(); itmenu != kactionmenu_map.end(); ++itmenu ) { // If I don't test it crash :( if (itmenu.data()) { diff --git a/konq-plugins/rellinks/plugin_rellinks.h b/konq-plugins/rellinks/plugin_rellinks.h index e8e5adb..d82402e 100644 --- a/konq-plugins/rellinks/plugin_rellinks.h +++ b/konq-plugins/rellinks/plugin_rellinks.h @@ -39,14 +39,14 @@ // type definitions typedef TQMap<int,DOM::Element> DOMElementMap; -typedef TQMap<TQString, KAction*> KActionMap; -typedef TQMap<TQString, KActionMenu*> KActionMenuMap; +typedef TQMap<TQString, TDEAction*> TDEActionMap; +typedef TQMap<TQString, TDEActionMenu*> TDEActionMenuMap; // forward declarations -class KActionMenu; +class TDEActionMenu; class TDEHTMLPart; class TDEHTMLView; -class KToolBar; +class TDEToolBar; class KURL; class TQTimer; @@ -153,14 +153,14 @@ private: TDEHTMLView* m_view; bool m_viewVisible; - KActionMenu *m_document; - KActionMenu *m_more; - KActionMenu *m_links; + TDEActionMenu *m_document; + TDEActionMenu *m_more; + TDEActionMenu *m_links; - /** Map of KAction */ - KActionMap kaction_map; - /** Map of KActionMenu */ - KActionMenuMap kactionmenu_map; + /** Map of TDEAction */ + TDEActionMap kaction_map; + /** Map of TDEActionMenu */ + TDEActionMenuMap kactionmenu_map; /** Map of all the link element which can be managed by rellinks */ TQMap<TQString,DOMElementMap> element_map; diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp index d337287..390f8a7 100644 --- a/konq-plugins/rsync/rsyncplugin.cpp +++ b/konq-plugins/rsync/rsyncplugin.cpp @@ -118,9 +118,9 @@ RsyncPlugin::RsyncPlugin (TQObject* parent, const char* name, if ( !m_part || !m_part->scrollWidget() ) return; - m_pSyncNow = new KAction(i18n("Synchronize F&older"), "syncnow", + m_pSyncNow = new TDEAction(i18n("Synchronize F&older"), "syncnow", actionCollection(), "syncnow"); - m_pSyncSetup = new KAction (i18n("Setup Syn&chronization"), "setupsync", + m_pSyncSetup = new TDEAction (i18n("Setup Syn&chronization"), "setupsync", actionCollection(), "setupsync"); m_pSyncNow->setIcon("remotesync"); m_pSyncSetup->setIcon("remotesyncconfig"); diff --git a/konq-plugins/rsync/rsyncplugin.h b/konq-plugins/rsync/rsyncplugin.h index af28935..cd4f20f 100644 --- a/konq-plugins/rsync/rsyncplugin.h +++ b/konq-plugins/rsync/rsyncplugin.h @@ -36,7 +36,7 @@ // and in a manner identical to these declarations, the plugin will // mysteriously fail when launched with kshell but work fine under BASH -class KActionMenu; +class TDEActionMenu; class KonqDirPart; class KLineEdit; @@ -65,8 +65,8 @@ private slots: private: KURL m_pURL; KonqDirPart* m_part; - KAction* m_pSyncNow; - KAction* m_pSyncSetup; + TDEAction* m_pSyncNow; + TDEAction* m_pSyncSetup; KRsync* m_rSync; }; #endif diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index 7e2ed07..dfdc27c 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -88,7 +88,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, TQWhatsThis::add(m_searchCombo, i18n("Search Bar<p>" "Enter a search term. Click on the icon to change search mode or provider.")); - new KAction( i18n( "Focus Searchbar" ), CTRL+Key_S, + new TDEAction( i18n( "Focus Searchbar" ), CTRL+Key_S, this, TQT_SLOT(focusSearchbar()), actionCollection(), "focus_search_bar"); @@ -413,7 +413,7 @@ void SearchBarPlugin::showSelectionMenu() } m_popupMenu->insertSeparator(); - m_googleMenu = new KSelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, TQT_TQOBJECT(this), TQT_SLOT(selectGoogleSuggestMode()), TQT_TQOBJECT(m_popupMenu)); + m_googleMenu = new TDESelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, TQT_TQOBJECT(this), TQT_SLOT(selectGoogleSuggestMode()), TQT_TQOBJECT(m_popupMenu)); TQStringList google_modes; google_modes << i18n("For Google Only") << i18n("For All Searches") << i18n("Never"); m_googleMenu->setItems(google_modes); diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h index a1423f8..6baf33f 100644 --- a/konq-plugins/searchbar/searchbar.h +++ b/konq-plugins/searchbar/searchbar.h @@ -178,7 +178,7 @@ class SearchBarPlugin : public KParts::Plugin SearchBarCombo *m_searchCombo; KWidgetAction *m_searchComboAction; TQPopupMenu *m_popupMenu; - KSelectAction *m_googleMenu; + TDESelectAction *m_googleMenu; TQPixmap m_searchIcon; SearchModes m_searchMode; TQString m_providerName; diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp index d4066c8..0229031 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp @@ -25,7 +25,7 @@ #include <klocale.h> BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ) - : KListViewItem( parent ), m_desc( desc ) + : TDEListViewItem( parent ), m_desc( desc ) { m_url = KURL::fromPathOrURL( url ); m_dateTime.setTime_t( time ); diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.h b/konq-plugins/sidebar/delicious/bookmarkListItem.h index 5b4c8c7..40316c1 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.h +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.h @@ -31,7 +31,7 @@ class TQString; -class BookmarkListItem: public KListViewItem +class BookmarkListItem: public TDEListViewItem { public: BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ); diff --git a/konq-plugins/sidebar/delicious/widget.ui b/konq-plugins/sidebar/delicious/widget.ui index c85760a..7bf7c0b 100644 --- a/konq-plugins/sidebar/delicious/widget.ui +++ b/konq-plugins/sidebar/delicious/widget.ui @@ -114,7 +114,7 @@ <string>Post a new bookmark</string> </property> </widget> - <widget class="KListView" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="2"> <column> <property name="text"> <string>Description</string> diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp index 5b110a0..49c6d1f 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.cpp +++ b/konq-plugins/sidebar/mediaplayer/controls.cpp @@ -77,7 +77,7 @@ void L33tSlider::wheelEvent(TQWheelEvent *e) SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* parent, const char* name ) - : KAction( text, accel, parent, name ) + : TDEAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; @@ -85,10 +85,10 @@ SliderAction::SliderAction(const TQString& text, int accel, const TQObject *rece int SliderAction::plug( TQWidget *w, int index ) { - if (!w->inherits("KToolBar")) return -1; + if (!w->inherits("TDEToolBar")) return -1; - KToolBar *toolBar = (KToolBar *)w; - int id = KAction::getToolButtonID(); + TDEToolBar *toolBar = (TDEToolBar *)w; + int id = TDEAction::getToolButtonID(); //Create it. m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar); @@ -100,20 +100,20 @@ int SliderAction::plug( TQWidget *w, int index ) connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); toolBar->setItemAutoSized( id, true ); - if (w->inherits( "KToolBar" )) - connect(toolBar, TQT_SIGNAL(moved(KToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(KToolBar::BarPosition))); + if (w->inherits( "TDEToolBar" )) + connect(toolBar, TQT_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(TDEToolBar::BarPosition))); emit plugged(); return containerCount() - 1; } -void SliderAction::toolbarMoved(KToolBar::BarPosition) +void SliderAction::toolbarMoved(TDEToolBar::BarPosition) { // I wish this worked :) return; /* - if (pos == KToolBar::Left || pos == KToolBar::Right) + if (pos == TDEToolBar::Left || pos == TDEToolBar::Right) { m_slider->setOrientationQt::Vertical); m_slider->setFixedWidth(m_slider->height()); @@ -128,7 +128,7 @@ return; void SliderAction::unplug( TQWidget *w ) { - KToolBar *toolBar = (KToolBar *)w; + TDEToolBar *toolBar = (TDEToolBar *)w; int idx = findContainer( w ); toolBar->removeItem( itemId( idx ) ); diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h index 3ecd9af..0c19d23 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.h +++ b/konq-plugins/sidebar/mediaplayer/controls.h @@ -69,7 +69,7 @@ private: /** * A slider for your toolbar **/ -class SliderAction : public KAction +class SliderAction : public TDEAction { Q_OBJECT @@ -84,7 +84,7 @@ signals: void plugged(); public slots: - void toolbarMoved(KToolBar::BarPosition pos); + void toolbarMoved(TDEToolBar::BarPosition pos); private: TQGuardedPtr<TQSlider> m_slider; TQStringList m_items; diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index ba2b129..45938a9 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -143,7 +143,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent link_down->setEnabled(false); connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown())); - link_list = new KListView(links); + link_list = new TDEListView(links); link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); link_list->setSorting(-1); link_list->setItemsMovable(TRUE); @@ -154,7 +154,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent TQWidget *actionPage = new TQWidget; - actionSelector = new KActionSelector(actionPage); + actionSelector = new TDEActionSelector(actionPage); loadAvailableActions(); tab->addTab(general, i18n("General")); diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h index 190c982..b37469a 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.h +++ b/konq-plugins/sidebar/metabar/src/configdialog.h @@ -70,13 +70,13 @@ class ConfigDialog : public TQDialog TQCheckBox *servicemenus; TQCheckBox *showframe; - KListView *link_list; + TDEListView *link_list; KComboBox *themes; TQCString topWidgetName; - KActionSelector *actionSelector; + TDEActionSelector *actionSelector; TQPtrDict<LinkEntry> linkList; diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index af141cc..2548c3f 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -117,11 +117,11 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare TQVBoxLayout *layout = new TQVBoxLayout(this); layout->addWidget(html->view()); - popup = new KPopupMenu(0); - KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); + popup = new TDEPopupMenu(0); + TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); configAction->plug(popup); - KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload"); + TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload"); reloadAction->plug(popup); setTheme(); diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h index 667b461..b832bc5 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.h +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h @@ -61,7 +61,7 @@ class MetabarWidget : public TQWidget MetabarFunctions *functions; KDirWatch *dir_watch; - KPopupMenu *popup; + TDEPopupMenu *popup; TQDict<ProtocolPlugin> plugins; diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index af04017..bbffb01 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -145,7 +145,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int const TQString priority = cfg.readEntry("X-TDE-Priority"); const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" ); bool usePopup = false; - KPopupMenu *popup; + TDEPopupMenu *popup; if(!submenuName.isEmpty()){ usePopup = true; @@ -156,7 +156,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int else{ MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? TQString() : TQString("hiddenaction"), count >= maxActions); - popup = new KPopupMenu(); + popup = new TDEPopupMenu(); popups.insert(idString, popup); count++; @@ -168,7 +168,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int for (TQValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){ if(usePopup){ - KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8()); + TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8()); action->plug(popup); } else{ @@ -204,7 +204,7 @@ void ServiceLoader::runAction(const TQString& name) void ServiceLoader::showPopup(const TQString &popup, const TQPoint &point) { - KPopupMenu *p = popups[popup]; + TDEPopupMenu *p = popups[popup]; if(p){ p->exec(point); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h index 99d85ed..42268de 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.h +++ b/konq-plugins/sidebar/metabar/src/serviceloader.h @@ -49,7 +49,7 @@ class ServiceLoader : public TQObject void showPopup(const TQString &popup, const TQPoint &point); private: - TQDict<KPopupMenu> popups; + TQDict<TDEPopupMenu> popups; TQMap<TQString,KDEDesktopMimeType::Service> services; KURL::List urlList; diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp index a5c1261..22bb3a7 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.cpp +++ b/konq-plugins/sidebar/newsticker/nspanel.cpp @@ -36,12 +36,12 @@ namespace KSB_News { // ListBox including ToolTip for item //////////////////////////////////////////////////////////////// TTListBox::TTListBox(TQWidget *parent, const char *name, WFlags f) - : KListBox(parent, name, f), + : TDEListBox(parent, name, f), TQToolTip(this) { } void TTListBox::clear() { - KListBox::clear(); + TDEListBox::clear(); } void TTListBox::maybeTip(const TQPoint &point) { diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h index b09ab33..36b503e 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.h +++ b/konq-plugins/sidebar/newsticker/nspanel.h @@ -42,7 +42,7 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// // ListBox including ToolTip for item //////////////////////////////////////////////////////////////// - class TTListBox : public KListBox, TQToolTip { + class TTListBox : public TDEListBox, TQToolTip { public: TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0); void clear(); diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index f6b3b7d..12be5c7 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -83,7 +83,7 @@ namespace KSB_News { // popup menu - popup = new KPopupMenu(this); + popup = new TDEPopupMenu(this); popup->insertItem(KStdGuiItem::configure().iconSet(), i18n("&Configure Newsticker..."), this, TQT_SLOT(slotConfigure())); @@ -94,7 +94,7 @@ namespace KSB_News { popup->insertSeparator(); // help menu - helpmenu = new KPopupMenu(this); + helpmenu = new TDEPopupMenu(this); helpmenu->insertItem(appIcon, i18n("&About Newsticker"), this, TQT_SLOT(slotShowAbout())); helpmenu->insertItem(i18n("&Report Bug..."), this, diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h index 2be171f..a1d6783 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h @@ -35,7 +35,7 @@ class TQVBoxLayout; class TQPushButton; class TQStringList; -class KPopupMenu; +class TDEPopupMenu; class TDEAboutData; class KAboutApplication; class KBugReport; @@ -76,7 +76,7 @@ namespace KSB_News { TQPtrDict<TQWidget> pagesheader; TQVBoxLayout *layout; TQWidget *currentPage; - KPopupMenu *popup, *helpmenu; + TDEPopupMenu *popup, *helpmenu; TDEAboutData *m_aboutdata; KAboutApplication *m_about; KBugReport *m_bugreport; diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp index f81dacc..a12d714 100644 --- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp @@ -49,54 +49,54 @@ SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name, if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - KActionMenu *menu = new KActionMenu( i18n("HTML Settings"), "configure", + TDEActionMenu *menu = new TDEActionMenu( i18n("HTML Settings"), "configure", actionCollection(), "action menu" ); menu->setDelayed( false ); - KToggleAction *action; + TDEToggleAction *action; - action = new KToggleAction( i18n("Java&Script"), 0, + action = new TDEToggleAction( i18n("Java&Script"), 0, this, TQT_SLOT(toggleJavascript()), actionCollection(), "javascript" ); menu->insert( action ); - action = new KToggleAction( i18n("&Java"), 0, + action = new TDEToggleAction( i18n("&Java"), 0, this, TQT_SLOT(toggleJava()), actionCollection(), "java" ); menu->insert( action ); - action = new KToggleAction( i18n("&Cookies"), 0, + action = new TDEToggleAction( i18n("&Cookies"), 0, this, TQT_SLOT(toggleCookies()), actionCollection(), "cookies" ); menu->insert( action ); - action = new KToggleAction( i18n("&Plugins"), 0, + action = new TDEToggleAction( i18n("&Plugins"), 0, this, TQT_SLOT(togglePlugins()), actionCollection(), "plugins" ); menu->insert( action ); - action = new KToggleAction( i18n("Autoload &Images"), 0, + action = new TDEToggleAction( i18n("Autoload &Images"), 0, this, TQT_SLOT(toggleImageLoading()), actionCollection(), "imageloading" ); menu->insert( action ); - menu->insert( new KActionSeparator(actionCollection()) ); + menu->insert( new TDEActionSeparator(actionCollection()) ); - action = new KToggleAction( i18n("Enable Pro&xy"), 0, + action = new TDEToggleAction( i18n("Enable Pro&xy"), 0, this, TQT_SLOT(toggleProxy()), actionCollection(), "useproxy" ); action->setCheckedState(i18n("Disable Pro&xy")); menu->insert( action ); - action = new KToggleAction( i18n("Enable Cac&he"), 0, + action = new TDEToggleAction( i18n("Enable Cac&he"), 0, this, TQT_SLOT(toggleCache()), actionCollection(), "usecache" ); action->setCheckedState(i18n("Disable Cac&he")); menu->insert( action ); - KSelectAction *sAction = new KSelectAction( i18n("Cache Po&licy"), 0, + TDESelectAction *sAction = new TDESelectAction( i18n("Cache Po&licy"), 0, 0, 0, actionCollection(), "cachepolicy" ); TQStringList policies; @@ -129,25 +129,25 @@ void SettingsPlugin::showPopup() KProtocolManager::reparseConfiguration(); bool cookies = cookiesEnabled( part->url().url() ); - ((KToggleAction*)actionCollection()->action("useproxy"))->setChecked(KProtocolManager::useProxy()); - ((KToggleAction*)actionCollection()->action("java"))->setChecked( part->javaEnabled() ); - ((KToggleAction*)actionCollection()->action("javascript"))->setChecked( part->jScriptEnabled() ); - ((KToggleAction*)actionCollection()->action("cookies"))->setChecked( cookies ); - ((KToggleAction*)actionCollection()->action("plugins"))->setChecked( part->pluginsEnabled() ); - ((KToggleAction*)actionCollection()->action("imageloading"))->setChecked( part->autoloadImages() ); - ((KToggleAction*)actionCollection()->action("usecache"))->setChecked(KProtocolManager::useCache()); + ((TDEToggleAction*)actionCollection()->action("useproxy"))->setChecked(KProtocolManager::useProxy()); + ((TDEToggleAction*)actionCollection()->action("java"))->setChecked( part->javaEnabled() ); + ((TDEToggleAction*)actionCollection()->action("javascript"))->setChecked( part->jScriptEnabled() ); + ((TDEToggleAction*)actionCollection()->action("cookies"))->setChecked( cookies ); + ((TDEToggleAction*)actionCollection()->action("plugins"))->setChecked( part->pluginsEnabled() ); + ((TDEToggleAction*)actionCollection()->action("imageloading"))->setChecked( part->autoloadImages() ); + ((TDEToggleAction*)actionCollection()->action("usecache"))->setChecked(KProtocolManager::useCache()); TDEIO::CacheControl cc = KProtocolManager::cacheControl(); switch ( cc ) { case TDEIO::CC_Verify: - ((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 0 ); + ((TDESelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 0 ); break; case TDEIO::CC_CacheOnly: - ((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 2 ); + ((TDESelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 2 ); break; case TDEIO::CC_Cache: - ((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 1 ); + ((TDESelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 1 ); break; case TDEIO::CC_Reload: // nothing for now case TDEIO::CC_Refresh: @@ -162,7 +162,7 @@ void SettingsPlugin::toggleJava() if( parent() && parent()->inherits("TDEHTMLPart")) { TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent()); - part->setJavaEnabled( ((KToggleAction*)actionCollection()->action("java"))->isChecked() ); + part->setJavaEnabled( ((TDEToggleAction*)actionCollection()->action("java"))->isChecked() ); } } @@ -171,7 +171,7 @@ void SettingsPlugin::toggleJavascript() if( parent() && parent()->inherits("TDEHTMLPart")) { TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent()); - part->setJScriptEnabled( ((KToggleAction*)actionCollection()->action("javascript"))->isChecked() ); + part->setJScriptEnabled( ((TDEToggleAction*)actionCollection()->action("javascript"))->isChecked() ); } } @@ -183,7 +183,7 @@ void SettingsPlugin::toggleCookies() TDEHTMLPart *part = static_cast<TDEHTMLPart *>( parent() ); TQString advice; - bool enable = ((KToggleAction*)actionCollection()->action("cookies"))->isChecked(); + bool enable = ((TDEToggleAction*)actionCollection()->action("cookies"))->isChecked(); advice = enable ? "Accept" : "Reject"; TQCString replyType; @@ -206,7 +206,7 @@ void SettingsPlugin::togglePlugins() if( parent() && parent()->inherits("TDEHTMLPart")) { TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent()); - part->setPluginsEnabled( ((KToggleAction*)actionCollection()->action("plugins"))->isChecked() ); + part->setPluginsEnabled( ((TDEToggleAction*)actionCollection()->action("plugins"))->isChecked() ); } } @@ -215,7 +215,7 @@ void SettingsPlugin::toggleImageLoading() if( parent() && parent()->inherits("TDEHTMLPart")) { TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent()); - part->setAutoloadImages( ((KToggleAction*)actionCollection()->action("imageloading"))->isChecked() ); + part->setAutoloadImages( ((TDEToggleAction*)actionCollection()->action("imageloading"))->isChecked() ); } } @@ -254,7 +254,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url ) void SettingsPlugin::toggleProxy() { - bool enable = ((KToggleAction*)actionCollection()->action("useproxy"))->isChecked(); + bool enable = ((TDEToggleAction*)actionCollection()->action("useproxy"))->isChecked(); int type; @@ -270,7 +270,7 @@ void SettingsPlugin::toggleProxy() config.setGroup( "Proxy Settings" ); config.writeEntry( "ProxyType", type ); - ((KToggleAction*)actionCollection()->action("useproxy"))->setChecked(enable); + ((TDEToggleAction*)actionCollection()->action("useproxy"))->setChecked(enable); updateIOSlaves(); } @@ -281,7 +281,7 @@ void SettingsPlugin::toggleCache() TDEConfig config( "tdeio_httprc", false, false ); config.writeEntry( "UseCache", !usesCache ); - ((KToggleAction*)actionCollection()->action("usecache"))->setChecked( !usesCache ); + ((TDEToggleAction*)actionCollection()->action("usecache"))->setChecked( !usesCache ); updateIOSlaves(); } diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index fe671a9..1c9187f 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -57,7 +57,7 @@ UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name, { setInstance(UAChangerPlugin::instance()); - m_pUAMenu = new KActionMenu( i18n("Change Browser &Identification"), "agent", + m_pUAMenu = new TDEActionMenu( i18n("Change Browser &Identification"), "agent", actionCollection(), "changeuseragent" ); m_pUAMenu->setDelayed( false ); connect( m_pUAMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), @@ -226,7 +226,7 @@ void UAChangerPlugin::slotAboutToShow() AliasConstIterator map = m_mapAlias.begin(); for( ; map != m_mapAlias.end(); ++map ) { - KPopupMenu *browserMenu = new KPopupMenu; + TDEPopupMenu *browserMenu = new TDEPopupMenu; BrowserGroup::ConstIterator e = map.data().begin(); for( ; e != map.data().end(); ++e ) { diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h index d90ac76..67936b3 100644 --- a/konq-plugins/uachanger/uachangerplugin.h +++ b/konq-plugins/uachanger/uachangerplugin.h @@ -30,7 +30,7 @@ #include <tdeparts/plugin.h> class TDEHTMLPart; -class KActionMenu; +class TDEActionMenu; class TDEConfig; namespace TDEIO @@ -73,7 +73,7 @@ private: bool m_bSettingsLoaded; TDEHTMLPart* m_part; - KActionMenu* m_pUAMenu; + TDEActionMenu* m_pUAMenu; TDEConfig* m_config; KURL m_currentURL; diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp index c411038..8e2ff26 100644 --- a/konq-plugins/validators/plugin_validators.cpp +++ b/konq-plugins/validators/plugin_validators.cpp @@ -50,21 +50,21 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name, { setInstance(PluginValidatorsFactory::instance()); - m_menu = new KActionMenu ( i18n( "&Validate Web Page" ), "validators", + m_menu = new TDEActionMenu ( i18n( "&Validate Web Page" ), "validators", actionCollection(), "validateWebpage" ); m_menu->setDelayed( false ); - m_menu->insert( new KAction( i18n( "Validate &HTML" ), + m_menu->insert( new TDEAction( i18n( "Validate &HTML" ), "htmlvalidator", 0, this, TQT_SLOT(slotValidateHTML()), actionCollection(), "validateHTML") ); - m_menu->insert( new KAction( i18n( "Validate &CSS" ), + m_menu->insert( new TDEAction( i18n( "Validate &CSS" ), "cssvalidator", 0, this, TQT_SLOT(slotValidateCSS()), actionCollection(), "validateCSS") ); - m_menu->insert( new KAction( i18n( "Validate &Links" ), + m_menu->insert( new TDEAction( i18n( "Validate &Links" ), 0, this, TQT_SLOT(slotValidateLinks()), actionCollection(), "validateLinks") ); @@ -73,7 +73,7 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name, if ( parent && parent->inherits( "TDEHTMLPart" )) { - m_menu->insert( new KAction( i18n( "C&onfigure Validator..." ), + m_menu->insert( new TDEAction( i18n( "C&onfigure Validator..." ), "configure", 0, this, TQT_SLOT(slotConfigure()), actionCollection(), "configure") ); @@ -90,7 +90,7 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name, PluginValidators::~PluginValidators() { delete m_configDialog; -// Dont' delete the action. KActionCollection as parent does the job already +// Dont' delete the action. TDEActionCollection as parent does the job already // and not deleting it at this point also ensures that in case we are not unplugged // from the GUI yet and the ~KXMLGUIClient destructor will do so it won't hit a // dead pointer. The kxmlgui factory keeps references to the actions, but it does not diff --git a/konq-plugins/validators/plugin_validators.h b/konq-plugins/validators/plugin_validators.h index 97e528e..1be1337 100644 --- a/konq-plugins/validators/plugin_validators.h +++ b/konq-plugins/validators/plugin_validators.h @@ -35,7 +35,7 @@ #include "validatorsdialog.h" #include <tqguardedptr.h> -class KAction; +class TDEAction; class KURL; class PluginValidators : public KParts::Plugin @@ -57,7 +57,7 @@ private slots: void slotStarted( TDEIO::Job* ); private: - KActionMenu *m_menu; + TDEActionMenu *m_menu; TQGuardedPtr<ValidatorsDialog> m_configDialog; // | // +-> Order dependency. TDEHTMLPart* m_part; // | diff --git a/konq-plugins/webarchiver/archiveviewbase.ui b/konq-plugins/webarchiver/archiveviewbase.ui index 743c591..b989c51 100644 --- a/konq-plugins/webarchiver/archiveviewbase.ui +++ b/konq-plugins/webarchiver/archiveviewbase.ui @@ -82,7 +82,7 @@ <cstring>progressBar</cstring> </property> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>URL</string> diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index abb72c9..6c79f72 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -54,7 +54,7 @@ PluginWebArchiver::PluginWebArchiver( TQObject* parent, const char* name, const TQStringList & ) : Plugin( parent, name ) { - (void) new KAction( i18n("Archive &Web Page..."), + (void) new TDEAction( i18n("Archive &Web Page..."), "webarchiver", 0, this, TQT_SLOT(slotSaveToArchive()), actionCollection(), "archivepage" ); diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp index 0858b4a..5b562c7 100644 --- a/ksig/ksig.cpp +++ b/ksig/ksig.cpp @@ -36,7 +36,7 @@ // public methods //////////////////////////////////////////////////////////////////////////////// -KSig::KSig(TQWidget *parent, const char *name) : KMainWindow(parent, name), +KSig::KSig(TQWidget *parent, const char *name) : TDEMainWindow(parent, name), changed(false) { setupActions(); @@ -64,17 +64,17 @@ KSig::~KSig() void KSig::setupActions() { KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection()); - new KAction(i18n("Remove"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(remove()), actionCollection(), "remove"); + new TDEAction(i18n("Remove"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(remove()), actionCollection(), "remove"); KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); KStdAction::cut(TQT_TQOBJECT(kapp), TQT_SLOT(cut()), actionCollection()); KStdAction::copy(TQT_TQOBJECT(kapp), TQT_SLOT(copy()), actionCollection()); KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), actionCollection()); - new KAction(i18n("C&lear"), "editclear", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), actionCollection(), "clear"); + new TDEAction(i18n("C&lear"), "editclear", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), actionCollection(), "clear"); - new KAction(i18n("Edit Standard Header"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editHeader()), actionCollection(), "editHeader"); - new KAction(i18n("Edit Standard Footer"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editFooter()), actionCollection(), "editFooter"); + new TDEAction(i18n("Edit Standard Header"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editHeader()), actionCollection(), "editHeader"); + new TDEAction(i18n("Edit Standard Footer"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editFooter()), actionCollection(), "editFooter"); } void KSig::setupLayout() @@ -103,8 +103,8 @@ void KSig::setupLayout() void KSig::setupSearchLine() { - KListViewSearchLineWidget *searchWidget = new KListViewSearchLineWidget(sigList, this); - new KWidgetAction(searchWidget, i18n("Search"), KShortcut(), 0, 0, actionCollection(), "search"); + TDEListViewSearchLineWidget *searchWidget = new TDEListViewSearchLineWidget(sigList, this); + new KWidgetAction(searchWidget, i18n("Search"), TDEShortcut(), 0, 0, actionCollection(), "search"); } void KSig::loadData() diff --git a/ksig/ksig.h b/ksig/ksig.h index a8ce410..7e484be 100644 --- a/ksig/ksig.h +++ b/ksig/ksig.h @@ -25,7 +25,7 @@ class KTextEdit; class TQSplitter; -class KSig : public KMainWindow +class KSig : public TDEMainWindow { Q_OBJECT diff --git a/ksig/siglistview.cpp b/ksig/siglistview.cpp index 76a440f..e4fe168 100644 --- a/ksig/siglistview.cpp +++ b/ksig/siglistview.cpp @@ -96,19 +96,19 @@ SigListViewItem *SigListView::createItem() SigListViewItem *SigListView::currentItem() { - return(dynamic_cast<SigListViewItem *>(KListView::currentItem())); + return(dynamic_cast<SigListViewItem *>(TDEListView::currentItem())); } const SigListViewItem *SigListView::currentItem() const { - return(dynamic_cast<SigListViewItem *>(KListView::currentItem())); + return(dynamic_cast<SigListViewItem *>(TDEListView::currentItem())); } //////////////////////////////////////////////////////////////////////////////// // protected members //////////////////////////////////////////////////////////////////////////////// -SigListView::SigListView(TQWidget *parent, const char *name) : KListView(parent, name) +SigListView::SigListView(TQWidget *parent, const char *name) : TDEListView(parent, name) { addColumn(i18n("Signatures")); diff --git a/ksig/siglistview.h b/ksig/siglistview.h index 82633e6..5508de5 100644 --- a/ksig/siglistview.h +++ b/ksig/siglistview.h @@ -34,7 +34,7 @@ class SigListViewItem; * be two instances of this widget created. */ -class SigListView : public KListView +class SigListView : public TDEListView { Q_OBJECT diff --git a/ksig/siglistviewitem.cpp b/ksig/siglistviewitem.cpp index 0442c2e..85fd343 100644 --- a/ksig/siglistviewitem.cpp +++ b/ksig/siglistviewitem.cpp @@ -49,9 +49,9 @@ void SigListViewItem::setText(const TQString &t) void SigListViewItem::refreshText() { if(!text().isEmpty()) - KListViewItem::setText(0, text().simplifyWhiteSpace()); + TDEListViewItem::setText(0, text().simplifyWhiteSpace()); else - KListViewItem::setText(0, emptySigString); + TDEListViewItem::setText(0, emptySigString); } void SigListViewItem::nodeToText(const TQDomNode &n, TQString &s) @@ -74,7 +74,7 @@ void SigListViewItem::nodeToText(const TQDomNode &n, TQString &s) // private members //////////////////////////////////////////////////////////////////////////////// -SigListViewItem::SigListViewItem(TQListView *parent, TQDomDocument document, TQDomElement signatureElement) : KListViewItem(parent) +SigListViewItem::SigListViewItem(TQListView *parent, TQDomDocument document, TQDomElement signatureElement) : TDEListViewItem(parent) { emptySigString = i18n("<empty signature>"); diff --git a/ksig/siglistviewitem.h b/ksig/siglistviewitem.h index 2b51edd..8dd42eb 100644 --- a/ksig/siglistviewitem.h +++ b/ksig/siglistviewitem.h @@ -22,7 +22,7 @@ #include <tqdom.h> -class SigListViewItem : public KListViewItem +class SigListViewItem : public TDEListViewItem { friend class SigListView; public: diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp index d5cfce0..63eb766 100644 --- a/noatun-plugins/dub/dub/dubapp.cpp +++ b/noatun-plugins/dub/dub/dubapp.cpp @@ -35,7 +35,7 @@ #define ID_STATUS_MSG 1 DubApp::DubApp(TQWidget* parent, const char* name) - : KMainWindow(parent, name) + : TDEMainWindow(parent, name) { kdDebug(90010) << "cons dubapp" << endl; config=kapp->config(); diff --git a/noatun-plugins/dub/dub/dubapp.h b/noatun-plugins/dub/dub/dubapp.h index 0c4f27d..1ddf273 100644 --- a/noatun-plugins/dub/dub/dubapp.h +++ b/noatun-plugins/dub/dub/dubapp.h @@ -28,7 +28,7 @@ class DubView; // Application stuff -class DubApp : public KMainWindow +class DubApp : public TDEMainWindow { Q_OBJECT @@ -66,9 +66,9 @@ private: * changing the view class. */ - // KAction pointers to enable/disable actions - //KAction* fileQuit; - KAction* fileClose; + // TDEAction pointers to enable/disable actions + //TDEAction* fileQuit; + TDEAction* fileClose; // signals and slots diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp index 8791f30..f79b88e 100644 --- a/noatun-plugins/lyrics/cmodule.cpp +++ b/noatun-plugins/lyrics/cmodule.cpp @@ -54,7 +54,7 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n(" // Search box TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() ); boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) ); - providersBox = new KListBox( this, "providersBox" ); + providersBox = new TDEListBox( this, "providersBox" ); boxlayout->addWidget(providersBox); boxButtons = new KButtonBox( this,Qt::Vertical ); diff --git a/noatun-plugins/lyrics/cmodule.h b/noatun-plugins/lyrics/cmodule.h index d95baf9..792625a 100644 --- a/noatun-plugins/lyrics/cmodule.h +++ b/noatun-plugins/lyrics/cmodule.h @@ -6,7 +6,7 @@ #include <klocale.h> class KLineEdit; -class KListBox; +class TDEListBox; class KButtonBox; struct SearchProvider { @@ -30,7 +30,7 @@ class LyricsCModule : public CModule { void nameChanged( const TQString &name ); void queryChanged( const TQString &query ); protected: - KListBox *providersBox; + TDEListBox *providersBox; KButtonBox *boxButtons; KLineEdit *nameEdit; KLineEdit *queryEdit; diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index 9f45f57..ee359b3 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -23,7 +23,7 @@ extern "C" Lyrics *lyrics; -Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) +Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false) { lyrics = this; /* Create default actions */ @@ -33,16 +33,16 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) //(void)KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(printPreview()), actionCollection()); //(void)KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection()); //(void)KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection()); - follow_act = new KToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow"); + follow_act = new TDEToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow"); KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection()); - attach_act = new KToggleAction(i18n("&Link URL to File"), "attach", KShortcut("CTRL+ALT+A"), actionCollection(), "attach_url"); + attach_act = new TDEToggleAction(i18n("&Link URL to File"), "attach", TDEShortcut("CTRL+ALT+A"), actionCollection(), "attach_url"); connect(attach_act, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(attach(bool))); back_act = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(back()), actionCollection()); back_act->setEnabled(false); forward_act = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(forward()), actionCollection()); forward_act->setEnabled(false); new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "kde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label"); - site_act = new KSelectAction(i18n("&Search Provider"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection(), "search_provider"); + site_act = new TDESelectAction(i18n("&Search Provider"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection(), "search_provider"); /* Add entry to menu */ menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), TQT_TQOBJECT(this), TQT_SLOT(viewLyrics())); diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h index db7252b..a5b411b 100644 --- a/noatun-plugins/lyrics/lyrics.h +++ b/noatun-plugins/lyrics/lyrics.h @@ -12,7 +12,7 @@ class HistoryManager; -class Lyrics : public KMainWindow, public Plugin { +class Lyrics : public TDEMainWindow, public Plugin { Q_OBJECT @@ -41,10 +41,10 @@ protected slots: private: int menuID; - KAction *back_act, *forward_act; - KToggleAction *follow_act; - KToggleAction *attach_act; - KSelectAction *site_act; + TDEAction *back_act, *forward_act; + TDEToggleAction *follow_act; + TDEToggleAction *attach_act; + TDESelectAction *site_act; TDEHTMLPart *htmlpart; TQValueVector<SearchProvider> mSites; HistoryManager *history; diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp index 803aba0..0a9e28d 100644 --- a/noatun-plugins/nexscope/gui.cpp +++ b/noatun-plugins/nexscope/gui.cpp @@ -71,7 +71,7 @@ private: Control::Control() : mConfigurator(0) { { - KToolBar *tools=toolBar(); + TDEToolBar *tools=toolBar(); KStdAction::save(this, TQT_SLOT(save()), actionCollection())->plug(tools); KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection())->plug(tools); KStdAction::open(this, TQT_SLOT(open()), actionCollection())->plug(tools); @@ -173,7 +173,7 @@ void Control::currentChanged(TQListViewItem *item) } -RendererListView::RendererListView(TQWidget *p) : KListView(p) +RendererListView::RendererListView(TQWidget *p) : TDEListView(p) { addColumn(i18n("Name")); header()->hide(); diff --git a/noatun-plugins/nexscope/gui.h b/noatun-plugins/nexscope/gui.h index baf0330..0630486 100644 --- a/noatun-plugins/nexscope/gui.h +++ b/noatun-plugins/nexscope/gui.h @@ -10,7 +10,7 @@ class Renderer; -class Control : public KMainWindow +class Control : public TDEMainWindow { Q_OBJECT @@ -34,13 +34,13 @@ protected slots: private: TQWidget *mRight; - KListView *mTree, *mCreatorsList; + TDEListView *mTree, *mCreatorsList; TQWidget *mConfigurator; KURL mCurrentURL; }; -class RendererListView : public KListView +class RendererListView : public TDEListView { Q_OBJECT diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index bde3302..83cc1bb 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -72,7 +72,7 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) TQHBox *middle = new TQHBox(this); middle->setSpacing(7); - mSchemaTree = new KListView(middle); + mSchemaTree = new TDEListView(middle); connect( mSchemaTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_SLOT(setCurrent(TQListViewItem*)) @@ -171,19 +171,19 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) } -class QueryGroupItem : public KListViewItem +class QueryGroupItem : public TDEListViewItem { QueryGroup *mItem; public: QueryGroupItem(QueryGroupItem *parent, QueryGroup *group, QueryGroupItem *after=0) - : KListViewItem(parent, after) + : TDEListViewItem(parent, after) { init(group); } - QueryGroupItem(KListView *parent, QueryGroup *group, QueryGroupItem *after=0) - : KListViewItem(parent, after) + QueryGroupItem(TDEListView *parent, QueryGroup *group, QueryGroupItem *after=0) + : TDEListViewItem(parent, after) { init(group); } @@ -199,10 +199,10 @@ public: } QueryGroupItem *parent() - { return static_cast<QueryGroupItem*>(KListViewItem::parent()); } + { return static_cast<QueryGroupItem*>(TDEListViewItem::parent()); } - KListView *listView() - { return static_cast<KListView*>(KListViewItem::listView()); } + TDEListView *listView() + { return static_cast<TDEListView*>(TDEListViewItem::listView()); } private: void init(QueryGroup *group) @@ -510,7 +510,7 @@ SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique) TQHBox *middle = new TQHBox(this); middle->setSpacing(7); - mSliceList = new KListView(middle); + mSliceList = new TDEListView(middle); TQWhatsThis::add(mSliceList, i18n("The list of slices. A Slice is part of the full collection. This allows you to categorize your playlist. You can add an item to the list by right clicking on it and selecting the Slice you want it in.")); mSliceList->addColumn(""); mSliceList->header()->hide(); @@ -535,20 +535,20 @@ SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique) } -class SliceListItem : public KListViewItem +class SliceListItem : public TDEListViewItem { Slice *mSlice; public: - SliceListItem(KListView *parent, Slice *slice) - : KListViewItem(parent, slice->name()), mSlice(slice) + SliceListItem(TDEListView *parent, Slice *slice) + : TDEListViewItem(parent, slice->name()), mSlice(slice) { } /** * new item **/ - SliceListItem(KListView *parent) - : KListViewItem(parent, i18n("New Slice")), mSlice(0) + SliceListItem(TDEListView *parent) + : TDEListViewItem(parent, i18n("New Slice")), mSlice(0) { } diff --git a/noatun-plugins/oblique/cmodule.h b/noatun-plugins/oblique/cmodule.h index 6455758..f0ee0d4 100644 --- a/noatun-plugins/oblique/cmodule.h +++ b/noatun-plugins/oblique/cmodule.h @@ -7,7 +7,7 @@ #include <noatun/pref.h> #include "query.h" -class KListView; +class TDEListView; class KLineEdit; class TQDialog; class Oblique; @@ -22,7 +22,7 @@ Q_OBJECT Oblique *mOblique; - KListView *mSchemaTree; + TDEListView *mSchemaTree; KLineEdit *mPropertyEdit, *mValueEdit, *mPresentationEdit; TQComboBox *mSchemaList; @@ -87,7 +87,7 @@ class SliceConfig : public TQWidget Q_OBJECT Oblique *mOblique; - KListView *mSliceList; + TDEListView *mSliceList; TQPushButton *mAdd, *mRemove; TQValueList<SliceListItem*> mAddedItems; TQValueList<Slice*> mRemovedItems; diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp index efc736d..b04945d 100644 --- a/noatun-plugins/oblique/menu.cpp +++ b/noatun-plugins/oblique/menu.cpp @@ -8,7 +8,7 @@ #include "tree.h" FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file) - : KPopupMenu(parent) + : TDEPopupMenu(parent) { if (file) mFiles.append(file); @@ -40,7 +40,7 @@ static void addTo(TQValueList<File> &files, TreeItem *item) } FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items) - : KPopupMenu(parent) + : TDEPopupMenu(parent) { addTo(mFiles, items); @@ -93,7 +93,7 @@ SliceListAction::SliceListAction( const TQString &text, Oblique *oblique, TQObject *reciever, const char *slot, const TQValueList<File> &files, TQObject *parent, const char *name - ) : KActionMenu(text, parent, name) + ) : TDEActionMenu(text, parent, name) { mFiles = files; mOblique = oblique; @@ -107,7 +107,7 @@ SliceListAction::SliceListAction( void SliceListAction::slicesModified() { mIndexToSlices.clear(); - KPopupMenu *menu = popupMenu(); + TDEPopupMenu *menu = popupMenu(); menu->clear(); TQPtrList<Slice> slices = mOblique->base()->slices(); @@ -154,7 +154,7 @@ SchemaListAction::SchemaListAction( const TQString &text, TQObject *reciever, const char *slot, TQObject *parent, const char *name - ) : KActionMenu(text, parent, name) + ) : TDEActionMenu(text, parent, name) { mTree = 0; if (reciever) @@ -167,7 +167,7 @@ void SchemaListAction::prepare() { assert(mTree); mIndexToSchemas.clear(); - KPopupMenu *menu = popupMenu(); + TDEPopupMenu *menu = popupMenu(); menu->clear(); if (!mTree) return; diff --git a/noatun-plugins/oblique/menu.h b/noatun-plugins/oblique/menu.h index 0b4e509..32d7d8d 100644 --- a/noatun-plugins/oblique/menu.h +++ b/noatun-plugins/oblique/menu.h @@ -14,7 +14,7 @@ /** * a context menu for a item in the list **/ -class FileMenu : public KPopupMenu +class FileMenu : public TDEPopupMenu { Q_OBJECT @@ -33,7 +33,7 @@ private slots: void toggleInSlice(Slice *slice); }; -class SliceListAction : public KActionMenu +class SliceListAction : public TDEActionMenu { Q_OBJECT @@ -57,7 +57,7 @@ private slots: }; -class SchemaListAction : public KActionMenu +class SchemaListAction : public TDEActionMenu { Q_OBJECT diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index 04c9cdd..4c83cc8 100644 --- a/noatun-plugins/oblique/tree.cpp +++ b/noatun-plugins/oblique/tree.cpp @@ -150,7 +150,7 @@ inline static void sortify(T *item) TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p) - : KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) + : TDEListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) { if (group->option(QueryGroup::Playable)) { @@ -162,7 +162,7 @@ TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQSt } TreeItem::TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p) - : KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) + : TDEListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) { if (group->option(QueryGroup::Playable)) { @@ -250,7 +250,7 @@ int TreeItem::compare(TQListViewItem *i, int col, bool) const Tree *TreeItem::tree() { - return static_cast<Tree*>(KListViewItem::listView()); + return static_cast<Tree*>(TDEListViewItem::listView()); } TQString TreeItem::presentation() const @@ -309,7 +309,7 @@ void TreeItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int w text.setRgb(r/2,g/2,b/2); newcg.setColor(TQColorGroup::Text, text); } - KListViewItem::paintCell(p, newcg, column, width, align); + TDEListViewItem::paintCell(p, newcg, column, width, align); font.setUnderline(false); p->setFont(font); @@ -322,7 +322,7 @@ void TreeItem::setOpen(bool o) mUserOpened = o; tree()->removeAutoExpanded(this); } - KListViewItem::setOpen(o); + TDEListViewItem::setOpen(o); } void TreeItem::autoExpand() @@ -432,7 +432,7 @@ TreeItem *TreeItem::next() Tree::Tree(Oblique *oblique, TQWidget *parent) - : KListView(parent), mOblique(oblique), mAutoExpanding(0) + : TDEListView(parent), mOblique(oblique), mAutoExpanding(0) { mCurrent = 0; lastMenu =0; @@ -458,8 +458,8 @@ Tree::Tree(Oblique *oblique, TQWidget *parent) ); connect( - this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(contextMenu(KListView*, TQListViewItem*, const TQPoint&)) + this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQT_SLOT(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); connect( this, TQT_SIGNAL(executed(TQListViewItem*)), @@ -500,7 +500,7 @@ void Tree::clear() napp->player()->stop(); setCurrent(0); } - KListView::clear(); + TDEListView::clear(); } void Tree::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme) @@ -512,7 +512,7 @@ void Tree::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme) return; } - KListView::movableDropEvent(parent, afterme); + TDEListView::movableDropEvent(parent, afterme); } @@ -533,7 +533,7 @@ void Tree::dropped(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> & TreeItem *Tree::firstChild() - { return static_cast<TreeItem*>(KListView::firstChild()); } + { return static_cast<TreeItem*>(TDEListView::firstChild()); } TreeItem *Tree::find(File item) { @@ -682,7 +682,7 @@ bool Tree::setSchema(const TQString &name) TQDragObject *Tree::dragObject() { if (currentItem() && static_cast<TreeItem*>(currentItem())->file()) - return KListView::dragObject(); + return TDEListView::dragObject(); return 0; } @@ -701,7 +701,7 @@ void Tree::setLimit(const TQString &text) } -void Tree::contextMenu(KListView*, TQListViewItem* i, const TQPoint& p) +void Tree::contextMenu(TDEListView*, TQListViewItem* i, const TQPoint& p) { if (!i) return; delete lastMenu; diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h index 4e8317c..c55e606 100644 --- a/noatun-plugins/oblique/tree.h +++ b/noatun-plugins/oblique/tree.h @@ -14,7 +14,7 @@ class Oblique; class Tree; -class TreeItem : public KListViewItem +class TreeItem : public TDEListViewItem { QueryGroup *mGroup; File mFile; @@ -31,11 +31,11 @@ public: const QueryGroup *group() const { return mGroup; } void setGroup(QueryGroup *group) { mGroup = group; } - TreeItem *parent() { return static_cast<TreeItem*>(KListViewItem::parent()); } + TreeItem *parent() { return static_cast<TreeItem*>(TDEListViewItem::parent()); } Tree *tree(); - TreeItem *itemBelow() { return static_cast<TreeItem*>(KListViewItem::itemBelow()); } - TreeItem *firstChild() { return static_cast<TreeItem*>(KListViewItem::firstChild()); } - TreeItem *nextSibling() { return static_cast<TreeItem*>(KListViewItem::nextSibling()); } + TreeItem *itemBelow() { return static_cast<TreeItem*>(TDEListViewItem::itemBelow()); } + TreeItem *firstChild() { return static_cast<TreeItem*>(TDEListViewItem::firstChild()); } + TreeItem *nextSibling() { return static_cast<TreeItem*>(TDEListViewItem::nextSibling()); } // for gdb, which sucks. TQString presentation() const; @@ -83,7 +83,7 @@ private: class FileMenu; class Loader; -class Tree : public KListView +class Tree : public TDEListView { Q_OBJECT @@ -151,7 +151,7 @@ public slots: void setLimit(const TQString &text); private slots: - void contextMenu(KListView* l, TQListViewItem* i, const TQPoint& p); + void contextMenu(TDEListView* l, TQListViewItem* i, const TQPoint& p); void play(TQListViewItem *item); void destroyLoader(); diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp index 5714c99..30da384 100644 --- a/noatun-plugins/oblique/view.cpp +++ b/noatun-plugins/oblique/view.cpp @@ -30,7 +30,7 @@ public: View::View(Oblique *oblique) - : KMainWindow(0, 0) + : TDEMainWindow(0, 0) { mOblique = oblique; mTree = 0; @@ -41,13 +41,13 @@ View::View(Oblique *oblique) setCentralWidget(mTabs); - KAction *ac; - ac = new KAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files"); + TDEAction *ac; + ac = new TDEAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files"); ac->setWhatsThis(i18n("Add a reference to a media file on disk to this collection.")); - ac = new KAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); + ac = new TDEAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); -// ac = new KAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload"); +// ac = new TDEAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload"); // ac->setWhatsThis(i18n("Reread the collection and meta-information from its files.")); ac = new SliceListAction( @@ -61,12 +61,12 @@ View::View(Oblique *oblique) ); mSchemaListAction->setWhatsThis(i18n("Select a schema to use to collate the tree.")); - ac = new KAction( + ac = new TDEAction( i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT(addTab()), actionCollection(), "newtab" ); - mRemoveTabAction = new KAction( + mRemoveTabAction = new TDEAction( i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT(removeTab()), actionCollection(), "removecurrenttab" ); @@ -79,7 +79,7 @@ View::View(Oblique *oblique) TQt::AlignVCenter | TQt::ShowPrefix ); l->adjustSize(); - new KWidgetAction(l, i18n("&Jump:"), KShortcut(ALT + Key_J), 0, 0, actionCollection(), "jump_label"); + new KWidgetAction(l, i18n("&Jump:"), TDEShortcut(ALT + Key_J), 0, 0, actionCollection(), "jump_label"); LineEditAction *jumpAction = new LineEditAction(i18n("Jump Bar"), 0, 0, actionCollection(), "jump_text"); jumpAction->setWhatsThis(i18n("Only display items which contain this string")); @@ -241,8 +241,8 @@ void View::use(Slice *s) -LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name) - : KWidgetAction(new KLineEdit(0), text, KShortcut(0), reciever, slot, parent, name) +LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, TDEActionCollection *parent, const char *name) + : KWidgetAction(new KLineEdit(0), text, TDEShortcut(0), reciever, slot, parent, name) { setAutoSized(true); } diff --git a/noatun-plugins/oblique/view.h b/noatun-plugins/oblique/view.h index 86ecece..397fc62 100644 --- a/noatun-plugins/oblique/view.h +++ b/noatun-plugins/oblique/view.h @@ -13,7 +13,7 @@ class SchemaListAction; class TabWidget; -class View : public KMainWindow +class View : public TDEMainWindow { Q_OBJECT @@ -21,7 +21,7 @@ Q_OBJECT Tree *mTree; TQValueList<Tree*> mTrees; TabWidget *mTabs; - KAction *mRemoveTabAction; + TDEAction *mRemoveTabAction; SchemaListAction *mSchemaListAction; public: @@ -62,7 +62,7 @@ class LineEditAction : public KWidgetAction Q_OBJECT public: - LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name); + LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, TDEActionCollection *parent, const char *name); KLineEdit *widget() { return static_cast<KLineEdit*>(KWidgetAction::widget()); } KLineEdit *lineEdit() { return widget(); } diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp index cebc10e..6c51903 100644 --- a/noatun-plugins/wavecapture/wavecapture.cpp +++ b/noatun-plugins/wavecapture/wavecapture.cpp @@ -139,7 +139,7 @@ void WaveCapture::saveAs() { KURL url = dlg.selectedURL(); if (url.isValid()) - KRecentDocument::add( url ); + TDERecentDocument::add( url ); m_job = TDEIO::file_move( KURL( filename2 ), url, -1, true ); connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( copyFinished( TDEIO::Job* ) ) ); |